0021827: [CEA 650] TUI setColor on an object displayed in wireframe is ignored

[modules/geom.git] / src / GEOMGUI / GEOM_msg_en.ts

diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts
index da7b2e0f8ac06d30bb7da91620b2fdae1b35083e..4f503aae272177242bb0143b2ef8b2a1c2291fa3 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_en.ts
+++ b/src/GEOMGUI/GEOM_msg_en.ts
@@ -11,6 +11,14 @@
         <source>CHANGE_ORIENTATION_NEW_OBJ_NAME</source>
         <translation>Invert</translation>
     </message>
+    <message>
+        <source>EDGE_WIDTH_TLT</source>
+        <translation>Select Edge Width</translation>
+    </message>
+    <message>
+        <source>ISOS_WIDTH_TLT</source>
+        <translation>Select Isos Width</translation>
+    </message>
     <message>
         <source>CLOSE_CONTOUR_NEW_OBJ_NAME</source>
         <translation>CloseContour</translation>
@@ -39,7 +47,7 @@ Please, select face, shell or solid and try again</translation>
     </message>
     <message>
         <source> iErr : 12</source>
-        <translation>Unallowed Type of Subshape</translation>
+        <translation>Unallowed Type of Sub-shape</translation>
     </message>
     <message>
         <source> iErr : 13</source>
@@ -303,11 +311,11 @@ Please, select face, shell or solid and try again</translation>
     </message>
     <message>
         <source>GEOM_CHAMFER_EDGES</source>
-        <translation>Chamfer On Edges From Shape</translation>
+        <translation>Chamfer On Selected Edges</translation>
     </message>
     <message>
         <source>GEOM_CHAMFER_FACES</source>
-        <translation>Chamfer On Faces From Shape</translation>
+        <translation>Chamfer On Selected Faces</translation>
     </message>
     <message>
         <source>GEOM_CHAMFER_TITLE</source>
@@ -317,6 +325,10 @@ Please, select face, shell or solid and try again</translation>
         <source>GEOM_CHANGE_ORIENTATION</source>
         <translation>Objects to change orientation</translation>
     </message>
+    <message>
+        <source>GEOM_CHANGE_DIRECTION</source>
+        <translation>Change direction</translation>
+    </message>
     <message>
         <source>GEOM_CHANGE_ORIENTATION_TITLE</source>
         <translation>Change orientation</translation>
@@ -343,7 +355,19 @@ Please, select face, shell or solid and try again</translation>
     </message>
     <message>
         <source>GEOM_CHECK_BLOCKS_COMPOUND_SUBSHAPES</source>
-        <translation>Incriminated Sub-Shapes</translation>
+        <translation>Incriminated Sub-shapes</translation>
+    </message>
+    <message>
+        <source>GEOM_GETNONBLOCKS_TITLE</source>
+        <translation>Get non-hexahedral solids and non-quadrangular faces</translation>
+    </message>
+    <message>
+        <source>GEOM_GETNONBLOCKS</source>
+        <translation>Get non blocks</translation>
+    </message>
+    <message>
+        <source>GEOM_NONBLOCKS</source>
+        <translation>NonBlocksGroup</translation>
     </message>
     <message>
         <source>GEOM_CHECK_INFOS</source>
@@ -427,7 +451,7 @@ Please, select face, shell or solid and try again</translation>
     </message>
     <message>
         <source>GEOM_CONFIRM_INFO</source>
-        <translation>Shape contains %1 sub shapes !</translation>
+        <translation>Shape contains %1 sub-shapes !</translation>
     </message>
     <message>
         <source>GEOM_COOR</source>
@@ -517,6 +541,22 @@ Please, select face, shell or solid and try again</translation>
         <source>GEOM_DIVIDE_EDGE_TITLE</source>
         <translation>Addition of point</translation>
     </message>
