From 93a8dbd31aedefd4bf75a884d641abeaa8b2feff Mon Sep 17 00:00:00 2001
From: Hiroyasu Nishiyama <hiroyasu.nishiyama.uq@hitachi.com>
Date: Wed, 14 Nov 2018 09:13:21 +0900
Subject: [PATCH] add Japanese translation of newly added message

---
 .../node_modules/@node-red/editor-client/locales/ja/editor.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
index 2720fc7a4..2b9df9e45 100644
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -423,6 +423,8 @@
             "updated": "更新済",
             "install": "ノードを追加",
             "installed": "追加しました",
+            "conflict": "競合",
+            "conflictTip": "<p>インストール済みのノードの種別と競合しているため<br/>ノードをインストールできません</p><p>競合: <code>__module__</code></p>",
             "loading": "カタログを読み込み中",
             "tab-nodes": "現在のノード",
             "tab-install": "ノードを追加",