summaryrefslogtreecommitdiffstats
path: root/pkg/i18n
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-05-06 20:14:13 +1000
committerGitHub <noreply@github.com>2022-05-06 20:14:13 +1000
commitf7fae0b82ea6aa865071cc8c86aaa356fb4ce496 (patch)
tree665f8ff435b920ef37c82961d9f98c60afa7f15c /pkg/i18n
parent6253258d4b59ab35088145e4b799dbbedec6783c (diff)
parent196d56d0141ec47e85abd752907faa74e35ce25f (diff)
Merge pull request #1869 from mark2185/feature/unset-upstream
Diffstat (limited to 'pkg/i18n')
-rw-r--r--pkg/i18n/chinese.go1
-rw-r--r--pkg/i18n/dutch.go1
-rw-r--r--pkg/i18n/english.go10
3 files changed, 11 insertions, 1 deletions
diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go
index 3de60412e..4dc2f9761 100644
--- a/pkg/i18n/chinese.go
+++ b/pkg/i18n/chinese.go
@@ -311,6 +311,7 @@ func chineseTranslationSet() TranslationSet {
DeleteRemoteBranch: "删除远程分支",
DeleteRemoteBranchMessage: "您确定要删除远程分支吗?",
LcSetUpstream: "设置为检出分支的上游",
+ LcSetAsUpstream: "设置为检出分支的上游",
SetUpstreamTitle: "设置上游分支",
SetUpstreamMessage: "您确定要将 {{.checkedOut}} 的上游分支设置为 {{.selected}} 吗?",
LcEditRemote: "编辑远程仓库",
diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go
index a72a3b6f0..b8605b839 100644
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -270,6 +270,7 @@ func dutchTranslationSet() TranslationSet {
DeleteRemoteBranch: "Verwijder Remote Branch",
DeleteRemoteBranchMessage: "Weet je zeker dat je deze remote branch wilt verwijderen",
LcSetUpstream: "stel in als upstream van uitgecheckte branch",
+ LcSetAsUpstream: "stel in als upstream van uitgecheckte branch",
SetUpstreamTitle: "Stel in als upstream branch",
SetUpstreamMessage: "Weet je zeker dat je de upstream branch van '{{.checkedOut}}' naar '{{.selected}}' wilt zetten",
LcEditRemote: "wijzig remote",
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 9c50e9790..aa3de764b 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -305,7 +305,9 @@ type TranslationSet struct {
LcRemoveRemotePrompt string
DeleteRemoteBranch string
DeleteRemoteBranchMessage string
+ LcSetAsUpstream string
LcSetUpstream string
+ LcUnsetUpstream string
SetUpstreamTitle string
SetUpstreamMessage string
LcEditRemote string
@@ -338,6 +340,7 @@ type TranslationSet struct {
Panel string
Keybindings string
LcRenameBranch string
+ LcSetUnsetUpstream string
NewGitFlowBranchPrompt string
RenameBranchWarning string
LcOpenMenu string
@@ -507,6 +510,7 @@ type Actions struct {
Merge string
RebaseBranch string
RenameBranch string
+ SetUnsetUpstream string
CreateBranch string
FastForwardBranch string
CherryPick string
@@ -907,7 +911,9 @@ func EnglishTranslationSet() TranslationSet {
LcRemoveRemotePrompt: "Are you sure you want to remove remote",
DeleteRemoteBranch: "Delete Remote Branch",
DeleteRemoteBranchMessage: "Are you sure you want to delete remote branch",
- LcSetUpstream: "set as upstream of checked-out branch",
+ LcSetAsUpstream: "set as upstream of checked-out branch",
+ LcSetUpstream: "set upstream of selected branch",
+ LcUnsetUpstream: "unset upstream of selected branch",
SetUpstreamTitle: "Set upstream branch",
SetUpstreamMessage: "Are you sure you want to set the upstream branch of '{{.checkedOut}}' to '{{.selected}}'",
LcEditRemote: "edit remote",
@@ -940,6 +946,7 @@ func EnglishTranslationSet() TranslationSet {
Panel: "Panel",
Keybindings: "Keybindings",
LcRenameBranch: "rename branch",
+ LcSetUnsetUpstream: "set/unset upstream",
NewBranchNamePrompt: "Enter new branch name for branch",
RenameBranchWarning: "This branch is tracking a remote. This action will only rename the local branch name, not the name of the remote branch. Continue?",
LcOpenMenu: "open menu",
@@ -1091,6 +1098,7 @@ func EnglishTranslationSet() TranslationSet {
Merge: "Merge",
RebaseBranch: "Rebase branch",
RenameBranch: "Rename branch",
+ SetUnsetUpstream: "Set/unset upstream",
CreateBranch: "Create branch",
CherryPick: "(Cherry-pick) Paste commits",
CheckoutFile: "Checkout file",