+    <message>
+        <source>GEOM_DIVIDEDDISK</source>
+        <translation>Divided Disk</translation>
+    </message>
+    <message>
+        <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>
@@ -533,6 +573,10 @@ Please, select face, shell or solid and try again</translation>
         <source>GEOM_DropSmallEdges</source>
         <translation>DropSmallEdges</translation>
     </message>
+    <message>
+        <source>GEOM_DRAFT_ANGLE</source>
+        <translation>Draft angle:</translation>
+    </message>
     <message>
         <source>GEOM_EDGE</source>
         <translation>Edge</translation>
@@ -573,6 +617,22 @@ Please, select face, shell or solid and try again</translation>
         <source>GEOM_ERR_LIB_NOT_FOUND</source>
         <translation>GUI library corresponding to the user action can not be found or loaded</translation>
     </message>
+    <message>
+        <source>GEOM_EXTRUDED_CUT_TITLE</source>
+        <translation>Extruded cut</translation>
+    </message>
+    <message>
+        <source>GEOM_EXTRUDED_CUT</source>
+        <translation>Extruded_cut</translation>
+    </message>
+    <message>
+        <source>GEOM_EXTRUDED_BOSS_TITLE</source>
+        <translation>Extruded boss</translation>
+    </message>
+    <message>
+        <source>GEOM_EXTRUDED_BOSS</source>
+        <translation>Extruded_boss</translation>
+    </message>
     <message>
         <source>GEOM_EXTRUSION</source>
         <translation>Extrusion</translation>
@@ -627,7 +687,8 @@ Please, select face, shell or solid and try again</translation>
     </message>
     <message>
         <source>MAKE_FACE_TOLERANCE_TOO_BIG</source>
-        <translation>Tolerance of resulting face is too big</translation>
+        <translation>Cannot build a planar face: required tolerance is
+        too big. Non-planar face is built.</translation>
     </message>
     <message>
         <source>GEOM_FACE_OR_LCS</source>
@@ -661,6 +722,10 @@ Please, select face, shell or solid and try again</translation>
         <source>GEOM_FILLET_1D</source>
         <translation>Fillet 1D</translation>
     </message>
+    <message>
+        <source>GEOM_FILLET_1D_IGNORE_SECANT</source>
+        <translation>Fuse collinear edges to allow bigger radius</translation>
+    </message>
     <message>
         <source>GEOM_FILLET_ABORT</source>
         <translation>Fillet can&apos;t be computed with radius %1</translation>
@@ -671,19 +736,11 @@ Please, select face, shell or solid and try again</translation>
     </message>
     <message>
         <source>GEOM_FILLET_EDGES</source>
-        <translation>Fillet On Edges From Shape</translation>
-    </message>
-    <message>
-        <source>GEOM_FILLET_WIRES</source>
-        <translation>Fillet On Wires From Shape</translation>
+        <translation>Fillet On Selected Edges</translation>
     </message>
     <message>
         <source>GEOM_FILLET_FACES</source>
-        <translation>Fillet On Faces From Shape</translation>
-    </message>
-    <message>
-        <source>GEOM_FILLET_VERTEXES</source>
-        <translation>Fillet On Vertexes From Face</translation>
+        <translation>Fillet On Selected Faces</translation>
     </message>
     <message>
         <source>GEOM_FILLET_TITLE</source>
@@ -785,6 +842,10 @@ Please, select face, shell or solid and try again</translation>
         <source>GEOM_GLUE_EDGES_TITLE</source>
         <translation>Glue edges</translation>
     </message>
+    <message>
+        <source>GLUE_ERROR_STICKED_SHAPES</source>
+        <translation>The tolerance value is too big. Sticked shapes are detected.</translation>
+    </message>
     <message>
         <source>GEOM_LIMIT_TOLERANCE_TITLE</source>
         <translation>Limit tolerance</translation>
@@ -793,10 +854,18 @@ Please, select face, shell or solid and try again</translation>
         <source>GEOM_HEIGHT</source>
         <translation>Height :</translation>
     </message>
