lots more refactoring

6 files changed, 14 insertions, 28 deletions

diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go
index 2d300caf7..1e41ff961 100644
--- a/pkg/i18n/chinese.go
+++ b/pkg/i18n/chinese.go
@@ -94,9 +94,9 @@ func chineseTranslationSet() TranslationSet {
 		LcNewBranch:                         "新分支",
 		LcDeleteBranch:                      "删除分支",
 		NoBranchesThisRepo:                  "此仓库中没有分支",
-		CommitMessageConfirm:                "{{.keyBindClose}}：关闭，{{.keyBindNewLine}}：新行，{{.keyBindConfirm}}：确认",
 		CommitWithoutMessageErr:             "您必须编写提交消息才能进行提交",
-		CloseConfirm:                        "{{.keyBindClose}}：关闭，{{.keyBindConfirm}}：确认",
+		LcCloseCancel:                       "关闭",
+		LcConfirm:                           "确认",
 		LcClose:                             "关闭",
 		LcQuit:                              "退出",
 		LcSquashDown:                        "向下压缩",
@@ -117,8 +117,6 @@ func chineseTranslationSet() TranslationSet {
 		LcAmendToCommit:                     "用已暂存的更改来修补提交",
 		LcRenameCommitEditor:                "使用编辑器重命名提交",
 		Error:                               "错误",
-		LcSelectHunk:                        "切换区块",
-		LcNavigateConflicts:                 "浏览冲突",
 		LcPickHunk:                          "选中区块",
 		LcPickAllHunks:                      "选中所有区块",
 		LcUndo:                              "撤销",
diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go
index f52908cea..c3b42da38 100644
--- a/pkg/i18n/dutch.go
+++ b/pkg/i18n/dutch.go
@@ -60,9 +60,9 @@ func dutchTranslationSet() TranslationSet {
 		LcNewBranch:                         "nieuwe branch",
 		LcDeleteBranch:                      "verwijder branch",
 		NoBranchesThisRepo:                  "Geen branches voor deze repo",
-		CommitMessageConfirm:                "{{.keyBindClose}}: Sluiten, {{.keyBindNewLine}}: Nieuwe lijn, {{.keyBindConfirm}}: Bevestig",
 		CommitWithoutMessageErr:             "Je kan geen commit maken zonder commit bericht",
-		CloseConfirm:                        "{{.keyBindClose}}: Sluiten, {{.keyBindConfirm}}: Bevestig",
+		LcCloseCancel:                       "sluiten",
+		LcConfirm:                           "bevestig",
 		LcClose:                             "sluiten",
 		LcQuit:                              "quit",
 		LcSquashDown:                        "squash beneden",
@@ -83,8 +83,6 @@ func dutchTranslationSet() TranslationSet {
 		LcRenameCommitEditor:                "hernoem commit met editor",
 		NoCommitsThisBranch:                 "Geen commits in deze branch",
 		Error:                               "Foutmelding",
-		LcSelectHunk:                        "selecteer stuk",
-		LcNavigateConflicts:                 "navigeer conflicts",
 		LcPickHunk:                          "kies stuk",
 		LcPickAllHunks:                      "kies beide stukken",
 		LcUndo:                              "ongedaan maken",
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
index 4d384da71..34af886a8 100644
--- a/pkg/i18n/english.go
+++ b/pkg/i18n/english.go
@@ -80,10 +80,10 @@ type TranslationSet struct {
 	LcNewBranch                         string
 	LcDeleteBranch                      string
 	NoBranchesThisRepo                  string
-	CommitMessageConfirm                string
 	CommitWithoutMessageErr             string
-	CloseConfirm                        string
 	LcClose                             string
+	LcCloseCancel                       string
+	LcConfirm                           string
 	LcQuit                              string
 	LcSquashDown                        string
 	LcFixupCommit                       string
@@ -107,8 +107,6 @@ type TranslationSet struct {
 	NoCommitsThisBranch                 string
 	UpdateRefHere                       string
 	Error                               string
-	LcSelectHunk                        string
-	LcNavigateConflicts                 string
 	LcPickHunk                          string
 	LcPickAllHunks                      string
 	LcUndo                              string
@@ -750,10 +748,10 @@ func EnglishTranslationSet() TranslationSet {
 		LcNewBranch:                         "new branch",
 		LcDeleteBranch:                      "delete branch",
 		NoBranchesThisRepo:                  "No branches for this repo",
-		CommitMessageConfirm:                "{{.keyBindClose}}: close, {{.keyBindNewLine}}: new line, {{.keyBindConfirm}}: confirm",
 		CommitWithoutMessageErr:             "You cannot commit without a commit message",
-		CloseConfirm:                        "{{.keyBindClose}}: close/cancel, {{.keyBindConfirm}}: confirm",
 		LcClose:                             "close",
+		LcCloseCancel:                       "close/cancel",
+		LcConfirm:                           "confirm",
 		LcQuit:                              "quit",
 		LcSquashDown:                        "squash down",
 		LcFixupCommit:                       "fixup commit",
@@ -777,8 +775,6 @@ func EnglishTranslationSet() TranslationSet {
 		SureResetCommitAuthor:               "The author field of this commit will be updated to match the configured user. This also renews the author timestamp. Continue?",
 		LcRenameCommitEditor:                "reword commit with editor",
 		Error:                               "Error",
-		LcSelectHunk:                        "select hunk",
-		LcNavigateConflicts:                 "navigate conflicts",
 		LcPickHunk:                          "pick hunk",
 		LcPickAllHunks:                      "pick all hunks",
 		LcUndo:                              "undo",
diff --git a/pkg/i18n/japanese.go b/pkg/i18n/japanese.go
index 891d737b0..2fd2b850f 100644
--- a/pkg/i18n/japanese.go
+++ b/pkg/i18n/japanese.go
@@ -85,9 +85,9 @@ func japaneseTranslationSet() TranslationSet {
 		LcNewBranch:             "新しいブランチを作成",
 		LcDeleteBranch:          "ブランチを削除",
 		NoBranchesThisRepo:      "リポジトリにブランチが存在しません",
-		CommitMessageConfirm:    "{{.keyBindClose}}: 閉じる, {{.keyBindNewLine}}: 改行, {{.keyBindConfirm}}: 確定",
 		CommitWithoutMessageErr: "コミットメッセージを入力してください",
-		CloseConfirm:            "{{.keyBindClose}}: 閉じる/キャンセル, {{.keyBindConfirm}}: 確認",
+		LcCloseCancel:           "閉じる/キャンセル",
+		LcConfirm:               "確認",
 		LcClose:                 "閉じる",
 		LcQuit:                  "終了",
 		// LcSquashDown:                        "squash down",
@@ -108,8 +108,6 @@ func japaneseTranslationSet() TranslationSet {
 		LcAmendToCommit:      "ステージされた変更でamendコミット",
 		LcRenameCommitEditor: "エディタでコミットメッセージを編集",
 		Error:                "エラー",
-		LcSelectHunk:         "hunkを選択",
-		LcNavigateConflicts:  "コンフリクトを移動",
 		// LcPickHunk:                          "pick hunk",
 		// LcPickAllHunks:                      "pick all hunks",
 		LcUndo:              "アンドゥ",
diff --git a/pkg/i18n/korean.go b/pkg/i18n/korean.go
index 88e7db8f6..3de86121a 100644
--- a/pkg/i18n/korean.go
+++ b/pkg/i18n/korean.go
@@ -84,9 +84,9 @@ func koreanTranslationSet() TranslationSet {
 		LcNewBranch:                         "새 브랜치 생성",
 		LcDeleteBranch:                      "브랜치 삭제",
 		NoBranchesThisRepo:                  "저장소에 브랜치가 존재하지 않습니다.",
-		CommitMessageConfirm:                "{{.keyBindClose}}: 닫기, {{.keyBindNewLine}}: 개행, {{.keyBindConfirm}}: 확인",
 		CommitWithoutMessageErr:             "커밋 메시지를 입력하세요.",
-		CloseConfirm:                        "{{.keyBindClose}}: 닫기/취소, {{.keyBindConfirm}}: 확인",
+		LcCloseCancel:                       "닫기/취소",
+		LcConfirm:                           "확인",
 		LcClose:                             "닫기",
 		LcQuit:                              "종료",
 		LcSquashDown:                        "squash down",
@@ -109,8 +109,6 @@ func koreanTranslationSet() TranslationSet {
 		SureResetCommitAuthor:               "The author field of this commit will be updated to match the configured user. This also renews the author timestamp. Continue?",
 		LcRenameCommitEditor:                "에디터에서 커밋메시지 수정",
 		Error:                               "오류",
-		LcSelectHunk:                        "hunk를 선택",
-		LcNavigateConflicts:                 "navigate conflicts",
 		LcPickHunk:                          "pick hunk",
 		LcPickAllHunks:                      "pick all hunks",
 		LcUndo:                              "되돌리기",
diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go
index 00ed9f38f..fb73dbf3d 100644
--- a/pkg/i18n/polish.go
+++ b/pkg/i18n/polish.go
@@ -55,9 +55,9 @@ func polishTranslationSet() TranslationSet {
 		LcNewBranch:                         "nowa gałąź",
 		LcDeleteBranch:                      "usuń gałąź",
 		NoBranchesThisRepo:                  "Brak gałęzi dla tego repozytorium",
-		CommitMessageConfirm:                "{{.keyBindClose}}: zamknij, {{.keyBindNewLine}}: nowa linia, {{.keyBindConfirm}}: potwierdź",
 		CommitWithoutMessageErr:             "Nie możesz commitować bez komunikatu",
-		CloseConfirm:                        "{{.keyBindClose}}: zamknij, {{.keyBindConfirm}}: potwierdź",
+		LcCloseCancel:                       "zamknij",
+		LcConfirm:                           "potwierdź",
 		LcClose:                             "zamknij",
 		LcSquashDown:                        "ściśnij",
 		LcFixupCommit:                       "napraw commit",
@@ -68,8 +68,6 @@ func polishTranslationSet() TranslationSet {
 		LcRewordCommit:                      "zmień nazwę commita",
 		LcRenameCommitEditor:                "zmień nazwę commita w edytorze",
 		Error:                               "Błąd",
-		LcSelectHunk:                        "wybierz kawałek",
-		LcNavigateConflicts:                 "nawiguj konflikty",
 		LcPickHunk:                          "wybierz kawałek",
 		LcPickAllHunks:                      "wybierz oba kawałki",
 		LcUndo:                              "cofnij",