Merge from V7_3_BR branch 18/12/2013

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73912044d3063089005e38e68c3d5f6eb8cc0376..919f6c15207bb30af0411be887a9e26433d6dc28 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ CMAKE_POLICY(SET CMP0003 NEW)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
 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})

diff --git a/src/HELLOGUI/CMakeLists.txt b/src/HELLOGUI/CMakeLists.txt
index 8621e696aae2f51f710b610eb7d1b65d1f40faf0..9547e881ca81339c845fc9f9c3b13020da8c9289 100644 (file)
--- a/src/HELLOGUI/CMakeLists.txt
+++ b/src/HELLOGUI/CMakeLists.txt
@@ -79,6 +79,7 @@ SET(_ts_RESOURCES
   HELLO_icons.ts
   HELLO_msg_en.ts
   HELLO_msg_fr.ts
+  HELLO_msg_ja.ts
 ) 
 
 # --- rules ---

diff --git a/src/HELLOGUI/HELLO_msg_ja.ts b/src/HELLOGUI/HELLO_msg_ja.ts
new file mode 100644 (file)
index 0000000..14a927f
--- /dev/null
+++ b/src/HELLOGUI/HELLO_msg_ja.ts
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS>
+  <context>
+    <name>HELLOGUI</name>
+    <message>
+      <source>MEN_FILE</source>
+      <translation>ファイル(&amp;F)</translation>
+    </message>
+    <message>
+      <source>MEN_FILE_HELLO</source>
+      <translation>こんにちは</translation>
+    </message>
+    <message>
+      <source>MEN_HELLO</source>
+      <translation>こんにちは</translation>
+    </message>
+    <message>
+      <source>MEN_OP_HELLO</source>
+      <translation>こんにちは</translation>
+    </message>
+    <message>
+      <source>MEN_OP_GOODBYE</source>
+      <translation>さようなら</translation>
+    </message>
+    <message>
+      <source>MEN_OP_TESTME</source>
+      <translation>私にください。</translation>
+    </message>
+    <message>
+      <source>STS_OP_HELLO</source>
+      <translation>サロメを歓迎します。</translation>
+    </message>
+    <message>
+      <source>STS_OP_GOODBYE</source>
+      <translation>サロメにさよならを言う</translation>
+    </message>
+    <message>
+      <source>STS_OP_TESTME</source>
+      <translation>カスタム メニュー アクションのテスト</translation>
+    </message>
+    <message>
+      <source>TLT_OP_HELLO</source>
+      <translation>Salut à 遠い ！</translation>
+    </message>
+    <message>
+      <source>TLT_OP_GOODBYE</source>
+      <translation>さようなら！</translation>
+    </message>
+    <message>
+      <source>TLT_OP_TESTME</source>
+      <translation>私にください。</translation>
+    </message>
+    <message>
+      <source>TOOL_TEST</source>
+      <translation>テスト</translation>
+    </message>
+    <message>
+      <source>TOOL_HELLO</source>
+      <translation>こんにちは</translation>
+    </message>
+    <message>
+      <source>BUT_OK</source>
+      <translation>わかりました</translation>
+    </message>
+    <message>
+      <source>INF_TESTME_TITLE</source>
+      <translation>こんにちは: 私にください。</translation>
+    </message>
+    <message>
+      <source>INF_TESTME_MSG</source>
+      <translation>カスタム メニュー アクションのテストのみです。</translation>
+    </message>
+    <message>
+      <source>QUE_ENTER_NAME</source>
+      <translation>あなたの名前を入力します。</translation>
+    </message>
+    <message>
+      <source>QUE_HELLO_TITLE</source>
+      <translation>サロメを歓迎します。</translation>
+    </message>
+    <message>
+      <source>INF_HELLO_TITLE</source>
+      <translation>こんにちは</translation>
+    </message>
+    <message>
+      <source>INF_HELLO_MSG</source>
+      <translation>救済 %1 ！</translation>
+    </message>
+    <message>
+      <source>ERR_HELLO_ALREADY_MET</source>
+      <translation>%1 はすでに知っている ！</translation>
+    </message>
+    <message>
+      <source>ERR_ERROR</source>
+      <translation>不明なエラー</translation>
+    </message>
+    <message>
+      <source>QUE_GOODBYE_TITLE</source>
+      <translation>サロメにさよならを言う</translation>
+    </message>
+    <message>
+      <source>INF_GOODBYE_TITLE</source>
+      <translation>さようなら</translation>
+    </message>
+    <message>
+      <source>INF_GOODBYE_MSG</source>
+      <translation>%1 さようなら ！</translation>
+    </message>
+    <message>
+      <source>ERR_GOODBYE_DID_NOT_MEET</source>
+      <translation>%1 はまだ出会ってません ！</translation>
+    </message>
+  </context>
+</TS>