diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2023-07-29 14:56:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-29 14:56:14 +0200 |
| commit | 52447e5d46cedda76926dbee36b867674335d508 (patch) | |
| tree | a7abd671722953175274da96aa077033233bee7d /pkg/i18n | |
| parent | a4772ae606174fb5cf5da2a3530e77f9d42352e4 (diff) | |
| parent | 6794149ec872764ba0ad2d03d998bcd6ebb95f96 (diff) | |
When bisecting, always mark the current commit as good/bad, not the selected (#2837)
Diffstat (limited to 'pkg/i18n')
| -rw-r--r-- | pkg/i18n/chinese.go | 2 | ||||
| -rw-r--r-- | pkg/i18n/english.go | 8 | ||||
| -rw-r--r-- | pkg/i18n/japanese.go | 2 | ||||
| -rw-r--r-- | pkg/i18n/korean.go | 2 | ||||
| -rw-r--r-- | pkg/i18n/russian.go | 2 | ||||
| -rw-r--r-- | pkg/i18n/traditional_chinese.go | 2 |
6 files changed, 10 insertions, 8 deletions
diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go index f6171f68e..2a494c97e 100644 --- a/pkg/i18n/chinese.go +++ b/pkg/i18n/chinese.go @@ -544,7 +544,7 @@ func chineseTranslationSet() TranslationSet { Bisect: Bisect{ Mark: "将 %s 标记为 %s", MarkStart: "将 %s 标记为 %s (start bisect)", - Skip: "跳过 %s", + SkipCurrent: "跳过 %s", ResetTitle: "重置 'git bisect'", ResetPrompt: "您确定要重置 'git bisect' 吗？", ResetOption: "重置二分查找", diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 2d0fb90e8..34f9e66e0 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -557,7 +557,8 @@ type Bisect struct { NewTermPrompt string BisectMenuTitle string Mark string - Skip string + SkipCurrent string + SkipSelected string CompleteTitle string CompletePrompt string CompletePromptIndeterminate string @@ -1347,9 +1348,10 @@ func EnglishTranslationSet() TranslationSet { BisectMark: "Bisect mark", }, Bisect: Bisect{ - Mark: "Mark %s as %s", + Mark: "Mark current commit (%s) as %s", MarkStart: "Mark %s as %s (start bisect)", - Skip: "Skip %s", + SkipCurrent: "Skip current commit (%s)", + SkipSelected: "Skip selected commit (%s)", ResetTitle: "Reset 'git bisect'", ResetPrompt: "Are you sure you want to reset 'git bisect'?", ResetOption: "Reset bisect", diff --git a/pkg/i18n/japanese.go b/pkg/i18n/japanese.go index 6f77aa26d..3cbc6e225 100644 --- a/pkg/i18n/japanese.go +++ b/pkg/i18n/japanese.go @@ -577,7 +577,7 @@ func japaneseTranslationSet() TranslationSet { Bisect: Bisect{ // Mark: "Mark %s as %s", // MarkStart: "Mark %s as %s (start bisect)", - Skip: "%s をスキップする", + SkipCurrent: "%s をスキップする", ResetTitle: "'git bisect' をリセット", ResetPrompt: "'git bisect' をリセットします。よろしいですか?", ResetOption: "Bisectをリセット", diff --git a/pkg/i18n/korean.go b/pkg/i18n/korean.go index 801a83474..f22e6cc47 100644 --- a/pkg/i18n/korean.go +++ b/pkg/i18n/korean.go @@ -576,7 +576,7 @@ func koreanTranslationSet() TranslationSet { Bisect: Bisect{ Mark: "Mark %s as %s", MarkStart: "Mark %s as %s (start bisect)", - Skip: "%s 를 스킵", + SkipCurrent: "%s 를 스킵", ResetTitle: "'git bisect' 를 리셋", ResetPrompt: "정말로 'git bisect' 를 리셋하시겠습니까?", ResetOption: "Bisect를 리셋", diff --git a/pkg/i18n/russian.go b/pkg/i18n/russian.go index fe4785667..ae21430e6 100644 --- a/pkg/i18n/russian.go +++ b/pkg/i18n/russian.go @@ -671,7 +671,7 @@ func RussianTranslationSet() TranslationSet { Bisect: Bisect{ Mark: "Отметить %s как %s", MarkStart: "Отметить %s как %s (начать бинарный поиск)", - Skip: "Пропустить %s", + SkipCurrent: "Пропустить %s", ResetTitle: "Сбросить 'git bisect'", ResetPrompt: "Вы уверены, что хотите сбросить 'git bisect'?", ResetOption: "Сбросить бинарный поиск", diff --git a/pkg/i18n/traditional_chinese.go b/pkg/i18n/traditional_chinese.go index ebdda62bf..3ccac945a 100644 --- a/pkg/i18n/traditional_chinese.go +++ b/pkg/i18n/traditional_chinese.go @@ -698,7 +698,7 @@ func traditionalChineseTranslationSet() TranslationSet { Bisect: Bisect{ Mark: "將 %s 標記為 %s", MarkStart: "將 %s 標記為 %s（開始二分查找）", - Skip: "跳過 %s", + SkipCurrent: "跳過 %s", ResetTitle: "重設 'git bisect'", ResetPrompt: "你確定要重設 'git bisect' 嗎？", ResetOption: "重設二分查找", |