X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESH_msg_en.ts;h=9b9183530da1a056070cc4ad44172bab53de8b36;hp=8bb38cd7cc985f279996a10884a5287366830b6f;hb=0fdf27b77bce6d48fa08a35ded5a5af3d13834e8;hpb=74d992bdafb957a5764fdaa72287328ff23cf654

diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index 8bb38cd7c..9b9183530 100644
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -744,7 +744,7 @@
         <source>TOP_MEASURE_AREA</source>
         <translation>Area</translation>
     </message>
-     <message>
+    <message>
         <source>MEN_MEASURE_VOLUME</source>
         <translation>Volume</translation>
     </message>
@@ -2040,6 +2040,10 @@ Check algorithm documentation for supported geometry</translation>
         <source>SMESH_MESHINFO_ORDER2</source>
         <translation>Quadratic</translation>
     </message>
+    <message>
+        <source>SMESH_MESHINFO_ORDER3</source>
+        <translation>Bi-Quadratic</translation>
+    </message>
     <message>
         <source>SMESH_MESHINFO_HEXAPRISM</source>
         <translation>Hexagonal prisms</translation>
@@ -2300,7 +2304,7 @@ Check algorithm documentation for supported geometry</translation>
         <source>PREF_NUMBERING_NODE</source>
         <translation>Nodes: Color</translation>
     </message>
-     <message>
+    <message>
         <source>PREF_NUMBERING_ELEM</source>
         <translation>Edges: Color</translation>
     </message>
@@ -4220,19 +4224,30 @@ It can&apos;t be deleted </translation>
         <translation>Sort child items</translation>
     </message>
 </context>
+<context>
+    <name>SMESHGUI_FieldSelectorWdg</name>
+    <message>
+        <source>FIELDS_TO_EXPORT</source>
+        <translation>Export Fields</translation>
+    </message>
+</context>
 <context>
     <name>SMESHGUI_Dialog</name>
     <message>
         <source>DLG_MESH</source>
-        <translation>meshes</translation>
+        <translation>mesh(s)</translation>
     </message>
     <message>
         <source>DLG_HYPO</source>
-        <translation>hypotheses</translation>
+        <translation>hypothesis(s)</translation>
     </message>
     <message>
         <source>DLG_ALGO</source>
-        <translation>algorithms</translation>
+        <translation>algorithm(s)</translation>
+    </message>
+    <message>
+        <source>DLG_GEOM</source>
+        <translation>object(s)</translation>
     </message>
 </context>
 <context>
@@ -4305,7 +4320,7 @@ Please, create VTK viewer and try again</translation>
     <message>
         <source>PREF_PRE_SELECTION</source>
         <translation>Pre-selection color</translation>
-    </message>    
+    </message>
     <message>
         <source>PREF_COLOR</source>
         <translation>Color</translation>
@@ -4562,6 +4577,10 @@ Please, create VTK viewer and try again</translation>
         <source>PREF_BALL_SIZE</source>
         <translation>Size of ball elements</translation>
     </message>
+    <message>
+        <source>PREF_BALL_SCALE</source>
+        <translation>Scale factor of ball elements</translation>
+    </message>
     <message>
         <source>PREF_WIDTH</source>
         <translation>Line width</translation>
@@ -4581,6 +4600,10 @@ Please, create VTK viewer and try again</translation>
         <source>ALLOW_ELEM_LIST_MODIF</source>
         <translation>Enable manual edition</translation>
     </message>
+    <message>
+        <source>SELECT_ALL</source>
+        <translation>Select All</translation>
+    </message>
 </context>
 <context>
     <name>SMESHGUI_Add0DElemsOnAllNodesDlg</name>
@@ -4838,11 +4861,11 @@ Do you want to restore original submesh priority?</translation>
         <source>RADIOBTN_2</source>
         <translation>Convert to quadratic</translation>
     </message>
-      <message>
+    <message>
         <source>RADIOBTN_3</source>
         <translation>Convert to bi-quadratic</translation>
-      </message>
-      <message>
+    </message>
+    <message>
         <source>NON_CONFORM_WARNING</source>
         <translation>Warning: mesh can become non-conformal</translation>
     </message>
@@ -5414,10 +5437,10 @@ Please check input data and try again</translation>
         <source>CONNECTED_ELEMS</source>
         <translation>Elements of a domain</translation>
     </message>
-  <message>
-    <source>NUMBEROFNODESINELEMENT</source>
-    <translation>Number Of Nodes In Element</translation>
-  </message>
+    <message>
+        <source>NUMBEROFNODESINELEMENT</source>
+        <translation>Number Of Nodes In Element</translation>
+    </message>
     <message>
         <source>COPY_FROM</source>
         <translation>Copy from...</translation>
@@ -5795,13 +5818,6 @@ Please specify them and try again</translation>
         <translation>Union of two groups</translation>
     </message>
 </context>
-<context>
-    <name>SMESHGUI_GroupDlg</name>
-    <message>
-        <source>SELECT_ALL</source>
-        <translation>Select All</translation>
-    </message>
-</context>
 <context>
     <name>SMESHGUI_UnionGroupsDlg</name>
     <message>
@@ -6002,10 +6018,15 @@ Please specify them and try again</translation>
         <translation>No sense in creating a submesh ignored by global algorithm &quot;%1&quot;</translation>
     </message>
     <message>
