diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
index 39713964b6..ad61cf65d0 100644
--- a/src/Mod/Draft/DraftTools.py
+++ b/src/Mod/Draft/DraftTools.py
@@ -2676,8 +2676,10 @@ class Trimex(Modifier):
             self.ui.cross(True)
             self.shift = hasMod(arg,MODCONSTRAIN)
             self.alt = hasMod(arg,MODALT)
+            if self.extrudeMode:
+                arg["ShiftDown"] = False
             wp = not(self.extrudeMode and self.shift)
-            self.point,info = getPoint(self,arg,workingplane=wp)[0]
+            self.point,cp,info = getPoint(self,arg,workingplane=wp)
             if hasMod(arg,MODSNAP): self.snapped = None
             else: self.snapped = self.view.getObjectInfo((arg["Position"][0],arg["Position"][1]))
             if self.extrudeMode:
@@ -2705,7 +2707,7 @@ class Trimex(Modifier):
         "redraws the ghost in extrude mode"
         self.newpoint = self.obj.Shape.Faces[0].CenterOfMass
         dvec = self.point.sub(self.newpoint)
-        if shift: delta = fcvec.project(dvec,self.normal)
+        if not shift: delta = fcvec.project(dvec,self.normal)
         else: delta = dvec
         if self.force:
             ratio = self.force/delta.Length
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage.ts b/src/Mod/Start/Gui/Resources/translations/StartPage.ts
index 351391a346..f34c864d6e 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage.ts
@@ -139,7 +139,7 @@
     </message>
     <message>
         <location filename="StartPage.py" line="41"/>
-        <source>FreeCAD default workbench</source>
+        <source>FreeCAD Complete workbench</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_af.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_af.qm
index a62fcc758e..8f915edb5e 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_af.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_af.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_af.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_af.ts
index 38c61e094c..85344f9082 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_af.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_af.ts
@@ -140,8 +140,8 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
-      <translation>FreeCAD default workbench</translation>
+      <source>FreeCAD Complete workbench</source>
+      <translation>FreeCAD Complete workbench</translation>
     </message>
     <message>
       <location filename="StartPage.py" line="43"/>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_de.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_de.qm
index 00eb940240..573d336fe8 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_de.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_de.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_de.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_de.ts
index a394715b70..fb8eee8d9e 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_de.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_de.ts
@@ -140,8 +140,8 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
-      <translation>FreeCAD default workbench</translation>
+      <source>FreeCAD Complete workbench</source>
+      <translation>FreeCAD Complete workbench</translation>
     </message>
     <message>
       <location filename="StartPage.py" line="43"/>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_es.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_es.qm
index 1f1b3340ad..cb1ecc850c 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_es.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_es.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_es.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_es.ts
index faf562b0f9..4778b7160d 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_es.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_es.ts
@@ -140,7 +140,7 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
+      <source>FreeCAD Complete workbench</source>
       <translation>Entorno de trabajo predeterminado de FreeCAD</translation>
     </message>
     <message>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_fi.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_fi.qm
index 07b72ed6ac..6b18866b42 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_fi.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_fi.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_fi.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_fi.ts
index df30593eed..2f651aafd0 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_fi.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_fi.ts
@@ -140,8 +140,8 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
-      <translation>FreeCAD default workbench</translation>
+      <source>FreeCAD Complete workbench</source>
+      <translation>FreeCAD Complete workbench</translation>
     </message>
     <message>
       <location filename="StartPage.py" line="43"/>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_fr.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_fr.qm
index b0deb5c621..1af3024590 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_fr.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_fr.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_fr.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_fr.ts
index 36e72f5f0b..3598521433 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_fr.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_fr.ts
@@ -140,7 +140,7 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
+      <source>FreeCAD Complete workbench</source>
       <translation>Atelier par défaut FreeCAD</translation>
     </message>
     <message>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_hr.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_hr.qm
index 42ee820c83..303541ace4 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_hr.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_hr.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_hr.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_hr.ts
index 9fa39a6896..ede22f437a 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_hr.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_hr.ts
@@ -140,7 +140,7 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
+      <source>FreeCAD Complete workbench</source>
       <translation>Inicijalno FreeCAD radno okruženje</translation>
     </message>
     <message>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_hu.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_hu.qm
index 84aedcf29e..d1c60b3b33 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_hu.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_hu.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_hu.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_hu.ts
index 1e7bbc2f29..6e46c89d20 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_hu.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_hu.ts
@@ -140,7 +140,7 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
+      <source>FreeCAD Complete workbench</source>
       <translation>FreeCAD alapértelmezett munkafelület</translation>
     </message>
     <message>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_it.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_it.qm
index e696ad3807..08408c5306 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_it.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_it.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_it.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_it.ts
index 04d4fa1893..b9aa0b60ff 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_it.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_it.ts
@@ -140,7 +140,7 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
+      <source>FreeCAD Complete workbench</source>
       <translation>Ambiente di lavoro predefinito di FreeCAD</translation>
     </message>
     <message>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_ja.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_ja.qm
index 89fdd9e76e..ca9c3e5a88 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_ja.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_ja.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_ja.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_ja.ts
index 1798e0ca1a..99f1e1fc30 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_ja.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_ja.ts
@@ -140,7 +140,7 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
+      <source>FreeCAD Complete workbench</source>
       <translation>FreeCADのデフォルトワークベンチ</translation>
     </message>
     <message>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_nl.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_nl.qm
