ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-26 23:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

0022628: [CEA 1202] The default icon disposition is not correct in french and in japanese

Browse Source
This commit is contained in:
vsr 2014-08-27 13:08:44 +04:00
parent 88911223a8
commit 71ea6f84c5
5 changed files with 183 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/SalomeApp.xml.in
View File

File diff suppressed because one or more lines are too long

107
src/GEOMGUI/GEOM_msg_en.ts
View File

@ -4008,54 +4008,6 @@ Please, select face, shell or solid and try again</translation>
<source>TOM_X</source> <source>TOM_X</source>
<translation>X</translation> <translation>X</translation>
</message> </message>
<message>
<source>TOOL_BASIC</source>
<translation>Basic</translation>
</message>
<message>
<source>TOOL_BLOCKS</source>
<translation>Blocks</translation>
</message>
<message>
<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>
</message>
<message>
<source>TOOL_PRIMITIVES</source>
<translation>Primitives</translation>
</message>
<message>
<source>TOOL_TRANSFORMATION</source>
<translation>Transformation</translation>
</message>
<message>
<source>TOOL_BUILD</source>
<translation>Build</translation>
</message>
<message>
<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>
</message>
<message>
<source>TOOL_MEASURES</source>
<translation>Measures</translation>
</message>
<message> <message>
<source>TOP_ARC</source> <source>TOP_ARC</source>
<translation>Create an arc</translation> <translation>Create an arc</translation>
@ -5181,10 +5133,6 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
<source>MEN_IMPORTEXPORT</source> <source>MEN_IMPORTEXPORT</source>
<translation>Import / Export XAO</translation> <translation>Import / Export XAO</translation>
</message> </message>
<message>
<source>TOOL_IMPORTEXPORT</source>
<translation>Import / Export XAO</translation>
</message>
<message> <message>
<source>TOP_EXPORTXAO</source> <source>TOP_EXPORTXAO</source>
<translation>Export to XAO</translation> <translation>Export to XAO</translation>
@ -5238,6 +5186,61 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
<translation>X=%1, Y=%2, Z=%3</translation> <translation>X=%1, Y=%2, Z=%3</translation>
</message> </message>
</context> </context>
<context>
<name>GeometryGUI</name>
<message>
<source>TOOL_BASIC</source>
<translation>Basic</translation>
</message>
<message>
<source>TOOL_BLOCKS</source>
<translation>Blocks</translation>
</message>
<message>
<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>
</message>
<message>
<source>TOOL_PRIMITIVES</source>
<translation>Primitives</translation>
</message>
<message>
<source>TOOL_TRANSFORMATION</source>
<translation>Transformation</translation>
</message>
<message>
<source>TOOL_BUILD</source>
<translation>Build</translation>
</message>
<message>
<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>
</message>
<message>
<source>TOOL_MEASURES</source>
<translation>Measures</translation>
</message>
<message>
<source>TOOL_IMPORTEXPORT</source>
<translation>Import / Export XAO</translation>
</message>
</context>
<context> <context>
<name>BasicGUI_CurveDlg</name> <name>BasicGUI_CurveDlg</name>
<message> <message>

107
src/GEOMGUI/GEOM_msg_fr.ts
View File