+    <message>
+        <source>GEOM_HEXAGON</source>
+        <translation>Hexagon</translation>
+    </message>
     <message>
         <source>GEOM_HOLES</source>
         <translation>Holes</translation>
     </message>
+    <message>
+        <source>GEOM_INIT_SHAPE</source>
+        <translation>Initial shape</translation>
+    </message>
     <message>
         <source>GEOM_IDENTICAL_NAMES_SELECT_BY_MOUSE</source>
         <translation>Identical names : select by mouse !</translation>
@@ -1097,6 +1166,10 @@ Please, select face, shell or solid and try again</translation>
         <source>GEOM_OFFSET_TITLE</source>
         <translation>Offset Surface</translation>
     </message>
+    <message>
+        <source>GEOM_PATTERN</source>
+        <translation>Division pattern</translation>
+    </message>
     <message>
         <source>GEOM_PROJECTION</source>
         <translation>Projection</translation>
@@ -1189,6 +1262,10 @@ Please, select face, shell or solid and try again</translation>
         <source>GEOM_PIPE_TITLE</source>
         <translation>Pipe Construction</translation>
     </message>
+    <message>
+        <source>GEOM_PROFILE</source>
+        <translation>Profile</translation>
+    </message>
     <message>
         <source>GEOM_SEGMENT</source>
         <translation>Segment of straight line</translation>
@@ -1351,7 +1428,7 @@ Please, select face, shell or solid and try again</translation>
     </message>
     <message>
         <source>GEOM_PRP_SELECT_SUBSHAPES</source>
-        <translation>Select Sub Shapes</translation>
+        <translation>Select Sub-shapes</translation>
     </message>
     <message>
         <source>GEOM_PRP_SHAPE_IN_STUDY</source>
@@ -1557,6 +1634,10 @@ Please, select face, shell or solid and try again</translation>
         <source>GEOM_SHELL_TITLE</source>
         <translation>Shell Construction</translation>
     </message>
+    <message>
+        <source>GEOM_SKETCH</source>
+        <translation>Sketch</translation>
+    </message>
     <message>
         <source>GEOM_SKETCHER_ABS</source>
         <translation>Absolute</translation>
@@ -1717,6 +1798,10 @@ Please, select face, shell or solid and try again</translation>
         <source>GEOM_SKETCHER_VXVY</source>
         <translation>VX-VY</translation>
     </message>
+    <message>
+        <source>GEOM_SKETCHER_WPLANE</source>
+        <translation>Select a planar face or a plane</translation>
+    </message>
     <message>
         <source>GEOM_SKETCHER_VY2</source>
         <translation>VY :</translation>
@@ -1789,6 +1874,10 @@ Please, select face, shell or solid and try again</translation>
         <source>GEOM_SPLINE_TITLE</source>
         <translation>Spline Construction</translation>
     </message>
+    <message>
+        <source>GEOM_SQUARE</source>
+        <translation>Square</translation>
+    </message>
     <message>
         <source>GEOM_START_LCS</source>
         <translation>Start LCS</translation>
@@ -1819,19 +1908,19 @@ Please, select face, shell or solid and try again</translation>
     </message>
     <message>
         <source>GEOM_SUBSHAPE_SELECT</source>
-        <translation>Select Sub Shapes</translation>
+        <translation>Select Sub-shapes</translation>
     </message>
     <message>
         <source>GEOM_SUBSHAPE_TITLE</source>
-        <translation>Sub Shapes Selection</translation>
+        <translation>Sub-shapes Selection</translation>
     </message>
     <message>
         <source>GEOM_SUBSHAPE_TYPE</source>
-        <translation>Sub Shapes Type</translation>
+        <translation>Sub-shapes Type</translation>
     </message>
     <message>
         <source>GEOM_SUB_SHAPE</source>
-        <translation>Sub Shapes</translation>
+        <translation>Sub-shapes</translation>
     </message>
     <message>
         <source>GEOM_SUPPRESSHOLE_FACE_SHELL</source>
