frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

move comment from json to js

Browse Source
This commit is contained in:
Kazuki-Nakanishi 2018-05-28 17:06:38 +09:00
parent b2cca10e8b
commit b0c693cc3a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/js/ui/projects/tab-versionControl.js
View File

@ -897,6 +897,7 @@ RED.sidebar.versionControl = (function() {
}, },
400: { 400: {
'git_push_failed': function(err) { 'git_push_failed': function(err) {
// TODO: better message
RED.notify(RED._("sidebar.project.versionControl.pushFailed"),"error"); RED.notify(RED._("sidebar.project.versionControl.pushFailed"),"error");
}, },
'unexpected_error': function(error) { 'unexpected_error': function(error) {

2
red/api/editor/locales/en-US/editor.json
View File

@ -495,7 +495,7 @@
"createRemoteBranchPlaceholder": "Find or create a remote branch", "createRemoteBranchPlaceholder": "Find or create a remote branch",
"trackedUpstreamBranch": "The created branch will be set as the tracked upstream branch.", "trackedUpstreamBranch": "The created branch will be set as the tracked upstream branch.",
"selectUpstreamBranch": "The branch will be created. Select below to set it as the tracked upstream branch.", "selectUpstreamBranch": "The branch will be created. Select below to set it as the tracked upstream branch.",
"pushFailed": "Push failed as the remote has more recent commits. Pull and merge first, then push again.", // TODO: better message "pushFailed": "Push failed as the remote has more recent commits. Pull and merge first, then push again.",
"push": "push", "push": "push",
"pull": "pull", "pull": "pull",
"unablePull": "<p>Unable to pull remote changes; your unstaged local changes would be overwritten.</p><p>Commit your changes and try again.</p>", "unablePull": "<p>Unable to pull remote changes; your unstaged local changes would be overwritten.</p><p>Commit your changes and try again.</p>",