Merge branch 'V8_2_BR'

CMakeLists.txt

@@ -33,7 +33,7 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 1)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})

src/GEOMGUI/GEOM_msg_fr.ts

@@ -5820,6 +5820,10 @@ le paramètre &apos;%1&apos; aux préférences du module Géométrie.</translati
         <source>TABLE_Y</source>
         <translation>Y</translation>
     </message>
+    <message>
+        <source>DISTANCE_PREV</source>
+        <translation>Distance</translation>
+    </message>
 </context>
 <context>
     <name>CurveCreator_Widget</name>
@@ -5923,6 +5927,14 @@ le paramètre &apos;%1&apos; aux préférences du module Géométrie.</translati
         <source>JOIN_TLT</source>
         <translation>Joindre les sections sélectionnées</translation>
     </message>
+    <message>
+        <source>BRING_TOGETHER</source>
+        <translation>Assembler</translation>
+    </message>
+    <message>
+        <source>BRING_TOGETHER_TLT</source>
+        <translation>Assembler deux points aux extrémités de deux sections</translation>
+    </message>
     <message>
         <source>CLEAR_ALL</source>
         <translation>Effacer tout</translation>
@@ -7242,6 +7254,18 @@ Voulez-vous en créer un nouveau ?</translation>
         <source>GEOM_INSPECT_OBJECT_MAIN_SHAPE</source>
         <translation>Forme principale</translation>
     </message>
+    <message>
+      <source>GEOM_INSPECT_TOLERANCE_FILTER</source>
+      <translation>Tolérance</translation>
+    </message>
+    <message>
+      <source>GEOM_INSPECT_RESET_MIN</source>
+      <translation>Valeur min</translation>
+    </message>
+    <message>
+      <source>GEOM_INSPECT_RESET_MAX</source>
+      <translation>Valeur max</translation>
+    </message>
     <message>
         <source>GEOM_INSPECT_OBJECT_SHOW</source>
         <translation>Afficher la sélection</translation>

src/GEOMGUI/GEOM_msg_ja.ts

@@ -469,7 +469,7 @@
     </message>
     <message>
       <source>GEOM_COMPSOLIDS</source>
-      <translation type="unfinished">CompSolids</translation>
+      <translation>複合ソリッド</translation>
     </message>
     <message>
       <source>GEOM_COMPOUND_TITLE</source>
@@ -609,7 +609,7 @@
     </message>
     <message>
       <source>GEOM_EDGES</source>
-      <translation type="unfinished">Edges</translation>
+      <translation>エッジ</translation>
     </message>
     <message>
       <source>GEOM_EDGE_TITLE</source>
@@ -2029,7 +2029,7 @@
     </message>
     <message>
       <source>GEOM_SOLIDS</source>
-      <translation type="unfinished">Solids</translation>
+      <translation>ソリッド</translation>
     </message>
     <message>
       <source>GEOM_SOLID_TITLE</source>
@@ -4965,7 +4965,7 @@
     </message>
     <message>
       <source>STB_POP_REDUCE_STUDY</source>
-      <translation>スタディの削減</translation>
+      <translation>スタディの縮小</translation>
     </message>
     <message>
       <source>MEN_POP_SHOW_ALL_DIMENSIONS</source>
@@ -5233,15 +5233,15 @@
     </message>
     <message>
       <source>TOP_EXTRACTION</source>
-      <translation type="unfinished">Extract and Rebuild</translation>
+      <translation>抽出と再構築</translation>
     </message>
     <message>
       <source>MEN_EXTRACTION</source>
-      <translation type="unfinished">Extract and Rebuild</translation>
+      <translation>抽出と再構築</translation>
     </message>
     <message>
       <source>STB_EXTRACTION</source>
-      <translation type="unfinished">Extract and Rebuild</translation>
+      <translation>抽出と再構築</translation>
     </message>
     <message>
       <source>TOP_EXTENSION</source>
@@ -5451,6 +5451,14 @@
       <source>GEOM_DIM_AXES</source>
       <translation>局所座標軸に沿った次元</translation>
     </message>
+    <message>
+      <source>SHOW_ALL_BTN</source>
+      <translation>全表示</translation>
+    </message>
+    <message>
+      <source>HIDE_ALL_BTN</source>
+      <translation>全非表示</translation>
+    </message>
   </context>
   <context>
     <name>GeometryGUI</name>
