diff --git a/src/container/calculator.cpp b/src/container/calculator.cpp index ca6c71dea..4807a03ce 100644 --- a/src/container/calculator.cpp +++ b/src/container/calculator.cpp @@ -217,6 +217,7 @@ qreal Calculator::find_var(QString s) void Calculator::serror(qint32 error) { + //TODO please translate text down here into english QString e[]= { "Синтаксическая ошибка", diff --git a/src/container/vcontainer.cpp b/src/container/vcontainer.cpp index 108909dc7..8643c2afa 100644 --- a/src/container/vcontainer.cpp +++ b/src/container/vcontainer.cpp @@ -357,7 +357,7 @@ QPainterPath VContainer::Equidistant(QVector points, const Detail::Equi QVector ekvPoints; if ( points.size() < 3 ) { - qDebug()<<"Not enough points for build equidistant.\n"; + qDebug()<<"Not enough points for building the equidistant.\n"; return ekv; } for (qint32 i = 0; i < points.size(); ++i ) @@ -383,6 +383,7 @@ QPainterPath VContainer::Equidistant(QVector points, const Detail::Equi } for (qint32 i = 0; i < points.size(); ++i ) { + //TODO please translate comments into english if ( i == 0 && eqv == Detail::CloseEquidistant) {//перша точка, ламана замкнена ekvPoints<Point along line - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -76,20 +76,20 @@ - Formula calculation of length of line + Formula for the calculation of length of line - Calculate formula + Calculate value ... - + :/icon/24x24/equal.png:/icon/24x24/equal.png @@ -176,7 +176,7 @@ - Name new point + Point label @@ -186,13 +186,13 @@ - Put variable into formula + Insert variable into the formula ... - + :/icon/24x24/putHere.png:/icon/24x24/putHere.png @@ -246,14 +246,14 @@ - Type line + Type of line - Show line from first point to our point + Show line from first point to this point @@ -281,7 +281,7 @@ - Standart table + Standard table @@ -326,7 +326,7 @@ - Variables. Click twice to select. + Variables - Click twice to insert into formula @@ -369,7 +369,7 @@ buttonBox - + diff --git a/src/dialogs/dialogarc.cpp b/src/dialogs/dialogarc.cpp index d9429dd36..c3ea343ef 100644 --- a/src/dialogs/dialogarc.cpp +++ b/src/dialogs/dialogarc.cpp @@ -170,7 +170,7 @@ void DialogArc::ValChenged(int row) if (ui->radioButtonLineAngles->isChecked()) { QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetLineAngle(item->text())) - .arg(tr("Value angle of line.")); + .arg(tr("Value of angle of line.")); ui->labelDescription->setText(desc); return; } diff --git a/src/dialogs/dialogarc.ui b/src/dialogs/dialogarc.ui index 65ab8d07b..98080c484 100644 --- a/src/dialogs/dialogarc.ui +++ b/src/dialogs/dialogarc.ui @@ -14,7 +14,7 @@ Arc - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -82,20 +82,20 @@ - Formula calculation of radius of arc + Formula for the calculation of radius of arc - Put variable into formula + Insert variable into the formula ... - + :/icon/24x24/putHereLeft.png:/icon/24x24/putHereLeft.png @@ -109,13 +109,13 @@ - Calculate formula + Calculate value ... - + :/icon/24x24/equal.png:/icon/24x24/equal.png @@ -218,13 +218,13 @@ - Put variable into formula + Insert variable into formula ... - + :/icon/24x24/putHereLeft.png:/icon/24x24/putHereLeft.png @@ -238,13 +238,13 @@ - Calculate formula + Calculate value ... - + :/icon/24x24/equal.png:/icon/24x24/equal.png @@ -347,13 +347,13 @@ - Put variable into formula + Insert marked variable into formula ... - + :/icon/24x24/putHereLeft.png:/icon/24x24/putHereLeft.png @@ -367,13 +367,13 @@ - Calculate formula + Calculate value ... - + :/icon/24x24/equal.png:/icon/24x24/equal.png @@ -458,7 +458,7 @@ - Standart table + Standard table @@ -563,7 +563,7 @@ buttonBox - + diff --git a/src/dialogs/dialogbisector.ui b/src/dialogs/dialogbisector.ui index c33b41537..bab63fbc7 100644 --- a/src/dialogs/dialogbisector.ui +++ b/src/dialogs/dialogbisector.ui @@ -79,14 +79,14 @@ - Formula calculation of length of bisector + Calculation of length of bisector by using the formula - Calculate formula + Calculate value ... @@ -179,7 +179,7 @@ - Name new point + Point label @@ -189,7 +189,7 @@ - Put variable into formula + Insert marked variable into the formula ... @@ -292,7 +292,7 @@ - Show line from second point to our point + Show line from second point to this point @@ -320,7 +320,7 @@ - Standart table + Standard table @@ -368,7 +368,7 @@ - Variables. Click twice to select. + Variables - Click twice to insert into formula diff --git a/src/dialogs/dialogdetail.ui b/src/dialogs/dialogdetail.ui index 08aba5839..7d25b3c3e 100644 --- a/src/dialogs/dialogdetail.ui +++ b/src/dialogs/dialogdetail.ui @@ -14,7 +14,7 @@ Detail - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -236,7 +236,7 @@ buttonBox - + diff --git a/src/dialogs/dialogendline.ui b/src/dialogs/dialogendline.ui index ad99685ca..9601b58d8 100644 --- a/src/dialogs/dialogendline.ui +++ b/src/dialogs/dialogendline.ui @@ -11,10 +11,10 @@ - Point in the end of line + Point in the end of a line - + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png @@ -82,20 +82,20 @@ - Formula calculation of length of line + Formula for calculation of length of line - Calculate formula + Calculate value ... - + :/icon/24x24/equal.png:/icon/24x24/equal.png @@ -162,7 +162,7 @@ ... - + :/icon/24x24/putHere.png:/icon/24x24/putHere.png @@ -223,7 +223,7 @@ - Name new point + Point label @@ -441,14 +441,14 @@ - Type line + Type of line - Show line from first point to our point + Show line from first point to this point @@ -476,7 +476,7 @@ - Standart table + Standard table @@ -524,7 +524,7 @@ - Variables. Click twice to select. + Variables - Click twice to insert in formula diff --git a/src/dialogs/dialogheight.ui b/src/dialogs/dialogheight.ui index 9c4900050..db3460197 100644 --- a/src/dialogs/dialogheight.ui +++ b/src/dialogs/dialogheight.ui @@ -65,7 +65,7 @@ - Name new point + Point label @@ -151,7 +151,7 @@ - Type line + Type of line diff --git a/src/dialogs/dialoghistory.cpp b/src/dialogs/dialoghistory.cpp index 95c29a52e..268a7db85 100644 --- a/src/dialogs/dialoghistory.cpp +++ b/src/dialogs/dialoghistory.cpp @@ -205,7 +205,7 @@ QString DialogHistory::Record(const VToolRecord &tool) data->GetPoint(tool.getId()).name()); break; case Tool::ShoulderPointTool: - record = QString(tr("%1 - Point of soulder")).arg(data->GetPoint(tool.getId()).name()); + record = QString(tr("%1 - Point of shoulder")).arg(data->GetPoint(tool.getId()).name()); break; case Tool::NormalTool: domElement = doc->elementById(QString().setNum(tool.getId())); @@ -214,7 +214,7 @@ QString DialogHistory::Record(const VToolRecord &tool) basePointId = domElement.attribute("firstPoint", "").toLongLong(); secondPointId = domElement.attribute("secondPoint", "").toLongLong(); } - record = QString(tr("%3 - Normal to line %1_%2")).arg(data->GetPoint(basePointId).name(), + record = QString(tr("%3 - normal to line %1_%2")).arg(data->GetPoint(basePointId).name(), data->GetPoint(secondPointId).name(), data->GetPoint(tool.getId()).name()); break; @@ -226,7 +226,7 @@ QString DialogHistory::Record(const VToolRecord &tool) basePointId = domElement.attribute("secondPoint", "").toLongLong(); thirdPointId = domElement.attribute("thirdPoint", "").toLongLong(); } - record = QString(tr("%4 - Bisector of angle %1_%2_%3")).arg(data->GetPoint(firstPointId).name(), + record = QString(tr("%4 - bisector of angle %1_%2_%3")).arg(data->GetPoint(firstPointId).name(), data->GetPoint(basePointId).name(), data->GetPoint(thirdPointId).name(), data->GetPoint(tool.getId()).name()); @@ -240,7 +240,7 @@ QString DialogHistory::Record(const VToolRecord &tool) p1Line2 = domElement.attribute("p1Line2", "").toLongLong(); p2Line2 = domElement.attribute("p2Line2", "").toLongLong(); } - record = QString(tr("%5 - Point of intersection lines %1_%2 and %3_%4")).arg(data->GetPoint(p1Line1).name(), + record = QString(tr("%5 - point of intersecting lines %1_%2 and %3_%4")).arg(data->GetPoint(p1Line1).name(), data->GetPoint(p2Line1).name(), data->GetPoint(p1Line2).name(), data->GetPoint(p2Line2).name(), @@ -282,7 +282,7 @@ QString DialogHistory::Record(const VToolRecord &tool) firstPointId = domElement.attribute("firstPoint", "").toLongLong(); secondPointId = domElement.attribute("secondPoint", "").toLongLong(); } - record = QString(tr("%4 - Point of contact arc with center in point %1 and line %2_%3")).arg( + record = QString(tr("%4 - point of contact of arc with the center in point %1 and line %2_%3")).arg( data->GetPoint(center).name(), data->GetPoint(firstPointId).name(), data->GetPoint(secondPointId).name(), data->GetPoint(tool.getId()).name()); break; @@ -297,7 +297,7 @@ QString DialogHistory::Record(const VToolRecord &tool) p1LineId = domElement.attribute("p1Line", "").toLongLong(); p2LineId = domElement.attribute("p2Line", "").toLongLong(); } - record = QString(tr("Point of perpendical from point %1 to line %2_%3")).arg( + record = QString(tr("Point of perpendicular from point %1 to line %2_%3")).arg( data->GetPoint(basePointId).name(), data->GetPoint(p1LineId).name(), data->GetPoint(p2LineId).name()); break; diff --git a/src/dialogs/dialogincrements.ui b/src/dialogs/dialogincrements.ui index 74203d5cc..2a08fca5c 100644 --- a/src/dialogs/dialogincrements.ui +++ b/src/dialogs/dialogincrements.ui @@ -31,7 +31,7 @@ - Table sizes + Sizes table diff --git a/src/dialogs/dialoglineintersect.ui b/src/dialogs/dialoglineintersect.ui index 25b5f8e95..9326698ea 100644 --- a/src/dialogs/dialoglineintersect.ui +++ b/src/dialogs/dialoglineintersect.ui @@ -69,7 +69,7 @@ - Name new point + Point label diff --git a/src/dialogs/dialognormal.ui b/src/dialogs/dialognormal.ui index 2283dbe55..70d5491a4 100644 --- a/src/dialogs/dialognormal.ui +++ b/src/dialogs/dialognormal.ui @@ -82,14 +82,14 @@ - Formula calculation of length of normal + Formula for calculation of length of normal - Calculate formula + Calculate value ... @@ -182,7 +182,7 @@ - Name new point + Point label @@ -192,7 +192,7 @@ - Put variable into formula + Insert variable into formula ... @@ -460,14 +460,14 @@ - Type line + Type of line - Show line from first point to our point + Show line from first point to this point @@ -495,7 +495,7 @@ - Standart table + Standard table @@ -543,7 +543,7 @@ - Variables. Click twice to select. + Variables - Click twice to insert into formula diff --git a/src/dialogs/dialogpointofcontact.ui b/src/dialogs/dialogpointofcontact.ui index e4f1fba75..1931ffa95 100644 --- a/src/dialogs/dialogpointofcontact.ui +++ b/src/dialogs/dialogpointofcontact.ui @@ -82,14 +82,14 @@ - Formula calculation of radius of arc + Formula for calculation of radius of arc - Calculate formula + Calculate value ... @@ -182,7 +182,7 @@ - Name new point + Point label @@ -192,7 +192,7 @@ - Put variable into formula + Insert variable into formula ... @@ -241,7 +241,7 @@ - Slect point of center of arc + Select point of center of arc @@ -335,7 +335,7 @@ - Standart table + Standard table @@ -383,7 +383,7 @@ - Variables. Click twice to select. + Variables - Click twice to insert into formula. diff --git a/src/dialogs/dialogpointofintersection.ui b/src/dialogs/dialogpointofintersection.ui index 303aa8cc0..9295f65ee 100644 --- a/src/dialogs/dialogpointofintersection.ui +++ b/src/dialogs/dialogpointofintersection.ui @@ -62,7 +62,7 @@ - Name new point + Point label @@ -82,7 +82,7 @@ - Point vertically + vertical point @@ -106,7 +106,7 @@ - Point horizontally + horizontal point diff --git a/src/dialogs/dialogshoulderpoint.ui b/src/dialogs/dialogshoulderpoint.ui index b1865211e..48539b116 100644 --- a/src/dialogs/dialogshoulderpoint.ui +++ b/src/dialogs/dialogshoulderpoint.ui @@ -82,14 +82,14 @@ - Formula calculation of length of line + Formula for calculation of length of line - Calculate formula + Calculate value ... @@ -182,7 +182,7 @@ - Name new point + Point label @@ -192,7 +192,7 @@ - Put variable into formula + Insert variable into formula ... @@ -356,7 +356,7 @@ - Standart table + Standard table @@ -404,7 +404,7 @@ - Variables. Click twice to select. + Variables - Click twice to insert into formula diff --git a/src/dialogs/dialogsinglepoint.ui b/src/dialogs/dialogsinglepoint.ui index eb2d385d1..6d84a9394 100644 --- a/src/dialogs/dialogsinglepoint.ui +++ b/src/dialogs/dialogsinglepoint.ui @@ -111,7 +111,7 @@ - Point name + Point label diff --git a/src/dialogs/dialogtriangle.ui b/src/dialogs/dialogtriangle.ui index 7e788b2f0..4121e7e01 100644 --- a/src/dialogs/dialogtriangle.ui +++ b/src/dialogs/dialogtriangle.ui @@ -65,7 +65,7 @@ - Name new point + Point label diff --git a/src/geometry/varc.cpp b/src/geometry/varc.cpp index 2dfd52a70..3bcda78e5 100644 --- a/src/geometry/varc.cpp +++ b/src/geometry/varc.cpp @@ -167,7 +167,7 @@ QVector VArc::SplOfArc(qint32 number) const qint32 n = NumberSplOfArc (); if ( number > n ) { - QString error = QString(tr("Arc have not this number of part.")); + QString error = QString(tr("Arc has not this number of parts.")); throw VException(error); } qreal f1 = GetF1 (); diff --git a/src/geometry/vspline.cpp b/src/geometry/vspline.cpp index 54e5026a0..a15fbea26 100644 --- a/src/geometry/vspline.cpp +++ b/src/geometry/vspline.cpp @@ -204,6 +204,7 @@ QLineF::IntersectType VSpline::CrossingSplLine ( const QLineF &line, QPointF *in return type; } } + //TODO please translate into english throw "Не можу знайти точку перетину сплайну з лінією."; } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index abd97ea9c..6cf671479 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -76,7 +76,7 @@ MainWindow::MainWindow(QWidget *parent) QSizePolicy policy(QSizePolicy::Expanding, QSizePolicy::Expanding); policy.setHorizontalStretch(12); view->setSizePolicy(policy); - helpLabel = new QLabel(tr("Create new drawing for start working.")); + helpLabel = new QLabel(tr("Create new pattern piece to start working.")); ui->statusBar->addWidget(helpLabel); connect(ui->actionArrowTool, &QAction::triggered, this, &MainWindow::ActionAroowTool); @@ -137,7 +137,7 @@ void MainWindow::ActionNewDraw() dlg->setInputMode( QInputDialog::TextInput ); dlg->setLabelText(tr("Drawing:")); dlg->setTextEchoMode(QLineEdit::Normal); - dlg->setWindowTitle(tr("Enter a name for the drawing.")); + dlg->setWindowTitle(tr("Enter a label for the pattern piece.")); dlg->resize(300, 100); dlg->setTextValue(nDraw); while (1) @@ -152,7 +152,7 @@ void MainWindow::ActionNewDraw() index = comboBoxDraws->findText(nameDraw); if (index != -1) {//we already have this name - qCritical()<GetNameActivDraw(); QInputDialog *dlg = new QInputDialog(this); dlg->setInputMode( QInputDialog::TextInput ); - dlg->setLabelText(tr("Drawing:")); + dlg->setLabelText(tr("Pattern piece:")); dlg->setTextEchoMode(QLineEdit::Normal); - dlg->setWindowTitle(tr("Enter a new name for the drawing.")); + dlg->setWindowTitle(tr("Enter a new label for the pattern piece.")); dlg->resize(300, 100); dlg->setTextValue(nDraw); while (1) @@ -216,7 +216,7 @@ void MainWindow::OptionDraw() index = comboBoxDraws->findText(nameDraw); if (index != -1) {//we already have this name - qCritical()< - Drawing + Pattern piece @@ -775,10 +775,10 @@ :/icon/32x32/new_draw.png:/icon/32x32/new_draw.png - New drawing + New pattern piece - Add new drawing + Add new pattern piece @@ -787,10 +787,10 @@ :/icon/32x32/option_draw.png:/icon/32x32/option_draw.png - Change the name of drawing + Change the name of pattern piece - Change the name of drawing + Change the name of pattern piece diff --git a/src/tablewindow.cpp b/src/tablewindow.cpp index 132c3a5e8..a6a11f054 100644 --- a/src/tablewindow.cpp +++ b/src/tablewindow.cpp @@ -26,6 +26,8 @@ ** *************************************************************************/ +//TODO: If this class is still relevant, please translate all russian/ukrain text into english + #include "tablewindow.h" #include "ui_tablewindow.h" #include "widgets/vtablegraphicsview.h" diff --git a/src/tools/drawTools/vtoollinepoint.cpp b/src/tools/drawTools/vtoollinepoint.cpp index e0042b60d..6b612c2c6 100644 --- a/src/tools/drawTools/vtoollinepoint.cpp +++ b/src/tools/drawTools/vtoollinepoint.cpp @@ -35,6 +35,7 @@ VToolLinePoint::VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64 mainLine(0) { Q_ASSERT_X(basePointId > 0, Q_FUNC_INFO, "basePointId <= 0"); + //TODO please translate comment //Лінія, що з'єднує дві точки QPointF point1 = data->GetPoint(basePointId).toQPointF(); QPointF point2 = data->GetPoint(id).toQPointF(); diff --git a/src/tools/drawTools/vtoolsinglepoint.cpp b/src/tools/drawTools/vtoolsinglepoint.cpp index 0308f2963..2342378f4 100644 --- a/src/tools/drawTools/vtoolsinglepoint.cpp +++ b/src/tools/drawTools/vtoolsinglepoint.cpp @@ -66,6 +66,7 @@ void VToolSinglePoint::AddToFile() AddToCalculation(domElement); } +//TODO please translate comments into english QVariant VToolSinglePoint::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) { if (change == ItemPositionChange && scene()) diff --git a/src/tools/modelingTools/vmodelingline.cpp b/src/tools/modelingTools/vmodelingline.cpp index 3ae98a59f..8f58bbbfc 100644 --- a/src/tools/modelingTools/vmodelingline.cpp +++ b/src/tools/modelingTools/vmodelingline.cpp @@ -36,6 +36,7 @@ VModelingLine::VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qin secondPoint(secondPoint), dialogLine(QSharedPointer()) { ignoreFullUpdate = true; + //TODO translate please //Лінія VPointF first = data->GetPointModeling(firstPoint); VPointF second = data->GetPointModeling(secondPoint); diff --git a/src/tools/modelingTools/vmodelingtool.h b/src/tools/modelingTools/vmodelingtool.h index 09c9b17b1..c78ff847a 100644 --- a/src/tools/modelingTools/vmodelingtool.h +++ b/src/tools/modelingTools/vmodelingtool.h @@ -96,7 +96,7 @@ protected: if (ignoreContextMenuEvent == false) { QMenu menu; - QAction *actionOption = menu.addAction(tr("Option")); + QAction *actionOption = menu.addAction(tr("Options")); QAction *actionRemove = 0; if (showRemove) { diff --git a/src/tools/vabstracttool.cpp b/src/tools/vabstracttool.cpp index 0d52f3faf..af9fe1005 100644 --- a/src/tools/vabstracttool.cpp +++ b/src/tools/vabstracttool.cpp @@ -26,6 +26,7 @@ ** *************************************************************************/ +//TODO please translate comments into english #include "vabstracttool.h" const QString VAbstractTool::AttrId = QStringLiteral("id"); diff --git a/src/tools/vtooldetail.cpp b/src/tools/vtooldetail.cpp index aeffdcee5..421391b45 100644 --- a/src/tools/vtooldetail.cpp +++ b/src/tools/vtooldetail.cpp @@ -299,6 +299,7 @@ QVariant VToolDetail::itemChange(QGraphicsItem::GraphicsItemChange change, const { if (change == ItemPositionHasChanged && scene()) { + //TODO please translate into english // value - это новое положение. QPointF newPos = value.toPointF(); //qDebug()<. ** *************************************************************************/ +//TODO if this class is still in use: please translate all ukrainian text into english #include "vcontrolpointspline.h" diff --git a/src/widgets/vitem.cpp b/src/widgets/vitem.cpp index 9eea52f22..666ce1c7e 100644 --- a/src/widgets/vitem.cpp +++ b/src/widgets/vitem.cpp @@ -25,6 +25,7 @@ ** along with Valentina. If not, see . ** *************************************************************************/ +//TODO if this class is still in use: please translate all ukrainian text into english #include "vitem.h" #include "../options.h" diff --git a/src/widgets/vmaingraphicsview.cpp b/src/widgets/vmaingraphicsview.cpp index 162e2fc00..e1d371d3c 100644 --- a/src/widgets/vmaingraphicsview.cpp +++ b/src/widgets/vmaingraphicsview.cpp @@ -64,7 +64,7 @@ void VMainGraphicsView::scalingTime(qreal x) Q_UNUSED(x); qreal factor = 1.0 + static_cast(_numScheduledScalings) / 300.0; if (QApplication::keyboardModifiers() == Qt::ControlModifier) - {// If you press CTRL this code will execute + {// If you press CTRL this code will be executed scale(factor, factor); emit NewFactor(factor); } diff --git a/src/widgets/vtablegraphicsview.cpp b/src/widgets/vtablegraphicsview.cpp index 5b6b3c01c..74e369026 100644 --- a/src/widgets/vtablegraphicsview.cpp +++ b/src/widgets/vtablegraphicsview.cpp @@ -25,6 +25,7 @@ ** along with Valentina. If not, see . ** *************************************************************************/ +//TODO if this class is still in use: please translate ukrainian text into english #include "vtablegraphicsview.h" @@ -44,12 +45,12 @@ void VTableGraphicsView::selectionChanged() QList listSelectedItems = scene()->selectedItems(); if ( listSelectedItems.isEmpty() == true ) { - qDebug() << tr("detail don't find"); + qDebug() << tr("can't find detail"); emit itemChect(true); } else { - qDebug() << tr("detail find"); + qDebug() << tr("detail found"); emit itemChect(false); } }