diff between master and first msocorcim branch

msocorcim.diff

diff --git a/src/App/PropertyFile.cpp b/src/App/PropertyFile.cpp
index 13599c8..70b0f7e 100644
--- a/src/App/PropertyFile.cpp
+++ b/src/App/PropertyFile.cpp
@@ -296,7 +296,7 @@ void PropertyFileIncluded::Restore(Base::XMLReader &reader)
 
 void PropertyFileIncluded::SaveDocFile (Base::Writer &writer) const
 {
-    Base::ifstream from(Base::FileInfo(_cValue.c_str()));
+    std::ifstream from(_cValue.c_str());
     if (!from)
         throw Base::Exception("PropertyFileIncluded::SaveDocFile() "
         "File in document transient dir deleted");
@@ -311,7 +311,7 @@ void PropertyFileIncluded::SaveDocFile (Base::Writer &writer) const
 
 void PropertyFileIncluded::RestoreDocFile(Base::Reader &reader)
 {
-    Base::ofstream to(Base::FileInfo(_cValue.c_str()));
+    std::ofstream to(_cValue.c_str());
     if (!to) 
         throw Base::Exception("PropertyFileIncluded::RestoreDocFile() "
         "File in document transient dir deleted");
@@ -343,7 +343,7 @@ Property *PropertyFileIncluded::Copy(void) const
         bool done = file.renameFile(NewName.filePath().c_str());
         assert(done);
         // remember the new name for the Undo
-        Base::Console().Log("Copy this=%p Before=%s After=%s\n",p,p->_cValue.c_str(),NewName.filePath().c_str());
+        Base::Console().Log("Copy this=%p Befor=%s After=%s\n",p,p->_cValue.c_str(),NewName.filePath().c_str());
         p->_cValue = NewName.filePath().c_str();
     }
 
diff --git a/src/Base/Writer.cpp b/src/Base/Writer.cpp
index 01eecef..74742f2 100644
--- a/src/Base/Writer.cpp
+++ b/src/Base/Writer.cpp
@@ -32,7 +32,6 @@
 #include "Exception.h"
 #include "Base64.h"
 #include "FileInfo.h"
-#include "Stream.h"
 #include "Tools.h"
 
 #include <algorithm>
@@ -60,24 +59,19 @@ Writer::~Writer()
 
 void Writer::insertAsciiFile(const char* FileName)
 {
-    Base::FileInfo fi(FileName);
-    Base::ifstream from(fi);
-    if (!from)
-        throw Base::Exception("Writer::insertAsciiFile() Could not open file!");
+    std::ifstream from(FileName);
+    if (!from) throw Base::Exception("Writer::insertAsciiFile() Could not open file!");
 
     Stream() << "<![CDATA[" << endl;
     char ch;
-    while (from.get(ch))
-        Stream().put(ch);
+    while (from.get(ch)) Stream().put(ch);
     Stream() << endl << "]]>" << endl;
 }
 
 void Writer::insertBinFile(const char* FileName)
 {
-    Base::FileInfo fi(FileName);
-    Base::ifstream from(fi, std::ios::in | std::ios::binary);
-    if (!from)
-        throw Base::Exception("Writer::insertAsciiFile() Could not open file!");
+    std::ifstream from(FileName);
+    if (!from) throw Base::Exception("Writer::insertAsciiFile() Could not open file!");
 
     Stream() << "<![CDATA[" << endl;
 
@@ -85,8 +79,8 @@ void Writer::insertBinFile(const char* FileName)
     std::string encoded;
     unsigned int i;
 
-    while (from) {
-        for (i=0 ; i<60 && from;i++)
+    while (from){
+        for(i=0 ; i<60 && from;i++)
             buf[i] = from.get();
         Stream() << Base::base64_encode(buf,i) << endl;
     }
diff --git a/src/Mod/Start/Gui/Resources/translations/StartPage.ts b/src/Mod/Start/Gui/Resources/translations/StartPage.ts
index 351391a..f34c864 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 a62fcc7..8f915ed 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 38c61e0..85344f9 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 00eb940..573d336 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 a394715..fb8eee8 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 1f1b334..cb1ecc8 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 faf562b..4778b71 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 07b72ed..6b18866 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 df30593..2f651aa 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 b0deb5c..1af3024 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 36e72f5..3598521 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 42ee820..303541a 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 9fa39a6..ede22f4 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 84aedcf..d1c60b3 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 1e7bbc2..6e46c89 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 e696ad3..08408c5 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 04d4fa1..b9aa0b6 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 89fdd9e..ca9c3e5 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 1798e0c..99f1e1f 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 43d5464..abf2a72 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 1f37830..6ab92c4 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 81164c1..e920714 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 c526fdc..9b24bb9 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 9d2baef..5e35f5b 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 922ec55..00d0e9e 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 7edfbb4..3f1299c 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 767755c..120f704 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 f13fc55..fc8b49b 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 90d45ed..dda7c48 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 05cb07d..af6a58a 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 7310ccd..32a4cc2 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 b49021a..5ac3d9b 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 38a2e41..7ae42e6 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 04c3229..05b6370 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 ccf91a0..b740960 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 4ae0511..c3983a8 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 843f079..53b8a2e 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):