diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json index a88890125..3f6617752 100644 --- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json +++ b/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": "__resolved__ of __unresolved__ 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", 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 ab19d459e..5b11e24c4 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 @@ -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": "__unresolved__ 個中 __resolved__ 個のコンフリクトを解決", + "localChanges": "ローカルの変更", + "remoteChanges": "リモートの変更", + "useLocalChanges": "ローカルの変更を使用", + "useRemoteChanges": "リモートの変更を使用", "commonVersionError": "共通バージョンは正しいJSON形式ではありません:", "oldVersionError": "古いバージョンは正しいJSON形式ではありません:", "newVersionError": "新しいバージョンは正しいJSON形式ではありません:" @@ -803,6 +811,7 @@ "branches": "ブランチ", "noBranches": "ブランチなし", "deleteConfirm": "本当にローカルブランチ'__name__'を削除しますか？削除すると元に戻すことはできません。", + "deleteBranch": "ブランチを削除", "unmergedConfirm": "ローカルブランチ'__name__'にはマージされていない変更があります。この変更は削除されます。本当に削除しますか？", "deleteUnmergedBranch": "マージされていないブランチを削除", "gitRemotes": "Gitリモート", diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js index ebdf683e3..26cdceb7e 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js +++ b/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 = $("").appendTo(nodePropertiesTableBody); - $("",{class:"red-ui-diff-list-cell-label"}).text("position").appendTo(row); + $("",{class:"red-ui-diff-list-cell-label"}).text(RED._("diff.type.position")).appendTo(row); localCell = $("",{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 = $("").appendTo(nodePropertiesTableBody); - $("",{class:"red-ui-diff-list-cell-label"}).text("wires").appendTo(row); + $("",{class:"red-ui-diff-list-cell-label"}).text(RED._("diff.type.wires")).appendTo(row); localCell = $("",{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 = /^..<<<<<<').text("<<<<<<< Local Changes").appendTo(line); + $('').text("<<<<<<< " + RED._("diff.localChanges")).appendTo(line); hunk.localChangeStart = actualLineNumber; } else { hunk.remoteChangeEnd = actualLineNumber; - $('').text(">>>>>>> Remote Changes").appendTo(line); - + $('').text(">>>>>>> " + RED._("diff.remoteChanges")).appendTo(line); } diffRow.addClass("mergeHeader-"+(isOurs?"ours":"theirs")); - $('') + $('') .appendTo(line) .on("click", function(evt) { evt.preventDefault(); @@ -2119,7 +2118,7 @@ RED.diff = (function() { $("

").text(commit.title).appendTo(content); $('
').text(commit.comment).appendTo(content); var summary = $('
').appendTo(content); - $('
').text("Commit "+commit.sha).appendTo(summary); + $('
').text(RED._('diff.commit')+" "+commit.sha).appendTo(summary); $('
').text((commit.authorName||commit.author)+" - "+options.date).appendTo(summary); if (commit.files) { diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js index c5dbfbdbf..2f782e011 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js +++ b/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;