Merge remote-tracking branch 'origin/BR_SHP_FORMAT' into BR_v14_rc

Conflicts:
	src/HYDROGUI/HYDROGUI_Operations.cxx

diff --cc src/HYDROGUI/CMakeLists.txt
Simple merge

diff --cc src/HYDROGUI/HYDROGUI_Operations.cxx
index ad34f778a3fed7121b7017a1218ef59bc1e24e0f,62707523e5f94e25ba8f0cf9ee0c199eca1fb4d6..8858974a1039c9aea1daf4309bf7485828750096
--- 1/src/HYDROGUI/HYDROGUI_Operations.cxx
--- 2/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@@ -66,7 -66,7 +66,8 @@@
  #include "HYDROGUI_ExportSinusXOp.h"
  #include "HYDROGUI_MergePolylinesOp.h"
  #include "HYDROGUI_SplitPolylinesOp.h"
 +#include "HYDROGUI_LandCoverColoringOp.h"
+ #include "HYDROGUI_ImportLandCoverOp.h"
  
  #include <HYDROData_Document.h>
  #include <HYDROData_Obstacle.h>

diff --cc src/HYDROGUI/HYDROGUI_Operations.h
Simple merge

diff --cc src/HYDROGUI/HYDROGUI_RecognizeContoursOp.cxx
Simple merge

diff --cc src/HYDROGUI/resources/HYDROGUI_msg_en.ts
Simple merge