-        <source>GEOMETRY_OBJECT_IS_NOT_DEFINED</source>
+        <source>GEOMETRY_OBJECT_IS_NOT_DEFINED_MESH</source>
         <translation>Geometry object is not defined.
 Do you want to create an empty mesh 
 without algorithms and hypotheses? </translation>
+    </message>
+    <message>
+        <source>GEOMETRY_OBJECT_IS_NOT_DEFINED_SUBMESH</source>
+        <translation>Geometry object is not defined.
+Please specify it and try again</translation>
     </message>
     <message>
         <source>GEOMETRY_OBJECT_IS_NULL</source>
@@ -6071,6 +6092,14 @@ Please enter valid name and try again</translation>
         <translation>There is no object for editing. Please
 select mesh or sub-mesh and try again</translation>
     </message>
+    <message>
+        <source>CONCURRENT_SUBMESH_APPEARS</source>
+        <translation> 
+The assigned algorithm has the same priority as one assigned to an 
+adjacent sub-mesh, hence it&apos;s undefined which algorithm to use for
+meshing boundary shared by two sub-meshes. Would you like to set
+the order of sub-mesh computation? </translation>
+    </message>
 </context>
 <context>
     <name>SMESHGUI_MeshPatternDlg</name>
@@ -6233,6 +6262,14 @@ It is impossible to read point coordinates from file</translation>
         <source>NONE</source>
         <translation>&lt;None&gt;</translation>
     </message>
+    <message>
+        <source>DEFAULT</source>
+        <translation>&lt;Default&gt;</translation>
+    </message>
+    <message>
+        <source>SELECT</source>
+        <translation>&lt;Select&gt;</translation>
+    </message>
 </context>
 <context>
     <name>SMESHGUI_MultiEditDlg</name>
@@ -6720,6 +6757,10 @@ It is impossible to read point coordinates from file</translation>
         <source>DUPLICATION_ONLY_ELEMS</source>
         <translation>Duplicate elements only</translation>
     </message>
+    <message>
+        <source>DUPLICATION_GROUP_BOUNDARY</source>
+        <translation>Duplicate nodes on group boundaries</translation>
+    </message>
     <message>
         <source>GROUP_ELEMS_TO_DUPLICATE</source>
         <translation>Group of elements to duplicate</translation>
@@ -6732,6 +6773,10 @@ It is impossible to read point coordinates from file</translation>
         <source>GROUP_ELEMS_TO_REPLACE</source>
         <translation>Group of elements to replace nodes with new ones</translation>
     </message>
+    <message>
+        <source>GROUP_VOLUME_GROUPS</source>
+        <translation>Groups of volumes</translation>
+    </message>
     <message>
         <source>CONSTRUCT_NEW_GROUP_NODES</source>
         <translation>Construct group with newly created nodes</translation>
@@ -6740,6 +6785,14 @@ It is impossible to read point coordinates from file</translation>
         <source>CONSTRUCT_NEW_GROUP_ELEMENTS</source>
         <translation>Construct group with newly created elements</translation>
     </message>
+    <message>
+        <source>CREATE_JOINT_ELEMENTS</source>
+        <translation>Create joint elements</translation>
+    </message>
+    <message>
+        <source>ON_ALL_BOUNDARIES</source>
+        <translation>On all boundaries</translation>
+    </message>
 </context>
 <context>
     <name>SMESHGUI_Make2DFrom3DDlg</name>
@@ -6814,7 +6867,7 @@ as they are of improper type:
     </message>
     <message>
         <source>SMESH_NOT_ONLY_GROUPS</source>
-        <translation>Can't process meshes and groups at once</translation>
+        <translation>Can&apos;t process meshes and groups at once</translation>
     </message>
     <message>
         <source>SMESH_ERR_NO_3D_ELEMENTS</source>
@@ -6867,6 +6920,10 @@ as they are of improper type:
         <source>QUADRATIC_LAB</source>
         <translation>Quadratic</translation>
     </message>
+    <message>
+        <source>BI_QUADRATIC_LAB</source>
+        <translation>Bi-Quadratic</translation>
+    </message>
     <message>
         <source>0D_LAB</source>
         <translation>0D:</translation>
@@ -7177,8 +7234,8 @@ as they are of improper type:
 <context>
     <name>SMESHGUI_TreeElemInfo</name>
     <message>
-      <source>SHOW_ITEM_INFO</source>
-      <translation>Show info</translation>
+        <source>SHOW_ITEM_INFO</source>
+        <translation>Show info</translation>
     </message>
     <message>
         <source>PROPERTY</source>
@@ -7401,7 +7458,7 @@ as they are of improper type:
     <message>
         <source>NUMBER_OF_THE_DOUBLE_FACES</source>
         <translation>Number of the double faces</translation>
-    </message>   
+    </message>
     <message>
         <source>ASPECT_RATIO_HISTOGRAM</source>
         <translation>Aspect Ratio histogram</translation>
@@ -7720,7 +7777,7 @@ as they are of improper type:
         <translation>Size:</translation>
     </message>
     <message>
-        <source>ORIENTATION_SCALE</source>
+        <source>SCALE_FACTOR</source>
         <translation>Scale:</translation>
     </message>
     <message>