index 43d54648e9..abf2a7236f 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_nl.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_nl.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_nl.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_nl.ts
index 1f37830bad..6ab92c4d3f 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_nl.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_nl.ts
@@ -140,7 +140,7 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
+      <source>FreeCAD Complete workbench</source>
       <translation>FreeCAD standaard werkbank</translation>
     </message>
     <message>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_no.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_no.qm
index 81164c1ea1..e920714c27 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_no.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_no.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_no.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_no.ts
index c526fdc84b..9b24bb94ae 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_no.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_no.ts
@@ -140,8 +140,8 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
-      <translation>FreeCAD default workbench</translation>
+      <source>FreeCAD Complete workbench</source>
+      <translation>FreeCAD Complete workbench</translation>
     </message>
     <message>
       <location filename="StartPage.py" line="43"/>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_pl.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_pl.qm
index 9d2baeffa9..5e35f5b0ab 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_pl.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_pl.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_pl.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_pl.ts
index 922ec55976..00d0e9e4ce 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_pl.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_pl.ts
@@ -140,7 +140,7 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
+      <source>FreeCAD Complete workbench</source>
       <translation>Domyślne środowisko FreeCADa</translation>
     </message>
     <message>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_pt.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_pt.qm
index 7edfbb4cd7..3f1299c580 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_pt.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_pt.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_pt.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_pt.ts
index 767755c562..120f704820 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_pt.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_pt.ts
@@ -140,7 +140,7 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
+      <source>FreeCAD Complete workbench</source>
       <translation>Bancada padrão do FreeCAD</translation>
     </message>
     <message>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_ru.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_ru.qm
index f13fc55c4d..fc8b49b01a 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_ru.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_ru.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_ru.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_ru.ts
index 90d45ed33a..dda7c4891f 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_ru.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_ru.ts
@@ -140,7 +140,7 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
+      <source>FreeCAD Complete workbench</source>
       <translation>Инструментарий FreeCAD по умолчанию</translation>
     </message>
     <message>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_se.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_se.qm
index 05cb07df74..af6a58a2b1 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_se.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_se.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_se.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_se.ts
index 7310ccd02a..32a4cc2a89 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_se.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_se.ts
@@ -140,7 +140,7 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
+      <source>FreeCAD Complete workbench</source>
       <translation>FreeCAD standard arbetsbänk</translation>
     </message>
     <message>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_uk.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_uk.qm
index b49021a9ea..5ac3d9b66d 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_uk.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_uk.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_uk.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_uk.ts
index 38a2e414a8..7ae42e6e1a 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_uk.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_uk.ts
@@ -140,8 +140,8 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
-      <translation>FreeCAD default workbench</translation>
+      <source>FreeCAD Complete workbench</source>
+      <translation>FreeCAD Complete workbench</translation>
     </message>
     <message>
       <location filename="StartPage.py" line="43"/>
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_zh.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_zh.qm
index 04c3229e0a..05b637001a 100644
Binary files a/src/Mod/Start/Gui/Resources/translations/StartPage_zh.qm and b/src/Mod/Start/Gui/Resources/translations/StartPage_zh.qm differ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_zh.ts b/src/Mod/Start/Gui/Resources/translations/StartPage_zh.ts
index ccf91a0f56..b740960fc1 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage_zh.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage_zh.ts
@@ -140,7 +140,7 @@
     </message>
     <message>
       <location filename="StartPage.py" line="41"/>
-      <source>FreeCAD default workbench</source>
+      <source>FreeCAD Complete workbench</source>
       <translation>FreeCAD默认工作台</translation>
     </message>
     <message>
diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py
index 4ae0511e11..c3983a86f5 100644
--- a/src/Mod/Start/StartPage/StartPage.py
+++ b/src/Mod/Start/StartPage/StartPage.py
@@ -52,7 +52,7 @@ text27 = translate("StartPage","The <b>Mesh Workbench</b> is used to work with M
 text28 = translate("StartPage","FreeCAD offers you several tools to convert between Mesh and Part objects.")
 text29 = translate("StartPage","Work with Meshes")
 text30 = translate("StartPage","The complete workbench")
-text31 = translate("StartPage","FreeCAD default workbench")
+text31 = translate("StartPage","FreeCAD Complete workbench")
 text32 = translate("StartPage","populated with some of the most commonly used tools.")
 text33 = translate("StartPage","file size:")
 text34 = translate("StartPage","creation time:")
diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py
index 843f0796be..53b8a2eb66 100644
--- a/src/Tools/SubWCRev.py
+++ b/src/Tools/SubWCRev.py
@@ -153,7 +153,10 @@ class GitControl(VersionControl):
                 self.url = r.groups()[0]
                 break
         self.hash=os.popen("git log -1 --pretty=format:%H").read()
-        self.branch=os.popen("git branch").read().split('\n')[0][2:]
+        for self.branch in os.popen("git branch").read().split('\n'):
+            if re.match( "\*", self.branch ) != None:
+                break 
+        self.branch=self.branch[2:]
         return True
 
     def printInfo(self):