@ -3996,54 +3996,6 @@ Choisissez une face, une coque ou un solide et essayez de nouveau</translation>
<source>TOM_X</source> <source>TOM_X</source>
<translation>X</translation> <translation>X</translation>
</message> </message>
<message>
<source>TOOL_BASIC</source>
<translation>Objets de base</translation>
</message>
<message>
<source>TOOL_BLOCKS</source>
<translation>Blocs</translation>
</message>
<message>
<source>TOOL_BOOLEAN</source>
<translation>Opérations booléennes </translation>
</message>
<message>
<source>TOOL_FEATURES</source>
<translation>Modification</translation>
</message>
<message>
<source>TOOL_GENERATION</source>
<translation>Génération</translation>
</message>
<message>
<source>TOOL_PRIMITIVES</source>
<translation>Primitives</translation>
</message>
<message>
<source>TOOL_TRANSFORMATION</source>
<translation>Transformation</translation>
</message>
<message>
<source>TOOL_BUILD</source>
<translation>Construire</translation>
</message>
<message>
<source>TOOL_OPERATIONS</source>
<translation>Opérations</translation>
</message>
<message>
<source>TOOL_PICTURES</source>
<translation>Images</translation>
</message>
<message>
<source>TOOL_ADVANCED</source>
<translation>Avancé</translation>
</message>
<message>
<source>TOOL_MEASURES</source>
<translation>Informations</translation>
</message>
<message> <message>
<source>TOP_ARC</source> <source>TOP_ARC</source>
<translation>Créer un arc</translation> <translation>Créer un arc</translation>
@ -5165,10 +5117,6 @@ le paramètre &apos;%1&apos; aux préférences du module Géométrie.</translati
<source>MEN_IMPORTEXPORT</source> <source>MEN_IMPORTEXPORT</source>
<translation>Import / Export XAO</translation> <translation>Import / Export XAO</translation>
</message> </message>
<message>
<source>TOOL_IMPORTEXPORT</source>
<translation>Import / Export XAO</translation>
</message>
<message> <message>
<source>TOP_EXPORTXAO</source> <source>TOP_EXPORTXAO</source>
<translation>Export XAO</translation> <translation>Export XAO</translation>
@ -5222,6 +5170,61 @@ le paramètre &apos;%1&apos; aux préférences du module Géométrie.</translati
<translation>X=%1, Y=%2, Z=%3</translation> <translation>X=%1, Y=%2, Z=%3</translation>
</message> </message>
</context> </context>
<context>
<name>GeometryGUI</name>
<message>
<source>TOOL_BASIC</source>
<translation>Objets de base</translation>
</message>
<message>
<source>TOOL_BLOCKS</source>
<translation>Blocs</translation>
</message>
<message>
<source>TOOL_BOOLEAN</source>
<translation>Opérations booléennes </translation>
</message>
<message>
<source>TOOL_FEATURES</source>
<translation>Modification</translation>
</message>
<message>
<source>TOOL_GENERATION</source>
<translation>Génération</translation>
</message>
<message>
<source>TOOL_PRIMITIVES</source>
<translation>Primitives</translation>
</message>
<message>
<source>TOOL_TRANSFORMATION</source>
<translation>Transformation</translation>
</message>
<message>
<source>TOOL_BUILD</source>
<translation>Construire</translation>
</message>
<message>
<source>TOOL_OPERATIONS</source>
<translation>Opérations</translation>
</message>
<message>
<source>TOOL_PICTURES</source>
<translation>Images</translation>
</message>
<message>
<source>TOOL_ADVANCED</source>
<translation>Avancé</translation>
</message>
<message>
<source>TOOL_MEASURES</source>
<translation>Informations</translation>
</message>
<message>
<source>TOOL_IMPORTEXPORT</source>
<translation>Import / Export XAO</translation>
</message>
</context>
<context> <context>
<name>BasicGUI_CurveDlg</name> <name>BasicGUI_CurveDlg</name>
<message> <message>

107
src/GEOMGUI/GEOM_msg_ja.ts
View File