@@ -5819,6 +5827,10 @@
       <source>TABLE_Y</source>
       <translation>Y</translation>
     </message>
+    <message>
+      <source>DISTANCE_PREV</source>
+      <translation>距離</translation>
+    </message>
   </context>
   <context>
     <name>CurveCreator_Widget</name>
@@ -5922,6 +5934,14 @@
       <source>JOIN_TLT</source>
       <translation>選択した断面を結合</translation>
     </message>
+    <message>
+      <source>BRING_TOGETHER</source>
+      <translation>まとめる</translation>
+    </message>
+    <message>
+      <source>BRING_TOGETHER_TLT</source>
+      <translation>２個のセクション先端点をまとめる</translation>
+    </message>
     <message>
       <source>CLEAR_ALL</source>
       <translation>すべて消去</translation>
@@ -6516,14 +6536,6 @@
       <source>REMOVE_BTN</source>
       <translation>削除</translation>
     </message>
-    <message>
-      <source>SHOW_ALL_BTN</source>
-      <translation>全表示</translation>
-    </message>
-    <message>
-      <source>HIDE_ALL_BTN</source>
-      <translation>全非表示</translation>
-    </message>
     <message>
       <source>DISTANCE_ITEM</source>
       <translation>距離</translation>
@@ -7231,6 +7243,18 @@
       <source>GEOM_INSPECT_OBJECT_MAIN_SHAPE</source>
       <translation>主形状</translation>
     </message>
+    <message>
+      <source>GEOM_INSPECT_TOLERANCE_FILTER</source>
+      <translation>トレランスフィルタ</translation>
+    </message>
+    <message>
+      <source>GEOM_INSPECT_RESET_MIN</source>
+      <translation>最小値</translation>
+    </message>
+    <message>
+      <source>GEOM_INSPECT_RESET_MAX</source>
+      <translation>最大値</translation>
+    </message>
     <message>
       <source>GEOM_INSPECT_OBJECT_SHOW</source>
       <translation>選択を表示</translation>
@@ -7614,51 +7638,51 @@
     <name>OperationGUI_ExtractionDlg</name>
     <message>
       <source>GEOM_EXTRACT_TITLE</source>
-      <translation type="unfinished">Extract and Rebuild</translation>
+      <translation>抽出と再構築</translation>
     </message>
     <message>
       <source>GEOM_EXTRACT_TYPE</source>
-      <translation type="unfinished">Extraction type</translation>
+      <translation>抽出タイプ</translation>
     </message>
     <message>
       <source>GEOM_EXTRACT_INPUT_PARAMS</source>
-      <translation type="unfinished">Input parameters</translation>
+      <translation>入力パラメータ</translation>
     </message>
     <message>
       <source>GEOM_EXTRACT_STATISTICS</source>
-      <translation type="unfinished">Statistics</translation>
+      <translation>統計</translation>
     </message>
     <message>
       <source>GEOM_EXTRACT_SUB_SHAPE_TYPE</source>
-      <translation type="unfinished">Sub-shape type</translation>
+      <translation>Sub-shape type</translation>
     </message>
     <message>
       <source>GEOM_EXTRACT_FILTERED_SHAPES</source>
-      <translation type="unfinished">Filtered shapes</translation>
+      <translation>フィルタされた形状</translation>
     </message>
     <message>
       <source>GEOM_EXTRACT_SHAPES_TO_EXTRACT</source>
-      <translation type="unfinished">Shapes to extract</translation>
+      <translation>形状の引き伸ばし</translation>
     </message>
     <message>
       <source>GEOM_EXTRACT_REBUILD</source>
-      <translation type="unfinished">Rebuild</translation>
+      <translation>再構築</translation>
     </message>
     <message>
       <source>GEOM_EXTRACT_REMOVED</source>
-      <translation type="unfinished">Removed</translation>
+      <translation>削除</translation>
     </message>
     <message>
       <source>GEOM_EXTRACT_MODIFIED</source>
-      <translation type="unfinished">Modified</translation>
+      <translation>修正</translation>
     </message>
     <message>
       <source>GEOM_EXTRACT_ADDED</source>
