diff options
author | skanehira <sho19921005@gmail.com> | 2019-03-16 16:43:13 +0900 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-03-18 09:49:23 +1100 |
commit | 32ddf0c2960e1076c526b542332f8233d916e2dd (patch) | |
tree | e8cfe72c856f83b480b56497e9566d1fb51594d6 | |
parent | c453bfeb32d90a4c9202e11e8179b9b500e1a73b (diff) |
generate commit files keybind
-rw-r--r-- | docs/Keybindings_en.md | 19 | ||||
-rw-r--r-- | docs/Keybindings_nl.md | 124 | ||||
-rw-r--r-- | docs/Keybindings_pl.md | 124 | ||||
-rw-r--r-- | pkg/i18n/dutch.go | 3 | ||||
-rw-r--r-- | pkg/i18n/english.go | 3 | ||||
-rw-r--r-- | pkg/i18n/polish.go | 3 |
6 files changed, 267 insertions, 9 deletions
diff --git a/docs/Keybindings_en.md b/docs/Keybindings_en.md index 07923ce89..108b6ba73 100644 --- a/docs/Keybindings_en.md +++ b/docs/Keybindings_en.md @@ -71,15 +71,7 @@ <kbd>c</kbd>: copy commit (cherry-pick) <kbd>C</kbd>: copy commit range (cherry-pick) <kbd>v</kbd>: paste commits (cherry-pick) - <kbd>enter</kbd>: display commit files -</pre> - -## Commit files -<pre> - <kbd>esc</kbd>: go back - <kbd>c</kbd>: checkout file - <kbd>d</kbd>: discard this commit's changes to this file - <kbd>o</kbd>: open file + <kbd>enter</kbd>: view commit's files </pre> ## Stash @@ -90,6 +82,15 @@ <kbd>d</kbd>: drop </pre> +## Commit files + +<pre> + <kbd>esc</kbd>: go back + <kbd>c</kbd>: checkout file + <kbd>d</kbd>: discard this commit's changes to this file + <kbd>o</kbd>: open file +</pre> + ## Main (Normal) <pre> diff --git a/docs/Keybindings_nl.md b/docs/Keybindings_nl.md new file mode 100644 index 000000000..dfa45df2c --- /dev/null +++ b/docs/Keybindings_nl.md @@ -0,0 +1,124 @@ +# Lazygit menu + +## Global + +<pre> + <kbd>m</kbd>: view merge/rebase options + <kbd>P</kbd>: push + <kbd>p</kbd>: pull + <kbd>R</kbd>: verversen +</pre> + +## Status + +<pre> + <kbd>e</kbd>: verander config file + <kbd>o</kbd>: open config file + <kbd>u</kbd>: check voor updates + <kbd>s</kbd>: wissel naar een recente repo +</pre> + +## Bestanden + +<pre> + <kbd>c</kbd>: Commit veranderingen + <kbd>A</kbd>: wijzig laatste commit + <kbd>C</kbd>: commit veranderingen met de git editor + <kbd>space</kbd>: toggle staged + <kbd>d</kbd>: Verwijder als untracked / uitchecken wordt gevolgd (ga weg) + <kbd>e</kbd>: verander bestand + <kbd>o</kbd>: open bestand + <kbd>i</kbd>: voeg toe aan .gitignore + <kbd>r</kbd>: refresh bestanden + <kbd>S</kbd>: stash-bestanden + <kbd>s</kbd>: soft reset to last commit + <kbd>a</kbd>: toggle staged alle + <kbd>t</kbd>: bewerkingen toevoegen + <kbd>D</kbd>: harde reset and verwijderen ongevolgde bestanden + <kbd>enter</kbd>: stage individuele hunks/lijnen + <kbd>f</kbd>: fetch +</pre> + +## Branches + +<pre> + <kbd>space</kbd>: uitchecken + <kbd>o</kbd>: maak een pull-aanvraag + <kbd>c</kbd>: uitchecken bij naam + <kbd>F</kbd>: forceer checkout + <kbd>n</kbd>: nieuwe branch + <kbd>d</kbd>: verwijder branch + <kbd>r</kbd>: rebase branch + <kbd>M</kbd>: merge in met huidige checked out branch + <kbd>f</kbd>: fast-forward this branch from its upstream +</pre> + +## Commits + +<pre> + <kbd>s</kbd>: squash beneden + <kbd>r</kbd>: hernoem commit + <kbd>R</kbd>: rename commit with editor + <kbd>g</kbd>: reset naar deze commit + <kbd>f</kbd>: Fixup commit + <kbd>d</kbd>: delete commit + <kbd>J</kbd>: move commit down one + <kbd>K</kbd>: move commit up one + <kbd>e</kbd>: edit commit + <kbd>A</kbd>: amend commit with staged changes + <kbd>p</kbd>: pick commit (when mid-rebase) + <kbd>t</kbd>: revert commit + <kbd>c</kbd>: copy commit (cherry-pick) + <kbd>C</kbd>: copy commit range (cherry-pick) + <kbd>v</kbd>: paste commits (cherry-pick) + <kbd>enter</kbd>: view commit's files +</pre> + +## Stash + +<pre> + <kbd>space</kbd>: toepassen + <kbd>g</kbd>: pop + <kbd>d</kbd>: drop +</pre> + +## Commit files + +<pre> + <kbd>esc</kbd>: go back + <kbd>c</kbd>: checkout file + <kbd>d</kbd>: discard this commit's changes to this file + <kbd>o</kbd>: open bestand +</pre> + +## Main (Normal) + +<pre> + <kbd>PgDn</kbd>: scroll down + <kbd>PgUp</kbd>: scroll up +</pre> + +## Main (Stage Lines/Hunks) + +<pre> + <kbd>esc</kbd>: ga terug naar het bestanden paneel + <kbd>▲</kbd>: select previous line + <kbd>▼</kbd>: select next line + <kbd>◄</kbd>: select previous hunk + <kbd>►</kbd>: select next hunk + <kbd>space</kbd>: stage lijn + <kbd>a</kbd>: stage hunk +</pre> + +## Main (Merging) + +<pre> + <kbd>esc</kbd>: ga terug naar het bestanden paneel + <kbd>space</kbd>: pick hunk + <kbd>b</kbd>: pick both hunks + <kbd>◄</kbd>: select previous conflict + <kbd>►</kbd>: select next conflict + <kbd>▲</kbd>: select top hunk + <kbd>▼</kbd>: select bottom hunk + <kbd>z</kbd>: undo +</pre> diff --git a/docs/Keybindings_pl.md b/docs/Keybindings_pl.md new file mode 100644 index 000000000..9e60e9657 --- /dev/null +++ b/docs/Keybindings_pl.md @@ -0,0 +1,124 @@ +# Lazygit menu + +## Globalne + +<pre> + <kbd>m</kbd>: view merge/rebase options + <kbd>P</kbd>: push + <kbd>p</kbd>: pull + <kbd>R</kbd>: odśwież +</pre> + +## Status + +<pre> + <kbd>e</kbd>: edytuj plik konfiguracyjny + <kbd>o</kbd>: otwórz plik konfiguracyjny + <kbd>u</kbd>: sprawdź aktualizacje + <kbd>s</kbd>: switch to a recent repo +</pre> + +## Pliki + +<pre> + <kbd>c</kbd>: commituj zmiany + <kbd>A</kbd>: zmień ostatnie zatwierdzenie + <kbd>C</kbd>: commituj zmiany używając edytora z gita + <kbd>space</kbd>: przełącz zatwierdzenie + <kbd>d</kbd>: usuń jeśli nie śledzony / przełącz jeśli śledzony + <kbd>e</kbd>: edytuj plik + <kbd>o</kbd>: otwórz plik + <kbd>i</kbd>: dodaj do .gitignore + <kbd>r</kbd>: odśwież pliki + <kbd>S</kbd>: przechowaj pliki + <kbd>s</kbd>: soft reset to last commit + <kbd>a</kbd>: przełącz wszystkie zatwierdzenia + <kbd>t</kbd>: dodaj łatkę + <kbd>D</kbd>: zresetuj twardo i usuń niepotwierdzone pliki + <kbd>enter</kbd>: zatwierdź pojedyncze linie + <kbd>f</kbd>: fetch +</pre> + +## Gałęzie + +<pre> + <kbd>space</kbd>: przełącz + <kbd>o</kbd>: utwórz żądanie wyciągnięcia + <kbd>c</kbd>: przełącz używając nazwy + <kbd>F</kbd>: wymuś przełączenie + <kbd>n</kbd>: nowa gałąź + <kbd>d</kbd>: usuń gałąź + <kbd>r</kbd>: rebase branch + <kbd>M</kbd>: scal do obecnej gałęzi + <kbd>f</kbd>: fast-forward this branch from its upstream +</pre> + +## Commity + +<pre> + <kbd>s</kbd>: ściśnij w dół + <kbd>r</kbd>: przemianuj commit + <kbd>R</kbd>: przemianuj commit w edytorze + <kbd>g</kbd>: zresetuj do tego commita + <kbd>f</kbd>: napraw commit + <kbd>d</kbd>: delete commit + <kbd>J</kbd>: move commit down one + <kbd>K</kbd>: move commit up one + <kbd>e</kbd>: edit commit + <kbd>A</kbd>: amend commit with staged changes + <kbd>p</kbd>: pick commit (when mid-rebase) + <kbd>t</kbd>: revert commit + <kbd>c</kbd>: copy commit (cherry-pick) + <kbd>C</kbd>: copy commit range (cherry-pick) + <kbd>v</kbd>: paste commits (cherry-pick) + <kbd>enter</kbd>: view commit's files +</pre> + +## Schowek + +<pre> + <kbd>space</kbd>: zastosuj + <kbd>g</kbd>: wyciągnij + <kbd>d</kbd>: porzuć +</pre> + +## Commit files + +<pre> + <kbd>esc</kbd>: go back + <kbd>c</kbd>: checkout file + <kbd>d</kbd>: discard this commit's changes to this file + <kbd>o</kbd>: otwórz plik +</pre> + +## Main (Normal) + +<pre> + <kbd>PgDn</kbd>: scroll down + <kbd>PgUp</kbd>: scroll up +</pre> + +## Main (Zatwierdzanie) + +<pre> + <kbd>esc</kbd>: wróć do panelu plików + <kbd>▲</kbd>: select previous line + <kbd>▼</kbd>: select next line + <kbd>◄</kbd>: select previous hunk + <kbd>►</kbd>: select next hunk + <kbd>space</kbd>: zatwierdź linię + <kbd>a</kbd>: zatwierdź kawałek +</pre> + +## Main (Merging) + +<pre> + <kbd>esc</kbd>: wróć do panelu plików + <kbd>space</kbd>: pick hunk + <kbd>b</kbd>: pick both hunks + <kbd>◄</kbd>: select previous conflict + <kbd>►</kbd>: select next conflict + <kbd>▲</kbd>: select top hunk + <kbd>▼</kbd>: select bottom hunk + <kbd>z</kbd>: undo +</pre> diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go index 74bf39a97..77b3052d9 100644 --- a/pkg/i18n/dutch.go +++ b/pkg/i18n/dutch.go @@ -650,6 +650,9 @@ func addDutch(i18nObject *i18n.Bundle) error { ID: "viewCommitFiles", Other: "view commit's files", }, &i18n.Message{ + ID: "CommitFilesTitle", + Other: "Commit files", + }, &i18n.Message{ ID: "goBack", Other: "go back", }, &i18n.Message{ diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 9280c0bbd..09805540a 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -673,6 +673,9 @@ func addEnglish(i18nObject *i18n.Bundle) error { ID: "viewCommitFiles", Other: "view commit's files", }, &i18n.Message{ + ID: "CommitFilesTitle", + Other: "Commit files", + }, &i18n.Message{ ID: "goBack", Other: "go back", }, &i18n.Message{ diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go index 753ef882c..951bc3728 100644 --- a/pkg/i18n/polish.go +++ b/pkg/i18n/polish.go @@ -633,6 +633,9 @@ func addPolish(i18nObject *i18n.Bundle) error { ID: "viewCommitFiles", Other: "view commit's files", }, &i18n.Message{ + ID: "CommitFilesTitle", + Other: "Commit files", + }, &i18n.Message{ ID: "goBack", Other: "go back", }, &i18n.Message{ |