From 7734c0564b36fdb44241ed1159f3fcdba56b99bc Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 21 Apr 2017 17:28:25 +0300 Subject: [PATCH] Localization improvements. --HG-- branch : release --- src/app/tape/tmainwindow.cpp | 2 +- .../configpages/preferencespatternpage.ui | 2 +- .../dialogs/dialogpatternproperties.ui | 4 ++-- src/app/valentina/mainwindow.cpp | 16 +++++++++----- src/app/valentina/mainwindow.ui | 22 +++++++++---------- src/libs/ifc/xml/vabstractconverter.cpp | 2 +- src/libs/vtools/dialogs/tools/dialogtool.cpp | 2 +- .../tools/piece/dialogseamallowance.cpp | 8 ++++++- .../dialogs/tools/piece/tabs/tabgrainline.ui | 2 +- .../dialogs/tools/piece/tabs/tablabels.ui | 2 +- .../dialogs/tools/piece/tabs/tabpassmarks.ui | 4 ++-- .../dialogs/tools/piece/tabs/tabpaths.ui | 4 ++-- .../dialogs/tools/piece/tabs/tabpins.ui | 2 +- src/libs/vtools/tools/vabstracttool.cpp | 2 +- 14 files changed, 42 insertions(+), 32 deletions(-) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index f0b5eb2ee..d3d0c7d78 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -2233,7 +2233,7 @@ void TMainWindow::SetCurrentFile(const QString &fileName) curFile = fileName; if (curFile.isEmpty()) { - ui->lineEditPathToFile->setText(tr("")); + ui->lineEditPathToFile->setText(QLatin1String("<") + tr("Empty") + QLatin1String(">")); ui->lineEditPathToFile->setToolTip(tr("File was not saved yet.")); ui->lineEditPathToFile->setCursorPosition(0); ui->pushButtonShowInExplorer->setEnabled(false); diff --git a/src/app/valentina/dialogs/configpages/preferencespatternpage.ui b/src/app/valentina/dialogs/configpages/preferencespatternpage.ui index 5a8c4a167..f972ae8ed 100644 --- a/src/app/valentina/dialogs/configpages/preferencespatternpage.ui +++ b/src/app/valentina/dialogs/configpages/preferencespatternpage.ui @@ -106,7 +106,7 @@ - By default forbid flipping for all new created workpieces" + By default forbid flipping for all new created workpieces Forbid flipping diff --git a/src/app/valentina/dialogs/dialogpatternproperties.ui b/src/app/valentina/dialogs/dialogpatternproperties.ui index 155897387..e28448b7e 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.ui +++ b/src/app/valentina/dialogs/dialogpatternproperties.ui @@ -21,7 +21,7 @@ - 3 + 1 @@ -725,7 +725,7 @@ - 200 + 200 true diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index affb3b1b2..0b61d0de5 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -96,6 +96,10 @@ QT_WARNING_POP const QString autosavePrefix = QStringLiteral(".autosave"); +// String below need for getting translation for key Ctrl +const QString strQShortcut = QStringLiteral("QShortcut"); // Context +const QString strCtrl = QStringLiteral("Ctrl"); // String + //--------------------------------------------------------------------------------------------------------------------- /** * @brief MainWindow constructor. @@ -1061,7 +1065,7 @@ void MainWindow::ToolGroup(bool checked) ToolSelectGroupObjects(); const QString tooltip = tr("Select one or more objects, hold %1 - for multiple selection, " "Enter - finish creation") - .arg(QCoreApplication::translate("QShortcut", "Ctrl")); + .arg(QCoreApplication::translate(strQShortcut.toUtf8().constData(), strCtrl.toUtf8().constData())); SetToolButton(checked, Tool::Group, ":/cursor/group_plus_cursor.png", tooltip, &MainWindow::ClosedDialogGroup); } @@ -1072,7 +1076,7 @@ void MainWindow::ToolRotation(bool checked) ToolSelectOperationObjects(); const QString tooltip = tr("Select one or more objects, hold %1 - for multiple selection, " "Enter - confirm selection") - .arg(QCoreApplication::translate("QShortcut", "Ctrl")); + .arg(QCoreApplication::translate(strQShortcut.toUtf8().constData(), strCtrl.toUtf8().constData())); SetToolButtonWithApply(checked, Tool::Rotation, ":/cursor/rotation_cursor.png", tooltip, &MainWindow::ClosedDrawDialogWithApply, &MainWindow::ApplyDrawDialog); @@ -1084,7 +1088,7 @@ void MainWindow::ToolFlippingByLine(bool checked) ToolSelectOperationObjects(); const QString tooltip = tr("Select one or more objects, hold %1 - for multiple selection, " "Enter - confirm selection") - .arg(QCoreApplication::translate("QShortcut", "Ctrl")); + .arg(QCoreApplication::translate(strQShortcut.toUtf8().constData(), strCtrl.toUtf8().constData())); SetToolButtonWithApply(checked, Tool::FlippingByLine, ":/cursor/flipping_line_cursor.png", tooltip, &MainWindow::ClosedDrawDialogWithApply, &MainWindow::ApplyDrawDialog); @@ -1096,7 +1100,7 @@ void MainWindow::ToolFlippingByAxis(bool checked) ToolSelectOperationObjects(); const QString tooltip = tr("Select one or more objects, hold %1 - for multiple selection, " "Enter - confirm selection") - .arg(QCoreApplication::translate("QShortcut", "Ctrl")); + .arg(QCoreApplication::translate(strQShortcut.toUtf8().constData(), strCtrl.toUtf8().constData())); SetToolButtonWithApply(checked, Tool::FlippingByAxis, ":/cursor/flipping_axis_cursor.png", tooltip, &MainWindow::ClosedDrawDialogWithApply, &MainWindow::ApplyDrawDialog); @@ -1108,7 +1112,7 @@ void MainWindow::ToolMove(bool checked) ToolSelectOperationObjects(); const QString tooltip = tr("Select one or more objects, hold %1 - for multiple selection, " "Enter - confirm selection") - .arg(QCoreApplication::translate("QShortcut", "Ctrl")); + .arg(QCoreApplication::translate(strQShortcut.toUtf8().constData(), strCtrl.toUtf8().constData())); SetToolButtonWithApply(checked, Tool::Move, ":/cursor/move_cursor.png", tooltip, &MainWindow::ClosedDrawDialogWithApply, &MainWindow::ApplyDrawDialog); @@ -2384,7 +2388,7 @@ void MainWindow::ActionLayout(bool checked) { listDetails.clear(); QMessageBox::warning(this, tr("Layout mode"), - tr("You can't use now the Layout mode. \n%1").arg(e.ErrorMessage()), + tr("You can't use now the Layout mode.") + QLatin1String(" \n") + e.ErrorMessage(), QMessageBox::Ok, QMessageBox::Ok); mode == Draw::Calculation ? ActionDraw(true) : ActionDetails(true); return; diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui index f7b6de9d4..d5a0b2aae 100644 --- a/src/app/valentina/mainwindow.ui +++ b/src/app/valentina/mainwindow.ui @@ -55,7 +55,7 @@ 0 0 - 100 + 127 358 @@ -427,7 +427,7 @@ 0 0 - 100 + 140 110 @@ -536,7 +536,7 @@ 0 0 - 100 + 140 248 @@ -798,7 +798,7 @@ 0 0 - 100 + 140 248 @@ -1146,8 +1146,8 @@ 0 0 - 100 - 196 + 140 + 326 @@ -1324,7 +1324,7 @@ 0 0 - 100 + 140 196 @@ -1511,8 +1511,8 @@ 0 0 - 100 - 58 + 140 + 326 @@ -2568,7 +2568,7 @@ Open Tape - Open Tape app for creating or editing measurements file + Open Tape app for creating or editing measurements file @@ -2650,8 +2650,8 @@ - + diff --git a/src/libs/ifc/xml/vabstractconverter.cpp b/src/libs/ifc/xml/vabstractconverter.cpp index 4cbe9b05b..ffdf0914c 100644 --- a/src/libs/ifc/xml/vabstractconverter.cpp +++ b/src/libs/ifc/xml/vabstractconverter.cpp @@ -77,7 +77,7 @@ QString VAbstractConverter::Convert() } else { - const QString errorMsg(tr("Error openning a temp file file: %1.").arg(m_tmpFile.errorString())); + const QString errorMsg(tr("Error openning a temp file: %1.").arg(m_tmpFile.errorString())); throw VException(errorMsg); } diff --git a/src/libs/vtools/dialogs/tools/dialogtool.cpp b/src/libs/vtools/dialogs/tools/dialogtool.cpp index 030ac1e1a..34a133e2a 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp @@ -804,7 +804,7 @@ qreal DialogTool::Eval(const QString &text, bool &flag, QLabel *label, const QSt flag = false; ChangeColor(labelEditFormula, Qt::red); label->setText(tr("Error") + " (" + postfix + ")"); - label->setToolTip(tr("Value can't be lass than 0")); + label->setToolTip(tr("Value can't be less than 0")); } else { diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp index 29b70b2ef..3f84f4e59 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp @@ -2211,7 +2211,13 @@ bool DialogSeamAllowance::MainPathIsValid() const if (valid) { m_ftb->SetTabText(TabOrder::Paths, tr("Paths")); - uiTabPaths->helpLabel->setText(tr("Ready!")); + QString tooltip = tr("Ready!"); + if (not applyAllowed) + { + tooltip = tooltip + QLatin1String(" ") + + tr("To open all detail's features complete creating the main path.") + QLatin1String(""); + } + uiTabPaths->helpLabel->setText(tooltip); } else { diff --git a/src/libs/vtools/dialogs/tools/piece/tabs/tabgrainline.ui b/src/libs/vtools/dialogs/tools/piece/tabs/tabgrainline.ui index b3175187f..21e76c87c 100644 --- a/src/libs/vtools/dialogs/tools/piece/tabs/tabgrainline.ui +++ b/src/libs/vtools/dialogs/tools/piece/tabs/tabgrainline.ui @@ -11,7 +11,7 @@ - Form + Form diff --git a/src/libs/vtools/dialogs/tools/piece/tabs/tablabels.ui b/src/libs/vtools/dialogs/tools/piece/tabs/tablabels.ui index 28f8dcf4b..6ddcb4901 100644 --- a/src/libs/vtools/dialogs/tools/piece/tabs/tablabels.ui +++ b/src/libs/vtools/dialogs/tools/piece/tabs/tablabels.ui @@ -11,7 +11,7 @@ - Form + Form diff --git a/src/libs/vtools/dialogs/tools/piece/tabs/tabpassmarks.ui b/src/libs/vtools/dialogs/tools/piece/tabs/tabpassmarks.ui index 78b0f3f38..0aa14e7d2 100644 --- a/src/libs/vtools/dialogs/tools/piece/tabs/tabpassmarks.ui +++ b/src/libs/vtools/dialogs/tools/piece/tabs/tabpassmarks.ui @@ -11,7 +11,7 @@ - Form + Form @@ -161,7 +161,7 @@ - + diff --git a/src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui b/src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui index 363f98f72..a538ed016 100644 --- a/src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui +++ b/src/libs/vtools/dialogs/tools/piece/tabs/tabpaths.ui @@ -11,7 +11,7 @@ - Form + Form @@ -21,7 +21,7 @@ - 0 + 1 diff --git a/src/libs/vtools/dialogs/tools/piece/tabs/tabpins.ui b/src/libs/vtools/dialogs/tools/piece/tabs/tabpins.ui index 1b6af4eb4..398f7fb32 100644 --- a/src/libs/vtools/dialogs/tools/piece/tabs/tabpins.ui +++ b/src/libs/vtools/dialogs/tools/piece/tabs/tabpins.ui @@ -11,7 +11,7 @@ - Form + Form diff --git a/src/libs/vtools/tools/vabstracttool.cpp b/src/libs/vtools/tools/vabstracttool.cpp index 95af6c0bd..7b0bbb6b5 100644 --- a/src/libs/vtools/tools/vabstracttool.cpp +++ b/src/libs/vtools/tools/vabstracttool.cpp @@ -414,7 +414,7 @@ QMap VAbstractTool::ColorsList() name = tr("light salmon"); break; case 8: // ColorGoldenRod - name = tr("golden rod"); + name = tr("goldenrod"); break; case 9: // ColorOrange name = tr("orange");