From e312b5f740a6847850e641e3ef8d924e12b554ff Mon Sep 17 00:00:00 2001 From: luz paz Date: Wed, 10 Mar 2021 11:35:58 -0500 Subject: [PATCH] Crowdin: remove obsolete translation manually [skip ci] For some reason updatets.py is not successfully removing obsolete translations. This is a long standing issue. The workaround is to manually remove them from the .ts file. ref: https://forum.freecadweb.org/viewtopic.php?f=21&t=51825&p=483474#p482519 crowdin: https://crowdin.com/translate/freecad/7254/en-pl?filter=basic&value=0#6572886 --- src/Mod/Part/Gui/TaskCheckGeometry.cpp | 2 +- src/Mod/Sketcher/Gui/ViewProviderSketch.cpp | 15 +++++---------- .../Start/Gui/Resources/translations/StartPage.ts | 5 ----- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.cpp b/src/Mod/Part/Gui/TaskCheckGeometry.cpp index 2c998a00d6..5de7c16920 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.cpp +++ b/src/Mod/Part/Gui/TaskCheckGeometry.cpp @@ -149,7 +149,7 @@ QString checkStatusToString(const int &index) } if (index > 33 || index < 0) { - QString message(QObject::tr("Out Of Enum Range:") + " "); + QString message(QObject::tr("Out Of Enum Range:") + QString::fromLatin1(" ")); QString number; number.setNum(index); message += number; diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index 4011a8a905..a63f65150d 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -6545,34 +6545,30 @@ void ViewProviderSketch::UpdateSolverInformation() else if (dofs < 0) { // over-constrained sketch std::string msg; SketchObject::appendConflictMsg(getSketchObject()->getLastConflicting(), msg); - signalSetUp(QString::fromLatin1("%1%2
%3
") + signalSetUp(QString::fromLatin1("%1 %2
%3
") .arg(tr("Over-constrained sketch")) - .arg(" ") .arg(tr("(click to select)")) .arg(QString::fromStdString(msg))); signalSolved(QString()); } else if (hasMalformed) { // malformed constraints - signalSetUp(QString::fromLatin1("%1%2
%3
") + signalSetUp(QString::fromLatin1("%1 %2
%3
") .arg(tr("Sketch contains malformed constraints")) - .arg(" ") .arg(tr("(click to select)")) .arg(appendMalformedMsg(getSketchObject()->getLastMalformedConstraints()))); signalSolved(QString()); } else if (hasConflicts) { // conflicting constraints - signalSetUp(QString::fromLatin1("%1%2
%3
") + signalSetUp(QString::fromLatin1("%1 %2
%3
") .arg(tr("Sketch contains conflicting constraints")) - .arg(" ") .arg(tr("(click to select)")) .arg(appendConflictMsg(getSketchObject()->getLastConflicting()))); signalSolved(QString()); } else { if (hasRedundancies) { // redundant constraints - signalSetUp(QString::fromLatin1("%1%2
%3
") + signalSetUp(QString::fromLatin1("%1 %2
%3
") .arg(tr("Sketch contains redundant constraints")) - .arg(" ") .arg(tr("(click to select)")) .arg(appendRedundantMsg(getSketchObject()->getLastRedundant()))); } @@ -6580,9 +6576,8 @@ void ViewProviderSketch::UpdateSolverInformation() QString partiallyRedundantString; if(hasPartiallyRedundant) { - partiallyRedundantString = QString::fromLatin1("
%1%2
%3
") + partiallyRedundantString = QString::fromLatin1("
%1 %2
%3
") .arg(tr("Sketch contains partially redundant constraints")) - .arg(" ") .arg(tr("(click to select)")) .arg(appendPartiallyRedundantMsg(getSketchObject()->getLastPartiallyRedundant())); } diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage.ts b/src/Mod/Start/Gui/Resources/translations/StartPage.ts index 198bbc5842..0952718cc0 100644 --- a/src/Mod/Start/Gui/Resources/translations/StartPage.ts +++ b/src/Mod/Start/Gui/Resources/translations/StartPage.ts @@ -343,11 +343,6 @@ An optional image to display as background - - - If this is checked, if a style sheet is specified in General preferences, it will be used and override the colors below - - Page background color