From b2cca10e8ba5f42cacd41eae93fafb9bcb66a5d3 Mon Sep 17 00:00:00 2001 From: Kazuki-Nakanishi Date: Mon, 28 May 2018 17:01:53 +0900 Subject: [PATCH] Add i18n support for version control of project --- editor/js/ui/projects/tab-versionControl.js | 131 ++++++++++---------- red/api/editor/locales/en-US/editor.json | 69 ++++++++++- red/api/editor/locales/ja/editor.json | 68 ++++++++++ 3 files changed, 203 insertions(+), 65 deletions(-) diff --git a/editor/js/ui/projects/tab-versionControl.js b/editor/js/ui/projects/tab-versionControl.js index 4560a56e5..c5db3f251 100644 --- a/editor/js/ui/projects/tab-versionControl.js +++ b/editor/js/ui/projects/tab-versionControl.js @@ -52,11 +52,11 @@ RED.sidebar.versionControl = (function() { 200: function(data) { var title; if (state === 'unstaged') { - title = 'Unstaged changes : '+entry.file + title = RED._("sidebar.project.versionControl.unstagedChanges")+' : '+entry.file } else if (state === 'staged') { - title = 'Staged changes : '+entry.file + title = RED._("sidebar.project.versionControl.stagedChanges")+' : '+entry.file } else { - title = 'Resolve conflicts : '+entry.file + title = RED._("sidebar.project.versionControl.resolveConflicts")+' : '+entry.file } var options = { diff: data.diff, @@ -65,18 +65,18 @@ RED.sidebar.versionControl = (function() { project: activeProject } if (state == 'unstaged') { - options.oldRevTitle = entry.indexStatus === " "?"HEAD":"Staged"; - options.newRevTitle = "Unstaged"; + options.oldRevTitle = entry.indexStatus === " "?RED._("sidebar.project.versionControl.head"):RED._("sidebar.project.versionControl.staged"); + options.newRevTitle = RED._("sidebar.project.versionControl.unstaged"); options.oldRev = entry.indexStatus === " "?"@":":0"; options.newRev = "_"; } else if (state === 'staged') { - options.oldRevTitle = "HEAD"; - options.newRevTitle = "Staged"; + options.oldRevTitle = RED._("sidebar.project.versionControl.head"); + options.newRevTitle = RED._("sidebar.project.versionControl.staged"); options.oldRev = "@"; options.newRev = ":0"; } else { - options.oldRevTitle = "Local"; - options.newRevTitle = "Remote"; + options.oldRevTitle = RED._("sidebar.project.versionControl.local"); + options.newRevTitle = RED._("sidebar.project.versionControl.remote"); options.commonRev = ":1"; options.oldRev = ":2"; options.newRev = ":3"; @@ -156,7 +156,7 @@ RED.sidebar.versionControl = (function() { evt.preventDefault(); var spinner = utils.addSpinnerOverlay(container).addClass('projects-dialog-spinner-contain'); - var notification = RED.notify("Are you sure you want to revert the changes to '"+entry.file+"'? This cannot be undone.", { + var notification = RED.notify(RED._("sidebar.project.versionControl.revert",{file:entry.file}), { type: "warning", modal: true, fixed: true, @@ -168,7 +168,7 @@ RED.sidebar.versionControl = (function() { notification.close(); } },{ - text: 'Revert changes', + text: RED._("sidebar.project.versionControl.revertChanges"), click: function() { notification.close(); var activeProject = RED.projects.getActiveProject(); @@ -281,6 +281,8 @@ RED.sidebar.versionControl = (function() { entry["update"+((state==='unstaged')?"Unstaged":"Staged")](entry, status); } var utils; + var emptyStagedItem; + var emptyMergedItem; function init(_utils) { utils = _utils; @@ -312,7 +314,7 @@ RED.sidebar.versionControl = (function() { }); localChanges = sections.add({ - title: "Local Changes", + title: RED._("sidebar.project.versionControl.localChanges"), collapsible: true }); localChanges.expand(); @@ -326,10 +328,12 @@ RED.sidebar.versionControl = (function() { refresh(true); }) + emptyStagedItem = { label: RED._("sidebar.project.versionControl.none") }; + emptyMergedItem = { label: RED._("sidebar.project.versionControl.conflictResolve") }; var unstagedContent = $('
').appendTo(localChanges.content); - var header = $('
Local files
').appendTo(unstagedContent); - stageAllButton = $('') + var header = $('
'+RED._("sidebar.project.versionControl.localFiles")+'
').appendTo(unstagedContent); + stageAllButton = $('') .appendTo(header) .click(function(evt) { evt.preventDefault(); @@ -359,9 +363,9 @@ RED.sidebar.versionControl = (function() { unmergedContent = $('
').appendTo(localChanges.content); - header = $('
Unmerged changes
').appendTo(unmergedContent); + header = $('
'+RED._("sidebar.project.versionControl.unmergedChanges")+'
').appendTo(unmergedContent); bg = $('
').appendTo(header); - var abortMergeButton = $('') + var abortMergeButton = $('') .appendTo(bg) .click(function(evt) { evt.preventDefault(); @@ -399,7 +403,7 @@ RED.sidebar.versionControl = (function() { addItem: function(row,index,entry) { if (entry === emptyMergedItem) { entry.button = { - label: 'commit', + label: RED._("sidebar.project.versionControl.commit"), click: function(evt) { evt.preventDefault(); evt.stopPropagation(); @@ -423,7 +427,7 @@ RED.sidebar.versionControl = (function() { var stagedContent = $('
').appendTo(localChanges.content); - header = $('
Changes to commit
').appendTo(stagedContent); + header = $('
'+RED._("sidebar.project.versionControl.changeToCommit")+'
').appendTo(stagedContent); bg = $('
').appendTo(header); var showCommitBox = function() { @@ -446,14 +450,14 @@ RED.sidebar.versionControl = (function() { abortMergeButton.attr("disabled",true); commitMessage.focus(); } - commitButton = $('') + commitButton = $('') .appendTo(bg) .click(function(evt) { evt.preventDefault(); evt.stopPropagation(); showCommitBox(); }); - unstageAllButton = $('') + unstageAllButton = $('') .appendTo(bg) .click(function(evt) { evt.preventDefault(); @@ -480,14 +484,14 @@ RED.sidebar.versionControl = (function() { commitBox = $('
').hide().appendTo(localChanges.content); - var commitMessage = $('') + var commitMessage = $('') .appendTo(commitBox) .on("change keyup paste",function() { submitCommitButton.attr('disabled',$(this).val().trim()===""); }); var commitToolbar = $('
').appendTo(commitBox); - var cancelCommitButton = $('') + var cancelCommitButton = $('') .appendTo(commitToolbar) .click(function(evt) { evt.preventDefault(); @@ -505,7 +509,7 @@ RED.sidebar.versionControl = (function() { abortMergeButton.attr("disabled",false); }) - var submitCommitButton = $('') + var submitCommitButton = $('') .appendTo(commitToolbar) .click(function(evt) { evt.preventDefault(); @@ -541,7 +545,7 @@ RED.sidebar.versionControl = (function() { var localHistory = sections.add({ - title: "Commit History", + title: RED._("sidebar.project.versionControl.commitHistory"), collapsible: true }); @@ -555,7 +559,7 @@ RED.sidebar.versionControl = (function() { var localBranchToolbar = $('
').appendTo(localHistory.content); - var localBranchButton = $('') + var localBranchButton = $('') .appendTo(localBranchToolbar) .click(function(evt) { evt.preventDefault(); @@ -612,7 +616,7 @@ RED.sidebar.versionControl = (function() { row.addClass('sidebar-version-control-commit-entry'); if (entry.url) { row.addClass('sidebar-version-control-commit-more'); - row.text("+ "+(entry.total-entry.totalKnown)+" more commit(s)"); + row.text("+ "+(entry.total-entry.totalKnown)+RED._("sidebar.project.versionControl.moreCommits")); row.click(function(e) { e.preventDefault(); getCommits(entry.url,localCommitList,row,entry.limit,entry.before); @@ -626,8 +630,8 @@ RED.sidebar.versionControl = (function() { result.parents = entry.parents; result.oldRev = entry.sha+"~1"; result.newRev = entry.sha; - result.oldRevTitle = "Commit "+entry.sha.substring(0,7)+"~1"; - result.newRevTitle = "Commit "+entry.sha.substring(0,7); + result.oldRevTitle = RED._("sidebar.project.versionControl.commitCapital")+" "+entry.sha.substring(0,7)+"~1"; + result.newRevTitle = RED._("sidebar.project.versionControl.commitCapital")+" "+entry.sha.substring(0,7); result.date = humanizeSinceDate(parseInt(entry.date)); RED.diff.showCommitDiff(result); }); @@ -666,10 +670,10 @@ RED.sidebar.versionControl = (function() { } var localBranchBox = $('
').hide().appendTo(localHistory.content); - $('
').text("Change local branch").appendTo(localBranchBox); + $('
').text(RED._("sidebar.project.versionControl.changeLocalBranch")).appendTo(localBranchBox); var localBranchList = utils.createBranchList({ - placeholder: "Find or create a branch", + placeholder: RED._("sidebar.project.versionControl.createBranchPlaceholder"), container: localBranchBox, onselect: function(body) { if (body.current) { @@ -701,7 +705,7 @@ RED.sidebar.versionControl = (function() { 400: { 'git_local_overwrite': function(error) { spinner.remove(); - RED.notify("You have local changes that would be overwritten by changing the branch. You must either commit or undo those changes first.",{ + RED.notify(RED._("sidebar.project.versionControl.localOverwrite"),{ type:'error', timeout: 8000 }); @@ -744,10 +748,10 @@ RED.sidebar.versionControl = (function() { },200); } } - $('
').text("Manage remote branch").appendTo(remoteBox); + $('
').text(RED._("sidebar.project.versionControl.manageRemoteBranch")).appendTo(remoteBox); var remoteBranchRow = $('
').appendTo(remoteBox); - var remoteBranchButton = $('') + var remoteBranchButton = $('') .appendTo(remoteBranchRow) .click(function(evt) { evt.preventDefault(); @@ -770,9 +774,9 @@ RED.sidebar.versionControl = (function() { var errorMessage = $('').hide().appendTo(remoteBox); - $('
Unable to access remote repository
').appendTo(errorMessage) + $('
'+RED._("sidebar.project.versionControl.unableToAccess")+'
').appendTo(errorMessage) var buttonRow = $('
').appendTo(errorMessage); - $('') + $('') .appendTo(buttonRow) .click(function(e) { e.preventDefault(); @@ -810,12 +814,12 @@ RED.sidebar.versionControl = (function() { }); }) - $('
').appendTo(remoteBox); + $('
').appendTo(remoteBox); var remoteBranchSubRow = $('
').hide().appendTo(remoteBranchRow); var remoteBranchList = utils.createBranchList({ - placeholder: "Find or create a remote branch", - currentLabel: "upstream", + placeholder: RED._("sidebar.project.versionControl.createRemoteBranchPlaceholder"), + currentLabel: RED._("sidebar.project.versionControl.upstream"), remote: function() { var project = RED.projects.getActiveProject(); var remotes = Object.keys(project.git.remotes); @@ -845,11 +849,11 @@ RED.sidebar.versionControl = (function() { }) } else { if (!activeProject.git.branches.remote) { - $('#sidebar-version-control-repo-toolbar-message').text("The created branch will be set as the tracked upstream branch."); + $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.trackedUpstreamBranch")); $("#sidebar-version-control-repo-toolbar-set-upstream").prop('checked',true); $("#sidebar-version-control-repo-toolbar-set-upstream").prop('disabled',true); } else { - $('#sidebar-version-control-repo-toolbar-message').text("The branch will be created. Select below to set it as the tracked upstream branch."); + $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.selectUpstreamBranch")); } $("#sidebar-version-control-repo-pull").attr('disabled',true); $("#sidebar-version-control-repo-push").attr('disabled',false); @@ -861,7 +865,7 @@ RED.sidebar.versionControl = (function() { var row = $('
').appendTo(remoteBox); - $('') + $('') .appendTo(row) .click(function(e) { e.preventDefault(); @@ -893,8 +897,7 @@ RED.sidebar.versionControl = (function() { }, 400: { 'git_push_failed': function(err) { - // TODO: better message + NLS - RED.notify("NLS: Push failed as the remote has more recent commits. Pull first and write a better error message!","error"); + RED.notify(RED._("sidebar.project.versionControl.pushFailed"),"error"); }, 'unexpected_error': function(error) { console.log(error); @@ -945,18 +948,18 @@ RED.sidebar.versionControl = (function() { }, 400: { 'git_local_overwrite': function(err) { - RED.notify("

Unable to pull remote changes; your unstaged local changes would be overwritten.

Commit your changes and try again.

"+ - '

'+'Show unstaged changes'+'

',"error",false,10000000); + RED.notify(RED._("sidebar.project.versionControl.unablePull")+ + '

'+RED._("sidebar.project.versionControl.showUnstagedChanges")+'

',"error",false,10000000); }, 'git_pull_merge_conflict': function(err) { refresh(true); closeRemoteBox(); }, 'git_connection_failed': function(err) { - RED.notify("Could not connect to remote repository: "+err.toString(),"warning") + RED.notify(RED._("sidebar.project.versionControl.connectionFailed")+err.toString(),"warning") }, 'git_pull_unrelated_history': function(error) { - var notification = RED.notify("

The remote has an unrelated history of commits.

Are you sure you want to pull the changes into your local repository?

",{ + var notification = RED.notify(RED._("sidebar.project.versionControl.pullUnrelatedHistory"),{ type: 'error', modal: true, fixed: true, @@ -967,7 +970,7 @@ RED.sidebar.versionControl = (function() { notification.close(); } },{ - text: 'Pull changes', + text: RED._("sidebar.project.versionControl.pullChanges"), click: function() { notification.close(); options.allowUnrelatedHistories = true; @@ -986,7 +989,7 @@ RED.sidebar.versionControl = (function() { spinner.remove(); }); } - $('') + $('') .appendTo(row) .click(function(e) { e.preventDefault(); @@ -999,7 +1002,7 @@ RED.sidebar.versionControl = (function() { RED.sidebar.addTab({ id: "version-control", - label: "history", + label: RED._("sidebar.project.versionControl.history"), name: "Project History", content: sidebarContent, enableOnEdit: false, @@ -1021,17 +1024,17 @@ RED.sidebar.versionControl = (function() { if (daysDelta > 30) { return (new Date(date*1000)).toLocaleDateString(); } else if (daysDelta > 0) { - return daysDelta+" day"+(daysDelta>1?"s":"")+" ago"; + return RED._("sidebar.project.versionControl.daysAgo", {count:daysDelta}) } var hoursDelta = Math.floor(delta / (60*60)); if (hoursDelta > 0) { - return hoursDelta+" hour"+(hoursDelta>1?"s":"")+" ago"; + return RED._("sidebar.project.versionControl.hoursAgo", {count:hoursDelta}) } var minutesDelta = Math.floor(delta / 60); if (minutesDelta > 0) { - return minutesDelta+" minute"+(minutesDelta>1?"s":"")+" ago"; + return RED._("sidebar.project.versionControl.minsAgo", {count:minutesDelta}) } - return "Seconds ago"; + return RED._("sidebar.project.versionControl.secondsAgo"); } function updateBulk(files,unstaged) { @@ -1066,9 +1069,6 @@ RED.sidebar.versionControl = (function() { var refreshInProgress = false; - var emptyStagedItem = { label:"None" }; - var emptyMergedItem = { label:"All conflicts resolved. Commit the changes to complete the merge." }; - function getCommits(url,targetList,spinnerTarget,limit,before) { var spinner = utils.addSpinnerOverlay(spinnerTarget); var fullUrl = url+"?limit="+(limit||20); @@ -1276,7 +1276,7 @@ RED.sidebar.versionControl = (function() { refreshFiles(result); $('#sidebar-version-control-local-branch').text(result.branches.local); - $('#sidebar-version-control-remote-branch').text(result.branches.remote||"none"); + $('#sidebar-version-control-remote-branch').text(result.branches.remote||RED._("sidebar.project.versionControl.none")); var commitsAhead = result.commits.ahead || 0; var commitsBehind = result.commits.behind || 0; @@ -1306,7 +1306,7 @@ RED.sidebar.versionControl = (function() { $('#sidebar-version-control-commits-ahead').text(""); $('#sidebar-version-control-commits-behind').text(""); - $('#sidebar-version-control-repo-toolbar-message').text("Your local branch is not currently tracking a remote branch."); + $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.notTracking")); $("#sidebar-version-control-repo-pull").attr('disabled',true); $("#sidebar-version-control-repo-push").attr('disabled',true); } @@ -1332,23 +1332,26 @@ RED.sidebar.versionControl = (function() { $('#sidebar-version-control-commits-ahead').text(commitsAhead); $('#sidebar-version-control-commits-behind').text(commitsBehind); if (isMerging) { - $('#sidebar-version-control-repo-toolbar-message').text("Your repository has unmerged changes. You need to fix the conflicts and commit the result."); + $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.statusUnmergedChanged")); $("#sidebar-version-control-repo-pull").attr('disabled',true); $("#sidebar-version-control-repo-push").attr('disabled',true); } else if (commitsAhead > 0 && commitsBehind === 0) { - $('#sidebar-version-control-repo-toolbar-message').text("Your repository is "+commitsAhead+" commit"+(commitsAhead===1?'':'s')+" ahead of the remote. You can push "+(commitsAhead===1?'this commit':'these commits')+" now."); + $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.commitsAhead", {count:commitsAhead})); $("#sidebar-version-control-repo-pull").attr('disabled',true); $("#sidebar-version-control-repo-push").attr('disabled',false); } else if (commitsAhead === 0 && commitsBehind > 0) { - $('#sidebar-version-control-repo-toolbar-message').text("Your repository is "+commitsBehind+" commit"+(commitsBehind===1?'':'s')+" behind of the remote. You can pull "+(commitsBehind===1?'this commit':'these commits')+" now."); + $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.commitsBehind",{ count: commitsBehind })); $("#sidebar-version-control-repo-pull").attr('disabled',false); $("#sidebar-version-control-repo-push").attr('disabled',true); } else if (commitsAhead > 0 && commitsBehind > 0) { - $('#sidebar-version-control-repo-toolbar-message').text("Your repository is "+commitsBehind+" commit"+(commitsBehind===1?'':'s')+" behind and "+commitsAhead+" commit"+(commitsAhead===1?'':'s')+" ahead of the remote. You must pull the remote commit"+(commitsBehind===1?'':'s')+" down before pushing."); + $('#sidebar-version-control-repo-toolbar-message').text( + RED._("sidebar.project.versionControl.commitsAheadAndBehind1",{ count:commitsBehind })+ + RED._("sidebar.project.versionControl.commitsAheadAndBehind2",{ count:commitsAhead })+ + RED._("sidebar.project.versionControl.commitsAheadAndBehind3",{ count:commitsBehind })); $("#sidebar-version-control-repo-pull").attr('disabled',false); $("#sidebar-version-control-repo-push").attr('disabled',true); } else if (commitsAhead === 0 && commitsBehind === 0) { - $('#sidebar-version-control-repo-toolbar-message').text("Your repository is up to date."); + $('#sidebar-version-control-repo-toolbar-message').text(RED._("sidebar.project.versionControl.repositoryUpToDate")); $("#sidebar-version-control-repo-pull").attr('disabled',true); $("#sidebar-version-control-repo-push").attr('disabled',true); } diff --git a/red/api/editor/locales/en-US/editor.json b/red/api/editor/locales/en-US/editor.json index dfcef21a6..01905db93 100644 --- a/red/api/editor/locales/en-US/editor.json +++ b/red/api/editor/locales/en-US/editor.json @@ -457,7 +457,74 @@ "delete": "Delete key", "git-config": "Git config", "deleteConfirm": "Are you sure you want to delete the SSH key __name__? This cannot be undone." - } + }, + "versionControl": { + "unstagedChanges": "Unstaged changes", + "stagedChanges": "Staged changes", + "resolveConflicts": "Resolve conflicts", + "head": "HEAD", + "staged": "Staged", + "unstaged": "Unstaged", + "local": "Local", + "remote": "Remote", + "revert": "Are you sure you want to revert the changes to '__file__'? This cannot be undone.", + "revertChanges": "Revert changes", + "localChanges": "Local Changes", + "none": "None", + "conflictResolve": "All conflicts resolved. Commit the changes to complete the merge.", + "localFiles": "Local files", + "all": "all", + "unmergedChanges": "Unmerged changes", + "abortMerge": "abort merge", + "commit": "commit", + "changeToCommit": "Changes to commit", + "commitPlaceholder": "Enter your commit message", + "cancelCapital": "Cancel", + "commitCapital": "Commit", + "commitHistory": "Commit History", + "branch": "Branch:", + "moreCommits": " more commit(s)", + "changeLocalBranch": "Change local branch", + "createBranchPlaceholder": "Find or create a branch", + "upstream": "upstream", + "localOverwrite": "You have local changes that would be overwritten by changing the branch. You must either commit or undo those changes first.", + "manageRemoteBranch": "Manage remote branch", + "unableToAccess": "Unable to access remote repository", + "retry": "Retry", + "setUpstreamBranch": "Set as upstream branch", + "createRemoteBranchPlaceholder": "Find or create a remote 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.", + "pushFailed": "Push failed as the remote has more recent commits. Pull and merge first, then push again.", // TODO: better message + "push": "push", + "pull": "pull", + "unablePull": "

Unable to pull remote changes; your unstaged local changes would be overwritten.

Commit your changes and try again.

", + "showUnstagedChanges": "Show unstaged changes", + "connectionFailed": "Could not connect to remote repository: ", + "pullUnrelatedHistory": "

The remote has an unrelated history of commits.

Are you sure you want to pull the changes into your local repository?

", + "pullChanges": "Pull changes", + "history": "history", + "daysAgo": "__count__ day ago", + "daysAgo_plural": "__count__ days ago", + "hoursAgo": "__count__ hour ago", + "hoursAgo_plural": "__count__ hours ago", + "minsAgo": "__count__ min ago", + "minsAgo_plural": "__count__ mins ago", + "secondsAgo": "Seconds ago", + "notTracking": "Your local branch is not currently tracking a remote branch.", + "statusUnmergedChanged": "Your repository has unmerged changes. You need to fix the conflicts and commit the result.", + "repositoryUpToDate": "Your repository is up to date.", + "commitsAhead": "Your repository is __count__ commit ahead of the remote. You can push this commit now.", + "commitsAhead_plural": "Your repository is __count__ commits ahead of the remote. You can push these commits now.", + "commitsBehind": "Your repository is __count__ commit behind of the remote. You can pull this commit now.", + "commitsBehind_plural": "Your repository is __count__ commits behind of the remote. You can pull these commits now.", + "commitsAheadAndBehind1": "Your repository is __count__ commit behind and ", + "commitsAheadAndBehind1_plural": "Your repository is __count__ commits behind and ", + "commitsAheadAndBehind2": "__count__ commit ahead of the remote. ", + "commitsAheadAndBehind2_plural": "__count__ commits ahead of the remote. ", + "commitsAheadAndBehind3": "You must pull the remote commit down before pushing.", + "commitsAheadAndBehind3_plural": "You must pull the remote commits down before pushing." + } } }, "typedInput": { diff --git a/red/api/editor/locales/ja/editor.json b/red/api/editor/locales/ja/editor.json index 999dc3422..58d9fe6bf 100644 --- a/red/api/editor/locales/ja/editor.json +++ b/red/api/editor/locales/ja/editor.json @@ -447,6 +447,74 @@ "delete": "キーを削除", "git-config": "Git設定", "deleteConfirm": "SSHキー __name__ を削除してもよいですか？ 削除したSSHキーを元に戻すことはできません。" + }, + "versionControl": { + "unstagedChanges": "ステージングされていない変更", + "stagedChanges": "ステージングされた変更", + "resolveConflicts": "コンフリクトの解決", + "head": "最新", + "staged": "ステージング", + "unstaged": "未ステージング", + "local": "ローカル", + "remote": "リモート", + "revert": "'__file__'への変更を本当に戻しますか？この操作は元に戻せません。", + "revertChanges": "変更を戻す", + "localChanges": "ローカルの変更", + "none": "なし", + "conflictResolve": "全てのコンフリクトが解消されました。マージを完了するため、変更をコミットしてください。", + "localFiles": "ローカルファイル", + "all": "全て", + "unmergedChanges": "マージされていない変更", + "abortMerge": "マージ中止", + "commit": "コミット", + "changeToCommit": "コミット対象とする変更", + "commitPlaceholder": "コミットメッセージを入力してください。", + "cancelCapital": "キャンセル", + "commitCapital": "コミット", + "commitHistory": "コミット履歴", + "branch": "ブランチ:", + "moreCommits": "個のコミット", + "changeLocalBranch": "ローカルブランチの変更", + "createBranchPlaceholder": "ブランチの検索または作成", + "upstream": "アップストリーム", + "localOverwrite": "ブランチの変更によって上書きされたローカルの変更があります。これらの変更を先にコミットするか、あるいは元に戻さなければなりません。", + "manageRemoteBranch": "リモートブランチの管理", + "unableToAccess": "リモートのリポジトリにアクセスできません。", + "retry": "リトライ", + "setUpstreamBranch": "アップストリームとして設定する", + "createRemoteBranchPlaceholder": "リモートブランチの検索または作成", + "trackedUpstreamBranch": "作成されたブランチは、トラッキングされたアップストリームブランチとなります。", + "selectUpstreamBranch": "ブランチが作成されました。トラッキングするアップストリームブランチを選択してください。", + "pushFailed": "リモートに新しいコミットがあるため、プッシュに失敗しました。プルしてマージしてから、再度プッシュしてください。", + "push": "プッシュ", + "pull": "プル", + "unablePull": "

リモートの変更のプル失敗：ステージングされていないローカルの変更を上書きされてしまいます。

変更をコミットしてから再度実行してください。

", + "showUnstagedChanges": "ステージングされていない変更を表示", + "connectionFailed": "リモートリポジトリに接続できません: ", + "pullUnrelatedHistory": "

リモートに関連のないコミット履歴があります。

本当に変更をプルしてローカルリポジトリに反映しますか？

", + "pullChanges": "プル変更", + "history": "履歴", + "plural": "", + "daysAgo": "__count__ 日前", + "daysAgo_plural": "__count__ 日前", + "hoursAgo": "__count__ 時間前", + "hoursAgo_plural": "__count__ 時間前", + "minsAgo": "__count__ 分前", + "minsAgo_plural": "__count__ 分前", + "secondsAgo": "数秒前", + "notTracking": "ローカルブランチは現在リモートブランチをトラッキングしていません。", + "statusUnmergedChanged": "リポジトリ内にマージされていない変更があります。コンフリクトを解決してコミットしてください。", + "repositoryUpToDate": "リポジトリは最新です。", + "commitsAhead": "あなたのリポジトリはリモートより__count__コミット進んでいます。現在のコミットをプッシュできます。", + "commitsAhead_plural": "あなたのリポジトリはリモートより__count__コミット進んでいます。現在のコミットをプッシュできます。", + "commitsBehind": "あなたのリポジトリはリモートより__count__コミット遅れています。現在のコミットをプルできます。", + "commitsBehind_plural": "あなたのリポジトリはリモートより__count__コミット遅れています。現在のコミットをプルできます。", + "commitsAheadAndBehind1": "あなたのリポジトリはリモートより__count__コミット遅れており、かつ", + "commitsAheadAndBehind1_plural": "あなたのリポジトリはリモートより__count__コミット遅れており、かつ", + "commitsAheadAndBehind2": "__count__コミット進んでいます。 ", + "commitsAheadAndBehind2_plural": "__count__コミット進んでいます。 ", + "commitsAheadAndBehind3": "プッシュする前にリモートのコミットをプルしてください。", + "commitsAheadAndBehind3_plural": "プッシュする前にリモートのコミットをプルしてください。" } } },