diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index 8142f6b65..4719d995e 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -143,8 +143,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
e: edit file o: open file - ◄: select previous conflict - ►: select next conflict + ◀: select previous conflict + ▶: select next conflict ▲: select previous hunk ▼: select next hunk z: undo @@ -164,8 +164,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Main Panel (Patch Building)- ◄: select previous hunk - ►: select next hunk + ◀: select previous hunk + ▶: select next hunk v: toggle drag select V: toggle drag select a: toggle select hunk @@ -179,8 +179,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Main Panel (Staging)- ◄: select previous hunk - ►: select next hunk + ◀: select previous hunk + ▶: select next hunk v: toggle drag select V: toggle drag select a: toggle select hunk diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md index 60f2739df..9b6b1b9f8 100644 --- a/docs/keybindings/Keybindings_ja.md +++ b/docs/keybindings/Keybindings_ja.md @@ -203,8 +203,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n directe: ファイルを編集 o: ファイルを開く - ◄: 前のコンフリクトを選択 - ►: 次のコンフリクトを選択 + ◀: 前のコンフリクトを選択 + ▶: 次のコンフリクトを選択 ▲: 前のhunkを選択 ▼: 次のhunkを選択 z: アンドゥ @@ -224,8 +224,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## メインパネル (Patch Building)- ◄: 前のhunkを選択 - ►: 次のhunkを選択 + ◀: 前のhunkを選択 + ▶: 次のhunkを選択 v: 範囲選択を切り替え V: 範囲選択を切り替え a: hunk選択を切り替え @@ -239,8 +239,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## メインパネル (Staging)- ◄: 前のhunkを選択 - ►: 次のhunkを選択 + ◀: 前のhunkを選択 + ▶: 次のhunkを選択 v: 範囲選択を切り替え V: 範囲選択を切り替え a: hunk選択を切り替え diff --git a/docs/keybindings/Keybindings_ko.md b/docs/keybindings/Keybindings_ko.md index 100241e74..5d55a35de 100644 --- a/docs/keybindings/Keybindings_ko.md +++ b/docs/keybindings/Keybindings_ko.md @@ -88,8 +88,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n directe: 파일 편집 o: 파일 닫기 - ◄: 이전 충돌을 선택 - ►: 다음 충돌을 선택 + ◀: 이전 충돌을 선택 + ▶: 다음 충돌을 선택 ▲: 이전 hunk를 선택 ▼: 다음 hunk를 선택 z: 되돌리기 @@ -109,8 +109,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## 메인 패널 (Patch Building)- ◄: 이전 hunk를 선택 - ►: 다음 hunk를 선택 + ◀: 이전 hunk를 선택 + ▶: 다음 hunk를 선택 v: 드래그 선택 전환 V: 드래그 선택 전환 a: toggle select hunk @@ -124,8 +124,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## 메인 패널 (Staging)- ◄: 이전 hunk를 선택 - ►: 다음 hunk를 선택 + ◀: 이전 hunk를 선택 + ▶: 다음 hunk를 선택 v: 드래그 선택 전환 V: 드래그 선택 전환 a: toggle select hunk diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index 2f2276bf4..801c3e5a0 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -143,8 +143,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n directe: verander bestand o: open bestand - ◄: selecteer voorgaand conflict - ►: selecteer volgende conflict + ◀: selecteer voorgaand conflict + ▶: selecteer volgende conflict ▲: selecteer bovenste hunk ▼: selecteer onderste hunk z: ongedaan maken @@ -164,8 +164,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Patch Bouwen- ◄: selecteer de vorige hunk - ►: selecteer de volgende hunk + ◀: selecteer de vorige hunk + ▶: selecteer de volgende hunk v: toggle drag selecteer V: toggle drag selecteer a: toggle selecteer hunk @@ -218,8 +218,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Staging- ◄: selecteer de vorige hunk - ►: selecteer de volgende hunk + ◀: selecteer de vorige hunk + ▶: selecteer de volgende hunk v: toggle drag selecteer V: toggle drag selecteer a: toggle selecteer hunk diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index be6368af3..d502c095d 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -101,8 +101,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Main Panel (Patch Building)- ◄: poprzedni kawałek - ►: następny kawałek + ◀: poprzedni kawałek + ▶: następny kawałek v: toggle drag select V: toggle drag select a: toggle select hunk @@ -156,8 +156,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## Poczekalnia- ◄: poprzedni kawałek - ►: następny kawałek + ◀: poprzedni kawałek + ▶: następny kawałek v: toggle drag select V: toggle drag select a: toggle select hunk @@ -218,8 +218,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n directe: edytuj plik o: otwórz plik - ◄: poprzedni konflikt - ►: następny konflikt + ◀: poprzedni konflikt + ▶: następny konflikt ▲: wybierz poprzedni kawałek ▼: wybierz następny kawałek z: cofnij diff --git a/docs/keybindings/Keybindings_zh.md b/docs/keybindings/Keybindings_zh.md index 87fde590a..379561f03 100644 --- a/docs/keybindings/Keybindings_zh.md +++ b/docs/keybindings/Keybindings_zh.md @@ -184,8 +184,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## 构建补丁中- ◄: 选择上一个区块 - ►: 选择下一个区块 + ◀: 选择上一个区块 + ▶: 选择下一个区块 v: 切换拖动选择 V: 切换拖动选择 a: 切换选择区块 @@ -212,8 +212,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n directe: 编辑文件 o: 打开文件 - ◄: 选择上一个冲突 - ►: 选择下一个冲突 + ◀: 选择上一个冲突 + ▶: 选择下一个冲突 ▲: 选择顶部块 ▼: 选择底部块 z: 撤销 @@ -226,8 +226,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct ## 正在暂存- ◄: 选择上一个区块 - ►: 选择下一个区块 + ◀: 选择上一个区块 + ▶: 选择下一个区块 v: 切换拖动选择 V: 切换拖动选择 a: 切换选择区块 diff --git a/pkg/gui/keybindings/keybindings.go b/pkg/gui/keybindings/keybindings.go index 09833944f..3099d880c 100644 --- a/pkg/gui/keybindings/keybindings.go +++ b/pkg/gui/keybindings/keybindings.go @@ -32,8 +32,8 @@ var keyMapReversed = map[gocui.Key]string{ gocui.KeyPgdn: "pgdown", gocui.KeyArrowUp: "▲", gocui.KeyArrowDown: "▼", - gocui.KeyArrowLeft: "◄", - gocui.KeyArrowRight: "►", + gocui.KeyArrowLeft: "◀", + gocui.KeyArrowRight: "▶", gocui.KeyTab: "tab", // ctrl+i gocui.KeyBacktab: "shift+tab", gocui.KeyEnter: "enter", // ctrl+m diff --git a/pkg/gui/presentation/files.go b/pkg/gui/presentation/files.go index 394b39f73..a941314c7 100644 --- a/pkg/gui/presentation/files.go +++ b/pkg/gui/presentation/files.go @@ -14,7 +14,7 @@ import ( const ( EXPANDED_ARROW = "▼" - COLLAPSED_ARROW = "►" + COLLAPSED_ARROW = "▶" ) // keeping these here as individual constants in case later on people want the old tree shape diff --git a/pkg/gui/presentation/files_test.go b/pkg/gui/presentation/files_test.go index 17e061012..729d0d8cf 100644 --- a/pkg/gui/presentation/files_test.go +++ b/pkg/gui/presentation/files_test.go @@ -53,7 +53,7 @@ func TestRenderFileTree(t *testing.T) { }, expected: toStringSlice( ` -► dir1 +▶ dir1 ▼ dir2 ▼ dir2 M file3 @@ -112,7 +112,7 @@ func TestRenderCommitFileTree(t *testing.T) { }, expected: toStringSlice( ` -► dir1 +▶ dir1 ▼ dir2 ▼ dir2 D file3