From: azv <azv@opencascade.com>
Date: Wed, 20 Nov 2019 07:38:11 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/master' into CEA_2019
X-Git-Tag: V9_5_0a1~167^2~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d588149317acbc2bd8e6ceb00f8e82e806571775;p=modules%2Fshaper.git

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

d588149317acbc2bd8e6ceb00f8e82e806571775
diff --cc CMakeLists.txt
index 8b38e66cf,ff40cf5b7..a753f404c
--- a/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)