@ -3983,54 +3983,6 @@
<source>TOM_X</source> <source>TOM_X</source>
<translation>X</translation> <translation>X</translation>
</message> </message>
<message>
<source>TOOL_BASIC</source>
<translation>基礎オブジェクト</translation>
</message>
<message>
<source>TOOL_BLOCKS</source>
<translation>ブロック分割</translation>
</message>
<message>
<source>TOOL_BOOLEAN</source>
<translation>ブーリアン操作</translation>
</message>
<message>
<source>TOOL_FEATURES</source>
<translation>フィーチャー</translation>
</message>
<message>
<source>TOOL_GENERATION</source>
<translation>押し出し/回転</translation>
</message>
<message>
<source>TOOL_PRIMITIVES</source>
<translation>基本図形</translation>
</message>
<message>
<source>TOOL_TRANSFORMATION</source>
<translation>変形/移動/回転</translation>
</message>
<message>
<source>TOOL_BUILD</source>
<translation>構築</translation>
</message>
<message>
<source>TOOL_OPERATIONS</source>
<translation>操作</translation>
</message>
<message>
<source>TOOL_PICTURES</source>
<translation>画像</translation>
</message>
<message>
<source>TOOL_ADVANCED</source>
<translation>高度なツール</translation>
</message>
<message>
<source>TOOL_MEASURES</source>
<translation>情報/測定</translation>
</message>
<message> <message>
<source>TOP_ARC</source> <source>TOP_ARC</source>
<translation>円弧を作成</translation> <translation>円弧を作成</translation>
@ -5151,10 +5103,6 @@
<source>MEN_IMPORTEXPORT</source> <source>MEN_IMPORTEXPORT</source>
<translation>インポート/エクスポート</translation> <translation>インポート/エクスポート</translation>
</message> </message>
<message>
<source>TOOL_IMPORTEXPORT</source>
<translation>インポート/エクスポート</translation>
</message>
<message> <message>
<source>TOP_EXPORTXAO</source> <source>TOP_EXPORTXAO</source>
<translation>エクスポートしました。</translation> <translation>エクスポートしました。</translation>
@ -5208,6 +5156,61 @@
<translation>X=%1, Y=%2, Z=%3</translation> <translation>X=%1, Y=%2, Z=%3</translation>
</message> </message>
</context> </context>
<context>
<name>GeometryGUI</name>
<message>
<source>TOOL_BASIC</source>
<translation>基礎オブジェクト</translation>
</message>
<message>
<source>TOOL_BLOCKS</source>
<translation>ブロック分割</translation>
</message>
<message>
<source>TOOL_BOOLEAN</source>
<translation>ブーリアン操作</translation>
</message>
<message>
<source>TOOL_FEATURES</source>
<translation>フィーチャー</translation>
</message>
<message>
<source>TOOL_GENERATION</source>
<translation>押し出し/回転</translation>
</message>
<message>
<source>TOOL_PRIMITIVES</source>
<translation>基本図形</translation>
</message>
<message>
<source>TOOL_TRANSFORMATION</source>
<translation>変形/移動/回転</translation>
</message>
<message>
<source>TOOL_BUILD</source>
<translation>構築</translation>
</message>
<message>
<source>TOOL_OPERATIONS</source>
<translation>操作</translation>
</message>
<message>
<source>TOOL_PICTURES</source>
<translation>画像</translation>
</message>
<message>
<source>TOOL_ADVANCED</source>
<translation>高度なツール</translation>
</message>
<message>
<source>TOOL_MEASURES</source>
<translation>情報/測定</translation>
</message>
<message>
<source>TOOL_IMPORTEXPORT</source>
<translation>インポート/エクスポート</translation>
</message>
</context>
<context> <context>
<name>BasicGUI_CurveDlg</name> <name>BasicGUI_CurveDlg</name>
<message> <message>

32
src/GEOMGUI/GeometryGUI.cxx
View File