@@ -2211,7 +2300,7 @@ Please, select face, shell or solid and try again</translation>
     </message>
     <message>
         <source>MEN_FEATURE_DETECTION</source>
-        <translation>Feature detection</translation>
+        <translation>Shape recognition</translation>
     </message>
     <message>
         <source>MEN_PICTURE_IMPORT</source>
@@ -2233,6 +2322,10 @@ Please, select face, shell or solid and try again</translation>
         <source>MEN_CHECK_COMPOUND</source>
         <translation>Check Compound of Blocks</translation>
     </message>
+    <message>
+        <source>MEN_GET_NON_BLOCKS</source>
+        <translation>Get Non Blocks</translation>
+    </message>
     <message>
         <source>MEN_CHECK_SELF_INTERSECTIONS</source>
         <translation>Detect Self-intersections</translation>
@@ -2309,6 +2402,30 @@ Please, select face, shell or solid and try again</translation>
         <source>MEN_DISK</source>
         <translation>Disk</translation>
     </message>
+    <message>
+        <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>
@@ -2321,6 +2438,30 @@ Please, select face, shell or solid and try again</translation>
         <source>MEN_DISPLAY_ONLY</source>
         <translation>Show Only</translation>
     </message>
+    <message>
+        <source>MEN_BRING_TO_FRONT</source>
+        <translation>Bring To Front</translation>
+    </message>
+    <message>
+        <source>TOP_BRING_TO_FRONT</source>
+        <translation>Bring To Front</translation>
+    </message>
+    <message>
+        <source>STB_BRING_TO_FRONT</source>
+        <translation>Bring To Front</translation>
+    </message>
+    <message>
+        <source>MEN_CLS_BRING_TO_FRONT</source>
+        <translation>Clear Top Level State</translation>
+    </message>
+    <message>
+        <source>TOP_CLS_BRING_TO_FRONT</source>
+        <translation>Clear Top Level State</translation>
+    </message>
+    <message>
+        <source>STB_CLS_BRING_TO_FRONT</source>
+        <translation>Clear Top Level State</translation>
+    </message>
     <message>
         <source>MEN_EDGE</source>
         <translation>Edge</translation>
@@ -2361,6 +2502,14 @@ Please, select face, shell or solid and try again</translation>
         <source>MEN_EXTRUSION</source>
         <translation>Extrusion</translation>
     </message>
+    <message>
+        <source>MEN_EXTRUDED_CUT</source>
+        <translation>Extruded cut</translation>
+    </message>
+    <message>
+        <source>MEN_EXTRUDED_BOSS</source>
+        <translation>Extruded boss</translation>
+    </message>
     <message>
         <source>MEN_FACE</source>
         <translation>Face</translation>
@@ -2573,6 +2722,34 @@ Please, select face, shell or solid and try again</translation>
         <source>MEN_POP_TEXTURE</source>
         <translation>Texture</translation>
     </message>
+    <message>
+        <source>MEN_EDGE_WIDTH</source>
+        <translation>Edge Width</translation>
+    </message>
+    <message>
+        <source>TOP_EDGE_WIDTH</source>
+        <translation>Edge Width</translation>
+    </message>
+    <message>
+        <source>STB_EDGE_WIDTH</source>
+        <translation>Edge Width</translation>
+    </message>
+    <message>
+        <source>MEN_ISOS_WIDTH</source>
+        <translation>Isos Width</translation>
+    </message>
+    <message>
+        <source>TOP_ISOS_WIDTH</source>
+        <translation>Isos Width</translation>
+    </message>
+    <message>
+        <source>STB_ISOS_WIDTH</source>
+        <translation>Isos Width</translation>
+    </message>
+    <message>
+        <source>MEN_LINE_WIDTH</source>
+        <translation>Line Width</translation>
+    </message>
     <message>
         <source>MEN_POP_SETTEXTURE</source>
         <translation>Texture</translation>
