EDF 2281 : missing translations, doc and pictures

diff --git a/doc/salome/gui/GEOM/images/dividedcylinder.png b/doc/salome/gui/GEOM/images/dividedcylinder.png
new file mode 100644 (file)
index 0000000..e84ecf0
Binary files /dev/null and b/doc/salome/gui/GEOM/images/dividedcylinder.png differ

diff --git a/doc/salome/gui/GEOM/images/dividedcylinder_dlg.png b/doc/salome/gui/GEOM/images/dividedcylinder_dlg.png
new file mode 100644 (file)
index 0000000..95b96d0
Binary files /dev/null and b/doc/salome/gui/GEOM/images/dividedcylinder_dlg.png differ

diff --git a/doc/salome/gui/GEOM/input/creating_dividedcylinder.doc b/doc/salome/gui/GEOM/input/creating_dividedcylinder.doc
index e0d7f08456b8cec75a7a2e5dfc34497beab4ddb7..1b9de1e2d39bba2de4a258eabfbc76eb27611ede 100644 (file)
--- a/doc/salome/gui/GEOM/input/creating_dividedcylinder.doc
+++ b/doc/salome/gui/GEOM/input/creating_dividedcylinder.doc
@@ -2,6 +2,10 @@
 
 \page create_dividedcylinder_page DividedCylinder
 
+The <b>Divided cylinder</b> object is a cylinder divided into \b blocks for easy hexaedral meshing</b>.
+
+\image html dividedcylinder.png
+
 To create a \b DividedCylinder in the <b>Main Menu</b> select <b>New Entity - >
 Advanced - > DividedCylinder </b>
 
@@ -17,10 +21,6 @@ Result of each operation will be a GEOM_Object.
 
 \image html dividedcylinder_dlg.png
 
-Example:
-
-\image html dividedcylinder.png
-
 Our <b>TUI Scripts</b> provide you with useful examples of creation of
 \ref tui_creation_dividedcylinder "Advanced objects".
 

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 360c2fb2a803c6f977922bd4b4d36ffd185b13b0..6ec86cabe60c40500520550b990138d70df52d07 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -252,8 +252,9 @@ ADVANCED_RESOURCES += dlg_pipetshapechamferh.png dlg_pipetshapechamferw.png
 ADVANCED_RESOURCES += dlg_pipetshapefilletl1.png dlg_pipetshapefilletr1.png dlg_pipetshapefilletw1.png
 ADVANCED_RESOURCES += dlg_pipetshapefilletl2.png dlg_pipetshapefilletr2.png dlg_pipetshapefilletw2.png
 ADVANCED_RESOURCES += dlg_pipetshapefilletrf.png
-#ADVANCED_RESOURCES += divideddisk.png divideddisk_r_ratio.png tree_divideddisk.png
-#ADVANCED_RESOURCES += dividedcylinder.png dividedcylinder_r_h.png tree_dividedcylinder.png
+# ADVANCED_RESOURCES += divideddisk.png divideddisk_r_ratio.png tree_divideddisk.png
+ADVANCED_RESOURCES += dividedcylinder.png dividedcylinder_r_h.png
+# tree_dividedcylinder.png
 ##@@ insert new functions before this line @@ do not remove this line @@##
 
 dist_salomeres_DATA += $(ADVANCED_RESOURCES)

diff --git a/resources/dividedcylinder.png b/resources/dividedcylinder.png
new file mode 100644 (file)
index 0000000..a7de2f6
Binary files /dev/null and b/resources/dividedcylinder.png differ

diff --git a/resources/dividedcylinder_r_h.png b/resources/dividedcylinder_r_h.png
new file mode 100644 (file)
index 0000000..1b914b9
Binary files /dev/null and b/resources/dividedcylinder_r_h.png differ

