Merge branch 'rnv/win_swig_generation' of salome:modules/smesh into rnv/win_swig_gene...

Conflicts:
	src/Tools/ZCracksPlug/__init__.py
	src/Tools/padder/spadderpy/gui/inputdialog.py

diff --cc src/Tools/padder/spadderpy/gui/inputdialog.py
index 2ca9f8fc9a3c0319778dbcccff7af8b3622fe027,a050077922fbd93f567a0bfb5521a33645db71c0..1ec31ce65a3994d480393a11b2560161a95e4eb2
--- 1/src/Tools/padder/spadderpy/gui/inputdialog.py
--- 2/src/Tools/padder/spadderpy/gui/inputdialog.py
+++ b/src/Tools/padder/spadderpy/gui/inputdialog.py
@@@ -93,7 -93,7 +93,7 @@@ class InputDialog(GenericDialog)
          # indexation.
          self.MESHTYPE_ICONS = {}
          meshTypeIndex = InputData.MESHTYPES.CONCRETE
--        self.__ui.cmbMeshType.setItemText(meshTypeIndex, "Béton")
++        self.__ui.cmbMeshType.setItemText(meshTypeIndex, "B?ton")
          icon = QIcon()
          icon.addFile(os.path.join(iconfolder,"concrete.png"))
          self.__ui.cmbMeshType.setItemIcon(meshTypeIndex, icon)