Merge remote-tracking branch 'remotes/origin/master' into CEA_2019

# Conflicts:
#	CMakeLists.txt
#	src/BuildPlugin/BuildPlugin_msg_fr.ts
#	src/CollectionPlugin/CollectionPlugin_msg_fr.ts
#	src/ConstructionPlugin/ConstructionPlugin_msg_fr.ts
#	src/FeaturesPlugin/FeaturesPlugin_Chamfer.cpp
#	src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts
#	src/FiltersPlugin/CMakeLists.txt
#	src/GeomAlgoAPI/CMakeLists.txt
#	src/GeomAlgoAPI/GeomAlgoAPI_Chamfer.cpp
#	src/GeomAlgoAPI/GeomAlgoAPI_Chamfer.h
#	src/PythonAddons/Test/TestcompoundVertices.py
#	src/PythonAddons/macros/compoundVertices/feature.py
#	src/PythonAddons/macros/compoundVertices/widget.xml
#	src/PythonAddons/macros/importParameters/feature.py
#	src/PythonAddons/macros/importParameters/importParameters.txt
#	src/PythonAddons/macros/importParameters/widget.xml
#	src/SHAPERGUI/SHAPERGUI_msg_fr.ts
#	src/XGUI/XGUI_msg_fr.ts

diff --cc CMakeLists.txt
index 8b38e66cf1d7079cacec74ea40c2ef332db21989,ff40cf5b789bfad0a0ad9ea04b477b034b667a04..a753f404c1b866b3754794d1604d139a2b17e688
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -120,13 -120,7 +120,9 @@@ ENDIF(${HAVE_SALOME}
  # Sketcher: Change radius of circular edges while dragging a point on the edge
  SET(SKETCHER_CHANGE_RADIUS_WHEN_MOVE TRUE)
  
 +SET(MAKE_TRANSLATION YES)
  
- IF(${MAKE_TRANSLATION})
-       ADD_DEFINITIONS( -DMAKE_TRANSLATION )
- ENDIF(${MAKE_TRANSLATION})
- 
- 
++    ADD_DEFINITIONS( -DMAKE_TRANSLATION )
  ADD_SUBDIRECTORY (src/Config)
  ADD_SUBDIRECTORY (src/Events)
  ADD_SUBDIRECTORY (src/Selector)

diff --cc src/ModuleBase/ModuleBase_Tools.cpp
Simple merge

diff --cc src/PartSet/PartSet_SketcherMgr.cpp
Simple merge

diff --cc src/XGUI/XGUI_Workshop.cpp
Simple merge