diff --git a/src/Mod/Arch/ArchStairs.py b/src/Mod/Arch/ArchStairs.py
index 62cd65a81a..6906fd06de 100644
--- a/src/Mod/Arch/ArchStairs.py
+++ b/src/Mod/Arch/ArchStairs.py
@@ -321,13 +321,13 @@ class _Stairs(ArchComponent.Component):
if not hasattr(obj,"LastSegment"):
obj.addProperty("App::PropertyLink","LastSegment","Segment and Parts","Last Segment (Flight or Landing) of Arch Stairs connecting to This Segment")
if not hasattr(obj,"AbsTop"):
- obj.addProperty("App::PropertyVector","AbsTop","Segment and Parts",QT_TRANSLATE_NOOP("App::Property","The 'absolute' top level of a flight of stairs leads to "))
+ obj.addProperty("App::PropertyVector","AbsTop","Segment and Parts",QT_TRANSLATE_NOOP("App::Property","The 'absolute' top level of a flight of stairs leads to"))
obj.setEditorMode("AbsTop",1)
if not hasattr(obj,"OutlineLeft"):
- obj.addProperty("App::PropertyVectorList","OutlineLeft","Segment and Parts",QT_TRANSLATE_NOOP("App::Property","The 'left outline' of stairs ")) # Used for Outline of Railing
+ obj.addProperty("App::PropertyVectorList","OutlineLeft","Segment and Parts",QT_TRANSLATE_NOOP("App::Property","The 'left outline' of stairs")) # Used for Outline of Railing
obj.setEditorMode("OutlineLeft",1)
if not hasattr(obj,"OutlineRight"):
- obj.addProperty("App::PropertyVectorList","OutlineRight","Segment and Parts",QT_TRANSLATE_NOOP("App::Property","The 'left outline' of stairs "))
+ obj.addProperty("App::PropertyVectorList","OutlineRight","Segment and Parts",QT_TRANSLATE_NOOP("App::Property","The 'left outline' of stairs"))
obj.setEditorMode("OutlineRight",1)
# Can't accept 'None' in list, need NaN
@@ -364,10 +364,10 @@ class _Stairs(ArchComponent.Component):
pass
if not hasattr(obj,"OutlineLeftAll"):
- obj.addProperty("App::PropertyVectorList","OutlineLeftAll","Segment and Parts",QT_TRANSLATE_NOOP("App::Property","The 'left outline' of all segments of stairs "))
+ obj.addProperty("App::PropertyVectorList","OutlineLeftAll","Segment and Parts",QT_TRANSLATE_NOOP("App::Property","The 'left outline' of all segments of stairs"))
obj.setEditorMode("OutlineLeftAll",1) # Used for Outline of Railing
if not hasattr(obj,"OutlineRightAll"):
- obj.addProperty("App::PropertyVectorList","OutlineRightAll","Segment and Parts",QT_TRANSLATE_NOOP("App::Property","The 'right outline' of all segments of stairs "))
+ obj.addProperty("App::PropertyVectorList","OutlineRightAll","Segment and Parts",QT_TRANSLATE_NOOP("App::Property","The 'right outline' of all segments of stairs"))
obj.setEditorMode("OutlineRightAll",1)
# Can't accept 'None' in list, need NaN
diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index 8cffdb849f..cbc4264686 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -2047,7 +2047,7 @@ class DraftToolBar:
self.autogroup = value
self.autoGroupButton.setText(obj.Label)
self.autoGroupButton.setIcon(obj.ViewObject.Icon)
- self.autoGroupButton.setToolTip(translate("draft", "Autogroup: ")+obj.Label)
+ self.autoGroupButton.setToolTip(translate("draft", "Autogroup:") + " " + obj.Label)
self.autoGroupButton.setDown(False)
else:
self.autogroup = None
diff --git a/src/Mod/Draft/draftguitools/gui_edit.py b/src/Mod/Draft/draftguitools/gui_edit.py
index 612d217444..936b892876 100644
--- a/src/Mod/Draft/draftguitools/gui_edit.py
+++ b/src/Mod/Draft/draftguitools/gui_edit.py
@@ -930,8 +930,8 @@ class Edit(gui_base_original.Modifier):
selection = Gui.Selection.getSelection()
self.edited_objects = []
if len(selection) > self.maxObjects:
- _err = translate("draft", "Too many objects selected, max number set to: ")
- App.Console.PrintMessage(_err + str(self.maxObjects) + "\n")
+ _err = translate("draft", "Too many objects selected, max number set to:")
+ App.Console.PrintMessage(_err + " " + str(self.maxObjects) + "\n")
return None
for obj in selection:
diff --git a/src/Mod/Draft/draftguitools/gui_scale.py b/src/Mod/Draft/draftguitools/gui_scale.py
index 65dcf64c25..0e8e77a42c 100644
--- a/src/Mod/Draft/draftguitools/gui_scale.py
+++ b/src/Mod/Draft/draftguitools/gui_scale.py
@@ -329,10 +329,12 @@ class Scale(gui_base_original.Modifier):
bads.append(obj)
if bads:
if len(bads) == 1:
- m = translate("draft", "Unable to scale object: ")
+ m = translate("draft", "Unable to scale object:")
+ m += " "
m += bads[0].Label
else:
- m = translate("draft", "Unable to scale objects: ")
+ m = translate("draft", "Unable to scale objects:")
+ m += " "
m += ", ".join([o.Label for o in bads])
m += " - " + translate("draft","This object type cannot be scaled directly. Please use the clone method.")
_err(m)
diff --git a/src/Mod/Draft/draftmake/make_arc_3points.py b/src/Mod/Draft/draftmake/make_arc_3points.py
index cb00898678..ef108fa980 100644
--- a/src/Mod/Draft/draftmake/make_arc_3points.py
+++ b/src/Mod/Draft/draftmake/make_arc_3points.py
@@ -122,12 +122,12 @@ def make_arc_3points(points, placement=None, face=False,
try:
utils.type_check([(points, (list, tuple))], name=_name)
except TypeError:
- _err(translate("draft","Points: ") + "{}".format(points))
+ _err(translate("draft","Points:") + " {}".format(points))
_err(translate("draft","Wrong input: must be list or tuple of three points exactly."))
return None
if len(points) != 3:
- _err(translate("draft","Points: ") + "{}".format(points))
+ _err(translate("draft","Points:") + " {}".format(points))
_err(translate("draft","Wrong input: must be list or tuple of three points exactly."))
return None
@@ -135,7 +135,7 @@ def make_arc_3points(points, placement=None, face=False,
try:
utils.type_check([(placement, App.Placement)], name=_name)
except TypeError:
- _err(translate("draft","Placement: ") + "{}".format(placement))
+ _err(translate("draft","Placement:") + " {}".format(placement))
_err(translate("draft","Wrong input: incorrect type of placement."))
return None
diff --git a/src/Mod/Draft/importDWG.py b/src/Mod/Draft/importDWG.py
index 2820d02fca..7e20be076e 100644
--- a/src/Mod/Draft/importDWG.py
+++ b/src/Mod/Draft/importDWG.py
@@ -219,8 +219,8 @@ def convertToDxf(dwgfilename):
basename = os.path.basename(dwgfilename)
cmdline = ('"%s" "%s" "%s" "ACAD2000" "DXF" "0" "1" "%s"'
% (teigha, indir, outdir, basename))
- FCC.PrintMessage(translate("ImportDWG", "Converting: ")
- + cmdline + "\n")
+ FCC.PrintMessage(translate("ImportDWG", "Converting:")
+ + " " + cmdline + "\n")
if six.PY2:
if isinstance(cmdline, six.text_type):
encoding = sys.getfilesystemencoding()
@@ -272,8 +272,8 @@ def convertToDwg(dxffilename, dwgfilename):
basename = os.path.basename(dxffilename)
cmdline = ('"%s" "%s" "%s" "ACAD2000" "DWG" "0" "1" "%s"'
% (teigha, indir, outdir, basename))
- FCC.PrintMessage(translate("ImportDWG", "Converting: ")
- + cmdline + "\n")
+ FCC.PrintMessage(translate("ImportDWG", "Converting:")
+ + " " + cmdline + "\n")
subprocess.call(cmdline, shell=True) # os.system(cmdline)
return dwgfilename
return None
diff --git a/src/Mod/Draft/importDXF.py b/src/Mod/Draft/importDXF.py
index beb5b255bb..f1a40fa0ac 100644
--- a/src/Mod/Draft/importDXF.py
+++ b/src/Mod/Draft/importDXF.py
@@ -3862,7 +3862,7 @@ def export(objectslist, filename, nospline=False, lwPoly=False):
filename = filename.encode("utf8")
dxf.saveas(filename)
- FCC.PrintMessage("successfully exported " + filename + "\n")
+ FCC.PrintMessage("successfully exported" + " " + filename + "\n")
else:
errorDXFLib(gui)
diff --git a/src/Mod/Draft/importOCA.py b/src/Mod/Draft/importOCA.py
index 8e6db75ded..0e013069d2 100644
--- a/src/Mod/Draft/importOCA.py
+++ b/src/Mod/Draft/importOCA.py
@@ -488,5 +488,5 @@ def export(exportList, filename):
# closing
oca.close()
FCC.PrintMessage(translate("importOCA",
- "successfully exported ")
- + filename + "\n")
+ "successfully exported")
+ + " " + filename + "\n")
diff --git a/src/Mod/Fem/femguiutils/selection_widgets.py b/src/Mod/Fem/femguiutils/selection_widgets.py
index 00afc0a06f..f87273ce48 100644
--- a/src/Mod/Fem/femguiutils/selection_widgets.py
+++ b/src/Mod/Fem/femguiutils/selection_widgets.py
@@ -271,7 +271,7 @@ class GeometryElementsSelection(QtGui.QWidget):
def initUI(self):
# auch ArchPanel ist coded ohne ui-file
# title
- self.setWindowTitle(self.tr("Geometry reference selector for a ") + self.sel_elem_text)
+ self.setWindowTitle(self.tr("Geometry reference selector for a") + " " + self.sel_elem_text)
# button
self.pushButton_Add = QtGui.QPushButton(self.tr("Add"))
# label
diff --git a/src/Mod/OpenSCAD/exportCSG.py b/src/Mod/OpenSCAD/exportCSG.py
index 1b5d75803a..01385ffcb1 100644
--- a/src/Mod/OpenSCAD/exportCSG.py
+++ b/src/Mod/OpenSCAD/exportCSG.py
@@ -269,4 +269,4 @@ def export(exportList,filename):
csg.write("}\n}\n")
# close file
csg.close()
- FreeCAD.Console.PrintMessage("successfully exported "+filename)
+ FreeCAD.Console.PrintMessage("successfully exported" + " " + filename)
diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.cpp b/src/Mod/Part/Gui/TaskCheckGeometry.cpp
index 9e7bdf28a8..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/Path/Gui/Resources/translations/Path.ts b/src/Mod/Path/Gui/Resources/translations/Path.ts
index e7925bf968..8f62d5fba2 100644
--- a/src/Mod/Path/Gui/Resources/translations/Path.ts
+++ b/src/Mod/Path/Gui/Resources/translations/Path.ts
@@ -793,11 +793,6 @@
The tool controller to use
-
-
- The description of the tool
-
-
Rapid Safety Height between locations.
diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
index 241e4467b7..757919a15d 100644
--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
+++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
@@ -6548,30 +6548,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
")
- .arg(tr("Over-constrained sketch "))
+ signalSetUp(QString::fromLatin1("%1 %2
%3
")
+ .arg(tr("Over-constrained sketch"))
.arg(tr("(click to select)"))
.arg(QString::fromStdString(msg)));
signalSolved(QString());
}
else if (hasMalformed) { // malformed constraints
- signalSetUp(QString::fromLatin1("%1%2
%3
")
- .arg(tr("Sketch contains malformed constraints "))
+ signalSetUp(QString::fromLatin1("%1 %2
%3
")
+ .arg(tr("Sketch contains malformed constraints"))
.arg(tr("(click to select)"))
.arg(appendMalformedMsg(getSketchObject()->getLastMalformedConstraints())));
signalSolved(QString());
}
else if (hasConflicts) { // conflicting constraints
- signalSetUp(QString::fromLatin1("%1%2
%3
")
- .arg(tr("Sketch contains conflicting constraints "))
+ signalSetUp(QString::fromLatin1("%1 %2
%3
")
+ .arg(tr("Sketch contains conflicting constraints"))
.arg(tr("(click to select)"))
.arg(appendConflictMsg(getSketchObject()->getLastConflicting())));
signalSolved(QString());
}
else {
if (hasRedundancies) { // redundant constraints
- signalSetUp(QString::fromLatin1("%1%2
%3
")
- .arg(tr("Sketch contains redundant constraints "))
+ signalSetUp(QString::fromLatin1("%1 %2
%3
")
+ .arg(tr("Sketch contains redundant constraints"))
.arg(tr("(click to select)"))
.arg(appendRedundantMsg(getSketchObject()->getLastRedundant())));
}
@@ -6579,8 +6579,8 @@ void ViewProviderSketch::UpdateSolverInformation()
QString partiallyRedundantString;
if(hasPartiallyRedundant) {
- partiallyRedundantString = QString::fromLatin1("
%1%2
%3
")
- .arg(tr("Sketch contains partially redundant constraints "))
+ partiallyRedundantString = QString::fromLatin1("
%1 %2
%3
")
+ .arg(tr("Sketch contains partially redundant constraints"))
.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
diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp
index 31a94facfd..49cf9170d0 100644
--- a/src/Mod/TechDraw/Gui/Command.cpp
+++ b/src/Mod/TechDraw/Gui/Command.cpp
@@ -1376,7 +1376,7 @@ void CmdTechDrawExportPageDXF::activated(int iMsg)
//WF? allow more than one TD Page per Dxf file?? 1 TD page = 1 DXF file = 1 drawing?
QString defaultDir;
QString fileName = Gui::FileDialog::getSaveFileName(Gui::getMainWindow(),
- QString::fromUtf8(QT_TR_NOOP("Save Dxf File ")),
+ QString::fromUtf8(QT_TR_NOOP("Save Dxf File")),
defaultDir,
QString::fromUtf8(QT_TR_NOOP("Dxf (*.dxf)")));
diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
index 7bccf1bae6..9aa4ea8d30 100644
--- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp
+++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp
@@ -854,7 +854,7 @@ void MDIViewPage::saveDXF()
{
QString defaultDir;
QString fileName = Gui::FileDialog::getSaveFileName(Gui::getMainWindow(),
- QString::fromUtf8(QT_TR_NOOP("Save Dxf File ")),
+ QString::fromUtf8(QT_TR_NOOP("Save Dxf File")),
defaultDir,
QString::fromUtf8(QT_TR_NOOP("Dxf (*.dxf)")));
if (fileName.isEmpty()) {
diff --git a/src/Mod/TechDraw/Gui/mrichtextedit.cpp b/src/Mod/TechDraw/Gui/mrichtextedit.cpp
index 4274d37daa..630ae0f6d4 100644
--- a/src/Mod/TechDraw/Gui/mrichtextedit.cpp
+++ b/src/Mod/TechDraw/Gui/mrichtextedit.cpp
@@ -102,7 +102,7 @@ MRichTextEdit::MRichTextEdit(QWidget *parent, QString textIn) : QWidget(parent)
<< tr("Heading 3")
<< tr("Heading 4")
<< tr("Monospace")
- << tr(" ");
+ << QString::fromUtf8(" ");
f_paragraph->addItems(m_paragraphItems);
connect(f_paragraph, SIGNAL(activated(int)),