diff --git a/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.cxx b/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.cxx
index b755c01ea54a888c8e63b96c87f765afbc758bf9..fdd172abcb3810bf0690c4ece51296058ba5f203 100644 (file)
--- a/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.cxx
+++ b/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.cxx
@@ -59,6 +59,9 @@ AdvancedGUI_DividedCylinderDlg::AdvancedGUI_DividedCylinderDlg (GeometryGUI* the
   mainFrame()->RadioButton3->close();
 
   GroupParams = new DlgRef_2Spin(centralWidget());
+  GroupParams->GroupBox1->setTitle(tr("GEOM_BOX_OBJ"));
+  GroupParams->TextLabel1->setText(tr("GEOM_RADIUS"));
+  GroupParams->TextLabel2->setText(tr("GEOM_HEIGHT"));
 
   QVBoxLayout* layout = new QVBoxLayout(centralWidget());
   layout->setMargin(0); layout->setSpacing(6);

diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts
index 3be6289babe25948a6a2b61e6c212d0f25be9896..4d047fc5c2a74bdce537c483a93b759eedc03eb7 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_en.ts
+++ b/src/GEOMGUI/GEOM_msg_en.ts
@@ -537,6 +537,14 @@ Please, select face, shell or solid and try again</translation>
         <source>GEOM_DIVIDEDDISK_TITLE</source>
         <translation>Divided Disk construction</translation>
     </message>
+    <message>
+        <source>GEOM_DIVIDEDCYLINDER</source>
+        <translation>Divided Cylinder</translation>
+    </message>
+    <message>
+        <source>GEOM_DIVIDEDCYLINDER_TITLE</source>
+        <translation>Divided Cylinder construction</translation>
+    </message>
     <message>
         <source>GEOM_DX</source>
         <translation>Dx :</translation>
@@ -2366,6 +2374,26 @@ Please, select face, shell or solid and try again</translation>
         <source>MEN_DIVIDEDDISK</source>
         <translation>Divided Disk</translation>
     </message>
+    <message>
+        <source>TOP_DIVIDEDDISK</source>
+        <translation>Divided Disk</translation>
+    </message>
+    <message>
+        <source>STB_DIVIDEDDISK</source>
+        <translation>Divided Disk</translation>
+    </message>
+    <message>
+        <source>MEN_DIVIDEDCYLINDER</source>
+        <translation>Divided Cylinder</translation>
+    </message>
+    <message>
+        <source>TOP_DIVIDEDCYLINDER</source>
+        <translation>Divided Cylinder</translation>
+    </message>
+    <message>
+        <source>STB_DIVIDEDCYLINDER</source>
+        <translation>Divided Cylinder</translation>
+    </message>
     <message>
         <source>MEN_DISPLAY_ALL</source>
         <translation>Show All</translation>

diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts
index 2551c3cf44bd563c9e4d860d30bcf37be9bd2718..f5431a4aac0ebd64be354aabda3b3197ca12c8c3 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_fr.ts
+++ b/src/GEOMGUI/GEOM_msg_fr.ts
@@ -537,6 +537,14 @@ Choisissez une face, une coque ou un solide et essayez de nouveau</translation>
         <source>GEOM_DIVIDEDDISK_TITLE</source>
         <translation>Construction d&apos;un disque prédécoupé</translation>
     </message>
+    <message>
+        <source>GEOM_DIVIDEDCYLINDER</source>
+        <translation>Cylinder prédécoupé</translation>
+    </message>
+    <message>
+        <source>GEOM_DIVIDEDCYLINDER_TITLE</source>
+        <translation>Construction d&apos;un cylindre prédécoupé</translation>
+    </message>
     <message>
         <source>GEOM_DX</source>
         <translation>Dx :</translation>
@@ -2366,6 +2374,26 @@ Choisissez une face, une coque ou un solide et essayez de nouveau</translation>
         <source>MEN_DIVIDEDDISK</source>
         <translation>Disque prédécoupé</translation>
     </message>
+    <message>
+        <source>TOP_DIVIDEDDISK</source>
+        <translation>Disque prédécoupé</translation>
+    </message>
+    <message>
+        <source>STB_DIVIDEDDISK</source>
+        <translation>Disque prédécoupé</translation>
+    </message>
+    <message>
+        <source>MEN_DIVIDEDCYLINDER</source>
+        <translation>Cylinder prédécoupé</translation>
+    </message>
+    <message>
+        <source>TOP_DIVIDEDCYLINDER</source>
+        <translation>Cylinder prédécoupé</translation>
+    </message>
+    <message>
+        <source>STB_DIVIDEDCYLINDER</source>
+        <translation>Cylinder prédécoupé</translation>
+    </message>
     <message>
         <source>MEN_DISPLAY_ALL</source>
         <translation>Afficher tout</translation>