@@ -2841,10 +3018,6 @@ Please, select face, shell or solid and try again</translation>
         <source>PREF_GROUP_GENERAL</source>
         <translation>General</translation>
     </message>
-    <message>
-        <source>PREF_GROUP_OCCVIEWER</source>
-        <translation>OCC Viewer 3d</translation>
-    </message>
     <message>
         <source>GEOM_PREF_GROUP_PRECISION</source>
         <translation>Input fields precision</translation>
@@ -2857,6 +3030,22 @@ Please, select face, shell or solid and try again</translation>
         <source>PREF_ISOS_COLOR</source>
         <translation>Color of isolines</translation>
     </message>
+    <message>
+        <source>PREF_TOPLEVEL_COLOR</source>
+        <translation>Top level color</translation>
+    </message>
+    <message>
+        <source>PREF_TOPLEVEL_DM</source>
+        <translation>Top level display mode</translation>
+    </message>
+    <message>
+        <source>MEN_KEEP_CURRENT_DM</source>
+        <translation>Keep current display mode</translation>
+    </message>
+    <message>
+        <source>MEN_SHOW_ADD_WACTOR</source>
+        <translation>Show additional wireframe actor</translation>
+    </message>
     <message>
         <source>PREF_LINE_COLOR</source>
         <translation>Color of edges, vectors, wires</translation>
@@ -2898,12 +3087,24 @@ Please, select face, shell or solid and try again</translation>
         <translation>Default wireframe color</translation>
     </message>
     <message>
-        <source>PREF_FRONT_MATERIAL</source>
-        <translation>Default front material</translation>
+        <source>PREF_MATERIAL</source>
+        <translation>Default material</translation>
+    </message>
+    <message>
+        <source>PREF_EDGE_WIDTH</source>
+        <translation>Edges width</translation>
     </message>
     <message>
-        <source>PREF_BACK_MATERIAL</source>
-        <translation>Default back material</translation>
+        <source>PREF_ISOLINES_WIDTH</source>
+        <translation>Iso lines width</translation>
+    </message>
+    <message>
+        <source>PREF_PREVIEW_EDGE_WIDTH</source>
+        <translation>Preview edges width</translation>
+    </message>
+    <message>
+        <source>PREF_MEASURES_LINE_WIDTH</source>
+        <translation>Measures lines width</translation>
     </message>
     <message>
         <source>PROCESS_SHAPE_NEW_OBJ_NAME</source>
@@ -2945,6 +3146,14 @@ Please, select face, shell or solid and try again</translation>
         <source>STB_BOX</source>
         <translation>Create a box</translation>
     </message>
+    <message>
+        <source>STB_FEATURE_DETECTION</source>
+        <translation>Shape recognition</translation>
+    </message>
+    <message>
+        <source>STB_PICTURE_IMPORT</source>
+        <translation>Import picture in viewer</translation>
+    </message>
     <message>
         <source>STB_CHAMFER</source>
         <translation>Create a chamfer</translation>
@@ -2961,6 +3170,10 @@ Please, select face, shell or solid and try again</translation>
         <source>STB_CHECK_COMPOUND</source>
         <translation>Check compound of blocks</translation>
     </message>
+    <message>
+        <source>STB_GET_NON_BLOCKS</source>
+        <translation>Get non blocks</translation>
+    </message>
     <message>
         <source>STB_CHECK_SELF_INTERSECTIONS</source>
         <translation>Detect Self-intersections</translation>
@@ -3077,6 +3290,14 @@ Please, select face, shell or solid and try again</translation>
         <source>STB_EXTRUSION</source>
         <translation>Create an extrusion</translation>
     </message>
+    <message>
+        <source>STB_EXTRUDED_CUT</source>
+        <translation>Extruded cut</translation>
+    </message>
+    <message>
+        <source>STB_EXTRUDED_BOSS</source>
+        <translation>Extruded boss</translation>
+    </message>
     <message>
         <source>STB_FACE</source>
         <translation>Build a face</translation>
