diff --git a/src/Mod/Drawing/Gui/TaskOrthoViews.ui b/src/Mod/Drawing/Gui/TaskOrthoViews.ui
index 92718a9900..580a747658 100644
--- a/src/Mod/Drawing/Gui/TaskOrthoViews.ui
+++ b/src/Mod/Drawing/Gui/TaskOrthoViews.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>259</width>
-    <height>491</height>
+    <height>496</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -122,22 +122,22 @@
       <widget class="QComboBox" name="rotate">
        <item>
         <property name="text">
-         <string>0</string>
+         <string notr="true">0</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>90</string>
+         <string notr="true">90</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>180</string>
+         <string notr="true">180</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>270</string>
+         <string notr="true">270</string>
         </property>
        </item>
       </widget>
diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
index 3822e12142..0a01847118 100644
--- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
+++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
@@ -500,7 +500,7 @@ class DrawSketchHandlerLineSet: public DrawSketchHandler
 {
 public:
     DrawSketchHandlerLineSet()
-      : Mode(STATUS_SEEK_First),SegmentMode(SEGMENT_MODE_Line),
+      : Mode(STATUS_SEEK_First),SegmentMode(SEGMENT_MODE_Line),
         TransitionMode(TRANSITION_MODE_Free),suppressTransition(false),EditCurve(2),
         firstVertex(-1),firstCurve(-1),previousCurve(-1),previousPosId(Sketcher::none) {}
     virtual ~DrawSketchHandlerLineSet() {}
@@ -517,7 +517,7 @@ public:
         SEGMENT_MODE_Arc,
         SEGMENT_MODE_Line
     };
-
+
     enum TRANSITION_MODE
     {
         TRANSITION_MODE_Free,
@@ -631,7 +631,7 @@ public:
                     else
                         EditCurve[1] = EditCurve[0] + EditCurve[1];
                 }
-                else if (TransitionMode == TRANSITION_MODE_Perpendicular_L ||
+                else if (TransitionMode == TRANSITION_MODE_Perpendicular_L ||
                          TransitionMode == TRANSITION_MODE_Perpendicular_R) {
                     Base::Vector2D Perpendicular(-dirVec.y,dirVec.x);
                     EditCurve[1].ProjToLine(EditCurve[2] - EditCurve[0], Perpendicular);
@@ -812,19 +812,19 @@ public:
                                                     Sketcher::end : Sketcher::start;
                 Sketcher::PointPos lastEndPosId = (SegmentMode == SEGMENT_MODE_Arc && startAngle > endAngle) ?
                                                   Sketcher::start : Sketcher::end;
-                // in case of a tangency constraint, the coincident constraint is redundant
+                // in case of a tangency constraint, the coincident constraint is redundant
                 std::string constrType = "Coincident";
-                if (!suppressTransition) {
-                    if (TransitionMode == TRANSITION_MODE_Tangent)
-                        constrType = "Tangent";
-                    else if (TransitionMode == TRANSITION_MODE_Perpendicular_L ||
-                             TransitionMode == TRANSITION_MODE_Perpendicular_R)
+                if (!suppressTransition) {
+                    if (TransitionMode == TRANSITION_MODE_Tangent)
+                        constrType = "Tangent";
+                    else if (TransitionMode == TRANSITION_MODE_Perpendicular_L ||
+                             TransitionMode == TRANSITION_MODE_Perpendicular_R)
                         constrType = "Perpendicular";
-                }
+                }
                 Gui::Command::doCommand(Gui::Command::Doc,
                     "App.ActiveDocument.%s.addConstraint(Sketcher.Constraint('%s',%i,%i,%i,%i)) ",
                     sketchgui->getObject()->getNameInDocument(), constrType.c_str(),
-                    previousCurve, previousPosId, lastCurve, lastStartPosId);
+                    previousCurve, previousPosId, lastCurve, lastStartPosId);
                 if (Mode == STATUS_Close) {
                     int firstGeoId;
                     Sketcher::PointPos firstPosId;
@@ -884,14 +884,14 @@ public:
 
                 applyCursor();
                 Mode = STATUS_SEEK_Second;
-                if (SegmentMode == SEGMENT_MODE_Arc) {
-                    TransitionMode = TRANSITION_MODE_Tangent;
-                    EditCurve.resize(3);
+                if (SegmentMode == SEGMENT_MODE_Arc) {
+                    TransitionMode = TRANSITION_MODE_Tangent;
+                    EditCurve.resize(3);
                     EditCurve[2] = EditCurve[0];
                 }
                 else {
-                    TransitionMode = TRANSITION_MODE_Free;
-                    EditCurve.resize(2);
+                    TransitionMode = TRANSITION_MODE_Free;
+                    EditCurve.resize(2);
                 }
                 SegmentMode = SEGMENT_MODE_Line;
                 EditCurve[1] = EditCurve[0];
@@ -912,7 +912,7 @@ protected:
     int previousCurve;
     Sketcher::PointPos previousPosId;
     std::vector<AutoConstraint> sugConstr1, sugConstr2;
-
+
     Base::Vector2D CenterPoint;
     Base::Vector3d dirVec;
     float startAngle, endAngle, arcRadius;
@@ -1077,7 +1077,7 @@ public:
                 float dy = rx * sin(angle) + ry * cos(angle);
                 EditCurve[i] = Base::Vector2D(CenterPoint.fX + dx, CenterPoint.fY + dy);
             }
-
+
             // Display radius and arc angle
             float radius = (onSketchPos - EditCurve[0]).Length();
 
@@ -1789,7 +1789,7 @@ CmdSketcherCreateFillet::CmdSketcherCreateFillet()
     sAppModule      = "Sketcher";
     sGroup          = QT_TR_NOOP("Sketcher");
     sMenuText       = QT_TR_NOOP("Create fillet");
-    sToolTipText    = QT_TR_NOOP("Create a fillet between two lines or at a coincidental point");
+    sToolTipText    = QT_TR_NOOP("Create a fillet between two lines or at a coincident point");
     sWhatsThis      = sToolTipText;
     sStatusTip      = sToolTipText;
     sPixmap         = "Sketcher_CreateFillet";