From 4374f00a52c2df6a55d2e929eb6d5d8fc095ad7e Mon Sep 17 00:00:00 2001
From: Christophe Bourcier <christophe.bourcier@cea.fr>
Date: Mon, 9 Oct 2017 14:40:21 +0200
Subject: [PATCH] Merge V8_4_BR branch.

---
 CMakeLists.txt                 |  2 +-
 src/GUI/HYBRIDPlugin_msg_ja.ts | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9dc25ee..ad05480 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
 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})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Common CMake macros
 # ===================
diff --git a/src/GUI/HYBRIDPlugin_msg_ja.ts b/src/GUI/HYBRIDPlugin_msg_ja.ts
index 2e7a329..c0627e2 100644
--- a/src/GUI/HYBRIDPlugin_msg_ja.ts
+++ b/src/GUI/HYBRIDPlugin_msg_ja.ts
@@ -68,12 +68,12 @@ downward means inward and upward means outward ...
       <translation>主に六面体</translation>
     </message>
     <message>
-        <source>HYBRID_GENERATION_CARTESIAN_CORE</source>
-        <translation type="unfinished">Cartesian core</translation>
+      <source>HYBRID_GENERATION_CARTESIAN_CORE</source>
+      <translation>カーテシアンコア</translation>
     </message>
     <message>
-        <source>HYBRID_CORE_SIZE</source>
-        <translation type="unfinished">Core elements size (cartesian core only)</translation>
+      <source>HYBRID_CORE_SIZE</source>
+      <translation>カーテシアンコアのサイズ (カーテシアンコアのみ)</translation>
     </message>
     <message>
       <source>HYBRID_ADD_MULTINORMALS</source>
@@ -320,16 +320,16 @@ downward means inward and upward means outward ...
       <translation>&lt;b&gt;警告&lt;/b&gt;: 強制メッシュは現在 w/o がジオメトリに関連付けたメッシュの説明を考慮のみしています。</translation>
     </message>
     <message>
-        <source>HYBRID_FACES_LAYERS_TAB</source>
-        <translation type="unfinished">Faces with layers</translation>
+      <source>HYBRID_FACES_LAYERS_TAB</source>
+      <translation>レイヤーのフェイス</translation>
     </message>
     <message>
-        <source>HYBRID_FACES_IMPRINTING_TAB</source>
-        <translation type="unfinished">Faces with imprinting</translation>
+      <source>HYBRID_FACES_IMPRINTING_TAB</source>
+      <translation>プリント付フェイス</translation>
     </message>
     <message>
-        <source>HYBRID_FACE_IDS</source>
-        <translation type="unfinished">Face IDs</translation>
+      <source>HYBRID_FACE_IDS</source>
+      <translation>面ID</translation>
     </message>
   </context>
 </TS>
-- 
2.39.2