-      <translation type="unfinished">Added</translation>
+      <translation>追加</translation>
     </message>
     <message>
       <source>GEOM_EXTRACT_NAME</source>
-      <translation type="unfinished">Extraction</translation>
+      <translation>抽出</translation>
     </message>
   </context>
 </TS>

src/STEPPlugin/STEPPlugin_msg_fr.ts

@@ -48,4 +48,58 @@
 Sinon le modèle sera mis à l&apos;échelle GEOM (unités interprétées comme des mètres).</translation>
     </message>
 </context>
+<context>
+    <name>STEPPlugin_ExportDlg</name>
+    <message>
+        <source>STEP_LENGTH_UNITS</source>
+        <translation>Unités de longueur</translation>
+    </message>
+    <message>
+        <source>STEP_UNITS_INCH</source>
+        <translation>pouce</translation>
+    </message>
+    <message>
+        <source>STEP_UNITS_MILLIMETER</source>
+        <translation>millimètre</translation>
+    </message>
+    <message>
+        <source>STEP_UNITS_FOOT</source>
+        <translation>pied</translation>
+    </message>
+    <message>
+        <source>STEP_UNITS_MILE</source>
+        <translation>mile</translation>
+    </message>
+    <message>
+        <source>STEP_UNITS_METER</source>
+        <translation>mètre</translation>
+    </message>
+    <message>
+        <source>STEP_UNITS_KILOMETER</source>
+        <translation>kilomètre</translation>
+    </message>
+    <message>
+        <source>STEP_UNITS_MILLIINCH</source>
+        <translation>millipouce</translation>
+    </message>
+    <message>
+        <source>STEP_UNITS_MICROMETER</source>
+        <translation>micromètre</translation>
+    </message>
+    <message>
+        <source>STEP_UNITS_CENTIMETER</source>
+        <translation>centimètre</translation>
+    </message>
+    <message>
+        <source>STEP_UNITS_MICROINCH</source>
+        <translation>micropouce</translation>
+    </message>
+</context>
+<context>
+    <name>STEPPlugin_ImportDlg</name>
+    <message>
+        <source>STEP_CREATE_ASSEMBLIES</source>
+        <translation>Crée les assemblages</translation>
+    </message>
+</context>
 </TS>

src/STEPPlugin/STEPPlugin_msg_ja.ts

@@ -47,4 +47,58 @@
       <translation>インポートしたファイルの単位をミリメートルからメートルに変換しますか？いいえを選んだ場合、メートル単位として解釈します。</translation>
     </message>
   </context>
+  <context>
+    <name>STEPPlugin_ExportDlg</name>
+    <message>
+      <source>STEP_LENGTH_UNITS</source>
+      <translation>長さの単位</translation>
+    </message>
+    <message>
+      <source>STEP_UNITS_INCH</source>
+      <translation>インチ</translation>
+    </message>
+    <message>
+      <source>STEP_UNITS_MILLIMETER</source>
+      <translation>ミリメートル</translation>
+    </message>
+    <message>
+      <source>STEP_UNITS_FOOT</source>
+      <translation>フィート</translation>
+    </message>
+    <message>
+      <source>STEP_UNITS_MILE</source>
+      <translation>マイル</translation>
+    </message>
+    <message>
+      <source>STEP_UNITS_METER</source>
+      <translation>メートル</translation>
+    </message>
+    <message>
+      <source>STEP_UNITS_KILOMETER</source>
+      <translation>キロメートル</translation>
+    </message>
+    <message>
+      <source>STEP_UNITS_MILLIINCH</source>
+      <translation>ミリインチ</translation>
+    </message>
+    <message>
+      <source>STEP_UNITS_MICROMETER</source>
+      <translation>マイクロメートル</translation>
+    </message>
+    <message>
+      <source>STEP_UNITS_CENTIMETER</source>
+      <translation>センチメートル</translation>
+    </message>
+    <message>
+      <source>STEP_UNITS_MICROINCH</source>
+      <translation>マイクロインチ</translation>
+    </message>
+  </context>
+  <context>
+    <name>STEPPlugin_ImportDlg</name>
+    <message>
+      <source>STEP_CREATE_ASSEMBLIES</source>
+      <translation>アセンブリの作成</translation>
+    </message>
+  </context>
 </TS>