Merge pull request #4849 from kazuhitoyokoi/master-addjpn

Add Japanese translations for v4.0.2

packages/node_modules/@node-red/editor-client/locales/en-US/editor.json

@@ -375,7 +375,10 @@
             "flowAdded": "flow added",
             "moved": "moved",
             "movedTo": "moved to __id__",
-            "movedFrom": "moved from __id__"
+            "movedFrom": "moved from __id__",
+            "none": "none",
+            "position": "position",
+            "wires": "wires"
         },
         "nodeCount": "__count__ node",
         "nodeCount_plural": "__count__ nodes",
@@ -384,9 +387,14 @@
         "reviewChanges": "Review Changes",
         "noBinaryFileShowed": "Cannot show binary file contents",
         "viewCommitDiff": "View Commit Changes",
+        "commit": "Commit",
         "compareChanges": "Compare Changes",
         "saveConflict": "Save conflict resolution",
         "conflictHeader": "<span>__resolved__</span> of <span>__unresolved__</span> conflicts resolved",
+        "localChanges": "Local Changes",
+        "remoteChanges": "Remote Changes",
+        "useLocalChanges": "use local changes",
+        "useRemoteChanges": "use remote changes",
         "commonVersionError": "Common Version doesn't contain valid JSON:",
         "oldVersionError": "Old Version doesn't contain valid JSON:",
         "newVersionError": "New Version doesn't contain valid JSON:"
@@ -803,6 +811,7 @@
                 "branches": "Branches",
                 "noBranches": "No branches",
                 "deleteConfirm": "Are you sure you want to delete the local branch '__name__'? This cannot be undone.",
+                "deleteBranch": "Delete branch",
                 "unmergedConfirm": "The local branch '__name__' has unmerged changes that will be lost. Are you sure you want to delete it?",
                 "deleteUnmergedBranch": "Delete unmerged branch",
                 "gitRemotes": "Git remotes",

packages/node_modules/@node-red/editor-client/locales/ja/editor.json

@@ -375,7 +375,10 @@
             "flowAdded": "追加されたフロー",
             "moved": "移動",
             "movedTo": "__id__ へ移動",
-            "movedFrom": "__id__ から移動"
+            "movedFrom": "__id__ から移動",
+            "none": "なし",
+            "position": "位置",
+            "wires": "ワイヤー"
         },
         "nodeCount": "__count__ 個のノード",
         "nodeCount_plural": "__count__ 個のノード",
@@ -384,9 +387,14 @@
         "reviewChanges": "変更を表示",
         "noBinaryFileShowed": "バイナリファイルの中身は表示することができません",
         "viewCommitDiff": "コミットの内容を表示",
+        "commit": "コミット",
         "compareChanges": "変更を比較",
         "saveConflict": "解決して保存",
         "conflictHeader": "<span>__unresolved__</span> 個中 <span>__resolved__</span> 個のコンフリクトを解決",
+        "localChanges": "ローカルの変更",
+        "remoteChanges": "リモートの変更",
+        "useLocalChanges": "ローカルの変更を使用",
+        "useRemoteChanges": "リモートの変更を使用",
         "commonVersionError": "共通バージョンは正しいJSON形式ではありません:",
         "oldVersionError": "古いバージョンは正しいJSON形式ではありません:",
         "newVersionError": "新しいバージョンは正しいJSON形式ではありません:"
@@ -803,6 +811,7 @@
                 "branches": "ブランチ",
                 "noBranches": "ブランチなし",
                 "deleteConfirm": "本当にローカルブランチ'__name__'を削除しますか？削除すると元に戻すことはできません。",
+                "deleteBranch": "ブランチを削除",
                 "unmergedConfirm": "ローカルブランチ'__name__'にはマージされていない変更があります。この変更は削除されます。本当に削除しますか？",
                 "deleteUnmergedBranch": "マージされていないブランチを削除",
                 "gitRemotes": "Gitリモート",

packages/node_modules/@node-red/editor-client/src/js/ui/diff.js

@@ -497,7 +497,7 @@ RED.diff = (function() {
             }
         })
         if (c === 0) {
-            result.text("none");
+            result.text(RED._("diff.type.none"));
         } else {
             list.appendTo(result);
         }
