Merge branch 'master' of ssh://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad

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

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>

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"/>

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"/>

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>

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"/>

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>

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>

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>

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>

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>

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>

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"/>

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>

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>

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>

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>

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"/>

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>

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:")

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):