@@ -3261,6 +3482,14 @@ Please, select face, shell or solid and try again</translation>
         <source>STB_POP_SHADING_WITH_EDGES</source>
         <translation>Shading With Edges</translation>
     </message>
+    <message>
+        <source>STB_POP_TEXTURE</source>
+        <translation>Texture</translation>
+    </message>
+    <message>
+        <source>STB_POP_VECTORS</source>
+        <translation>Show Edge Direction</translation>
+    </message>
     <message>
         <source>STB_POP_SETTEXTURE</source>
         <translation>Add a texture</translation>
@@ -3301,10 +3530,18 @@ Please, select face, shell or solid and try again</translation>
         <source>STB_SEWING</source>
         <translation>Perform sewing</translation>
     </message>
+    <message>
+        <source>STB_WIREFRAME</source>
+        <translation>Wireframe</translation>
+    </message>
     <message>
         <source>STB_SHADING</source>
         <translation>Shading</translation>
     </message>
+    <message>
+        <source>STB_SHADING_WITH_EDGES</source>
+        <translation>Shading with edges</translation>
+    </message>
     <message>
         <source>STB_VECTOR_MODE</source>
         <translation>Change Edge Presentation Mode</translation>
@@ -3473,6 +3710,10 @@ Please, select face, shell or solid and try again</translation>
         <source>TOOL_BOOLEAN</source>
         <translation>Boolean operations</translation>
     </message>
+    <message>
+        <source>TOOL_FEATURES</source>
+        <translation>Modification</translation>
+    </message>
     <message>
         <source>TOOL_GENERATION</source>
         <translation>Generation</translation>
@@ -3493,6 +3734,10 @@ Please, select face, shell or solid and try again</translation>
         <source>TOOL_OPERATIONS</source>
         <translation>Operations</translation>
     </message>
+    <message>
+        <source>TOOL_PICTURES</source>
+        <translation>Pictures</translation>
+    </message>
     <message>
         <source>TOOL_ADVANCED</source>
         <translation>Advanced</translation>
@@ -3537,6 +3782,10 @@ Please, select face, shell or solid and try again</translation>
         <source>TOP_CHECK_COMPOUND</source>
         <translation>Check compound of blocks</translation>
     </message>
+    <message>
+        <source>TOP_GET_NON_BLOCKS</source>
+        <translation>Get non blocks</translation>
+    </message>
     <message>
         <source>TOP_CHECK_SELF_INTERSECTIONS</source>
         <translation>Detect Self-intersections</translation>
@@ -3645,6 +3894,14 @@ Please, select face, shell or solid and try again</translation>
         <source>TOP_EXTRUSION</source>
         <translation>Create an extrusion</translation>
     </message>
+    <message>
+        <source>TOP_EXTRUDED_BOSS</source>
+        <translation>Extruded boss</translation>
+    </message>
+    <message>
+        <source>TOP_EXTRUDED_CUT</source>
+        <translation>Extruded cut</translation>
+    </message>
     <message>
         <source>TOP_FACE</source>
         <translation>Build face</translation>
@@ -3741,6 +3998,14 @@ Please, select face, shell or solid and try again</translation>
         <source>TOP_MUL_TRANSLATION</source>
         <translation>Multi-Translation</translation>
     </message>
+    <message>
+        <source>TOP_PICTURE_IMPORT</source>
+        <translation>Import picture in viewer</translation>
+    </message>
+    <message>
+        <source>TOP_FEATURE_DETECTION</source>
+        <translation>Shape recognition</translation>
+    </message>
     <message>
         <source>TOP_OFFSET</source>
         <translation>Offset surface</translation>
@@ -3999,7 +4264,7 @@ Please, select face, shell or solid and try again</translation>
     </message>
     <message>
         <source>GEOM_CHAMFER_EDGE</source>
