diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py
index 39713964b..ad61cf65d 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 351391a34..f34c864d6 100644
--- a/src/Mod/Start/Gui/Resources/translations/StartPage.ts
+++ b/src/Mod/Start/Gui/Resources/translations/StartPage.ts
@@ -139,7 +139,7 @@
- FreeCAD default workbench
+ FreeCAD Complete workbench
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_af.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_af.qm
index a62fcc758..8f915edb5 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 38c61e094..85344f908 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 @@
- FreeCAD default workbench
- FreeCAD default workbench
+ FreeCAD Complete workbench
+ FreeCAD Complete workbench
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_de.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_de.qm
index 00eb94024..573d336fe 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 a394715b7..fb8eee8d9 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 @@
- FreeCAD default workbench
- FreeCAD default workbench
+ FreeCAD Complete workbench
+ FreeCAD Complete workbench
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_es.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_es.qm
index 1f1b3340a..cb1ecc850 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 faf562b0f..4778b7160 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 @@
- FreeCAD default workbench
+ FreeCAD Complete workbench
Entorno de trabajo predeterminado de FreeCAD
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_fi.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_fi.qm
index 07b72ed6a..6b18866b4 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 df30593ee..2f651aafd 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 @@
- FreeCAD default workbench
- FreeCAD default workbench
+ FreeCAD Complete workbench
+ FreeCAD Complete workbench
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_fr.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_fr.qm
index b0deb5c62..1af302459 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 36e72f5f0..359852143 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 @@
- FreeCAD default workbench
+ FreeCAD Complete workbench
Atelier par défaut FreeCAD
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_hr.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_hr.qm
index 42ee820c8..303541ace 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 9fa39a689..ede22f437 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 @@
- FreeCAD default workbench
+ FreeCAD Complete workbench
Inicijalno FreeCAD radno okruženje
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_hu.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_hu.qm
index 84aedcf29..d1c60b3b3 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 1e7bbc2f2..6e46c89d2 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 @@
- FreeCAD default workbench
+ FreeCAD Complete workbench
FreeCAD alapértelmezett munkafelület
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_it.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_it.qm
index e696ad380..08408c530 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 04d4fa189..b9aa0b60f 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 @@
- FreeCAD default workbench
+ FreeCAD Complete workbench
Ambiente di lavoro predefinito di FreeCAD
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_ja.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_ja.qm
index 89fdd9e76..ca9c3e5a8 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 1798e0ca1..99f1e1fc3 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 @@
- FreeCAD default workbench
+ FreeCAD Complete workbench
FreeCADのデフォルトワークベンチ
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_nl.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_nl.qm
index 43d54648e..abf2a7236 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 1f37830ba..6ab92c4d3 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 @@
- FreeCAD default workbench
+ FreeCAD Complete workbench
FreeCAD standaard werkbank
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_no.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_no.qm
index 81164c1ea..e920714c2 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 c526fdc84..9b24bb94a 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 @@
- FreeCAD default workbench
- FreeCAD default workbench
+ FreeCAD Complete workbench
+ FreeCAD Complete workbench
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_pl.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_pl.qm
index 9d2baeffa..5e35f5b0a 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 922ec5597..00d0e9e4c 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 @@
- FreeCAD default workbench
+ FreeCAD Complete workbench
Domyślne środowisko FreeCADa
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_pt.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_pt.qm
index 7edfbb4cd..3f1299c58 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 767755c56..120f70482 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 @@
- FreeCAD default workbench
+ FreeCAD Complete workbench
Bancada padrão do FreeCAD
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_ru.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_ru.qm
index f13fc55c4..fc8b49b01 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 90d45ed33..dda7c4891 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 @@
- FreeCAD default workbench
+ FreeCAD Complete workbench
Инструментарий FreeCAD по умолчанию
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_se.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_se.qm
index 05cb07df7..af6a58a2b 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 7310ccd02..32a4cc2a8 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 @@
- FreeCAD default workbench
+ FreeCAD Complete workbench
FreeCAD standard arbetsbänk
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_uk.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_uk.qm
index b49021a9e..5ac3d9b66 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 38a2e414a..7ae42e6e1 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 @@
- FreeCAD default workbench
- FreeCAD default workbench
+ FreeCAD Complete workbench
+ FreeCAD Complete workbench
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage_zh.qm b/src/Mod/Start/Gui/Resources/translations/StartPage_zh.qm
index 04c3229e0..05b637001 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 ccf91a0f5..b740960fc 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 @@
- FreeCAD default workbench
+ FreeCAD Complete workbench
FreeCAD默认工作台
diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py
index 4ae0511e1..c3983a86f 100644
--- a/src/Mod/Start/StartPage/StartPage.py
+++ b/src/Mod/Start/StartPage/StartPage.py
@@ -52,7 +52,7 @@ text27 = translate("StartPage","The Mesh Workbench 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 843f0796b..53b8a2eb6 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):