Fix translations

docs/keybindings/Keybindings_en.md

@@ -208,11 +208,11 @@
   <kbd>esc</kbd>: return to files panel
   <kbd>M</kbd>: open external merge tool (git mergetool)
   <kbd>space</kbd>: pick hunk
-  <kbd>b</kbd>: pick both hunks
+  <kbd>b</kbd>: pick all hunks
   <kbd>◄</kbd>: select previous conflict
   <kbd>►</kbd>: select next conflict
-  <kbd>▲</kbd>: select top hunk
+  <kbd>▲</kbd>: select previous hunk
-  <kbd>▼</kbd>: select bottom hunk
+  <kbd>▼</kbd>: select next hunk
   <kbd>z</kbd>: undo
 </pre>
 

docs/keybindings/Keybindings_pl.md

@@ -208,11 +208,11 @@
   <kbd>esc</kbd>: wróć do panelu plików
   <kbd>M</kbd>: open external merge tool (git mergetool)
   <kbd>space</kbd>: pick hunk
-  <kbd>b</kbd>: pick both hunks
+  <kbd>b</kbd>: pick all hunks
   <kbd>◄</kbd>: select previous conflict
   <kbd>►</kbd>: select next conflict
-  <kbd>▲</kbd>: select top hunk
+  <kbd>▲</kbd>: select previous hunk
-  <kbd>▼</kbd>: select bottom hunk
+  <kbd>▼</kbd>: select next hunk
   <kbd>z</kbd>: cofnij
 </pre>
 

pkg/gui/keybindings.go