-        <translation>Chamfer On Selected Edges</translation>
+        <translation>Chamfer On Edge common with 2 Faces</translation>
     </message>
     <message>
         <source>SELECTED_EDGE</source>
@@ -4069,6 +4334,30 @@ Please, select face, shell or solid and try again</translation>
         <source>STB_REMOVE_EXTRA_EDGES</source>
         <translation>Remove extra edges</translation>
     </message>
+    <message>
+        <source>GEOM_FUSE_EDGES_TITLE</source>
+        <translation>Fuse Collinear Edges within a Wire</translation>
+    </message>
+    <message>
+        <source>GEOM_FUSE_EDGES</source>
+        <translation>Fuse edges</translation>
+    </message>
+    <message>
+        <source>FUSE_EDGES_NEW_OBJ_NAME</source>
+        <translation>FuseEdges</translation>
+    </message>
+    <message>
+        <source>TOP_FUSE_EDGES</source>
+        <translation>Fuse collinear edges within a wire</translation>
+    </message>
+    <message>
+        <source>MEN_FUSE_EDGES</source>
+        <translation>Fuse Collinear Edges within a Wire</translation>
+    </message>
+    <message>
+        <source>STB_FUSE_EDGES</source>
+        <translation>Fuse collinear edges within a wire</translation>
+    </message>
     <message>
         <source>TOP_NORMALE</source>
         <translation>Normal to a face</translation>
@@ -4303,11 +4592,11 @@ Please, select face, shell or solid and try again</translation>
     </message>
     <message>
         <source>GEOM_RESTORE_SUB_SHAPES</source>
-        <translation>Set presentation parameters and subshapes from arguments</translation>
+        <translation>Set presentation parameters and sub-shapes from arguments</translation>
     </message>
     <message>
         <source>GEOM_RSS_ADD_FREFIX</source>
-        <translation>Add prefix to names of restored subshapes</translation>
+        <translation>Add prefix to names of restored sub-shapes</translation>
     </message>
     <message>
         <source>GEOM_PREVIEW</source>
@@ -4329,6 +4618,13 @@ Please, select face, shell or solid and try again</translation>
         <source>GEOM_IMPORT_ERRORS</source>
         <translation>Import operation has finished with errors:</translation>
     </message>
+    <message>
+        <source>EXPORT_IGES_HETEROGENEOUS_COMPOUND</source>
+        <translation>This compound cannot be exported in IGES format
+without loss, because it contains entities, that must be saved in
+different modes. It is vertices, edges and wires on the one hand and
+shells and solids on the other hand.</translation>
+    </message>
     <message>
         <source>GEOM_PUBLISH_NAMED_SHAPES</source>
         <translation>Create groups for named shapes (if there are any)?</translation>
@@ -4342,6 +4638,14 @@ Otherwise the dimensions will be kept without modifications.</translation>
         <source>GEOM_ADVANCED</source>
         <translation>Advanced shape: type %1</translation>
     </message>
+    <message>
+        <source>GEOM_ADVANCED_202</source>
+        <translation>Divided Disk</translation>
+    </message>
+    <message>
+        <source>GEOM_ADVANCED_203</source>
+        <translation>Divided Cylinder</translation>
+    </message>
     <message>
         <source>GEOM_PRECISION_HINT</source>
         <translation>Input value precision can be adjusted using
@@ -4488,7 +4792,7 @@ Otherwise the dimensions will be kept without modifications.</translation>
     <message>
         <source>GEOM_PCURVE_NBSTEP</source>
         <translation>Number of steps</translation>
-    </message>        
+    </message>
 </context>
 <context>
     <name>BasicGUI_EllipseDlg</name>
@@ -4706,7 +5010,7 @@ Number of sketch points too small</translation>
     <message>
         <source>GEOM_PICTURE</source>
         <translation>Picture</translation>
-    </message>   
+    </message>
     <message>
         <source>GEOM_COLOR_FILTER</source>
         <translation>Filtering sample</translation>
