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 fff6c1db04..025a19438f 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_scale.py b/src/Mod/Draft/draftguitools/gui_scale.py index 30914c05b1..92de0b5928 100644 --- a/src/Mod/Draft/draftguitools/gui_scale.py +++ b/src/Mod/Draft/draftguitools/gui_scale.py @@ -330,10 +330,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..7c46e0019f 100644 --- a/src/Mod/Draft/draftmake/make_arc_3points.py +++ b/src/Mod/Draft/draftmake/make_arc_3points.py @@ -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/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..2c998a00d6 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 number; number.setNum(index); message += number; diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index 34798294e2..4011a8a905 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -6546,21 +6546,24 @@ void ViewProviderSketch::UpdateSolverInformation() std::string msg; SketchObject::appendConflictMsg(getSketchObject()->getLastConflicting(), msg); signalSetUp(QString::fromLatin1("%1%2
%3

") - .arg(tr("Over-constrained sketch ")) + .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

") - .arg(tr("Sketch contains malformed constraints ")) + .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

") - .arg(tr("Sketch contains conflicting constraints ")) + .arg(tr("Sketch contains conflicting constraints")) + .arg(" ") .arg(tr("(click to select)")) .arg(appendConflictMsg(getSketchObject()->getLastConflicting()))); signalSolved(QString()); @@ -6568,7 +6571,8 @@ void ViewProviderSketch::UpdateSolverInformation() else { if (hasRedundancies) { // redundant constraints signalSetUp(QString::fromLatin1("%1%2
%3

") - .arg(tr("Sketch contains redundant constraints ")) + .arg(tr("Sketch contains redundant constraints")) + .arg(" ") .arg(tr("(click to select)")) .arg(appendRedundantMsg(getSketchObject()->getLastRedundant()))); } @@ -6577,7 +6581,8 @@ void ViewProviderSketch::UpdateSolverInformation() if(hasPartiallyRedundant) { partiallyRedundantString = QString::fromLatin1("
%1%2
%3

") - .arg(tr("Sketch contains partially redundant constraints ")) + .arg(tr("Sketch contains partially redundant constraints")) + .arg(" ") .arg(tr("(click to select)")) .arg(appendPartiallyRedundantMsg(getSketchObject()->getLastPartiallyRedundant())); }