summaryrefslogtreecommitdiffstats
path: root/pkg/i18n
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-01-05 12:01:59 +1100
committerJesse Duffield <jessedduffield@gmail.com>2022-01-07 10:52:51 +1100
commit91fe68576cde3e4582373b255c5eb97cd3065c71 (patch)
treedce5212c30f0a1b01cc96e7ee10307c80578e7f4 /pkg/i18n
parentbbb5eee23a62162d2695a27f923e1a543852742a (diff)
refactor
Diffstat (limited to 'pkg/i18n')
-rw-r--r--pkg/i18n/chinese.go3
-rw-r--r--pkg/i18n/english.go12
2 files changed, 8 insertions, 7 deletions
diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go
index 1ca7bd615..edf1f500b 100644
--- a/pkg/i18n/chinese.go
+++ b/pkg/i18n/chinese.go
@@ -441,8 +441,7 @@ func chineseTranslationSet() TranslationSet {
LcCreatePullRequestOptions: "创建抓取请求选项",
LcDefaultBranch: "默认分支",
LcSelectBranch: "选择分支",
- CreatingPullRequestAtUrl: "在 URL 创建抓取请求: %s",
- Spans: Spans{
+ Actions: Actions{
// TODO: combine this with the original keybinding descriptions (those are all in lowercase atm)
CheckoutCommit: "检出提交",
CheckoutReflogCommit: "检出reflog提交",
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index d3ed9af15..da87f0d10 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -438,7 +438,6 @@ type TranslationSet struct {
LcDefaultBranch string
LcSelectBranch string
CreatePullRequest string
- CreatingPullRequestAtUrl string
OpeningCommitInBrowser string
SelectConfigFile string
NoConfigFileFoundErr string
@@ -456,10 +455,10 @@ type TranslationSet struct {
SortCommits string
CantChangeContextSizeError string
LcOpenCommitInBrowser string
- Spans Spans
+ Actions Actions
}
-type Spans struct {
+type Actions struct {
CheckoutCommit string
CheckoutReflogCommit string
CheckoutTag string
@@ -540,6 +539,8 @@ type Spans struct {
HardReset string
Undo string
Redo string
+ CopyPullRequestURL string
+ OpenMergeTool string
}
const englishIntroPopupMessage = `
@@ -989,7 +990,6 @@ func EnglishTranslationSet() TranslationSet {
LcCreatePullRequestOptions: "create pull request options",
LcDefaultBranch: "default branch",
LcSelectBranch: "select branch",
- CreatingPullRequestAtUrl: "Creating pull request at URL: %s",
OpeningCommitInBrowser: "Opening commit in browser at URL: %s",
SelectConfigFile: "Select config file",
NoConfigFileFoundErr: "No config file found",
@@ -1007,7 +1007,7 @@ func EnglishTranslationSet() TranslationSet {
SortCommits: "commit sort order",
CantChangeContextSizeError: "Cannot change context while in patch building mode because we were too lazy to support it when releasing the feature. If you really want it, please let us know!",
LcOpenCommitInBrowser: "open commit in browser",
- Spans: Spans{
+ Actions: Actions{
// TODO: combine this with the original keybinding descriptions (those are all in lowercase atm)
CheckoutCommit: "Checkout commit",
CheckoutReflogCommit: "Checkout reflog commit",
@@ -1089,6 +1089,8 @@ func EnglishTranslationSet() TranslationSet {
FastForwardBranch: "Fast forward branch",
Undo: "Undo",
Redo: "Redo",
+ CopyPullRequestURL: "Copy pull request URL",
+ OpenMergeTool: "Open merge tool",
},
}
}