@@ -4793,7 +5097,7 @@ Number of sketch points too small</translation>
     </message>
     <message>
         <source>MAIN_SUB_SHAPES</source>
-        <translation>Main Shape And Sub-Shapes</translation>
+        <translation>Main Shape And Sub-shapes</translation>
     </message>
     <message>
         <source>NO_GROUP</source>
@@ -4829,7 +5133,7 @@ Number of sketch points too small</translation>
     </message>
     <message>
         <source>SUBSHAPES_OF_SHAPE2</source>
-        <translation>Only Sub-Shapes of the Second Shape</translation>
+        <translation>Only Sub-shapes of the Second Shape</translation>
     </message>
     <message>
         <source>SECOND_SHAPE</source>
@@ -5002,6 +5306,13 @@ Would you like to continue?</translation>
         <translation>Deflection :</translation>
     </message>
 </context>
+<context>
+    <name>GEOMToolsGUI_LineWidthDlg</name>
+    <message>
+        <source>GEOM_LINE_WIDTH</source>
+        <translation>Line width:</translation>
+    </message>
+</context>
 <context>
     <name>GEOMToolsGUI_MarkerDlg</name>
     <message>
@@ -5053,44 +5364,69 @@ Would you like to continue?</translation>
     <name>GEOMToolsGUI_MaterialPropertiesDlg</name>
     <message>
         <source>MATERIAL_PROPERTIES_TLT</source>
-        <translation>Set Material Properties</translation>
+        <translation>Color and Material Properties</translation>
     </message>
     <message>
-        <source>MATERIAL_BACK_CHK</source>
-        <translation>Enable back material</translation>
-    </message>
-    <message>
-        <source>AMBIENT_GRP</source>
+        <source>REFLECTION_0</source>
         <translation>Ambient</translation>
     </message>
     <message>
-        <source>DIFFUSE_GRP</source>
+        <source>REFLECTION_1</source>
         <translation>Diffuse</translation>
     </message>
     <message>
-        <source>SPECULAR_GRP</source>
+        <source>REFLECTION_2</source>
         <translation>Specular</translation>
     </message>
     <message>
-        <source>EMISSION_GRP</source>
-        <translation>Emission</translation>
-    </message>
-    <message>
-        <source>COLOR</source>
-        <translation>Color:</translation>
+        <source>REFLECTION_3</source>
+        <translation>Emissive</translation>
     </message>
     <message>
-        <source>COEFFICIENT</source>
-        <translation>Coefficient:</translation>
+        <source>ENABLED</source>
+        <translation>Enabled</translation>
     </message>
     <message>
         <source>SHININESS</source>
         <translation>Shininess:</translation>
     </message>
+    <message>
+        <source>PHYSICAL</source>
+        <translation>Physical</translation>
+    </message>
+    <message>
+        <source>ADD_MATERIAL</source>
+        <translation>Add material</translation>
+    </message>
+    <message>
+        <source>DELETE_MATERIAL</source>
+        <translation>Remove material</translation>
+    </message>
+    <message>
+        <source>RENAME_MATERIAL</source>
+        <translation>Rename material</translation>
+    </message>
+    <message>
+        <source>CURRENT_MATERIAL</source>
+        <translation>[ Current ]</translation>
+    </message>
+    <message>
+        <source>CURRENT_COLOR</source>
+        <translation>Color</translation>
+    </message>
     <message>
         <source>CUSTOM_MATERIAL</source>
         <translation>Custom material</translation>
     </message>
+    <message>
+        <source>QUE_CREATE_NEW_MATERIAL</source>
+        <translation>Changing properties of pre-defined material is not allowed.
+Do you want to create new material?</translation>
+    </message>
+    <message>
+        <source>QUE_REMOVE_MATERIAL</source>
+        <translation>Remove material %1?</translation>
+    </message>
     <message>
         <source>OK_BTN</source>
         <translation>&amp;OK</translation>