@@ -821,7 +821,7 @@ RED.diff = (function() {
                 conflict = true;
             }
             row = $("<tr>").appendTo(nodePropertiesTableBody);
-            $("<td>",{class:"red-ui-diff-list-cell-label"}).text("position").appendTo(row);
+            $("<td>",{class:"red-ui-diff-list-cell-label"}).text(RED._("diff.type.position")).appendTo(row);
             localCell = $("<td>",{class:"red-ui-diff-list-cell red-ui-diff-list-node-local"}).appendTo(row);
             if (localNode) {
                 localCell.addClass("red-ui-diff-status-"+(localChanged?"moved":"unchanged"));
@@ -899,7 +899,7 @@ RED.diff = (function() {
                 conflict = true;
             }
             row = $("<tr>").appendTo(nodePropertiesTableBody);
-            $("<td>",{class:"red-ui-diff-list-cell-label"}).text("wires").appendTo(row);
+            $("<td>",{class:"red-ui-diff-list-cell-label"}).text(RED._("diff.type.wires")).appendTo(row);
             localCell = $("<td>",{class:"red-ui-diff-list-cell red-ui-diff-list-node-local"}).appendTo(row);
             if (localNode) {
                 if (!conflict) {
@@ -2029,15 +2029,14 @@ RED.diff = (function() {
                             if (!isSeparator) {
                                 var isOurs = /^..<<<<<<</.test(lineText);
                                 if (isOurs) {
-                                    $('<span>').text("<<<<<<< Local Changes").appendTo(line);
+                                    $('<span>').text("<<<<<<< " + RED._("diff.localChanges")).appendTo(line);
                                     hunk.localChangeStart = actualLineNumber;
                                 } else {
                                     hunk.remoteChangeEnd = actualLineNumber;
-                                    $('<span>').text(">>>>>>> Remote Changes").appendTo(line);
+                                    $('<span>').text(">>>>>>> " + RED._("diff.remoteChanges")).appendTo(line);
-
                                 }
                                 diffRow.addClass("mergeHeader-"+(isOurs?"ours":"theirs"));
-                                $('<button class="red-ui-button red-ui-button-small" style="float: right; margin-right: 20px;"><i class="fa fa-angle-double-'+(isOurs?"down":"up")+'"></i> use '+(isOurs?"local":"remote")+' changes</button>')
+                                $('<button class="red-ui-button red-ui-button-small" style="float: right; margin-right: 20px;"><i class="fa fa-angle-double-'+(isOurs?"down":"up")+'"></i> '+RED._(isOurs?"diff.useLocalChanges":"diff.useRemoteChanges")+'</button>')
                                     .appendTo(line)
                                     .on("click", function(evt) {
                                         evt.preventDefault();
@@ -2119,7 +2118,7 @@ RED.diff = (function() {
                 $("<h3>").text(commit.title).appendTo(content);
                 $('<div class="commit-body"></div>').text(commit.comment).appendTo(content);
                 var summary = $('<div class="commit-summary"></div>').appendTo(content);
-                $('<div style="float: right">').text("Commit "+commit.sha).appendTo(summary);
+                $('<div style="float: right">').text(RED._('diff.commit')+" "+commit.sha).appendTo(summary);
                 $('<div>').text((commit.authorName||commit.author)+" - "+options.date).appendTo(summary);
 
                 if (commit.files) {

packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js

@@ -1256,7 +1256,7 @@ RED.projects.settings = (function() {
                                             notification.close();
                                         }
                                     },{
-                                        text: 'Delete branch',
+                                        text: RED._("sidebar.project.projectSettings.deleteBranch"),
                                         click: function() {
                                             notification.close();
                                             var url = "projects/"+activeProject.name+"/branches/"+entry.name;

packages/node_modules/@node-red/nodes/locales/ja/messages.json

@@ -1047,6 +1047,7 @@
         "joinedUsing": "連結文字",
         "send": "メッセージ送信:",
         "afterCount": "指定数のメッセージパーツを受信後",
+        "useparts": "既存のmsg.partsプロパティを使用",
         "count": "合計値",
         "subsequent": "後続のメッセージ毎",
         "afterTimeout": "最初のメッセージ受信からのタイムアウト後",
@@ -1113,6 +1114,7 @@
         "too-many": "batchノード内で保持しているメッセージが多すぎます",
         "unexpected": "想定外のモード",
         "no-parts": "メッセージにpartsプロパティがありません",
+        "honourParts": "msg.partsを用いたbatch操作を許可",
         "error": {
             "invalid-count": "メッセージ数が不正",
             "invalid-overlap": "オーバラップが不正",