@@ -1464,8 +1464,8 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			ViewName:    "main",
 			Contexts:    []string{string(MAIN_MERGING_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Main.PickBothHunks),
-			Handler:     gui.handlePickBothHunks,
+			Handler:     gui.handlePickAllHunks,
-			Description: gui.Tr.PickBothHunks,
+			Description: gui.Tr.PickAllHunks,
 		},
 		{
 			ViewName:    "main",
@@ -1486,14 +1486,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Contexts:    []string{string(MAIN_MERGING_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.PrevItem),
 			Handler:     gui.handleSelectPrevConflictHunk,
-			Description: gui.Tr.SelectTop,
+			Description: gui.Tr.SelectPrevHunk,
 		},
 		{
 			ViewName:    "main",
 			Contexts:    []string{string(MAIN_MERGING_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.NextItem),
 			Handler:     gui.handleSelectNextConflictHunk,
-			Description: gui.Tr.SelectBottom,
+			Description: gui.Tr.SelectNextHunk,
 		},
 		{
 			ViewName: "main",

pkg/gui/merge_panel.go

@@ -95,7 +95,7 @@ func (gui *Gui) handlePickHunk() error {
 	})
 }
 
-func (gui *Gui) handlePickBothHunks() error {
+func (gui *Gui) handlePickAllHunks() error {
 	return gui.withMergeConflictLock(func() error {
 		gui.takeOverMergeConflictScrolling()
 
@@ -233,7 +233,7 @@ func (gui *Gui) getMergingOptions() map[string]string {
 		fmt.Sprintf("%s %s", gui.getKeyDisplay(keybindingConfig.Universal.PrevItem), gui.getKeyDisplay(keybindingConfig.Universal.NextItem)):   gui.Tr.LcSelectHunk,
 		fmt.Sprintf("%s %s", gui.getKeyDisplay(keybindingConfig.Universal.PrevBlock), gui.getKeyDisplay(keybindingConfig.Universal.NextBlock)): gui.Tr.LcNavigateConflicts,
 		gui.getKeyDisplay(keybindingConfig.Universal.Select):   gui.Tr.LcPickHunk,
-		gui.getKeyDisplay(keybindingConfig.Main.PickBothHunks): gui.Tr.LcPickBothHunks,
+		gui.getKeyDisplay(keybindingConfig.Main.PickBothHunks): gui.Tr.LcPickAllHunks,
 		gui.getKeyDisplay(keybindingConfig.Universal.Undo):     gui.Tr.LcUndo,
 	}
 }

pkg/i18n/chinese.go

@@ -130,7 +130,7 @@ func chineseTranslationSet() TranslationSet {
 		LcSelectHunk:                        "选择块",
 		LcNavigateConflicts:                 "解决冲突",
 		LcPickHunk:                          "选择块",
-		LcPickBothHunks:                     "pick both hunks",
+		LcPickAllHunks:                      "pick all hunks",
 		LcUndo:                              "撤销",
 		LcUndoReflog:                        "撤销 (via reflog) (实验性)",
 		LcRedoReflog:                        "重做 (via reflog) (实验性)",
@@ -201,7 +201,7 @@ func chineseTranslationSet() TranslationSet {
 		FoundConflictsTitle:                 "自动合并失败",
 		Undo:                                "撤销",
 		PickHunk:                            "pick hunk",
-		PickBothHunks:                       "pick both hunks",
+		PickAllHunks:                        "pick all hunks",
 		ViewMergeRebaseOptions:              "查看 合并/变基 选项",
 		NotMergingOrRebasing:                "您目前既不进行基础调整也不进行合并",
 		RecentRepos:                         "最近的仓库",
@@ -247,8 +247,8 @@ func chineseTranslationSet() TranslationSet {
 		NextHunk:                            "选择下一个块",
 		PrevConflict:                        "选择上一个冲突",
 		NextConflict:                        "选择下一个冲突",
-		SelectTop:                           "选择顶部块",
+		SelectPrevHunk:                      "选择顶部块",
-		SelectBottom:                        "选择底部块",
+		SelectNextHunk:                      "选择底部块",
 		ScrollDown:                          "向下滚动",
 		ScrollUp:                            "向上滚动",
 		LcScrollUpMainPanel:                 "向上滚动主面板",

pkg/i18n/dutch.go

@@ -113,7 +113,7 @@ func dutchTranslationSet() TranslationSet {
 		LcSelectHunk:                        "selecteer stuk",
 		LcNavigateConflicts:                 "navigeer conflicts",
 		LcPickHunk:                          "kies stuk",
-		LcPickBothHunks:                     "kies beide stukken",
+		LcPickAllHunks:                      "kies beide stukken",
 		LcUndo:                              "ongedaan maken",
 		LcUndoReflog:                        "ongedaan maken (via reflog) (experimenteel)",
 		LcRedoReflog:                        "redo (via reflog) (experimenteel)",
@@ -183,7 +183,7 @@ func dutchTranslationSet() TranslationSet {
 		FoundConflictsTitle:                 "Auto-merge mislukt",
 		Undo:                                "ongedaan maken",
 		PickHunk:                            "kies hunk",
-		PickBothHunks:                       "kies bijde hunks",
+		PickAllHunks:                        "kies bijde hunks",
 		ViewMergeRebaseOptions:              "bekijk merge/rebase opties",
 		NotMergingOrRebasing:                "Je bent momenteel niet aan het rebasen of mergen",
 		RecentRepos:                         "recente repositories",
@@ -229,8 +229,8 @@ func dutchTranslationSet() TranslationSet {
 		NextHunk:                            "selecteer de volgende hunk",
 		PrevConflict:                        "selecteer voorgaand conflict",
 		NextConflict:                        "selecteer volgende conflict",
-		SelectTop:                           "selecteer bovenste hunk",
+		SelectPrevHunk:                      "selecteer bovenste hunk",
-		SelectBottom:                        "selecteer onderste hunk",
+		SelectNextHunk:                      "selecteer onderste hunk",
 		ScrollDown:                          "scroll omlaag",
 		ScrollUp:                            "scroll omhoog",
 		LcScrollUpMainPanel:                 "scroll naar beneden vanaf hoofdpaneel",

pkg/i18n/english.go

@@ -127,7 +127,7 @@ type TranslationSet struct {
 	LcSelectHunk                        string
 	LcNavigateConflicts                 string
 	LcPickHunk                          string
-	LcPickBothHunks                     string
+	LcPickAllHunks                      string
 	LcUndo                              string
 	LcUndoReflog                        string
 	LcRedoReflog                        string
@@ -198,7 +198,7 @@ type TranslationSet struct {
 	FoundConflictsTitle                 string
 	Undo                                string
 	PickHunk                            string
-	PickBothHunks                       string
+	PickAllHunks                        string
 	ViewMergeRebaseOptions              string
 	NotMergingOrRebasing                string
 	RecentRepos                         string
@@ -243,8 +243,8 @@ type TranslationSet struct {
 	NextHunk                            string
 	PrevConflict                        string
 	NextConflict                        string
-	SelectTop                           string
+	SelectPrevHunk                      string
-	SelectBottom                        string
+	SelectNextHunk                      string
 	ScrollDown                          string
 	ScrollUp                            string
 	LcScrollUpMainPanel                 string
@@ -682,7 +682,7 @@ func englishTranslationSet() TranslationSet {
 		LcSelectHunk:                        "select hunk",
 		LcNavigateConflicts:                 "navigate conflicts",
 		LcPickHunk:                          "pick hunk",
-		LcPickBothHunks:                     "pick both hunks",
+		LcPickAllHunks:                      "pick all hunks",
 		LcUndo:                              "undo",
 		LcUndoReflog:                        "undo (via reflog) (experimental)",
 		LcRedoReflog:                        "redo (via reflog) (experimental)",
@@ -753,7 +753,7 @@ func englishTranslationSet() TranslationSet {
 		FoundConflictsTitle:                 "Auto-merge failed",
 		Undo:                                "undo",
 		PickHunk:                            "pick hunk",
-		PickBothHunks:                       "pick both hunks",
+		PickAllHunks:                        "pick all hunks",
 		ViewMergeRebaseOptions:              "view merge/rebase options",
 		NotMergingOrRebasing:                "You are currently neither rebasing nor merging",
 		RecentRepos:                         "recent repositories",
@@ -799,8 +799,8 @@ func englishTranslationSet() TranslationSet {
 		NextHunk:                            "select next hunk",
 		PrevConflict:                        "select previous conflict",
 		NextConflict:                        "select next conflict",
-		SelectTop:                           "select top hunk",
+		SelectPrevHunk:                      "select previous hunk",
-		SelectBottom:                        "select bottom hunk",
+		SelectNextHunk:                      "select next hunk",
 		ScrollDown:                          "scroll down",
 		ScrollUp:                            "scroll up",
 		LcScrollUpMainPanel:                 "scroll up main panel",

pkg/i18n/polish.go

@@ -96,7 +96,7 @@ func polishTranslationSet() TranslationSet {
 		LcSelectHunk:                        "wybierz kawałek",
 		LcNavigateConflicts:                 "nawiguj konflikty",
 		LcPickHunk:                          "wybierz kawałek",
-		LcPickBothHunks:                     "wybierz oba kawałki",
+		LcPickAllHunks:                      "wybierz oba kawałki",
 		LcUndo:                              "cofnij",
 		LcPop:                               "wyciągnij",
 		LcDrop:                              "porzuć",
@@ -166,7 +166,7 @@ func polishTranslationSet() TranslationSet {
 		FoundConflictsTitle:                 "Auto-merge failed",
 		Undo:                                "undo",
 		PickHunk:                            "pick hunk",
-		PickBothHunks:                       "pick both hunks",
+		PickAllHunks:                        "pick all hunks",
 		ViewMergeRebaseOptions:              "view merge/rebase options",
 		NotMergingOrRebasing:                "You are currently neither rebasing nor merging",
 		RecentRepos:                         "recent repositories",
@@ -190,8 +190,8 @@ func polishTranslationSet() TranslationSet {
 		NextHunk:                            "select next hunk",
 		PrevConflict:                        "select previous conflict",
 		NextConflict:                        "select next conflict",
-		SelectTop:                           "select top hunk",
+		SelectPrevHunk:                      "select previous hunk",
-		SelectBottom:                        "select bottom hunk",
+		SelectNextHunk:                      "select next hunk",
 		ScrollDown:                          "scroll down",
 		ScrollUp:                            "scroll up",
 		AmendCommitTitle:                    "Amend Commit",