@ -1344,7 +1344,7 @@ void GeometryGUI::initialize( CAM_Application* app )
// ---- create toolbars -------------------------- // ---- create toolbars --------------------------
int basicTbId = createTool( tr( "TOOL_BASIC" ) ); int basicTbId = createTool( tr( "TOOL_BASIC" ), QString( "GEOMBasic" ) );
createTool( GEOMOp::OpPoint, basicTbId ); createTool( GEOMOp::OpPoint, basicTbId );
createTool( GEOMOp::OpLine, basicTbId ); createTool( GEOMOp::OpLine, basicTbId );
createTool( GEOMOp::OpCircle, basicTbId ); createTool( GEOMOp::OpCircle, basicTbId );
@ -1359,11 +1359,11 @@ void GeometryGUI::initialize( CAM_Application* app )
createTool( GEOMOp::OpLCS, basicTbId ); createTool( GEOMOp::OpLCS, basicTbId );
createTool( GEOMOp::OpOriginAndVectors, basicTbId ); createTool( GEOMOp::OpOriginAndVectors, basicTbId );
// int sketchTbId = createTool( tr( "TOOL_SKETCH" ) ); // int sketchTbId = createTool( tr( "TOOL_SKETCH" ), QString( "GEOMSketch" ) );
// createTool( GEOMOp::Op2dSketcher, sketchTbId ); // createTool( GEOMOp::Op2dSketcher, sketchTbId );
// createTool( GEOMOp::Op3dSketcher, sketchTbId ); // createTool( GEOMOp::Op3dSketcher, sketchTbId );
int primTbId = createTool( tr( "TOOL_PRIMITIVES" ) ); int primTbId = createTool( tr( "TOOL_PRIMITIVES" ), QString( "GEOMPrimitives" ) );
createTool( GEOMOp::OpBox, primTbId ); createTool( GEOMOp::OpBox, primTbId );
createTool( GEOMOp::OpCylinder, primTbId ); createTool( GEOMOp::OpCylinder, primTbId );
createTool( GEOMOp::OpSphere, primTbId ); createTool( GEOMOp::OpSphere, primTbId );
@ -1373,17 +1373,17 @@ void GeometryGUI::initialize( CAM_Application* app )
createTool( GEOMOp::OpDisk, primTbId ); createTool( GEOMOp::OpDisk, primTbId );
//createTool( GEOMOp::OpPipeTShape, primTbId ); //rnc //createTool( GEOMOp::OpPipeTShape, primTbId ); //rnc
//int blocksTbId = createTool( tr( "TOOL_BLOCKS" ) ); //int blocksTbId = createTool( tr( "TOOL_BLOCKS" ), QString( "GEOMBlocks" ) );
//createTool( GEOMOp::OpDividedDisk, blocksTbId ); //createTool( GEOMOp::OpDividedDisk, blocksTbId );
//createTool( GEOMOp::OpDividedCylinder, blocksTbId ); //createTool( GEOMOp::OpDividedCylinder, blocksTbId );
int boolTbId = createTool( tr( "TOOL_BOOLEAN" ) ); int boolTbId = createTool( tr( "TOOL_BOOLEAN" ), QString( "GEOMBooleanOperations" ) );
createTool( GEOMOp::OpFuse, boolTbId ); createTool( GEOMOp::OpFuse, boolTbId );
createTool( GEOMOp::OpCommon, boolTbId ); createTool( GEOMOp::OpCommon, boolTbId );
createTool( GEOMOp::OpCut, boolTbId ); createTool( GEOMOp::OpCut, boolTbId );
createTool( GEOMOp::OpSection, boolTbId ); createTool( GEOMOp::OpSection, boolTbId );
int genTbId = createTool( tr( "TOOL_GENERATION" ) ); int genTbId = createTool( tr( "TOOL_GENERATION" ), QString( "GEOMGeneration" ) );
createTool( GEOMOp::OpPrism, genTbId ); createTool( GEOMOp::OpPrism, genTbId );
createTool( GEOMOp::OpRevolution, genTbId ); createTool( GEOMOp::OpRevolution, genTbId );
createTool( GEOMOp::OpFilling, genTbId ); createTool( GEOMOp::OpFilling, genTbId );
@ -1392,7 +1392,7 @@ void GeometryGUI::initialize( CAM_Application* app )
createTool( GEOMOp::OpPipePath, genTbId ); createTool( GEOMOp::OpPipePath, genTbId );
#endif #endif
int transTbId = createTool( tr( "TOOL_TRANSFORMATION" ) ); int transTbId = createTool( tr( "TOOL_TRANSFORMATION" ), QString( "GEOMTransformation" ) );
createTool( GEOMOp::OpTranslate, transTbId ); createTool( GEOMOp::OpTranslate, transTbId );
createTool( GEOMOp::OpRotate, transTbId ); createTool( GEOMOp::OpRotate, transTbId );
createTool( GEOMOp::OpChangeLoc, transTbId ); createTool( GEOMOp::OpChangeLoc, transTbId );
@ -1404,14 +1404,14 @@ void GeometryGUI::initialize( CAM_Application* app )
createTool( GEOMOp::OpMultiTranslate, transTbId ); createTool( GEOMOp::OpMultiTranslate, transTbId );
createTool( GEOMOp::OpMultiRotate, transTbId ); createTool( GEOMOp::OpMultiRotate, transTbId );
int operTbId = createTool( tr( "TOOL_OPERATIONS" ) ); int operTbId = createTool( tr( "TOOL_OPERATIONS" ), QString( "GEOMOperations" ) );
createTool( GEOMOp::OpExplode, operTbId ); createTool( GEOMOp::OpExplode, operTbId );
createTool( GEOMOp::OpPartition, operTbId ); createTool( GEOMOp::OpPartition, operTbId );
createTool( GEOMOp::OpArchimede, operTbId ); createTool( GEOMOp::OpArchimede, operTbId );
createTool( GEOMOp::OpShapesOnShape, operTbId ); createTool( GEOMOp::OpShapesOnShape, operTbId );
createTool( GEOMOp::OpSharedShapes, operTbId ); createTool( GEOMOp::OpSharedShapes, operTbId );
int featTbId = createTool( tr( "TOOL_FEATURES" ) ); int featTbId = createTool( tr( "TOOL_FEATURES" ), QString( "GEOMModification" ) );
createTool( GEOMOp::OpFillet1d, featTbId ); createTool( GEOMOp::OpFillet1d, featTbId );
createTool( GEOMOp::OpFillet2d, featTbId ); createTool( GEOMOp::OpFillet2d, featTbId );
createTool( GEOMOp::OpFillet3d, featTbId ); createTool( GEOMOp::OpFillet3d, featTbId );
@ -1423,7 +1423,7 @@ void GeometryGUI::initialize( CAM_Application* app )
createTool( GEOMOp::OpCurveCreator, featTbId ); createTool( GEOMOp::OpCurveCreator, featTbId );
#endif #endif
int buildTbId = createTool( tr( "TOOL_BUILD" ) ); int buildTbId = createTool( tr( "TOOL_BUILD" ), QString( "GEOMBuild" ) );
createTool( GEOMOp::OpEdge, buildTbId ); createTool( GEOMOp::OpEdge, buildTbId );
createTool( GEOMOp::OpWire, buildTbId ); createTool( GEOMOp::OpWire, buildTbId );
createTool( GEOMOp::OpFace, buildTbId ); createTool( GEOMOp::OpFace, buildTbId );
@ -1431,7 +1431,7 @@ void GeometryGUI::initialize( CAM_Application* app )
createTool( GEOMOp::OpSolid, buildTbId ); createTool( GEOMOp::OpSolid, buildTbId );
createTool( GEOMOp::OpCompound, buildTbId ); createTool( GEOMOp::OpCompound, buildTbId );
int measureTbId = createTool( tr( "TOOL_MEASURES" ) ); int measureTbId = createTool( tr( "TOOL_MEASURES" ), QString( "GEOMMeasures" ) );
createTool( GEOMOp::OpPointCoordinates, measureTbId ); createTool( GEOMOp::OpPointCoordinates, measureTbId );
createTool( GEOMOp::OpProperties, measureTbId ); createTool( GEOMOp::OpProperties, measureTbId );
createTool( GEOMOp::OpCenterMass, measureTbId ); createTool( GEOMOp::OpCenterMass, measureTbId );
@ -1452,17 +1452,17 @@ void GeometryGUI::initialize( CAM_Application* app )
createTool( GEOMOp::OpGetNonBlocks, measureTbId ); createTool( GEOMOp::OpGetNonBlocks, measureTbId );
createTool( GEOMOp::OpCheckSelfInters, measureTbId ); createTool( GEOMOp::OpCheckSelfInters, measureTbId );
int picturesTbId = createTool( tr( "TOOL_PICTURES" ) ); int picturesTbId = createTool( tr( "TOOL_PICTURES" ), QString( "GEOMPictures" ) );
createTool( GEOMOp::OpPictureImport, picturesTbId ); createTool( GEOMOp::OpPictureImport, picturesTbId );
#ifdef WITH_OPENCV #ifdef WITH_OPENCV
createTool( GEOMOp::OpFeatureDetect, picturesTbId ); createTool( GEOMOp::OpFeatureDetect, picturesTbId );
#endif #endif
int impexpTbId = createTool( tr( "TOOL_IMPORTEXPORT" ) ); int impexpTbId = createTool( tr( "TOOL_IMPORTEXPORT" ), QString( "GEOMImportExportXAO" ) );
createTool( GEOMOp::OpExportXAO, impexpTbId ); createTool( GEOMOp::OpExportXAO, impexpTbId );
createTool( GEOMOp::OpImportXAO, impexpTbId ); createTool( GEOMOp::OpImportXAO, impexpTbId );
//int advancedTbId = createTool( tr( "TOOL_ADVANCED" ) ); //int advancedTbId = createTool( tr( "TOOL_ADVANCED" ), QString( "GEOMAdvanced" ) );
//createTool( GEOMOp::OpSmoothingSurface, advancedTbId ); //createTool( GEOMOp::OpSmoothingSurface, advancedTbId );
//@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@// //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@//
@ -1693,7 +1693,7 @@ void GeometryGUI::addPluginActions()
// create "Advanced Operations" menu and corresponding toolbar // create "Advanced Operations" menu and corresponding toolbar
//int advancedMenuId = createMenu(tr("MEN_ADVANCED"), -1, -1, 10); //int advancedMenuId = createMenu(tr("MEN_ADVANCED"), -1, -1, 10);
//int advancedTbarId = createTool(tr("TOOL_ADVANCED")); //int advancedTbarId = createTool(tr("TOOL_ADVANCED"), QString( "Advanced" ));
int id = GEOMOp::OpLastOperationID; // TODO? int id = GEOMOp::OpLastOperationID; // TODO?
// loop on xmlFiles // loop on xmlFiles
@ -1763,7 +1763,7 @@ void GeometryGUI::addPluginActions()
QString subTool = stools[0]; QString subTool = stools[0];
subTool = subTool.toUpper().prepend("TOOL_"); subTool = subTool.toUpper().prepend("TOOL_");
int toolId = createTool(tr(subTool.toLatin1().constData())); int toolId = createTool(tr(subTool.toLatin1().constData()), subTool.toLatin1().constData());
//createTool(id, advancedTbarId); //createTool(id, advancedTbarId);
createTool(id, toolId); createTool(id, toolId);