go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-06 23:46:13 +02:00
Code Issues Releases Activity

Improve keybinding descriptions

Browse Source 
This adds a bunch of tooltips to keybindings and updates some keybinding descriptions (i.e. labels).

It's in preparation for displaying more keybindings on-screen (in the bottom right of the screen),
and so due in part to laziness it shortens some descriptions so that we don't need to manage both
a short and long description (for on-screen vs in-menu). Nonetheless I've added a ShortDescription
field for when we do want to have both a short and long description.

You'll notice that some keybindings I deemed unworthy of the options view have longer descriptions,
because I could get away with it.
This commit is contained in:
Jesse Duffield 2024-01-02 14:00:36 +11:00
parent 0aa6109d4d
commit 7bddf53223
43 changed files with 2525 additions and 2199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

293
docs/keybindings/Keybindings_en.md
View File

@ -9,26 +9,28 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-r> `` | Switch to a recent repo | | | `` <c-r> `` | Switch to a recent repo | |
| `` <pgup> (fn+up/shift+k) `` | Scroll up main panel | | | `` <pgup> (fn+up/shift+k) `` | Scroll up main window | |
| `` <pgdown> (fn+down/shift+j) `` | Scroll down main panel | | | `` <pgdown> (fn+down/shift+j) `` | Scroll down main window | |
| `` @ `` | Open command log menu | | | `` @ `` | View command log options | View options for the command log e.g. show/hide the command log and focus the command log. |
| `` } `` | Increase the size of the context shown around changes in the diff view | | | `` P `` | Push | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` { `` | Decrease the size of the context shown around changes in the diff view | | | `` p `` | Pull | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` : `` | Execute custom command | | | `` } `` | Increase diff context size | Increase the amount of the context shown around changes in the diff view. |
| `` { `` | Decrease diff context size | Decrease the amount of the context shown around changes in the diff view. |
| `` : `` | Execute custom command | Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands. |
| `` <c-p> `` | View custom patch options | | | `` <c-p> `` | View custom patch options | |
| `` m `` | View merge/rebase options | | | `` m `` | View merge/rebase options | View options to abort/continue/skip the current merge/rebase. |
| `` R `` | Refresh | | | `` R `` | Refresh | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
| `` + `` | Next screen mode (normal/half/fullscreen) | | | `` + `` | Next screen mode (normal/half/fullscreen) | |
| `` _ `` | Prev screen mode | | | `` _ `` | Prev screen mode | |
| `` ? `` | Open menu | | | `` ? `` | Open keybindings menu | |
| `` <c-s> `` | View filter-by-path options | | | `` <c-s> `` | View filter-by-path options | View options for filtering the commit log by a file path, so that only commits relating to that path are shown. |
| `` W `` | Open diff menu | | | `` W `` | View diffing options | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-e> `` | Open diff menu | | | `` <c-e> `` | View diffing options | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-w> `` | Toggle whether or not whitespace changes are shown in the diff view | | | `` q `` | Quit | |
| `` <esc> `` | Cancel | |
| `` <c-w> `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view. |
| `` z `` | Undo | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | `` z `` | Undo | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
| `` <c-z> `` | Redo | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | `` <c-z> `` | Redo | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
| `` P `` | Push | |
| `` p `` | Pull | |
## List panel navigation ## List panel navigation
@ -51,16 +53,16 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy the committed file name to the clipboard | | | `` <c-o> `` | Copy path to clipboard | |
| `` c `` | Checkout file | | | `` c `` | Checkout | Checkout file. This replaces the file in your working tree with the version from the selected commit. |
| `` d `` | Discard this commit's changes to this file | | | `` d `` | Remove | Discard this commit's changes to this file. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes this file. |
| `` o `` | Open file | | | `` o `` | Open file | Open file in default application. |
| `` e `` | Edit file | | | `` e `` | Edit | Open file in external editor. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <space> `` | Toggle file included in patch | | | `` <space> `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` a `` | Toggle all files included in patch | | | `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | | | `` <enter> `` | Enter file / Toggle directory collapsed | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
| `` ` `` | Toggle file tree view | | | `` ` `` | Toggle file tree view | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` / `` | Search the current view by text | | | `` / `` | Search the current view by text | |
## Commit summary ## Commit summary
@ -75,37 +77,37 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy commit SHA to clipboard | | | `` <c-o> `` | Copy commit SHA to clipboard | |
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | | | `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
| `` b `` | View bisect options | | | `` b `` | View bisect options | |
| `` s `` | Squash down | | | `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
| `` f `` | Fixup commit | | | `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded. |
| `` r `` | Reword commit | | | `` r `` | Reword | Reword the selected commit's message. |
| `` R `` | Reword commit with editor | | | `` R `` | Reword with editor | |
| `` d `` | Delete commit | | | `` d `` | Drop | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
| `` e `` | Edit commit | | | `` e `` | Edit (start interactive rebase) | Edit the selected commit. Use this to start an interactive rebase from the selected commit. When already mid-rebase, this will mark the selected commit for editing, which means that upon continuing the rebase, the rebase will pause at the selected commit to allow you to make changes. |
| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
If you would instead like to start an interactive rebase from the selected commit, press `e`. | If you would instead like to start an interactive rebase from the selected commit, press `e`. |
| `` p `` | Pick commit (when mid-rebase) | | | `` p `` | Pick | Mark the selected commit to be picked (when mid-rebase). This means that the commit will be retained upon continuing the rebase. |
| `` F `` | Create fixup commit for this commit | | | `` F `` | Create fixup commit | Create 'fixup!' commit for the selected commit. Later on, you can press `S` on this same commit to apply all above fixup commits. |
| `` S `` | Squash all 'fixup!' commits above selected commit (autosquash) | | | `` S `` | Apply fixup commits | Squash all 'fixup!' commits above selected commit (autosquash). |
| `` <c-j> `` | Move commit down one | | | `` <c-j> `` | Move commit down one | |
| `` <c-k> `` | Move commit up one | | | `` <c-k> `` | Move commit up one | |
| `` V `` | Paste commits (cherry-pick) | | | `` V `` | Paste (cherry-pick) | |
| `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
| `` A `` | Amend commit with staged changes | | | `` A `` | Amend | Amend commit with staged changes. If the selected commit is the HEAD commit, this will perform `git commit --amend`. Otherwise the commit will be amended via a rebase. |
| `` a `` | Set/Reset commit author | | | `` a `` | Amend commit attribute | Set/Reset commit author or set co-author. |
| `` t `` | Revert commit | | | `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
| `` T `` | Tag commit | | | `` T `` | Tag commit | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
| `` <c-l> `` | Open log menu | | | `` <c-l> `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
| `` w `` | View worktree options | | | `` <space> `` | Checkout | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | Checkout commit | | | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | Copy commit attribute | |
| `` o `` | Open commit in browser | | | `` o `` | Open commit in browser | |
| `` n `` | Create new branch off of commit | | | `` n `` | Create new branch off of commit | |
| `` g `` | View reset options | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | Copy commit (cherry-pick) | | | `` C `` | Copy (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | View selected item's files | | | `` <enter> `` | View files | |
| `` w `` | View worktree options | |
| `` / `` | Search the current view by text | | | `` / `` | Search the current view by text | |
## Confirmation panel ## Confirmation panel
@ -119,30 +121,30 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy the file name to the clipboard | | | `` <c-o> `` | Copy path to clipboard | |
| `` <space> `` | Toggle staged | | | `` <space> `` | Stage | Toggle staged for selected file. |
| `` <c-b> `` | Filter files by status | | | `` <c-b> `` | Filter files by status | |
| `` y `` | Copy to clipboard | | | `` y `` | Copy to clipboard | |
| `` c `` | Commit changes | | | `` c `` | Commit | Commit staged changes. |
| `` w `` | Commit changes without pre-commit hook | | | `` w `` | Commit changes without pre-commit hook | |
| `` A `` | Amend last commit | | | `` A `` | Amend last commit | |
| `` C `` | Commit changes using git editor | | | `` C `` | Commit changes using git editor | |
| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
| `` e `` | Edit file | | | `` e `` | Edit | Open file in external editor. |
| `` o `` | Open file | | | `` o `` | Open file | Open file in default application. |
| `` i `` | Ignore or exclude file | | | `` i `` | Ignore or exclude file | |
| `` r `` | Refresh files | | | `` r `` | Refresh files | |
| `` s `` | Stash all changes | | | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
| `` S `` | View stash options | | | `` S `` | View stash options | View stash options (e.g. stash all, stash staged, stash unstaged). |
| `` a `` | Stage/unstage all | | | `` a `` | Stage all | Toggle staged/unstaged for all files in working tree. |
| `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory | | | `` <enter> `` | Stage lines / Collapse directory | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
| `` d `` | View 'discard changes' options | | | `` d `` | Discard | View options for discarding changes to the selected file. |
| `` g `` | View upstream reset options | | | `` g `` | View upstream reset options | |
| `` D `` | View reset options | | | `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
| `` ` `` | Toggle file tree view | | | `` ` `` | Toggle file tree view | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` M `` | Open external merge tool (git mergetool) | | | `` M `` | Open external merge tool | Run `git mergetool`. |
| `` f `` | Fetch | | | `` f `` | Fetch | Fetch changes from remote. |
| `` / `` | Search the current view by text | | | `` / `` | Search the current view by text | |
## Local branches ## Local branches
@ -151,40 +153,40 @@ If you would instead like to start an interactive rebase from the selected commi
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy branch name to clipboard | | | `` <c-o> `` | Copy branch name to clipboard | |
| `` i `` | Show git-flow options | | | `` i `` | Show git-flow options | |
| `` <space> `` | Checkout | | | `` <space> `` | Checkout | Checkout selected item. |
| `` n `` | New branch | | | `` n `` | New branch | |
| `` o `` | Create pull request | | | `` o `` | Create pull request | |
| `` O `` | Create pull request options | | | `` O `` | View create pull request options | |
| `` <c-y> `` | Copy pull request URL to clipboard | | | `` <c-y> `` | Copy pull request URL to clipboard | |
| `` c `` | Checkout by name, enter '-' to switch to last | | | `` c `` | Checkout by name | Checkout by name. In the input box you can enter '-' to switch to the last branch. |
| `` F `` | Force checkout | | | `` F `` | Force checkout | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
| `` d `` | View delete options | | | `` d `` | Delete | View delete options for local/remote branch. |
| `` r `` | Rebase checked-out branch onto this branch | | | `` r `` | Rebase | Rebase the checked-out branch onto the selected branch. |
| `` M `` | Merge into currently checked out branch | | | `` M `` | Merge | Merge selected branch into currently checked out branch. |
| `` f `` | Fast-forward this branch from its upstream | | | `` f `` | Fast-forward | Fast-forward selected branch from its upstream. |
| `` T `` | Create tag | | | `` T `` | New tag | |
| `` s `` | Sort order | | | `` s `` | Sort order | |
| `` g `` | View reset options | | | `` g `` | Reset | |
| `` R `` | Rename branch | | | `` R `` | Rename branch | |
| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
| `` w `` | View worktree options | |
| `` <enter> `` | View commits | | | `` <enter> `` | View commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Main panel (merging) ## Main panel (merging)
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` e `` | Edit file | |
| `` o `` | Open file | |
| `` <left> `` | Select previous conflict | |
| `` <right> `` | Select next conflict | |
| `` <up> `` | Select previous hunk | |
| `` <down> `` | Select next hunk | |
| `` z `` | Undo | |
| `` M `` | Open external merge tool (git mergetool) | |
| `` <space> `` | Pick hunk | | | `` <space> `` | Pick hunk | |
| `` b `` | Pick all hunks | | | `` b `` | Pick all hunks | |
| `` <up> `` | Previous hunk | |
| `` <down> `` | Next hunk | |
| `` <left> `` | Previous conflict | |
| `` <right> `` | Next conflict | |
| `` z `` | Undo | Undo last merge conflict resolution. |
| `` e `` | Edit file | Open file in external editor. |
| `` o `` | Open file | Open file in default application. |
| `` M `` | Open external merge tool | Run `git mergetool`. |
| `` <esc> `` | Return to files panel | | | `` <esc> `` | Return to files panel | |
## Main panel (normal) ## Main panel (normal)
@ -198,14 +200,14 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <left> `` | Select previous hunk | | | `` <left> `` | Go to previous hunk | |
| `` <right> `` | Select next hunk | | | `` <right> `` | Go to next hunk | |
| `` v `` | Toggle range select | | | `` v `` | Toggle range select | |
| `` a `` | Toggle select hunk | | | `` a `` | Select hunk | Toggle hunk selection mode. |
| `` <c-o> `` | Copy the selected text to the clipboard | | | `` <c-o> `` | Copy selected text to clipboard | |
| `` o `` | Open file | | | `` o `` | Open file | Open file in default application. |
| `` e `` | Edit file | | | `` e `` | Edit file | Open file in external editor. |
| `` <space> `` | Add/Remove line(s) to patch | | | `` <space> `` | Toggle lines in patch | |
| `` <esc> `` | Exit custom patch builder | | | `` <esc> `` | Exit custom patch builder | |
| `` / `` | Search the current view by text | | | `` / `` | Search the current view by text | |
@ -213,19 +215,19 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <left> `` | Select previous hunk | | | `` <left> `` | Go to previous hunk | |
| `` <right> `` | Select next hunk | | | `` <right> `` | Go to next hunk | |
| `` v `` | Toggle range select | | | `` v `` | Toggle range select | |
| `` a `` | Toggle select hunk | | | `` a `` | Select hunk | Toggle hunk selection mode. |
| `` <c-o> `` | Copy the selected text to the clipboard | | | `` <c-o> `` | Copy selected text to clipboard | |
| `` o `` | Open file | | | `` <space> `` | Stage | Toggle selection staged / unstaged. |
| `` e `` | Edit file | | | `` d `` | Discard | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
| `` o `` | Open file | Open file in default application. |
| `` e `` | Edit file | Open file in external editor. |
| `` <esc> `` | Return to files panel | | | `` <esc> `` | Return to files panel | |
| `` <tab> `` | Switch to other panel (staged/unstaged changes) | | | `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
| `` <space> `` | Toggle line staged / unstaged | | | `` E `` | Edit hunk | Edit selected hunk in external editor. |
| `` d `` | Discard change (git reset) | | | `` c `` | Commit | Commit staged changes. |
| `` E `` | Edit hunk | |
| `` c `` | Commit changes | |
| `` w `` | Commit changes without pre-commit hook | | | `` w `` | Commit changes without pre-commit hook | |
| `` C `` | Commit changes using git editor | | | `` C `` | Commit changes using git editor | |
| `` / `` | Search the current view by text | | | `` / `` | Search the current view by text | |
@ -243,16 +245,16 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy commit SHA to clipboard | | | `` <c-o> `` | Copy commit SHA to clipboard | |
| `` w `` | View worktree options | | | `` <space> `` | Checkout | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | Checkout commit | | | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | Copy commit attribute | |
| `` o `` | Open commit in browser | | | `` o `` | Open commit in browser | |
| `` n `` | Create new branch off of commit | | | `` n `` | Create new branch off of commit | |
| `` g `` | View reset options | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | Copy commit (cherry-pick) | | | `` C `` | Copy (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | | | `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | View commits | | | `` <enter> `` | View commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Remote branches ## Remote branches
@ -260,47 +262,48 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy branch name to clipboard | | | `` <c-o> `` | Copy branch name to clipboard | |
| `` <space> `` | Checkout | | | `` <space> `` | Checkout | Checkout a new local branch based on the selected remote branch. The new branch will track the remote branch. |
| `` n `` | New branch | | | `` n `` | New branch | |
| `` M `` | Merge into currently checked out branch | | | `` M `` | Merge | Merge selected branch into currently checked out branch. |
| `` r `` | Rebase checked-out branch onto this branch | | | `` r `` | Rebase | Rebase the checked-out branch onto the selected branch. |
| `` d `` | Delete remote tag | | | `` d `` | Delete | Delete the remote branch from the remote. |
| `` u `` | Set as upstream of checked-out branch | | | `` u `` | Set as upstream | Set the selected remote branch as the upstream of the checked-out branch. |
| `` s `` | Sort order | | | `` s `` | Sort order | |
| `` g `` | View reset options | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | View commits | | | `` <enter> `` | View commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Remotes ## Remotes
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` f `` | Fetch remote | | | `` <enter> `` | View branches | |
| `` n `` | Add new remote | | | `` n `` | New remote | |
| `` d `` | Remove remote | | | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
| `` e `` | Edit remote | | | `` e `` | Edit | Edit the selected remote's name or URL. |
| `` f `` | Fetch | Fetch updates from the remote repository. This retrieves new commits and branches without merging them into your local branches. |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Stash ## Stash
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | Apply | | | `` <space> `` | Apply | Apply the stash entry to your working directory. |
| `` g `` | Pop | | | `` g `` | Pop | Apply the stash entry to your working directory and remove the stash entry. |
| `` d `` | Drop | | | `` d `` | Drop | Remove the stash entry from the stash list. |
| `` n `` | New branch | | | `` n `` | New branch | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
| `` r `` | Rename stash | | | `` r `` | Rename stash | |
| `` <enter> `` | View files | |
| `` w `` | View worktree options | | | `` w `` | View worktree options | |
| `` <enter> `` | View selected item's files | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Status ## Status
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` o `` | Open config file | | | `` o `` | Open config file | Open file in default application. |
| `` e `` | Edit config file | | | `` e `` | Edit config file | Open file in external editor. |
| `` u `` | Check for update | | | `` u `` | Check for update | |
| `` <enter> `` | Switch to a recent repo | | | `` <enter> `` | Switch to a recent repo | |
| `` a `` | Show all branch logs | | | `` a `` | Show all branch logs | |
@ -310,16 +313,16 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy commit SHA to clipboard | | | `` <c-o> `` | Copy commit SHA to clipboard | |
| `` w `` | View worktree options | | | `` <space> `` | Checkout | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | Checkout commit | | | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | Copy commit attribute | |
| `` o `` | Open commit in browser | | | `` o `` | Open commit in browser | |
| `` n `` | Create new branch off of commit | | | `` n `` | Create new branch off of commit | |
| `` g `` | View reset options | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | Copy commit (cherry-pick) | | | `` C `` | Copy (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | | | `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | View selected item's files | | | `` <enter> `` | View files | |
| `` w `` | View worktree options | |
| `` / `` | Search the current view by text | | | `` / `` | Search the current view by text | |
## Submodules ## Submodules
@ -327,13 +330,12 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy submodule name to clipboard | | | `` <c-o> `` | Copy submodule name to clipboard | |
| `` <enter> `` | Enter submodule | | | `` <enter> `` | Enter | Enter submodule. After entering the submodule, you can press `<esc>` to escape back to the parent repo. |
| `` <space> `` | Enter submodule | | | `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
| `` d `` | Remove submodule | | | `` u `` | Update | Update selected submodule. |
| `` u `` | Update submodule | | | `` n `` | New submodule | |
| `` n `` | Add new submodule | |
| `` e `` | Update submodule URL | | | `` e `` | Update submodule URL | |
| `` i `` | Initialize submodule | | | `` i `` | Initialize | Initialize the selected submodule to prepare for fetching. You probably want to follow this up by invoking the 'update' action to fetch the submodule. |
| `` b `` | View bulk submodule options | | | `` b `` | View bulk submodule options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
@ -341,22 +343,21 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | Checkout | | | `` <space> `` | Checkout | Checkout the selected tag tag as a detached HEAD. |
| `` d `` | View delete options | | | `` n `` | New tag | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
| `` P `` | Push tag | | | `` d `` | Delete | View delete options for local/remote tag. |
| `` n `` | Create tag | | | `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
| `` g `` | View reset options | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | View commits | | | `` <enter> `` | View commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Worktrees ## Worktrees
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` n `` | Create worktree | | | `` n `` | New worktree | |
| `` <space> `` | Switch to worktree | | | `` <space> `` | Switch | Switch to the selected worktree. |
| `` <enter> `` | Switch to worktree | |
| `` o `` | Open in editor | | | `` o `` | Open in editor | |
| `` d `` | Remove worktree | | | `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |

261
docs/keybindings/Keybindings_ja.md
View File

@ -11,24 +11,26 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| `` <c-r> `` | 最近使用したリポジトリに切り替え | | | `` <c-r> `` | 最近使用したリポジトリに切り替え | |
| `` <pgup> (fn+up/shift+k) `` | メインパネルを上にスクロール | | | `` <pgup> (fn+up/shift+k) `` | メインパネルを上にスクロール | |
| `` <pgdown> (fn+down/shift+j) `` | メインパネルを下にスクロール | | | `` <pgdown> (fn+down/shift+j) `` | メインパネルを下にスクロール | |
| `` @ `` | コマンドログメニューを開く | | | `` @ `` | コマンドログメニューを開く | View options for the command log e.g. show/hide the command log and focus the command log. |
| `` } `` | Increase the size of the context shown around changes in the diff view | | | `` P `` | Push | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` { `` | Decrease the size of the context shown around changes in the diff view | | | `` p `` | Pull | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` : `` | カスタムコマンドを実行 | | | `` } `` | Increase diff context size | Increase the amount of the context shown around changes in the diff view. |
| `` { `` | Decrease diff context size | Decrease the amount of the context shown around changes in the diff view. |
| `` : `` | カスタムコマンドを実行 | Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands. |
| `` <c-p> `` | View custom patch options | | | `` <c-p> `` | View custom patch options | |
| `` m `` | View merge/rebase options | | | `` m `` | View merge/rebase options | View options to abort/continue/skip the current merge/rebase. |
| `` R `` | リフレッシュ | | | `` R `` | リフレッシュ | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
| `` + `` | 次のスクリーンモード (normal/half/fullscreen) | | | `` + `` | 次のスクリーンモード (normal/half/fullscreen) | |
| `` _ `` | 前のスクリーンモード | | | `` _ `` | 前のスクリーンモード | |
| `` ? `` | メニューを開く | | | `` ? `` | メニューを開く | |
| `` <c-s> `` | View filter-by-path options | | | `` <c-s> `` | View filter-by-path options | View options for filtering the commit log by a file path, so that only commits relating to that path are shown. |
| `` W `` | 差分メニューを開く | | | `` W `` | 差分メニューを開く | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-e> `` | 差分メニューを開く | | | `` <c-e> `` | 差分メニューを開く | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-w> `` | 空白文字の差分の表示有無を切り替え | | | `` q `` | 終了 | |
| `` <esc> `` | キャンセル | |
| `` <c-w> `` | 空白文字の差分の表示有無を切り替え | Toggle whether or not whitespace changes are shown in the diff view. |
| `` z `` | アンドゥ (via reflog) (experimental) | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | `` z `` | アンドゥ (via reflog) (experimental) | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
| `` <c-z> `` | リドゥ (via reflog) (experimental) | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | `` <c-z> `` | リドゥ (via reflog) (experimental) | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
| `` P `` | Push | |
| `` p `` | Pull | |
## 一覧パネルの操作 ## 一覧パネルの操作
@ -51,13 +53,13 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | 適用 | | | `` <space> `` | 適用 | Apply the stash entry to your working directory. |
| `` g `` | Pop | | | `` g `` | Pop | Apply the stash entry to your working directory and remove the stash entry. |
| `` d `` | Drop | | | `` d `` | Drop | Remove the stash entry from the stash list. |
| `` n `` | 新しいブランチを作成 | | | `` n `` | 新しいブランチを作成 | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
| `` r `` | Stashを変更 | | | `` r `` | Stashを変更 | |
| `` <enter> `` | View files | |
| `` w `` | View worktree options | | | `` w `` | View worktree options | |
| `` <enter> `` | View selected item's files | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Sub-commits ## Sub-commits
@ -65,27 +67,26 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | コミットのSHAをクリップボードにコピー | | | `` <c-o> `` | コミットのSHAをクリップボードにコピー | |
| `` w `` | View worktree options | | | `` <space> `` | チェックアウト | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | コミットをチェックアウト | | | `` y `` | コミットの情報をコピー | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | コミットの情報をコピー | |
| `` o `` | ブラウザでコミットを開く | | | `` o `` | ブラウザでコミットを開く | |
| `` n `` | コミットにブランチを作成 | | | `` n `` | コミットにブランチを作成 | |
| `` g `` | View reset options | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | コミットをコピー (cherry-pick) | | | `` C `` | コミットをコピー (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | | | `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | View selected item's files | | | `` <enter> `` | View files | |
| `` w `` | View worktree options | |
| `` / `` | 検索を開始 | | | `` / `` | 検索を開始 | |
## Worktrees ## Worktrees
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` n `` | Create worktree | | | `` n `` | New worktree | |
| `` <space> `` | Switch to worktree | | | `` <space> `` | Switch | Switch to the selected worktree. |
| `` <enter> `` | Switch to worktree | |
| `` o `` | Open in editor | | | `` o `` | Open in editor | |
| `` d `` | Remove worktree | | | `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## コミット ## コミット
@ -93,53 +94,53 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | コミットのSHAをクリップボードにコピー | | | `` <c-o> `` | コミットのSHAをクリップボードにコピー | |
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | | | `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
| `` b `` | View bisect options | | | `` b `` | View bisect options | |
| `` s `` | Squash down | | | `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
| `` f `` | Fixup commit | | | `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded. |
| `` r `` | コミットメッセージを変更 | | | `` r `` | コミットメッセージを変更 | Reword the selected commit's message. |
| `` R `` | エディタでコミットメッセージを編集 | | | `` R `` | エディタでコミットメッセージを編集 | |
| `` d `` | コミットを削除 | | | `` d `` | コミットを削除 | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
| `` e `` | コミットを編集 | | | `` e `` | Edit (start interactive rebase) | コミットを編集 |
| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
If you would instead like to start an interactive rebase from the selected commit, press `e`. | If you would instead like to start an interactive rebase from the selected commit, press `e`. |
| `` p `` | Pick commit (when mid-rebase) | | | `` p `` | Pick | Mark the selected commit to be picked (when mid-rebase). This means that the commit will be retained upon continuing the rebase. |
| `` F `` | このコミットに対するfixupコミットを作成 | | | `` F `` | Create fixup commit | このコミットに対するfixupコミットを作成 |
| `` S `` | Squash all 'fixup!' commits above selected commit (autosquash) | | | `` S `` | Apply fixup commits | Squash all 'fixup!' commits above selected commit (autosquash). |
| `` <c-j> `` | コミットを1つ下に移動 | | | `` <c-j> `` | コミットを1つ下に移動 | |
| `` <c-k> `` | コミットを1つ上に移動 | | | `` <c-k> `` | コミットを1つ上に移動 | |
| `` V `` | コミットを貼り付け (cherry-pick) | | | `` V `` | コミットを貼り付け (cherry-pick) | |
| `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
| `` A `` | ステージされた変更でamendコミット | | | `` A `` | Amend | ステージされた変更でamendコミット |
| `` a `` | Set/Reset commit author | | | `` a `` | Amend commit attribute | Set/Reset commit author or set co-author. |
| `` t `` | コミットをrevert | | | `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
| `` T `` | タグを作成 | | | `` T `` | タグを作成 | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
| `` <c-l> `` | ログメニューを開く | | | `` <c-l> `` | ログメニューを開く | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
| `` w `` | View worktree options | | | `` <space> `` | チェックアウト | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | コミットをチェックアウト | | | `` y `` | コミットの情報をコピー | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | コミットの情報をコピー | |
| `` o `` | ブラウザでコミットを開く | | | `` o `` | ブラウザでコミットを開く | |
| `` n `` | コミットにブランチを作成 | | | `` n `` | コミットにブランチを作成 | |
| `` g `` | View reset options | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | コミットをコピー (cherry-pick) | | | `` C `` | コミットをコピー (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | View selected item's files | | | `` <enter> `` | View files | |
| `` w `` | View worktree options | |
| `` / `` | 検索を開始 | | | `` / `` | 検索を開始 | |
## コミットファイル ## コミットファイル
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | コミットされたファイル名をクリップボードにコピー | | | `` <c-o> `` | ファイル名をクリップボードにコピー | |
| `` c `` | Checkout file | | | `` c `` | チェックアウト | Checkout file. This replaces the file in your working tree with the version from the selected commit. |
| `` d `` | Discard this commit's changes to this file | | | `` d `` | Remove | Discard this commit's changes to this file. This runs an interactive rebase in the background, so you may get a merge conflict if a later commit also changes this file. |
| `` o `` | ファイルを開く | | | `` o `` | ファイルを開く | Open file in default application. |
| `` e `` | ファイルを編集 | | | `` e `` | Edit | Open file in external editor. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <space> `` | Toggle file included in patch | | | `` <space> `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` a `` | Toggle all files included in patch | | | `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | | | `` <enter> `` | Enter file / Toggle directory collapsed | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
| `` ` `` | ファイルツリーの表示を切り替え | | | `` ` `` | ファイルツリーの表示を切り替え | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` / `` | 検索を開始 | | | `` / `` | 検索を開始 | |
## コミットメッセージ ## コミットメッセージ
@ -154,13 +155,12 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | サブモジュール名をクリップボードにコピー | | | `` <c-o> `` | サブモジュール名をクリップボードにコピー | |
| `` <enter> `` | サブモジュールを開く | | | `` <enter> `` | Enter | サブモジュールを開く |
| `` <space> `` | サブモジュールを開く | | | `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
| `` d `` | サブモジュールを削除 | | | `` u `` | Update | サブモジュールを更新 |
| `` u `` | サブモジュールを更新 | |
| `` n `` | サブモジュールを新規追加 | | | `` n `` | サブモジュールを新規追加 | |
| `` e `` | サブモジュールのURLを更新 | | | `` e `` | サブモジュールのURLを更新 | |
| `` i `` | サブモジュールを初期化 | | | `` i `` | Initialize | サブモジュールを初期化 |
| `` b `` | View bulk submodule options | | | `` b `` | View bulk submodule options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
@ -168,8 +168,8 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` o `` | 設定ファイルを開く | | | `` o `` | 設定ファイルを開く | Open file in default application. |
| `` e `` | 設定ファイルを編集 | | | `` e `` | 設定ファイルを編集 | Open file in external editor. |
| `` u `` | 更新を確認 | | | `` u `` | 更新を確認 | |
| `` <enter> `` | 最近使用したリポジトリに切り替え | | | `` <enter> `` | 最近使用したリポジトリに切り替え | |
| `` a `` | すべてのブランチログを表示 | | | `` a `` | すべてのブランチログを表示 | |
@ -178,13 +178,13 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | チェックアウト | | | `` <space> `` | チェックアウト | Checkout the selected tag tag as a detached HEAD. |
| `` d `` | View delete options | | | `` n `` | タグを作成 | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
| `` P `` | タグをpush | | | `` d `` | Delete | View delete options for local/remote tag. |
| `` n `` | タグを作成 | | | `` P `` | タグをpush | Push the selected tag to a remote. You'll be prompted to select a remote. |
| `` g `` | View reset options | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | コミットを閲覧 | | | `` <enter> `` | コミットを閲覧 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## ファイル ## ファイル
@ -192,29 +192,29 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | ファイル名をクリップボードにコピー | | | `` <c-o> `` | ファイル名をクリップボードにコピー | |
| `` <space> `` | ステージ/アンステージ | | | `` <space> `` | ステージ/アンステージ | Toggle staged for selected file. |
| `` <c-b> `` | ファイルをフィルタ (ステージ/アンステージ) | | | `` <c-b> `` | ファイルをフィルタ (ステージ/アンステージ) | |
| `` y `` | Copy to clipboard | | | `` y `` | Copy to clipboard | |
| `` c `` | 変更をコミット | | | `` c `` | 変更をコミット | Commit staged changes. |
| `` w `` | pre-commitフックを実行せずに変更をコミット | | | `` w `` | pre-commitフックを実行せずに変更をコミット | |
| `` A `` | 最新のコミットにamend | | | `` A `` | 最新のコミットにamend | |
| `` C `` | gitエディタを使用して変更をコミット | | | `` C `` | gitエディタを使用して変更をコミット | |
| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
| `` e `` | ファイルを編集 | | | `` e `` | Edit | Open file in external editor. |
| `` o `` | ファイルを開く | | | `` o `` | ファイルを開く | Open file in default application. |
| `` i `` | ファイルをignore | | | `` i `` | ファイルをignore | |
| `` r `` | ファイルをリフレッシュ | | | `` r `` | ファイルをリフレッシュ | |
| `` s `` | 変更をstash | | | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
| `` S `` | View stash options | | | `` S `` | View stash options | View stash options (e.g. stash all, stash staged, stash unstaged). |
| `` a `` | すべての変更をステージ/アンステージ | | | `` a `` | すべての変更をステージ/アンステージ | Toggle staged/unstaged for all files in working tree. |
| `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory | | | `` <enter> `` | Stage lines / Collapse directory | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
| `` d `` | View 'discard changes' options | | | `` d `` | Discard | View options for discarding changes to the selected file. |
| `` g `` | View upstream reset options | | | `` g `` | View upstream reset options | |
| `` D `` | View reset options | | | `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
| `` ` `` | ファイルツリーの表示を切り替え | | | `` ` `` | ファイルツリーの表示を切り替え | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` M `` | Git mergetoolを開く | | | `` M `` | Git mergetoolを開く | Run `git mergetool`. |
| `` f `` | Fetch | | | `` f `` | Fetch | Fetch changes from remote. |
| `` / `` | 検索を開始 | | | `` / `` | 検索を開始 | |
## ブランチ ## ブランチ
@ -223,40 +223,40 @@ If you would instead like to start an interactive rebase from the selected commi
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | ブランチ名をクリップボードにコピー | | | `` <c-o> `` | ブランチ名をクリップボードにコピー | |
| `` i `` | Show git-flow options | | | `` i `` | Show git-flow options | |
| `` <space> `` | チェックアウト | | | `` <space> `` | チェックアウト | Checkout selected item. |
| `` n `` | 新しいブランチを作成 | | | `` n `` | 新しいブランチを作成 | |
| `` o `` | Pull Requestを作成 | | | `` o `` | Pull Requestを作成 | |
| `` O `` | Create pull request options | | | `` O `` | View create pull request options | |
| `` <c-y> `` | Pull RequestのURLをクリップボードにコピー | | | `` <c-y> `` | Pull RequestのURLをクリップボードにコピー | |
| `` c `` | Checkout by name, enter '-' to switch to last | | | `` c `` | Checkout by name | Checkout by name. In the input box you can enter '-' to switch to the last branch. |
| `` F `` | Force checkout | | | `` F `` | Force checkout | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
| `` d `` | View delete options | | | `` d `` | Delete | View delete options for local/remote branch. |
| `` r `` | Rebase checked-out branch onto this branch | | | `` r `` | Rebase | Rebase the checked-out branch onto the selected branch. |
| `` M `` | 現在のブランチにマージ | | | `` M `` | 現在のブランチにマージ | Merge selected branch into currently checked out branch. |
| `` f `` | Fast-forward this branch from its upstream | | | `` f `` | Fast-forward | Fast-forward selected branch from its upstream. |
| `` T `` | タグを作成 | | | `` T `` | タグを作成 | |
| `` s `` | 並び替え | | | `` s `` | 並び替え | |
| `` g `` | View reset options | | | `` g `` | Reset | |
| `` R `` | ブランチ名を変更 | | | `` R `` | ブランチ名を変更 | |
| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
| `` w `` | View worktree options | |
| `` <enter> `` | コミットを閲覧 | | | `` <enter> `` | コミットを閲覧 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## メインパネル (Merging) ## メインパネル (Merging)
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` e `` | ファイルを編集 | |
| `` o `` | ファイルを開く | |
| `` <left> `` | 前のコンフリクトを選択 | |
| `` <right> `` | 次のコンフリクトを選択 | |
| `` <up> `` | 前のhunkを選択 | |
| `` <down> `` | 次のhunkを選択 | |
| `` z `` | アンドゥ | |
| `` M `` | Git mergetoolを開く | |
| `` <space> `` | Pick hunk | | | `` <space> `` | Pick hunk | |
| `` b `` | Pick all hunks | | | `` b `` | Pick all hunks | |
| `` <up> `` | 前のhunkを選択 | |
| `` <down> `` | 次のhunkを選択 | |
| `` <left> `` | 前のコンフリクトを選択 | |
| `` <right> `` | 次のコンフリクトを選択 | |
| `` z `` | アンドゥ | Undo last merge conflict resolution. |
| `` e `` | ファイルを編集 | Open file in external editor. |
| `` o `` | ファイルを開く | Open file in default application. |
| `` M `` | Git mergetoolを開く | Run `git mergetool`. |
| `` <esc> `` | ファイル一覧に戻る | | | `` <esc> `` | ファイル一覧に戻る | |
## メインパネル (Normal) ## メインパネル (Normal)
@ -273,10 +273,10 @@ If you would instead like to start an interactive rebase from the selected commi
| `` <left> `` | 前のhunkを選択 | | | `` <left> `` | 前のhunkを選択 | |
| `` <right> `` | 次のhunkを選択 | | | `` <right> `` | 次のhunkを選択 | |
| `` v `` | 範囲選択を切り替え | | | `` v `` | 範囲選択を切り替え | |
| `` a `` | Hunk選択を切り替え | | | `` a `` | Hunk選択を切り替え | Toggle hunk selection mode. |
| `` <c-o> `` | 選択されたテキストをクリップボードにコピー | | | `` <c-o> `` | 選択されたテキストをクリップボードにコピー | |
| `` o `` | ファイルを開く | | | `` o `` | ファイルを開く | Open file in default application. |
| `` e `` | ファイルを編集 | | | `` e `` | ファイルを編集 | Open file in external editor. |
| `` <space> `` | 行をパッチに追加/削除 | | | `` <space> `` | 行をパッチに追加/削除 | |
| `` <esc> `` | Exit custom patch builder | | | `` <esc> `` | Exit custom patch builder | |
| `` / `` | 検索を開始 | | | `` / `` | 検索を開始 | |
@ -288,16 +288,16 @@ If you would instead like to start an interactive rebase from the selected commi
| `` <left> `` | 前のhunkを選択 | | | `` <left> `` | 前のhunkを選択 | |
| `` <right> `` | 次のhunkを選択 | | | `` <right> `` | 次のhunkを選択 | |
| `` v `` | 範囲選択を切り替え | | | `` v `` | 範囲選択を切り替え | |
| `` a `` | Hunk選択を切り替え | | | `` a `` | Hunk選択を切り替え | Toggle hunk selection mode. |
| `` <c-o> `` | 選択されたテキストをクリップボードにコピー | | | `` <c-o> `` | 選択されたテキストをクリップボードにコピー | |
| `` o `` | ファイルを開く | | | `` <space> `` | ステージ/アンステージ | 選択行をステージ/アンステージ |
| `` e `` | ファイルを編集 | | | `` d `` | 変更を削除 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
| `` o `` | ファイルを開く | Open file in default application. |
| `` e `` | ファイルを編集 | Open file in external editor. |
| `` <esc> `` | ファイル一覧に戻る | | | `` <esc> `` | ファイル一覧に戻る | |
| `` <tab> `` | パネルを切り替え | | | `` <tab> `` | パネルを切り替え | Switch to other view (staged/unstaged changes). |
| `` <space> `` | 選択行をステージ/アンステージ | | | `` E `` | Edit hunk | Edit selected hunk in external editor. |
| `` d `` | 変更を削除 (git reset) | | | `` c `` | 変更をコミット | Commit staged changes. |
| `` E `` | Edit hunk | |
| `` c `` | 変更をコミット | |
| `` w `` | pre-commitフックを実行せずに変更をコミット | | | `` w `` | pre-commitフックを実行せずに変更をコミット | |
| `` C `` | gitエディタを使用して変更をコミット | | | `` C `` | gitエディタを使用して変更をコミット | |
| `` / `` | 検索を開始 | | | `` / `` | 検索を開始 | |
@ -314,10 +314,11 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` f `` | リモートをfetch | | | `` <enter> `` | View branches | |
| `` n `` | リモートを新規追加 | | | `` n `` | リモートを新規追加 | |
| `` d `` | リモートを削除 | | | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
| `` e `` | リモートを編集 | | | `` e `` | Edit | リモートを編集 |
| `` f `` | Fetch | リモートをfetch |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## リモートブランチ ## リモートブランチ
@ -325,16 +326,16 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | ブランチ名をクリップボードにコピー | | | `` <c-o> `` | ブランチ名をクリップボードにコピー | |
| `` <space> `` | チェックアウト | | | `` <space> `` | チェックアウト | Checkout a new local branch based on the selected remote branch. The new branch will track the remote branch. |
| `` n `` | 新しいブランチを作成 | | | `` n `` | 新しいブランチを作成 | |
| `` M `` | 現在のブランチにマージ | | | `` M `` | 現在のブランチにマージ | Merge selected branch into currently checked out branch. |
| `` r `` | Rebase checked-out branch onto this branch | | | `` r `` | Rebase | Rebase the checked-out branch onto the selected branch. |
| `` d `` | Delete remote tag | | | `` d `` | Delete | Delete the remote branch from the remote. |
| `` u `` | Set as upstream of checked-out branch | | | `` u `` | Set as upstream | Set the selected remote branch as the upstream of the checked-out branch. |
| `` s `` | 並び替え | | | `` s `` | 並び替え | |
| `` g `` | View reset options | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | コミットを閲覧 | | | `` <enter> `` | コミットを閲覧 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 参照ログ ## 参照ログ
@ -342,16 +343,16 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | コミットのSHAをクリップボードにコピー | | | `` <c-o> `` | コミットのSHAをクリップボードにコピー | |
| `` w `` | View worktree options | | | `` <space> `` | チェックアウト | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | コミットをチェックアウト | | | `` y `` | コミットの情報をコピー | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | コミットの情報をコピー | |
| `` o `` | ブラウザでコミットを開く | | | `` o `` | ブラウザでコミットを開く | |
| `` n `` | コミットにブランチを作成 | | | `` n `` | コミットにブランチを作成 | |
| `` g `` | View reset options | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | コミットをコピー (cherry-pick) | | | `` C `` | コミットをコピー (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | | | `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | コミットを閲覧 | | | `` <enter> `` | コミットを閲覧 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 確認パネル ## 確認パネル

247
docs/keybindings/Keybindings_ko.md
View File

@ -11,24 +11,26 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| `` <c-r> `` | 최근에 사용한 저장소로 전환 | | | `` <c-r> `` | 최근에 사용한 저장소로 전환 | |
| `` <pgup> (fn+up/shift+k) `` | 메인 패널을 위로 스크롤 | | | `` <pgup> (fn+up/shift+k) `` | 메인 패널을 위로 스크롤 | |
| `` <pgdown> (fn+down/shift+j) `` | 메인 패널을 아래로로 스크롤 | | | `` <pgdown> (fn+down/shift+j) `` | 메인 패널을 아래로로 스크롤 | |
| `` @ `` | 명령어 로그 메뉴 열기 | | | `` @ `` | 명령어 로그 메뉴 열기 | View options for the command log e.g. show/hide the command log and focus the command log. |
| `` } `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기 | | | `` P `` | 푸시 | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` { `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기 | | | `` p `` | 업데이트 | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` : `` | Execute custom command | | | `` } `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기 | Increase the amount of the context shown around changes in the diff view. |
| `` { `` | Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기 | Decrease the amount of the context shown around changes in the diff view. |
| `` : `` | Execute custom command | Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands. |
| `` <c-p> `` | 커스텀 Patch 옵션 보기 | | | `` <c-p> `` | 커스텀 Patch 옵션 보기 | |
| `` m `` | View merge/rebase options | | | `` m `` | View merge/rebase options | View options to abort/continue/skip the current merge/rebase. |
| `` R `` | 새로고침 | | | `` R `` | 새로고침 | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
| `` + `` | 다음 스크린 모드 (normal/half/fullscreen) | | | `` + `` | 다음 스크린 모드 (normal/half/fullscreen) | |
| `` _ `` | 이전 스크린 모드 | | | `` _ `` | 이전 스크린 모드 | |
| `` ? `` | 매뉴 열기 | | | `` ? `` | 매뉴 열기 | |
| `` <c-s> `` | View filter-by-path options | | | `` <c-s> `` | View filter-by-path options | View options for filtering the commit log by a file path, so that only commits relating to that path are shown. |
| `` W `` | Diff 메뉴 열기 | | | `` W `` | Diff 메뉴 열기 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-e> `` | Diff 메뉴 열기 | | | `` <c-e> `` | Diff 메뉴 열기 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-w> `` | 공백문자를 Diff 뷰에서 표시 여부 전환 | | | `` q `` | 종료 | |
| `` <esc> `` | 취소 | |
| `` <c-w> `` | 공백문자를 Diff 뷰에서 표시 여부 전환 | Toggle whether or not whitespace changes are shown in the diff view. |
| `` z `` | 되돌리기 (reflog) (실험적) | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | `` z `` | 되돌리기 (reflog) (실험적) | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
| `` <c-z> `` | 다시 실행 (reflog) (실험적) | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | `` <c-z> `` | 다시 실행 (reflog) (실험적) | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
| `` P `` | 푸시 | |
| `` p `` | 업데이트 | |
## List panel navigation ## List panel navigation
@ -52,29 +54,29 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 커밋 SHA를 클립보드에 복사 | | | `` <c-o> `` | 커밋 SHA를 클립보드에 복사 | |
| `` w `` | View worktree options | | | `` <space> `` | 체크아웃 | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | 커밋을 체크아웃 | | | `` y `` | 커밋 attribute 복사 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | 커밋 attribute 복사 | |
| `` o `` | 브라우저에서 커밋 열기 | | | `` o `` | 브라우저에서 커밋 열기 | |
| `` n `` | 커밋에서 새 브랜치를 만듭니다. | | | `` n `` | 커밋에서 새 브랜치를 만듭니다. | |
| `` g `` | View reset options | | | `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | 커밋을 복사 (cherry-pick) | | | `` C `` | 커밋을 복사 (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | | | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | 커밋 보기 | | | `` <enter> `` | 커밋 보기 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Stash ## Stash
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | 적용 | | | `` <space> `` | 적용 | Apply the stash entry to your working directory. |
| `` g `` | Pop | | | `` g `` | Pop | Apply the stash entry to your working directory and remove the stash entry. |
| `` d `` | Drop | | | `` d `` | Drop | Remove the stash entry from the stash list. |
| `` n `` | 새 브랜치 생성 | | | `` n `` | 새 브랜치 생성 | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
| `` r `` | Rename stash | | | `` r `` | Rename stash | |
| `` w `` | View worktree options | |
| `` <enter> `` | View selected item's files | | | `` <enter> `` | View selected item's files | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Sub-commits ## Sub-commits
@ -82,27 +84,26 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 커밋 SHA를 클립보드에 복사 | | | `` <c-o> `` | 커밋 SHA를 클립보드에 복사 | |
| `` w `` | View worktree options | | | `` <space> `` | 체크아웃 | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | 커밋을 체크아웃 | | | `` y `` | 커밋 attribute 복사 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | 커밋 attribute 복사 | |
| `` o `` | 브라우저에서 커밋 열기 | | | `` o `` | 브라우저에서 커밋 열기 | |
| `` n `` | 커밋에서 새 브랜치를 만듭니다. | | | `` n `` | 커밋에서 새 브랜치를 만듭니다. | |
| `` g `` | View reset options | | | `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | 커밋을 복사 (cherry-pick) | | | `` C `` | 커밋을 복사 (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | | | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | View selected item's files | | | `` <enter> `` | View selected item's files | |
| `` w `` | View worktree options | |
| `` / `` | 검색 시작 | | | `` / `` | 검색 시작 | |
## Worktrees ## Worktrees
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` n `` | Create worktree | | | `` n `` | New worktree | |
| `` <space> `` | Switch to worktree | | | `` <space> `` | Switch | Switch to the selected worktree. |
| `` <enter> `` | Switch to worktree | |
| `` o `` | Open in editor | | | `` o `` | Open in editor | |
| `` d `` | Remove worktree | | | `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 메뉴 ## 메뉴
@ -117,16 +118,16 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` e `` | 파일 편집 | |
| `` o `` | 파일 닫기 | |
| `` <left> `` | 이전 충돌을 선택 | |
| `` <right> `` | 다음 충돌을 선택 | |
| `` <up> `` | 이전 hunk를 선택 | |
| `` <down> `` | 다음 hunk를 선택 | |
| `` z `` | 되돌리기 | |
| `` M `` | Git mergetool를 열기 | |
| `` <space> `` | Pick hunk | | | `` <space> `` | Pick hunk | |
| `` b `` | Pick all hunks | | | `` b `` | Pick all hunks | |
| `` <up> `` | 이전 hunk를 선택 | |
| `` <down> `` | 다음 hunk를 선택 | |
| `` <left> `` | 이전 충돌을 선택 | |
| `` <right> `` | 다음 충돌을 선택 | |
| `` z `` | 되돌리기 | Undo last merge conflict resolution. |
| `` e `` | 파일 편집 | Open file in external editor. |
| `` o `` | 파일 닫기 | Open file in default application. |
| `` M `` | Git mergetool를 열기 | Run `git mergetool`. |
| `` <esc> `` | 파일 목록으로 돌아가기 | | | `` <esc> `` | 파일 목록으로 돌아가기 | |
## 메인 패널 (Normal) ## 메인 패널 (Normal)
@ -143,10 +144,10 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| `` <left> `` | 이전 hunk를 선택 | | | `` <left> `` | 이전 hunk를 선택 | |
| `` <right> `` | 다음 hunk를 선택 | | | `` <right> `` | 다음 hunk를 선택 | |
| `` v `` | 드래그 선택 전환 | | | `` v `` | 드래그 선택 전환 | |
| `` a `` | Toggle select hunk | | | `` a `` | Toggle select hunk | Toggle hunk selection mode. |
| `` <c-o> `` | 선택한 텍스트를 클립보드에 복사 | | | `` <c-o> `` | 선택한 텍스트를 클립보드에 복사 | |
| `` o `` | 파일 닫기 | | | `` o `` | 파일 닫기 | Open file in default application. |
| `` e `` | 파일 편집 | | | `` e `` | 파일 편집 | Open file in external editor. |
| `` <space> `` | Line(s)을 패치에 추가/삭제 | | | `` <space> `` | Line(s)을 패치에 추가/삭제 | |
| `` <esc> `` | Exit custom patch builder | | | `` <esc> `` | Exit custom patch builder | |
| `` / `` | 검색 시작 | | | `` / `` | 검색 시작 | |
@ -158,16 +159,16 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| `` <left> `` | 이전 hunk를 선택 | | | `` <left> `` | 이전 hunk를 선택 | |
| `` <right> `` | 다음 hunk를 선택 | | | `` <right> `` | 다음 hunk를 선택 | |
| `` v `` | 드래그 선택 전환 | | | `` v `` | 드래그 선택 전환 | |
| `` a `` | Toggle select hunk | | | `` a `` | Toggle select hunk | Toggle hunk selection mode. |
| `` <c-o> `` | 선택한 텍스트를 클립보드에 복사 | | | `` <c-o> `` | 선택한 텍스트를 클립보드에 복사 | |
| `` o `` | 파일 닫기 | | | `` <space> `` | Staged 전환 | 선택한 행을 staged / unstaged |
| `` e `` | 파일 편집 | | | `` d `` | 변경을 삭제 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
| `` o `` | 파일 닫기 | Open file in default application. |
| `` e `` | 파일 편집 | Open file in external editor. |
| `` <esc> `` | 파일 목록으로 돌아가기 | | | `` <esc> `` | 파일 목록으로 돌아가기 | |
| `` <tab> `` | 패널 전환 | | | `` <tab> `` | 패널 전환 | Switch to other view (staged/unstaged changes). |
| `` <space> `` | 선택한 행을 staged / unstaged | | | `` E `` | Edit hunk | Edit selected hunk in external editor. |
| `` d `` | 변경을 삭제 (git reset) | | | `` c `` | 커밋 변경내용 | Commit staged changes. |
| `` E `` | Edit hunk | |
| `` c `` | 커밋 변경내용 | |
| `` w `` | Commit changes without pre-commit hook | | | `` w `` | Commit changes without pre-commit hook | |
| `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. | | | `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. | |
| `` / `` | 검색 시작 | | | `` / `` | 검색 시작 | |
@ -178,32 +179,32 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 브랜치명을 클립보드에 복사 | | | `` <c-o> `` | 브랜치명을 클립보드에 복사 | |
| `` i `` | Git-flow 옵션 보기 | | | `` i `` | Git-flow 옵션 보기 | |
| `` <space> `` | 체크아웃 | | | `` <space> `` | 체크아웃 | Checkout selected item. |
| `` n `` | 새 브랜치 생성 | | | `` n `` | 새 브랜치 생성 | |
| `` o `` | 풀 리퀘스트 생성 | | | `` o `` | 풀 리퀘스트 생성 | |
| `` O `` | 풀 리퀘스트 생성 옵션 | | | `` O `` | 풀 리퀘스트 생성 옵션 | |
| `` <c-y> `` | 풀 리퀘스트 URL을 클립보드에 복사 | | | `` <c-y> `` | 풀 리퀘스트 URL을 클립보드에 복사 | |
| `` c `` | 이름으로 체크아웃 | | | `` c `` | 이름으로 체크아웃 | Checkout by name. In the input box you can enter '-' to switch to the last branch. |
| `` F `` | 강제 체크아웃 | | | `` F `` | 강제 체크아웃 | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
| `` d `` | View delete options | | | `` d `` | Delete | View delete options for local/remote branch. |
| `` r `` | 체크아웃된 브랜치를 이 브랜치에 리베이스 | | | `` r `` | 체크아웃된 브랜치를 이 브랜치에 리베이스 | Rebase the checked-out branch onto the selected branch. |
| `` M `` | 현재 브랜치에 병합 | | | `` M `` | 현재 브랜치에 병합 | Merge selected branch into currently checked out branch. |
| `` f `` | Fast-forward this branch from its upstream | | | `` f `` | Fast-forward this branch from its upstream | Fast-forward selected branch from its upstream. |
| `` T `` | 태그를 생성 | | | `` T `` | 태그를 생성 | |
| `` s `` | Sort order | | | `` s `` | Sort order | |
| `` g `` | View reset options | | | `` g `` | View reset options | |
| `` R `` | 브랜치 이름 변경 | | | `` R `` | 브랜치 이름 변경 | |
| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
| `` w `` | View worktree options | |
| `` <enter> `` | 커밋 보기 | | | `` <enter> `` | 커밋 보기 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 상태 ## 상태
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` o `` | 설정 파일 열기 | | | `` o `` | 설정 파일 열기 | Open file in default application. |
| `` e `` | 설정 파일 수정 | | | `` e `` | 설정 파일 수정 | Open file in external editor. |
| `` u `` | 업데이트 확인 | | | `` u `` | 업데이트 확인 | |
| `` <enter> `` | 최근에 사용한 저장소로 전환 | | | `` <enter> `` | 최근에 사용한 저장소로 전환 | |
| `` a `` | 모든 브랜치 로그 표시 | | | `` a `` | 모든 브랜치 로그 표시 | |
@ -213,13 +214,12 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 서브모듈 이름을 클립보드에 복사 | | | `` <c-o> `` | 서브모듈 이름을 클립보드에 복사 | |
| `` <enter> `` | 서브모듈 열기 | | | `` <enter> `` | Enter | 서브모듈 열기 |
| `` <space> `` | 서브모듈 열기 | | | `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
| `` d `` | 서브모듈 삭제 | | | `` u `` | Update | 서브모듈 업데이트 |
| `` u `` | 서브모듈 업데이트 | |
| `` n `` | 새로운 서브모듈 추가 | | | `` n `` | 새로운 서브모듈 추가 | |
| `` e `` | 서브모듈의 URL을 수정 | | | `` e `` | 서브모듈의 URL을 수정 | |
| `` i `` | 서브모듈 초기화 | | | `` i `` | Initialize | 서브모듈 초기화 |
| `` b `` | View bulk submodule options | | | `` b `` | View bulk submodule options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
@ -227,10 +227,11 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` f `` | 원격을 업데이트 | | | `` <enter> `` | View branches | |
| `` n `` | 새로운 Remote 추가 | | | `` n `` | 새로운 Remote 추가 | |
| `` d `` | Remote를 삭제 | | | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
| `` e `` | Remote를 수정 | | | `` e `` | Edit | Remote를 수정 |
| `` f `` | Fetch | 원격을 업데이트 |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 원격 브랜치 ## 원격 브랜치
@ -238,16 +239,16 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 브랜치명을 클립보드에 복사 | | | `` <c-o> `` | 브랜치명을 클립보드에 복사 | |
| `` <space> `` | 체크아웃 | | | `` <space> `` | 체크아웃 | Checkout a new local branch based on the selected remote branch. The new branch will track the remote branch. |
| `` n `` | 새 브랜치 생성 | | | `` n `` | 새 브랜치 생성 | |
| `` M `` | 현재 브랜치에 병합 | | | `` M `` | 현재 브랜치에 병합 | Merge selected branch into currently checked out branch. |
| `` r `` | 체크아웃된 브랜치를 이 브랜치에 리베이스 | | | `` r `` | 체크아웃된 브랜치를 이 브랜치에 리베이스 | Rebase the checked-out branch onto the selected branch. |
| `` d `` | Delete remote tag | | | `` d `` | Delete | Delete the remote branch from the remote. |
| `` u `` | Set as upstream of checked-out branch | | | `` u `` | Set as upstream | Set the selected remote branch as the upstream of the checked-out branch. |
| `` s `` | Sort order | | | `` s `` | Sort order | |
| `` g `` | View reset options | | | `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | 커밋 보기 | | | `` <enter> `` | 커밋 보기 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 커밋 ## 커밋
@ -257,51 +258,51 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| `` <c-o> `` | 커밋 SHA를 클립보드에 복사 | | | `` <c-o> `` | 커밋 SHA를 클립보드에 복사 | |
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | | | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
| `` b `` | Bisect 옵션 보기 | | | `` b `` | Bisect 옵션 보기 | |
| `` s `` | Squash down | | | `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
| `` f `` | Fixup commit | | | `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded. |
| `` r `` | 커밋메시지 변경 | | | `` r `` | 커밋메시지 변경 | Reword the selected commit's message. |
| `` R `` | 에디터에서 커밋메시지 수정 | | | `` R `` | 에디터에서 커밋메시지 수정 | |
| `` d `` | 커밋 삭제 | | | `` d `` | 커밋 삭제 | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
| `` e `` | 커밋을 편집 | | | `` e `` | Edit (start interactive rebase) | 커밋을 편집 |
| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
If you would instead like to start an interactive rebase from the selected commit, press `e`. | If you would instead like to start an interactive rebase from the selected commit, press `e`. |
| `` p `` | Pick commit (when mid-rebase) | | | `` p `` | Pick | Pick commit (when mid-rebase) |
| `` F `` | Create fixup commit for this commit | | | `` F `` | Create fixup commit | Create fixup commit for this commit |
| `` S `` | Squash all 'fixup!' commits above selected commit (autosquash) | | | `` S `` | Apply fixup commits | Squash all 'fixup!' commits above selected commit (autosquash) |
| `` <c-j> `` | 커밋을 1개 아래로 이동 | | | `` <c-j> `` | 커밋을 1개 아래로 이동 | |
| `` <c-k> `` | 커밋을 1개 위로 이동 | | | `` <c-k> `` | 커밋을 1개 위로 이동 | |
| `` V `` | 커밋을 붙여넣기 (cherry-pick) | | | `` V `` | 커밋을 붙여넣기 (cherry-pick) | |
| `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
| `` A `` | Amend commit with staged changes | | | `` A `` | Amend | Amend commit with staged changes |
| `` a `` | Set/Reset commit author | | | `` a `` | Amend commit attribute | Set/Reset commit author or set co-author. |
| `` t `` | 커밋 되돌리기 | | | `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
| `` T `` | Tag commit | | | `` T `` | Tag commit | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
| `` <c-l> `` | 로그 메뉴 열기 | | | `` <c-l> `` | 로그 메뉴 열기 | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
| `` w `` | View worktree options | | | `` <space> `` | 체크아웃 | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | 커밋을 체크아웃 | | | `` y `` | 커밋 attribute 복사 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | 커밋 attribute 복사 | |
| `` o `` | 브라우저에서 커밋 열기 | | | `` o `` | 브라우저에서 커밋 열기 | |
| `` n `` | 커밋에서 새 브랜치를 만듭니다. | | | `` n `` | 커밋에서 새 브랜치를 만듭니다. | |
| `` g `` | View reset options | | | `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | 커밋을 복사 (cherry-pick) | | | `` C `` | 커밋을 복사 (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | View selected item's files | | | `` <enter> `` | View selected item's files | |
| `` w `` | View worktree options | |
| `` / `` | 검색 시작 | | | `` / `` | 검색 시작 | |
## 커밋 파일 ## 커밋 파일
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 커밋한 파일명을 클립보드에 복사 | | | `` <c-o> `` | 파일명을 클립보드에 복사 | |
| `` c `` | Checkout file | | | `` c `` | 체크아웃 | Checkout file |
| `` d `` | Discard this commit's changes to this file | | | `` d `` | Remove | Discard this commit's changes to this file |
| `` o `` | 파일 닫기 | | | `` o `` | 파일 닫기 | Open file in default application. |
| `` e `` | 파일 편집 | | | `` e `` | Edit | Open file in external editor. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <space> `` | Toggle file included in patch | | | `` <space> `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` a `` | Toggle all files included in patch | | | `` a `` | Toggle all files included in patch | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | | | `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
| `` ` `` | 파일 트리뷰로 전환 | | | `` ` `` | 파일 트리뷰로 전환 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` / `` | 검색 시작 | | | `` / `` | 검색 시작 | |
## 커밋메시지 ## 커밋메시지
@ -315,13 +316,13 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | 체크아웃 | | | `` <space> `` | 체크아웃 | Checkout the selected tag tag as a detached HEAD. |
| `` d `` | View delete options | | | `` n `` | 태그를 생성 | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
| `` P `` | 태그를 push | | | `` d `` | Delete | View delete options for local/remote tag. |
| `` n `` | 태그를 생성 | | | `` P `` | 태그를 push | Push the selected tag to a remote. You'll be prompted to select a remote. |
| `` g `` | View reset options | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | 커밋 보기 | | | `` <enter> `` | 커밋 보기 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 파일 ## 파일
@ -329,29 +330,29 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 파일명을 클립보드에 복사 | | | `` <c-o> `` | 파일명을 클립보드에 복사 | |
| `` <space> `` | Staged 전환 | | | `` <space> `` | Staged 전환 | Toggle staged for selected file. |
| `` <c-b> `` | 파일을 필터하기 (Staged/unstaged) | | | `` <c-b> `` | 파일을 필터하기 (Staged/unstaged) | |
| `` y `` | Copy to clipboard | | | `` y `` | Copy to clipboard | |
| `` c `` | 커밋 변경내용 | | | `` c `` | 커밋 변경내용 | Commit staged changes. |
| `` w `` | Commit changes without pre-commit hook | | | `` w `` | Commit changes without pre-commit hook | |
| `` A `` | 마지맛 커밋 수정 | | | `` A `` | 마지맛 커밋 수정 | |
| `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. | | | `` C `` | Git 편집기를 사용하여 변경 내용을 커밋합니다. | |
| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
| `` e `` | 파일 편집 | | | `` e `` | Edit | Open file in external editor. |
| `` o `` | 파일 닫기 | | | `` o `` | 파일 닫기 | Open file in default application. |
| `` i `` | Ignore file | | | `` i `` | Ignore file | |
| `` r `` | 파일 새로고침 | | | `` r `` | 파일 새로고침 | |
| `` s `` | 변경사항을 Stash | | | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
| `` S `` | Stash 옵션 보기 | | | `` S `` | Stash 옵션 보기 | View stash options (e.g. stash all, stash staged, stash unstaged). |
| `` a `` | 모든 변경을 Staged/unstaged으로 전환 | | | `` a `` | 모든 변경을 Staged/unstaged으로 전환 | Toggle staged/unstaged for all files in working tree. |
| `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory | | | `` <enter> `` | Stage individual hunks/lines for file, or collapse/expand for directory | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
| `` d `` | View 'discard changes' options | | | `` d `` | View 'discard changes' options | View options for discarding changes to the selected file. |
| `` g `` | View upstream reset options | | | `` g `` | View upstream reset options | |
| `` D `` | View reset options | | | `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
| `` ` `` | 파일 트리뷰로 전환 | | | `` ` `` | 파일 트리뷰로 전환 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` M `` | Git mergetool를 열기 | | | `` M `` | Git mergetool를 열기 | Run `git mergetool`. |
| `` f `` | Fetch | | | `` f `` | Fetch | Fetch changes from remote. |
| `` / `` | 검색 시작 | | | `` / `` | 검색 시작 | |
## 확인 패널 ## 확인 패널

251
docs/keybindings/Keybindings_nl.md
View File

@ -11,24 +11,26 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| `` <c-r> `` | Wissel naar een recente repo | | | `` <c-r> `` | Wissel naar een recente repo | |
| `` <pgup> (fn+up/shift+k) `` | Scroll naar beneden vanaf hoofdpaneel | | | `` <pgup> (fn+up/shift+k) `` | Scroll naar beneden vanaf hoofdpaneel | |
| `` <pgdown> (fn+down/shift+j) `` | Scroll naar beneden vanaf hoofdpaneel | | | `` <pgdown> (fn+down/shift+j) `` | Scroll naar beneden vanaf hoofdpaneel | |
| `` @ `` | Open command log menu | | | `` @ `` | View command log options | View options for the command log e.g. show/hide the command log and focus the command log. |
| `` } `` | Increase the size of the context shown around changes in the diff view | | | `` P `` | Push | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` { `` | Decrease the size of the context shown around changes in the diff view | | | `` p `` | Pull | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` : `` | Voer aangepaste commando uit | | | `` } `` | Increase diff context size | Increase the amount of the context shown around changes in the diff view. |
| `` { `` | Decrease diff context size | Decrease the amount of the context shown around changes in the diff view. |
| `` : `` | Voer aangepaste commando uit | Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands. |
| `` <c-p> `` | Bekijk aangepaste patch opties | | | `` <c-p> `` | Bekijk aangepaste patch opties | |
| `` m `` | Bekijk merge/rebase opties | | | `` m `` | Bekijk merge/rebase opties | View options to abort/continue/skip the current merge/rebase. |
| `` R `` | Verversen | | | `` R `` | Verversen | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
| `` + `` | Volgende scherm modus (normaal/half/groot) | | | `` + `` | Volgende scherm modus (normaal/half/groot) | |
| `` _ `` | Vorige scherm modus | | | `` _ `` | Vorige scherm modus | |
| `` ? `` | Open menu | | | `` ? `` | Open menu | |
| `` <c-s> `` | Bekijk scoping opties | | | `` <c-s> `` | Bekijk scoping opties | View options for filtering the commit log by a file path, so that only commits relating to that path are shown. |
| `` W `` | Open diff menu | | | `` W `` | Open diff menu | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-e> `` | Open diff menu | | | `` <c-e> `` | Open diff menu | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-w> `` | Toggle whether or not whitespace changes are shown in the diff view | | | `` q `` | Quit | |
| `` <esc> `` | Annuleren | |
| `` <c-w> `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view. |
| `` z `` | Ongedaan maken (via reflog) (experimenteel) | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | `` z `` | Ongedaan maken (via reflog) (experimenteel) | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
| `` <c-z> `` | Redo (via reflog) (experimenteel) | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | `` <c-z> `` | Redo (via reflog) (experimenteel) | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
| `` P `` | Push | |
| `` p `` | Pull | |
## Lijstpaneel navigatie ## Lijstpaneel navigatie
@ -52,29 +54,29 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Kopieer de bestandsnaam naar het klembord | | | `` <c-o> `` | Kopieer de bestandsnaam naar het klembord | |
| `` <space> `` | Toggle staged | | | `` <space> `` | Toggle staged | Toggle staged for selected file. |
| `` <c-b> `` | Filter files by status | | | `` <c-b> `` | Filter files by status | |
| `` y `` | Copy to clipboard | | | `` y `` | Copy to clipboard | |
| `` c `` | Commit veranderingen | | | `` c `` | Commit veranderingen | Commit staged changes. |
| `` w `` | Commit veranderingen zonder pre-commit hook | | | `` w `` | Commit veranderingen zonder pre-commit hook | |
| `` A `` | Wijzig laatste commit | | | `` A `` | Wijzig laatste commit | |
| `` C `` | Commit veranderingen met de git editor | | | `` C `` | Commit veranderingen met de git editor | |
| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
| `` e `` | Verander bestand | | | `` e `` | Edit | Open file in external editor. |
| `` o `` | Open bestand | | | `` o `` | Open bestand | Open file in default application. |
| `` i `` | Ignore or exclude file | | | `` i `` | Ignore or exclude file | |
| `` r `` | Refresh bestanden | | | `` r `` | Refresh bestanden | |
| `` s `` | Stash-bestanden | | | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
| `` S `` | Bekijk stash opties | | | `` S `` | Bekijk stash opties | View stash options (e.g. stash all, stash staged, stash unstaged). |
| `` a `` | Toggle staged alle | | | `` a `` | Toggle staged alle | Toggle staged/unstaged for all files in working tree. |
| `` <enter> `` | Stage individuele hunks/lijnen | | | `` <enter> `` | Stage individuele hunks/lijnen | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
| `` d `` | Bekijk 'veranderingen ongedaan maken' opties | | | `` d `` | Bekijk 'veranderingen ongedaan maken' opties | View options for discarding changes to the selected file. |
| `` g `` | Bekijk upstream reset opties | | | `` g `` | Bekijk upstream reset opties | |
| `` D `` | Bekijk reset opties | | | `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
| `` ` `` | Toggle bestandsboom weergave | | | `` ` `` | Toggle bestandsboom weergave | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` M `` | Open external merge tool (git mergetool) | | | `` M `` | Open external merge tool | Run `git mergetool`. |
| `` f `` | Fetch | | | `` f `` | Fetch | Fetch changes from remote. |
| `` / `` | Start met zoeken | | | `` / `` | Start met zoeken | |
## Bevestigingspaneel ## Bevestigingspaneel
@ -90,24 +92,24 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Kopieer branch name naar klembord | | | `` <c-o> `` | Kopieer branch name naar klembord | |
| `` i `` | Laat git-flow opties zien | | | `` i `` | Laat git-flow opties zien | |
| `` <space> `` | Uitchecken | | | `` <space> `` | Uitchecken | Checkout selected item. |
| `` n `` | Nieuwe branch | | | `` n `` | Nieuwe branch | |
| `` o `` | Maak een pull-request | | | `` o `` | Maak een pull-request | |
| `` O `` | Bekijk opties voor pull-aanvraag | | | `` O `` | Bekijk opties voor pull-aanvraag | |
| `` <c-y> `` | Kopieer de URL van het pull-verzoek naar het klembord | | | `` <c-y> `` | Kopieer de URL van het pull-verzoek naar het klembord | |
| `` c `` | Uitchecken bij naam | | | `` c `` | Uitchecken bij naam | Checkout by name. In the input box you can enter '-' to switch to the last branch. |
| `` F `` | Forceer checkout | | | `` F `` | Forceer checkout | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
| `` d `` | View delete options | | | `` d `` | Delete | View delete options for local/remote branch. |
| `` r `` | Rebase branch | | | `` r `` | Rebase branch | Rebase the checked-out branch onto the selected branch. |
| `` M `` | Merge in met huidige checked out branch | | | `` M `` | Merge in met huidige checked out branch | Merge selected branch into currently checked out branch. |
| `` f `` | Fast-forward deze branch vanaf zijn upstream | | | `` f `` | Fast-forward deze branch vanaf zijn upstream | Fast-forward selected branch from its upstream. |
| `` T `` | Creëer tag | | | `` T `` | Creëer tag | |
| `` s `` | Sort order | | | `` s `` | Sort order | |
| `` g `` | Bekijk reset opties | | | `` g `` | Bekijk reset opties | |
| `` R `` | Hernoem branch | | | `` R `` | Hernoem branch | |
| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
| `` w `` | View worktree options | |
| `` <enter> `` | Bekijk commits | | | `` <enter> `` | Bekijk commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Commit bericht ## Commit bericht
@ -121,16 +123,16 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Kopieer de vastgelegde bestandsnaam naar het klembord | | | `` <c-o> `` | Kopieer de bestandsnaam naar het klembord | |
| `` c `` | Bestand uitchecken | | | `` c `` | Uitchecken | Bestand uitchecken |
| `` d `` | Uitsluit deze commit zijn veranderingen aan dit bestand | | | `` d `` | Remove | Uitsluit deze commit zijn veranderingen aan dit bestand |
| `` o `` | Open bestand | | | `` o `` | Open bestand | Open file in default application. |
| `` e `` | Verander bestand | | | `` e `` | Edit | Open file in external editor. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <space> `` | Toggle bestand inbegrepen in patch | | | `` <space> `` | Toggle bestand inbegrepen in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` a `` | Toggle all files included in patch | | | `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` <enter> `` | Enter bestand om geselecteerde regels toe te voegen aan de patch | | | `` <enter> `` | Enter bestand om geselecteerde regels toe te voegen aan de patch | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
| `` ` `` | Toggle bestandsboom weergave | | | `` ` `` | Toggle bestandsboom weergave | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` / `` | Start met zoeken | | | `` / `` | Start met zoeken | |
## Commits ## Commits
@ -140,35 +142,35 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| `` <c-o> `` | Kopieer commit SHA naar klembord | | | `` <c-o> `` | Kopieer commit SHA naar klembord | |
| `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie | | | `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie | |
| `` b `` | View bisect options | | | `` b `` | View bisect options | |
| `` s `` | Squash beneden | | | `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
| `` f `` | Fixup commit | | | `` f `` | Fixup | Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded. |
| `` r `` | Hernoem commit | | | `` r `` | Hernoem commit | Reword the selected commit's message. |
| `` R `` | Hernoem commit met editor | | | `` R `` | Hernoem commit met editor | |
| `` d `` | Verwijder commit | | | `` d `` | Verwijder commit | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
| `` e `` | Wijzig commit | | | `` e `` | Edit (start interactive rebase) | Wijzig commit |
| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
If you would instead like to start an interactive rebase from the selected commit, press `e`. | If you would instead like to start an interactive rebase from the selected commit, press `e`. |
| `` p `` | Kies commit (wanneer midden in rebase) | | | `` p `` | Pick | Kies commit (wanneer midden in rebase) |
| `` F `` | Creëer fixup commit | | | `` F `` | Create fixup commit | Creëer fixup commit |
| `` S `` | Squash bovenstaande commits | | | `` S `` | Apply fixup commits | Squash bovenstaande commits |
| `` <c-j> `` | Verplaats commit 1 naar beneden | | | `` <c-j> `` | Verplaats commit 1 naar beneden | |
| `` <c-k> `` | Verplaats commit 1 naar boven | | | `` <c-k> `` | Verplaats commit 1 naar boven | |
| `` V `` | Plak commits (cherry-pick) | | | `` V `` | Plak commits (cherry-pick) | |
| `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
| `` A `` | Wijzig commit met staged veranderingen | | | `` A `` | Amend | Wijzig commit met staged veranderingen |
| `` a `` | Set/Reset commit author | | | `` a `` | Amend commit attribute | Set/Reset commit author or set co-author. |
| `` t `` | Commit ongedaan maken | | | `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
| `` T `` | Tag commit | | | `` T `` | Tag commit | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
| `` <c-l> `` | Open log menu | | | `` <c-l> `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
| `` w `` | View worktree options | | | `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | Checkout commit | | | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | Copy commit attribute | |
| `` o `` | Open commit in browser | | | `` o `` | Open commit in browser | |
| `` n `` | Creëer nieuwe branch van commit | | | `` n `` | Creëer nieuwe branch van commit | |
| `` g `` | Bekijk reset opties | | | `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | Kopieer commit (cherry-pick) | | | `` C `` | Kopieer commit (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | Bekijk gecommite bestanden | | | `` <enter> `` | Bekijk gecommite bestanden | |
| `` w `` | View worktree options | |
| `` / `` | Start met zoeken | | | `` / `` | Start met zoeken | |
## Menu ## Menu
@ -183,16 +185,16 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` e `` | Verander bestand | |
| `` o `` | Open bestand | |
| `` <left> `` | Selecteer voorgaand conflict | |
| `` <right> `` | Selecteer volgende conflict | |
| `` <up> `` | Selecteer bovenste hunk | |
| `` <down> `` | Selecteer onderste hunk | |
| `` z `` | Ongedaan maken | |
| `` M `` | Open external merge tool (git mergetool) | |
| `` <space> `` | Kies stuk | | | `` <space> `` | Kies stuk | |
| `` b `` | Kies beide stukken | | | `` b `` | Kies beide stukken | |
| `` <up> `` | Selecteer bovenste hunk | |
| `` <down> `` | Selecteer onderste hunk | |
| `` <left> `` | Selecteer voorgaand conflict | |
| `` <right> `` | Selecteer volgende conflict | |
| `` z `` | Ongedaan maken | Undo last merge conflict resolution. |
| `` e `` | Verander bestand | Open file in external editor. |
| `` o `` | Open bestand | Open file in default application. |
| `` M `` | Open external merge tool | Run `git mergetool`. |
| `` <esc> `` | Ga terug naar het bestanden paneel | | | `` <esc> `` | Ga terug naar het bestanden paneel | |
## Normaal ## Normaal
@ -209,10 +211,10 @@ If you would instead like to start an interactive rebase from the selected commi
| `` <left> `` | Selecteer de vorige hunk | | | `` <left> `` | Selecteer de vorige hunk | |
| `` <right> `` | Selecteer de volgende hunk | | | `` <right> `` | Selecteer de volgende hunk | |
| `` v `` | Toggle drag selecteer | | | `` v `` | Toggle drag selecteer | |
| `` a `` | Toggle selecteer hunk | | | `` a `` | Toggle selecteer hunk | Toggle hunk selection mode. |
| `` <c-o> `` | Copy the selected text to the clipboard | | | `` <c-o> `` | Copy selected text to clipboard | |
| `` o `` | Open bestand | | | `` o `` | Open bestand | Open file in default application. |
| `` e `` | Verander bestand | | | `` e `` | Verander bestand | Open file in external editor. |
| `` <space> `` | Voeg toe/verwijder lijn(en) in patch | | | `` <space> `` | Voeg toe/verwijder lijn(en) in patch | |
| `` <esc> `` | Sluit lijn-bij-lijn modus | | | `` <esc> `` | Sluit lijn-bij-lijn modus | |
| `` / `` | Start met zoeken | | | `` / `` | Start met zoeken | |
@ -222,16 +224,16 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Kopieer commit SHA naar klembord | | | `` <c-o> `` | Kopieer commit SHA naar klembord | |
| `` w `` | View worktree options | | | `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | Checkout commit | | | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | Copy commit attribute | |
| `` o `` | Open commit in browser | | | `` o `` | Open commit in browser | |
| `` n `` | Creëer nieuwe branch van commit | | | `` n `` | Creëer nieuwe branch van commit | |
| `` g `` | Bekijk reset opties | | | `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | Kopieer commit (cherry-pick) | | | `` C `` | Kopieer commit (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie | | | `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | Bekijk commits | | | `` <enter> `` | Bekijk commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Remote branches ## Remote branches
@ -239,26 +241,27 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Kopieer branch name naar klembord | | | `` <c-o> `` | Kopieer branch name naar klembord | |
| `` <space> `` | Uitchecken | | | `` <space> `` | Uitchecken | Checkout a new local branch based on the selected remote branch. The new branch will track the remote branch. |
| `` n `` | Nieuwe branch | | | `` n `` | Nieuwe branch | |
| `` M `` | Merge in met huidige checked out branch | | | `` M `` | Merge in met huidige checked out branch | Merge selected branch into currently checked out branch. |
| `` r `` | Rebase branch | | | `` r `` | Rebase branch | Rebase the checked-out branch onto the selected branch. |
| `` d `` | Delete remote tag | | | `` d `` | Delete | Delete the remote branch from the remote. |
| `` u `` | Stel in als upstream van uitgecheckte branch | | | `` u `` | Set as upstream | Stel in als upstream van uitgecheckte branch |
| `` s `` | Sort order | | | `` s `` | Sort order | |
| `` g `` | Bekijk reset opties | | | `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | Bekijk commits | | | `` <enter> `` | Bekijk commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Remotes ## Remotes
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` f `` | Fetch remote | | | `` <enter> `` | View branches | |
| `` n `` | Voeg een nieuwe remote toe | | | `` n `` | Voeg een nieuwe remote toe | |
| `` d `` | Verwijder remote | | | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
| `` e `` | Wijzig remote | | | `` e `` | Edit | Wijzig remote |
| `` f `` | Fetch | Fetch remote |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Staging ## Staging
@ -268,16 +271,16 @@ If you would instead like to start an interactive rebase from the selected commi
| `` <left> `` | Selecteer de vorige hunk | | | `` <left> `` | Selecteer de vorige hunk | |
| `` <right> `` | Selecteer de volgende hunk | | | `` <right> `` | Selecteer de volgende hunk | |
| `` v `` | Toggle drag selecteer | | | `` v `` | Toggle drag selecteer | |
| `` a `` | Toggle selecteer hunk | | | `` a `` | Toggle selecteer hunk | Toggle hunk selection mode. |
| `` <c-o> `` | Copy the selected text to the clipboard | | | `` <c-o> `` | Copy selected text to clipboard | |
| `` o `` | Open bestand | | | `` <space> `` | Toggle staged | Toggle lijnen staged / unstaged |
| `` e `` | Verander bestand | | | `` d `` | Verwijdert change (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
| `` o `` | Open bestand | Open file in default application. |
| `` e `` | Verander bestand | Open file in external editor. |
| `` <esc> `` | Ga terug naar het bestanden paneel | | | `` <esc> `` | Ga terug naar het bestanden paneel | |
| `` <tab> `` | Ga naar een ander paneel | | | `` <tab> `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). |
| `` <space> `` | Toggle lijnen staged / unstaged | | | `` E `` | Edit hunk | Edit selected hunk in external editor. |
| `` d `` | Verwijdert change (git reset) | | | `` c `` | Commit veranderingen | Commit staged changes. |
| `` E `` | Edit hunk | |
| `` c `` | Commit veranderingen | |
| `` w `` | Commit veranderingen zonder pre-commit hook | | | `` w `` | Commit veranderingen zonder pre-commit hook | |
| `` C `` | Commit veranderingen met de git editor | | | `` C `` | Commit veranderingen met de git editor | |
| `` / `` | Start met zoeken | | | `` / `` | Start met zoeken | |
@ -286,21 +289,21 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | Toepassen | | | `` <space> `` | Toepassen | Apply the stash entry to your working directory. |
| `` g `` | Pop | | | `` g `` | Pop | Apply the stash entry to your working directory and remove the stash entry. |
| `` d `` | Laten vallen | | | `` d `` | Laten vallen | Remove the stash entry from the stash list. |
| `` n `` | Nieuwe branch | | | `` n `` | Nieuwe branch | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
| `` r `` | Rename stash | | | `` r `` | Rename stash | |
| `` w `` | View worktree options | |
| `` <enter> `` | Bekijk gecommite bestanden | | | `` <enter> `` | Bekijk gecommite bestanden | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Status ## Status
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` o `` | Open config bestand | | | `` o `` | Open config bestand | Open file in default application. |
| `` e `` | Verander config bestand | | | `` e `` | Verander config bestand | Open file in external editor. |
| `` u `` | Check voor updates | | | `` u `` | Check voor updates | |
| `` <enter> `` | Wissel naar een recente repo | | | `` <enter> `` | Wissel naar een recente repo | |
| `` a `` | Alle logs van de branch laten zien | | | `` a `` | Alle logs van de branch laten zien | |
@ -310,16 +313,16 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Kopieer commit SHA naar klembord | | | `` <c-o> `` | Kopieer commit SHA naar klembord | |
| `` w `` | View worktree options | | | `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | Checkout commit | | | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | Copy commit attribute | |
| `` o `` | Open commit in browser | | | `` o `` | Open commit in browser | |
| `` n `` | Creëer nieuwe branch van commit | | | `` n `` | Creëer nieuwe branch van commit | |
| `` g `` | Bekijk reset opties | | | `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | Kopieer commit (cherry-pick) | | | `` C `` | Kopieer commit (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie | | | `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | Bekijk gecommite bestanden | | | `` <enter> `` | Bekijk gecommite bestanden | |
| `` w `` | View worktree options | |
| `` / `` | Start met zoeken | | | `` / `` | Start met zoeken | |
## Submodules ## Submodules
@ -327,13 +330,12 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Kopieer submodule naam naar klembord | | | `` <c-o> `` | Kopieer submodule naam naar klembord | |
| `` <enter> `` | Enter submodule | | | `` <enter> `` | Enter | Enter submodule |
| `` <space> `` | Enter submodule | | | `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
| `` d `` | Remove submodule | | | `` u `` | Update | Update selected submodule. |
| `` u `` | Update submodule | |
| `` n `` | Voeg nieuwe submodule toe | | | `` n `` | Voeg nieuwe submodule toe | |
| `` e `` | Update submodule URL | | | `` e `` | Update submodule URL | |
| `` i `` | Initialiseer submodule | | | `` i `` | Initialize | Initialiseer submodule |
| `` b `` | Bekijk bulk submodule opties | | | `` b `` | Bekijk bulk submodule opties | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
@ -341,22 +343,21 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | Uitchecken | | | `` <space> `` | Uitchecken | Checkout the selected tag tag as a detached HEAD. |
| `` d `` | View delete options | | | `` n `` | Creëer tag | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
| `` P `` | Push tag | | | `` d `` | Delete | View delete options for local/remote tag. |
| `` n `` | Creëer tag | | | `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
| `` g `` | Bekijk reset opties | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | Bekijk commits | | | `` <enter> `` | Bekijk commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Worktrees ## Worktrees
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` n `` | Create worktree | | | `` n `` | New worktree | |
| `` <space> `` | Switch to worktree | | | `` <space> `` | Switch | Switch to the selected worktree. |
| `` <enter> `` | Switch to worktree | |
| `` o `` | Open in editor | | | `` o `` | Open in editor | |
| `` d `` | Remove worktree | | | `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |

273
docs/keybindings/Keybindings_pl.md
View File

@ -9,26 +9,28 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-r> `` | Switch to a recent repo | | | `` <c-r> `` | Switch to a recent repo | |
| `` <pgup> (fn+up/shift+k) `` | Scroll up main panel | | | `` <pgup> (fn+up/shift+k) `` | Scroll up main window | |
| `` <pgdown> (fn+down/shift+j) `` | Scroll down main panel | | | `` <pgdown> (fn+down/shift+j) `` | Scroll down main window | |
| `` @ `` | Open command log menu | | | `` @ `` | View command log options | View options for the command log e.g. show/hide the command log and focus the command log. |
| `` } `` | Increase the size of the context shown around changes in the diff view | | | `` P `` | Push | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` { `` | Decrease the size of the context shown around changes in the diff view | | | `` p `` | Pull | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` : `` | Wykonaj własną komendę | | | `` } `` | Increase diff context size | Increase the amount of the context shown around changes in the diff view. |
| `` { `` | Decrease diff context size | Decrease the amount of the context shown around changes in the diff view. |
| `` : `` | Wykonaj własną komendę | Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands. |
| `` <c-p> `` | View custom patch options | | | `` <c-p> `` | View custom patch options | |
| `` m `` | Widok scalenia/opcje zmiany bazy | | | `` m `` | Widok scalenia/opcje zmiany bazy | View options to abort/continue/skip the current merge/rebase. |
| `` R `` | Odśwież | | | `` R `` | Odśwież | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
| `` + `` | Next screen mode (normal/half/fullscreen) | | | `` + `` | Next screen mode (normal/half/fullscreen) | |
| `` _ `` | Prev screen mode | | | `` _ `` | Prev screen mode | |
| `` ? `` | Open menu | | | `` ? `` | Open keybindings menu | |
| `` <c-s> `` | View filter-by-path options | | | `` <c-s> `` | View filter-by-path options | View options for filtering the commit log by a file path, so that only commits relating to that path are shown. |
| `` W `` | Open diff menu | | | `` W `` | View diffing options | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-e> `` | Open diff menu | | | `` <c-e> `` | View diffing options | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-w> `` | Toggle whether or not whitespace changes are shown in the diff view | | | `` q `` | Quit | |
| `` <esc> `` | Anuluj | |
| `` <c-w> `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view. |
| `` z `` | Undo | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | `` z `` | Undo | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
| `` <c-z> `` | Redo | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | `` <c-z> `` | Redo | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
| `` P `` | Push | |
| `` p `` | Pull | |
## List panel navigation ## List panel navigation
@ -59,37 +61,37 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy commit SHA to clipboard | | | `` <c-o> `` | Copy commit SHA to clipboard | |
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | | | `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
| `` b `` | View bisect options | | | `` b `` | View bisect options | |
| `` s `` | Ściśnij | | | `` s `` | Spłaszcz | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
| `` f `` | Napraw commit | | | `` f `` | Napraw | Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded. |
| `` r `` | Zmień nazwę commita | | | `` r `` | Zmień nazwę commita | Reword the selected commit's message. |
| `` R `` | Zmień nazwę commita w edytorze | | | `` R `` | Zmień nazwę commita w edytorze | |
| `` d `` | Usuń commit | | | `` d `` | Usuń commit | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
| `` e `` | Edytuj commit | | | `` e `` | Edit (start interactive rebase) | Edytuj commit |
| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
If you would instead like to start an interactive rebase from the selected commit, press `e`. | If you would instead like to start an interactive rebase from the selected commit, press `e`. |
| `` p `` | Wybierz commit (podczas zmiany bazy) | | | `` p `` | Pick | Wybierz commit (podczas zmiany bazy) |
| `` F `` | Utwórz commit naprawczy dla tego commita | | | `` F `` | Create fixup commit | Utwórz commit naprawczy dla tego commita |
| `` S `` | Spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash) | | | `` S `` | Apply fixup commits | Spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash) |
| `` <c-j> `` | Przenieś commit 1 w dół | | | `` <c-j> `` | Przenieś commit 1 w dół | |
| `` <c-k> `` | Przenieś commit 1 w górę | | | `` <c-k> `` | Przenieś commit 1 w górę | |
| `` V `` | Wklej commity (przebieranie) | | | `` V `` | Wklej commity (przebieranie) | |
| `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
| `` A `` | Popraw commit zmianami z poczekalni | | | `` A `` | Amend | Popraw commit zmianami z poczekalni |
| `` a `` | Set/Reset commit author | | | `` a `` | Amend commit attribute | Set/Reset commit author or set co-author. |
| `` t `` | Odwróć commit | | | `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
| `` T `` | Tag commit | | | `` T `` | Tag commit | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
| `` <c-l> `` | Open log menu | | | `` <c-l> `` | View log options | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
| `` w `` | View worktree options | | | `` <space> `` | Przełącz | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | Checkout commit | | | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | Copy commit attribute | |
| `` o `` | Open commit in browser | | | `` o `` | Open commit in browser | |
| `` n `` | Create new branch off of commit | | | `` n `` | Create new branch off of commit | |
| `` g `` | Wyświetl opcje resetu | | | `` g `` | Wyświetl opcje resetu | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | Kopiuj commit (przebieranie) | | | `` C `` | Kopiuj commit (przebieranie) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | Przeglądaj pliki commita | | | `` <enter> `` | Przeglądaj pliki commita | |
| `` w `` | View worktree options | |
| `` / `` | Search the current view by text | | | `` / `` | Search the current view by text | |
## Confirmation panel ## Confirmation panel
@ -105,24 +107,24 @@ If you would instead like to start an interactive rebase from the selected commi
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy branch name to clipboard | | | `` <c-o> `` | Copy branch name to clipboard | |
| `` i `` | Show git-flow options | | | `` i `` | Show git-flow options | |
| `` <space> `` | Przełącz | | | `` <space> `` | Przełącz | Checkout selected item. |
| `` n `` | Nowa gałąź | | | `` n `` | Nowa gałąź | |
| `` o `` | Utwórz żądanie pobrania | | | `` o `` | Utwórz żądanie pobrania | |
| `` O `` | Utwórz opcje żądania ściągnięcia | | | `` O `` | Utwórz opcje żądania ściągnięcia | |
| `` <c-y> `` | Skopiuj adres URL żądania pobrania do schowka | | | `` <c-y> `` | Skopiuj adres URL żądania pobrania do schowka | |
| `` c `` | Przełącz używając nazwy | | | `` c `` | Przełącz używając nazwy | Checkout by name. In the input box you can enter '-' to switch to the last branch. |
| `` F `` | Wymuś przełączenie | | | `` F `` | Wymuś przełączenie | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
| `` d `` | View delete options | | | `` d `` | Delete | View delete options for local/remote branch. |
| `` r `` | Zmiana bazy gałęzi | | | `` r `` | Zmiana bazy gałęzi | Rebase the checked-out branch onto the selected branch. |
| `` M `` | Scal do obecnej gałęzi | | | `` M `` | Scal do obecnej gałęzi | Merge selected branch into currently checked out branch. |
| `` f `` | Fast-forward this branch from its upstream | | | `` f `` | Fast-forward | Fast-forward selected branch from its upstream. |
| `` T `` | Create tag | | | `` T `` | New tag | |
| `` s `` | Sort order | | | `` s `` | Sort order | |
| `` g `` | Wyświetl opcje resetu | | | `` g `` | Wyświetl opcje resetu | |
| `` R `` | Rename branch | | | `` R `` | Rename branch | |
| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
| `` w `` | View worktree options | |
| `` <enter> `` | View commits | | | `` <enter> `` | View commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Main panel (patch building) ## Main panel (patch building)
@ -132,11 +134,11 @@ If you would instead like to start an interactive rebase from the selected commi
| `` <left> `` | Poprzedni kawałek | | | `` <left> `` | Poprzedni kawałek | |
| `` <right> `` | Następny kawałek | | | `` <right> `` | Następny kawałek | |
| `` v `` | Toggle range select | | | `` v `` | Toggle range select | |
| `` a `` | Toggle select hunk | | | `` a `` | Select hunk | Toggle hunk selection mode. |
| `` <c-o> `` | Copy the selected text to the clipboard | | | `` <c-o> `` | Copy selected text to clipboard | |
| `` o `` | Otwórz plik | | | `` o `` | Otwórz plik | Open file in default application. |
| `` e `` | Edytuj plik | | | `` e `` | Edytuj plik | Open file in external editor. |
| `` <space> `` | Add/Remove line(s) to patch | | | `` <space> `` | Toggle lines in patch | |
| `` <esc> `` | Wyście z trybu "linia po linii" | | | `` <esc> `` | Wyście z trybu "linia po linii" | |
| `` / `` | Search the current view by text | | | `` / `` | Search the current view by text | |
@ -152,46 +154,46 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy the file name to the clipboard | | | `` <c-o> `` | Copy path to clipboard | |
| `` <space> `` | Przełącz stan poczekalni | | | `` <space> `` | Przełącz stan poczekalni | Toggle staged for selected file. |
| `` <c-b> `` | Filter files by status | | | `` <c-b> `` | Filter files by status | |
| `` y `` | Copy to clipboard | | | `` y `` | Copy to clipboard | |
| `` c `` | Zatwierdź zmiany | | | `` c `` | Zatwierdź zmiany | Commit staged changes. |
| `` w `` | Zatwierdź zmiany bez skryptu pre-commit | | | `` w `` | Zatwierdź zmiany bez skryptu pre-commit | |
| `` A `` | Zmień ostatni commit | | | `` A `` | Zmień ostatni commit | |
| `` C `` | Zatwierdź zmiany używając edytora | | | `` C `` | Zatwierdź zmiany używając edytora | |
| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
| `` e `` | Edytuj plik | | | `` e `` | Edit | Open file in external editor. |
| `` o `` | Otwórz plik | | | `` o `` | Otwórz plik | Open file in default application. |
| `` i `` | Ignore or exclude file | | | `` i `` | Ignore or exclude file | |
| `` r `` | Odśwież pliki | | | `` r `` | Odśwież pliki | |
| `` s `` | Przechowaj zmiany | | | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
| `` S `` | Wyświetl opcje schowka | | | `` S `` | Wyświetl opcje schowka | View stash options (e.g. stash all, stash staged, stash unstaged). |
| `` a `` | Przełącz stan poczekalni wszystkich | | | `` a `` | Przełącz stan poczekalni wszystkich | Toggle staged/unstaged for all files in working tree. |
| `` <enter> `` | Zatwierdź pojedyncze linie | | | `` <enter> `` | Zatwierdź pojedyncze linie | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
| `` d `` | Pokaż opcje porzucania zmian | | | `` d `` | Pokaż opcje porzucania zmian | View options for discarding changes to the selected file. |
| `` g `` | View upstream reset options | | | `` g `` | View upstream reset options | |
| `` D `` | Wyświetl opcje resetu | | | `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
| `` ` `` | Toggle file tree view | | | `` ` `` | Toggle file tree view | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` M `` | Open external merge tool (git mergetool) | | | `` M `` | Open external merge tool | Run `git mergetool`. |
| `` f `` | Pobierz | | | `` f `` | Pobierz | Fetch changes from remote. |
| `` / `` | Search the current view by text | | | `` / `` | Search the current view by text | |
## Pliki commita ## Pliki commita
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy the committed file name to the clipboard | | | `` <c-o> `` | Copy path to clipboard | |
| `` c `` | Plik wybierania | | | `` c `` | Przełącz | Plik wybierania |
| `` d `` | Porzuć zmiany commita dla tego pliku | | | `` d `` | Remove | Porzuć zmiany commita dla tego pliku |
| `` o `` | Otwórz plik | | | `` o `` | Otwórz plik | Open file in default application. |
| `` e `` | Edytuj plik | | | `` e `` | Edit | Open file in external editor. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <space> `` | Toggle file included in patch | | | `` <space> `` | Toggle file included in patch | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` a `` | Toggle all files included in patch | | | `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` <enter> `` | Enter file to add selected lines to the patch (or toggle directory collapsed) | | | `` <enter> `` | Enter file / Toggle directory collapsed | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
| `` ` `` | Toggle file tree view | | | `` ` `` | Toggle file tree view | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` / `` | Search the current view by text | | | `` / `` | Search the current view by text | |
## Poczekalnia ## Poczekalnia
@ -201,16 +203,16 @@ If you would instead like to start an interactive rebase from the selected commi
| `` <left> `` | Poprzedni kawałek | | | `` <left> `` | Poprzedni kawałek | |
| `` <right> `` | Następny kawałek | | | `` <right> `` | Następny kawałek | |
| `` v `` | Toggle range select | | | `` v `` | Toggle range select | |
| `` a `` | Toggle select hunk | | | `` a `` | Select hunk | Toggle hunk selection mode. |
| `` <c-o> `` | Copy the selected text to the clipboard | | | `` <c-o> `` | Copy selected text to clipboard | |
| `` o `` | Otwórz plik | | | `` <space> `` | Przełącz stan poczekalni | Toggle selection staged / unstaged. |
| `` e `` | Edytuj plik | | | `` d `` | Discard | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
| `` o `` | Otwórz plik | Open file in default application. |
| `` e `` | Edytuj plik | Open file in external editor. |
| `` <esc> `` | Wróć do panelu plików | | | `` <esc> `` | Wróć do panelu plików | |
| `` <tab> `` | Switch to other panel (staged/unstaged changes) | | | `` <tab> `` | Switch view | Switch to other view (staged/unstaged changes). |
| `` <space> `` | Toggle line staged / unstaged | | | `` E `` | Edit hunk | Edit selected hunk in external editor. |
| `` d `` | Discard change (git reset) | | | `` c `` | Zatwierdź zmiany | Commit staged changes. |
| `` E `` | Edit hunk | |
| `` c `` | Zatwierdź zmiany | |
| `` w `` | Zatwierdź zmiany bez skryptu pre-commit | | | `` w `` | Zatwierdź zmiany bez skryptu pre-commit | |
| `` C `` | Zatwierdź zmiany używając edytora | | | `` C `` | Zatwierdź zmiany używając edytora | |
| `` / `` | Search the current view by text | | | `` / `` | Search the current view by text | |
@ -220,16 +222,16 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy commit SHA to clipboard | | | `` <c-o> `` | Copy commit SHA to clipboard | |
| `` w `` | View worktree options | | | `` <space> `` | Przełącz | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | Checkout commit | | | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | Copy commit attribute | |
| `` o `` | Open commit in browser | | | `` o `` | Open commit in browser | |
| `` n `` | Create new branch off of commit | | | `` n `` | Create new branch off of commit | |
| `` g `` | Wyświetl opcje resetu | | | `` g `` | Wyświetl opcje resetu | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | Kopiuj commit (przebieranie) | | | `` C `` | Kopiuj commit (przebieranie) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | | | `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | View commits | | | `` <enter> `` | View commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Remote branches ## Remote branches
@ -237,63 +239,64 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy branch name to clipboard | | | `` <c-o> `` | Copy branch name to clipboard | |
| `` <space> `` | Przełącz | | | `` <space> `` | Przełącz | Checkout a new local branch based on the selected remote branch. The new branch will track the remote branch. |
| `` n `` | Nowa gałąź | | | `` n `` | Nowa gałąź | |
| `` M `` | Scal do obecnej gałęzi | | | `` M `` | Scal do obecnej gałęzi | Merge selected branch into currently checked out branch. |
| `` r `` | Zmiana bazy gałęzi | | | `` r `` | Zmiana bazy gałęzi | Rebase the checked-out branch onto the selected branch. |
| `` d `` | Delete remote tag | | | `` d `` | Delete | Delete the remote branch from the remote. |
| `` u `` | Set as upstream of checked-out branch | | | `` u `` | Set as upstream | Set the selected remote branch as the upstream of the checked-out branch. |
| `` s `` | Sort order | | | `` s `` | Sort order | |
| `` g `` | Wyświetl opcje resetu | | | `` g `` | Wyświetl opcje resetu | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | View commits | | | `` <enter> `` | View commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Remotes ## Remotes
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` f `` | Fetch remote | | | `` <enter> `` | View branches | |
| `` n `` | Add new remote | | | `` n `` | New remote | |
| `` d `` | Remove remote | | | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
| `` e `` | Edit remote | | | `` e `` | Edit | Edit the selected remote's name or URL. |
| `` f `` | Pobierz | Fetch updates from the remote repository. This retrieves new commits and branches without merging them into your local branches. |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Scalanie ## Scalanie
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` e `` | Edytuj plik | |
| `` o `` | Otwórz plik | |
| `` <left> `` | Poprzedni konflikt | |
| `` <right> `` | Następny konflikt | |
| `` <up> `` | Wybierz poprzedni kawałek | |
| `` <down> `` | Wybierz następny kawałek | |
| `` z `` | Cofnij | |
| `` M `` | Open external merge tool (git mergetool) | |
| `` <space> `` | Wybierz kawałek | | | `` <space> `` | Wybierz kawałek | |
| `` b `` | Wybierz oba kawałki | | | `` b `` | Wybierz oba kawałki | |
| `` <up> `` | Wybierz poprzedni kawałek | |
| `` <down> `` | Wybierz następny kawałek | |
| `` <left> `` | Poprzedni konflikt | |
| `` <right> `` | Następny konflikt | |
| `` z `` | Cofnij | Undo last merge conflict resolution. |
| `` e `` | Edytuj plik | Open file in external editor. |
| `` o `` | Otwórz plik | Open file in default application. |
| `` M `` | Open external merge tool | Run `git mergetool`. |
| `` <esc> `` | Wróć do panelu plików | | | `` <esc> `` | Wróć do panelu plików | |
## Schowek ## Schowek
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | Zastosuj | | | `` <space> `` | Zastosuj | Apply the stash entry to your working directory. |
| `` g `` | Wyciągnij | | | `` g `` | Wyciągnij | Apply the stash entry to your working directory and remove the stash entry. |
| `` d `` | Porzuć | | | `` d `` | Porzuć | Remove the stash entry from the stash list. |
| `` n `` | Nowa gałąź | | | `` n `` | Nowa gałąź | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
| `` r `` | Rename stash | | | `` r `` | Rename stash | |
| `` w `` | View worktree options | |
| `` <enter> `` | Przeglądaj pliki commita | | | `` <enter> `` | Przeglądaj pliki commita | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Status ## Status
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` o `` | Otwórz konfigurację | | | `` o `` | Otwórz konfigurację | Open file in default application. |
| `` e `` | Edytuj konfigurację | | | `` e `` | Edytuj konfigurację | Open file in external editor. |
| `` u `` | Sprawdź aktualizacje | | | `` u `` | Sprawdź aktualizacje | |
| `` <enter> `` | Switch to a recent repo | | | `` <enter> `` | Switch to a recent repo | |
| `` a `` | Pokaż wszystkie logi gałęzi | | | `` a `` | Pokaż wszystkie logi gałęzi | |
@ -303,16 +306,16 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy commit SHA to clipboard | | | `` <c-o> `` | Copy commit SHA to clipboard | |
| `` w `` | View worktree options | | | `` <space> `` | Przełącz | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | Checkout commit | | | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | Copy commit attribute | |
| `` o `` | Open commit in browser | | | `` o `` | Open commit in browser | |
| `` n `` | Create new branch off of commit | | | `` n `` | Create new branch off of commit | |
| `` g `` | Wyświetl opcje resetu | | | `` g `` | Wyświetl opcje resetu | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | Kopiuj commit (przebieranie) | | | `` C `` | Kopiuj commit (przebieranie) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | Reset cherry-picked (copied) commits selection | | | `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | Przeglądaj pliki commita | | | `` <enter> `` | Przeglądaj pliki commita | |
| `` w `` | View worktree options | |
| `` / `` | Search the current view by text | | | `` / `` | Search the current view by text | |
## Submodules ## Submodules
@ -320,13 +323,12 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Copy submodule name to clipboard | | | `` <c-o> `` | Copy submodule name to clipboard | |
| `` <enter> `` | Enter submodule | | | `` <enter> `` | Enter | Enter submodule. After entering the submodule, you can press `<esc>` to escape back to the parent repo. |
| `` <space> `` | Enter submodule | | | `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
| `` d `` | Remove submodule | | | `` u `` | Update | Update selected submodule. |
| `` u `` | Update submodule | | | `` n `` | New submodule | |
| `` n `` | Add new submodule | |
| `` e `` | Update submodule URL | | | `` e `` | Update submodule URL | |
| `` i `` | Initialize submodule | | | `` i `` | Initialize | Initialize the selected submodule to prepare for fetching. You probably want to follow this up by invoking the 'update' action to fetch the submodule. |
| `` b `` | View bulk submodule options | | | `` b `` | View bulk submodule options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
@ -334,24 +336,23 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | Przełącz | | | `` <space> `` | Przełącz | Checkout the selected tag tag as a detached HEAD. |
| `` d `` | View delete options | | | `` n `` | New tag | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
| `` P `` | Push tag | | | `` d `` | Delete | View delete options for local/remote tag. |
| `` n `` | Create tag | | | `` P `` | Push tag | Push the selected tag to a remote. You'll be prompted to select a remote. |
| `` g `` | Wyświetl opcje resetu | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | View commits | | | `` <enter> `` | View commits | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Worktrees ## Worktrees
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` n `` | Create worktree | | | `` n `` | New worktree | |
| `` <space> `` | Switch to worktree | | | `` <space> `` | Switch | Switch to the selected worktree. |
| `` <enter> `` | Switch to worktree | |
| `` o `` | Open in editor | | | `` o `` | Open in editor | |
| `` d `` | Remove worktree | | | `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Zwykłe ## Zwykłe

247
docs/keybindings/Keybindings_ru.md
View File

@ -11,24 +11,26 @@ _Связки клавиш_
| `` <c-r> `` | Переключиться на последний репозиторий | | | `` <c-r> `` | Переключиться на последний репозиторий | |
| `` <pgup> (fn+up/shift+k) `` | Прокрутить вверх главную панель | | | `` <pgup> (fn+up/shift+k) `` | Прокрутить вверх главную панель | |
| `` <pgdown> (fn+down/shift+j) `` | Прокрутить вниз главную панель | | | `` <pgdown> (fn+down/shift+j) `` | Прокрутить вниз главную панель | |
| `` @ `` | Открыть меню журнала команд | | | `` @ `` | Открыть меню журнала команд | View options for the command log e.g. show/hide the command log and focus the command log. |
| `` } `` | Увеличить размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | | | `` P `` | Отправить изменения | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` { `` | Уменьшите размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | | | `` p `` | Получить и слить изменения | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` : `` | Выполнить пользовательскую команду | | | `` } `` | Увеличить размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | Increase the amount of the context shown around changes in the diff view. |
| `` { `` | Уменьшите размер контекста, отображаемого вокруг изменений в просмотрщике сравнении | Decrease the amount of the context shown around changes in the diff view. |
| `` : `` | Выполнить пользовательскую команду | Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands. |
| `` <c-p> `` | Просмотреть пользовательские параметры патча | | | `` <c-p> `` | Просмотреть пользовательские параметры патча | |
| `` m `` | Просмотреть параметры слияния/перебазирования | | | `` m `` | Просмотреть параметры слияния/перебазирования | View options to abort/continue/skip the current merge/rebase. |
| `` R `` | Обновить | | | `` R `` | Обновить | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
| `` + `` | Следующий режим экрана (нормальный/полуэкранный/полноэкранный) | | | `` + `` | Следующий режим экрана (нормальный/полуэкранный/полноэкранный) | |
| `` _ `` | Предыдущий режим экрана | | | `` _ `` | Предыдущий режим экрана | |
| `` ? `` | Открыть меню | | | `` ? `` | Открыть меню | |
| `` <c-s> `` | Просмотреть параметры фильтрации по пути | | | `` <c-s> `` | Просмотреть параметры фильтрации по пути | View options for filtering the commit log by a file path, so that only commits relating to that path are shown. |
| `` W `` | Открыть меню сравнении | | | `` W `` | Открыть меню сравнении | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-e> `` | Открыть меню сравнении | | | `` <c-e> `` | Открыть меню сравнении | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-w> `` | Переключить отображение изменении пробелов в просмотрщике сравнении | | | `` q `` | Выйти | |
| `` <esc> `` | Отменить | |
| `` <c-w> `` | Переключить отображение изменении пробелов в просмотрщике сравнении | Toggle whether or not whitespace changes are shown in the diff view. |
| `` z `` | Отменить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git запустить, чтобы отменить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. | | `` z `` | Отменить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git запустить, чтобы отменить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. |
| `` <c-z> `` | Повторить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git нужно запустить, чтобы повторить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. | | `` <c-z> `` | Повторить (через reflog) (экспериментальный) | Журнал ссылок (reflog) будет использоваться для определения того, какую команду git нужно запустить, чтобы повторить последнюю команду git. Сюда не входят изменения в рабочем дереве; учитываются только коммиты. |
| `` P `` | Отправить изменения | |
| `` p `` | Получить и слить изменения | |
## Навигация по панели списка ## Навигация по панели списка
@ -51,11 +53,10 @@ _Связки клавиш_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` n `` | Create worktree | | | `` n `` | New worktree | |
| `` <space> `` | Switch to worktree | | | `` <space> `` | Switch | Switch to the selected worktree. |
| `` <enter> `` | Switch to worktree | |
| `` o `` | Open in editor | | | `` o `` | Open in editor | |
| `` d `` | Remove worktree | | | `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Главная панель (Индексирование) ## Главная панель (Индексирование)
@ -65,16 +66,16 @@ _Связки клавиш_
| `` <left> `` | Выбрать предыдущую часть | | | `` <left> `` | Выбрать предыдущую часть | |
| `` <right> `` | Выбрать следующую часть | | | `` <right> `` | Выбрать следующую часть | |
| `` v `` | Переключить выборку перетаскивания | | | `` v `` | Переключить выборку перетаскивания | |
| `` a `` | Переключить выборку частей | | | `` a `` | Переключить выборку частей | Toggle hunk selection mode. |
| `` <c-o> `` | Скопировать выделенный текст в буфер обмена | | | `` <c-o> `` | Скопировать выделенный текст в буфер обмена | |
| `` o `` | Открыть файл | | | `` <space> `` | Переключить индекс | Переключить строку в проиндексированные / непроиндексированные |
| `` e `` | Редактировать файл | | | `` d `` | Отменить изменение (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
| `` o `` | Открыть файл | Open file in default application. |
| `` e `` | Редактировать файл | Open file in external editor. |
| `` <esc> `` | Вернуться к панели файлов | | | `` <esc> `` | Вернуться к панели файлов | |
| `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | | | `` <tab> `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). |
| `` <space> `` | Переключить строку в проиндексированные / непроиндексированные | | | `` E `` | Изменить эту часть | Edit selected hunk in external editor. |
| `` d `` | Отменить изменение (git reset) | | | `` c `` | Сохранить изменения | Commit staged changes. |
| `` E `` | Изменить эту часть | |
| `` c `` | Сохранить изменения | |
| `` w `` | Закоммитить изменения без предварительного хука коммита | | | `` w `` | Закоммитить изменения без предварительного хука коммита | |
| `` C `` | Сохранить изменения с помощью редактора git | | | `` C `` | Сохранить изменения с помощью редактора git | |
| `` / `` | Найти | | | `` / `` | Найти | |
@ -90,16 +91,16 @@ _Связки клавиш_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` e `` | Редактировать файл | |
| `` o `` | Открыть файл | |
| `` <left> `` | Выбрать предыдущий конфликт | |
| `` <right> `` | Выбрать следующий конфликт | |
| `` <up> `` | Выбрать предыдущую часть | |
| `` <down> `` | Выбрать следующую часть | |
| `` z `` | Отменить | |
| `` M `` | Открыть внешний инструмент слияния (git mergetool) | |
| `` <space> `` | Выбрать эту часть | | | `` <space> `` | Выбрать эту часть | |
| `` b `` | Выбрать все части | | | `` b `` | Выбрать все части | |
| `` <up> `` | Выбрать предыдущую часть | |
| `` <down> `` | Выбрать следующую часть | |
| `` <left> `` | Выбрать предыдущий конфликт | |
| `` <right> `` | Выбрать следующий конфликт | |
| `` z `` | Отменить | Undo last merge conflict resolution. |
| `` e `` | Редактировать файл | Open file in external editor. |
| `` o `` | Открыть файл | Open file in default application. |
| `` M `` | Открыть внешний инструмент слияния (git mergetool) | Run `git mergetool`. |
| `` <esc> `` | Вернуться к панели файлов | | | `` <esc> `` | Вернуться к панели файлов | |
## Главная панель (сборка патчей) ## Главная панель (сборка патчей)
@ -109,10 +110,10 @@ _Связки клавиш_
| `` <left> `` | Выбрать предыдущую часть | | | `` <left> `` | Выбрать предыдущую часть | |
| `` <right> `` | Выбрать следующую часть | | | `` <right> `` | Выбрать следующую часть | |
| `` v `` | Переключить выборку перетаскивания | | | `` v `` | Переключить выборку перетаскивания | |
| `` a `` | Переключить выборку частей | | | `` a `` | Переключить выборку частей | Toggle hunk selection mode. |
| `` <c-o> `` | Скопировать выделенный текст в буфер обмена | | | `` <c-o> `` | Скопировать выделенный текст в буфер обмена | |
| `` o `` | Открыть файл | | | `` o `` | Открыть файл | Open file in default application. |
| `` e `` | Редактировать файл | | | `` e `` | Редактировать файл | Open file in external editor. |
| `` <space> `` | Добавить/удалить строку(и) для патча | | | `` <space> `` | Добавить/удалить строку(и) для патча | |
| `` <esc> `` | Выйти из сборщика пользовательских патчей | | | `` <esc> `` | Выйти из сборщика пользовательских патчей | |
| `` / `` | Найти | | | `` / `` | Найти | |
@ -122,16 +123,16 @@ _Связки клавиш_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Скопировать SHA коммита в буфер обмена | | | `` <c-o> `` | Скопировать SHA коммита в буфер обмена | |
| `` w `` | View worktree options | | | `` <space> `` | Переключить | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | Переключить коммит | | | `` y `` | Скопировать атрибут коммита | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | Скопировать атрибут коммита | |
| `` o `` | Открыть коммит в браузере | | | `` o `` | Открыть коммит в браузере | |
| `` n `` | Создать новую ветку с этого коммита | | | `` n `` | Создать новую ветку с этого коммита | |
| `` g `` | Просмотреть параметры сброса | | | `` g `` | Просмотреть параметры сброса | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | Скопировать отобранные коммит (cherry-pick) | | | `` C `` | Скопировать отобранные коммит (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | | | `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | Просмотреть коммиты | | | `` <enter> `` | Просмотреть коммиты | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Коммиты ## Коммиты
@ -141,35 +142,35 @@ _Связки клавиш_
| `` <c-o> `` | Скопировать SHA коммита в буфер обмена | | | `` <c-o> `` | Скопировать SHA коммита в буфер обмена | |
| `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | | | `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | |
| `` b `` | Просмотреть параметры бинарного поиска | | | `` b `` | Просмотреть параметры бинарного поиска | |
| `` s `` | Объединить несколько коммитов в один нижний | | | `` s `` | Объединить коммиты (Squash) | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
| `` f `` | Объединить несколько коммитов в один отбросив сообщение коммита | | | `` f `` | Объединить несколько коммитов в один отбросив сообщение коммита (Fixup) | Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded. |
| `` r `` | Перефразировать коммит | | | `` r `` | Перефразировать коммит | Reword the selected commit's message. |
| `` R `` | Переписать коммит с помощью редактора | | | `` R `` | Переписать коммит с помощью редактора | |
| `` d `` | Удалить коммит | | | `` d `` | Удалить коммит | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
| `` e `` | Изменить коммит | | | `` e `` | Edit (start interactive rebase) | Изменить коммит |
| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
If you would instead like to start an interactive rebase from the selected commit, press `e`. | If you would instead like to start an interactive rebase from the selected commit, press `e`. |
| `` p `` | Выбрать коммит (в середине перебазирования) | | | `` p `` | Pick | Выбрать коммит (в середине перебазирования) |
| `` F `` | Создать fixup коммит для этого коммита | | | `` F `` | Create fixup commit | Создать fixup коммит для этого коммита |
| `` S `` | Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение) | | | `` S `` | Apply fixup commits | Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение) |
| `` <c-j> `` | Переместить коммит вниз на один | | | `` <c-j> `` | Переместить коммит вниз на один | |
| `` <c-k> `` | Переместить коммит вверх на один | | | `` <c-k> `` | Переместить коммит вверх на один | |
| `` V `` | Вставить отобранные коммиты (cherry-pick) | | | `` V `` | Вставить отобранные коммиты (cherry-pick) | |
| `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
| `` A `` | Править последний коммит с проиндексированными изменениями | | | `` A `` | Amend | Править последний коммит с проиндексированными изменениями |
| `` a `` | Установить/убрать автора коммита | | | `` a `` | Установить/убрать автора коммита | Set/Reset commit author or set co-author. |
| `` t `` | Отменить коммит | | | `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
| `` T `` | Пометить коммит тегом | | | `` T `` | Пометить коммит тегом | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
| `` <c-l> `` | Открыть меню журнала | | | `` <c-l> `` | Открыть меню журнала | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
| `` w `` | View worktree options | | | `` <space> `` | Переключить | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | Переключить коммит | | | `` y `` | Скопировать атрибут коммита | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | Скопировать атрибут коммита | |
| `` o `` | Открыть коммит в браузере | | | `` o `` | Открыть коммит в браузере | |
| `` n `` | Создать новую ветку с этого коммита | | | `` n `` | Создать новую ветку с этого коммита | |
| `` g `` | Просмотреть параметры сброса | | | `` g `` | Просмотреть параметры сброса | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | Скопировать отобранные коммит (cherry-pick) | | | `` C `` | Скопировать отобранные коммит (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | Просмотреть файлы выбранного элемента | | | `` <enter> `` | Просмотреть файлы выбранного элемента | |
| `` w `` | View worktree options | |
| `` / `` | Найти | | | `` / `` | Найти | |
## Локальные Ветки ## Локальные Ветки
@ -178,24 +179,24 @@ If you would instead like to start an interactive rebase from the selected commi
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Скопировать название ветки в буфер обмена | | | `` <c-o> `` | Скопировать название ветки в буфер обмена | |
| `` i `` | Показать параметры git-flow | | | `` i `` | Показать параметры git-flow | |
| `` <space> `` | Переключить | | | `` <space> `` | Переключить | Checkout selected item. |
| `` n `` | Новая ветка | | | `` n `` | Новая ветка | |
| `` o `` | Создать запрос на принятие изменений | | | `` o `` | Создать запрос на принятие изменений | |
| `` O `` | Создать параметры запроса принятие изменений | | | `` O `` | Создать параметры запроса принятие изменений | |
| `` <c-y> `` | Скопировать URL запроса на принятие изменений в буфер обмена | | | `` <c-y> `` | Скопировать URL запроса на принятие изменений в буфер обмена | |
| `` c `` | Переключить по названию | | | `` c `` | Переключить по названию | Checkout by name. In the input box you can enter '-' to switch to the last branch. |
| `` F `` | Принудительное переключение | | | `` F `` | Принудительное переключение | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
| `` d `` | View delete options | | | `` d `` | Delete | View delete options for local/remote branch. |
| `` r `` | Перебазировать переключённую ветку на эту ветку | | | `` r `` | Перебазировать переключённую ветку на эту ветку | Rebase the checked-out branch onto the selected branch. |
| `` M `` | Слияние с текущей переключённой веткой | | | `` M `` | Слияние с текущей переключённой веткой | Merge selected branch into currently checked out branch. |
| `` f `` | Перемотать эту ветку вперёд из её upstream-ветки | | | `` f `` | Перемотать эту ветку вперёд из её upstream-ветки | Fast-forward selected branch from its upstream. |
| `` T `` | Создать тег | | | `` T `` | Создать тег | |
| `` s `` | Порядок сортировки | | | `` s `` | Порядок сортировки | |
| `` g `` | Просмотреть параметры сброса | | | `` g `` | Просмотреть параметры сброса | |
| `` R `` | Переименовать ветку | | | `` R `` | Переименовать ветку | |
| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
| `` w `` | View worktree options | |
| `` <enter> `` | Просмотреть коммиты | | | `` <enter> `` | Просмотреть коммиты | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Меню ## Меню
@ -218,16 +219,16 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Скопировать SHA коммита в буфер обмена | | | `` <c-o> `` | Скопировать SHA коммита в буфер обмена | |
| `` w `` | View worktree options | | | `` <space> `` | Переключить | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | Переключить коммит | | | `` y `` | Скопировать атрибут коммита | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | Скопировать атрибут коммита | |
| `` o `` | Открыть коммит в браузере | | | `` o `` | Открыть коммит в браузере | |
| `` n `` | Создать новую ветку с этого коммита | | | `` n `` | Создать новую ветку с этого коммита | |
| `` g `` | Просмотреть параметры сброса | | | `` g `` | Просмотреть параметры сброса | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | Скопировать отобранные коммит (cherry-pick) | | | `` C `` | Скопировать отобранные коммит (cherry-pick) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | | | `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | Просмотреть файлы выбранного элемента | | | `` <enter> `` | Просмотреть файлы выбранного элемента | |
| `` w `` | View worktree options | |
| `` / `` | Найти | | | `` / `` | Найти | |
## Подмодули ## Подмодули
@ -235,13 +236,12 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Скопировать название подмодуля в буфер обмена | | | `` <c-o> `` | Скопировать название подмодуля в буфер обмена | |
| `` <enter> `` | Ввести подмодуль | | | `` <enter> `` | Enter | Ввести подмодуль |
| `` <space> `` | Ввести подмодуль | | | `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
| `` d `` | Удалить подмодуль | | | `` u `` | Update | Обновить подмодуль |
| `` u `` | Обновить подмодуль | |
| `` n `` | Добавить новый подмодуль | | | `` n `` | Добавить новый подмодуль | |
| `` e `` | Обновить URL подмодуля | | | `` e `` | Обновить URL подмодуля | |
| `` i `` | Инициализировать подмодуль | | | `` i `` | Initialize | Инициализировать подмодуль |
| `` b `` | Просмотреть параметры массового подмодуля | | | `` b `` | Просмотреть параметры массового подмодуля | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
@ -256,24 +256,24 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Скопировать закомиченное имя файла в буфер обмена | | | `` <c-o> `` | Скопировать название файла в буфер обмена | |
| `` c `` | Переключить файл | | | `` c `` | Переключить | Переключить файл |
| `` d `` | Отменить изменения коммита в этом файле | | | `` d `` | Remove | Отменить изменения коммита в этом файле |
| `` o `` | Открыть файл | | | `` o `` | Открыть файл | Open file in default application. |
| `` e `` | Редактировать файл | | | `` e `` | Edit | Open file in external editor. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <space> `` | Переключить файлы включённые в патч | | | `` <space> `` | Переключить файлы включённые в патч | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` a `` | Переключить все файлы, включённые в патч | | | `` a `` | Переключить все файлы, включённые в патч | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` <enter> `` | Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения) | | | `` <enter> `` | Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения) | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
| `` ` `` | Переключить вид дерева файлов | | | `` ` `` | Переключить вид дерева файлов | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` / `` | Найти | | | `` / `` | Найти | |
## Статус ## Статус
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` o `` | Открыть файл конфигурации | | | `` o `` | Открыть файл конфигурации | Open file in default application. |
| `` e `` | Редактировать файл конфигурации | | | `` e `` | Редактировать файл конфигурации | Open file in external editor. |
| `` u `` | Проверить обновления | | | `` u `` | Проверить обновления | |
| `` <enter> `` | Переключиться на последний репозиторий | | | `` <enter> `` | Переключиться на последний репозиторий | |
| `` a `` | Показать все логи ветки | | | `` a `` | Показать все логи ветки | |
@ -282,13 +282,13 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | Переключить | | | `` <space> `` | Переключить | Checkout the selected tag tag as a detached HEAD. |
| `` d `` | View delete options | | | `` n `` | Создать тег | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
| `` P `` | Отправить тег | | | `` d `` | Delete | View delete options for local/remote tag. |
| `` n `` | Создать тег | | | `` P `` | Отправить тег | Push the selected tag to a remote. You'll be prompted to select a remote. |
| `` g `` | Просмотреть параметры сброса | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | Просмотреть коммиты | | | `` <enter> `` | Просмотреть коммиты | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Удалённые ветки ## Удалённые ветки
@ -296,26 +296,27 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Скопировать название ветки в буфер обмена | | | `` <c-o> `` | Скопировать название ветки в буфер обмена | |
| `` <space> `` | Переключить | | | `` <space> `` | Переключить | Checkout a new local branch based on the selected remote branch. The new branch will track the remote branch. |
| `` n `` | Новая ветка | | | `` n `` | Новая ветка | |
| `` M `` | Слияние с текущей переключённой веткой | | | `` M `` | Слияние с текущей переключённой веткой | Merge selected branch into currently checked out branch. |
| `` r `` | Перебазировать переключённую ветку на эту ветку | | | `` r `` | Перебазировать переключённую ветку на эту ветку | Rebase the checked-out branch onto the selected branch. |
| `` d `` | Delete remote tag | | | `` d `` | Delete | Delete the remote branch from the remote. |
| `` u `` | Установить как upstream-ветку переключённую ветку | | | `` u `` | Set as upstream | Установить как upstream-ветку переключённую ветку |
| `` s `` | Порядок сортировки | | | `` s `` | Порядок сортировки | |
| `` g `` | Просмотреть параметры сброса | | | `` g `` | Просмотреть параметры сброса | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | Просмотреть коммиты | | | `` <enter> `` | Просмотреть коммиты | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Удалённые репозитории ## Удалённые репозитории
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` f `` | Получение изменения из удалённого репозитория | | | `` <enter> `` | View branches | |
| `` n `` | Добавить новую удалённую ветку | | | `` n `` | Добавить новую удалённую ветку | |
| `` d `` | Удалить удалённую ветку | | | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
| `` e `` | Редактировать удалённый репозитории | | | `` e `` | Edit | Редактировать удалённый репозитории |
| `` f `` | Получить изменения | Получение изменения из удалённого репозитория |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Файлы ## Файлы
@ -323,40 +324,40 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | Скопировать название файла в буфер обмена | | | `` <c-o> `` | Скопировать название файла в буфер обмена | |
| `` <space> `` | Переключить индекс | | | `` <space> `` | Переключить индекс | Toggle staged for selected file. |
| `` <c-b> `` | Фильтровать файлы (проиндексированные/непроиндексированные) | | | `` <c-b> `` | Фильтровать файлы (проиндексированные/непроиндексированные) | |
| `` y `` | Copy to clipboard | | | `` y `` | Copy to clipboard | |
| `` c `` | Сохранить изменения | | | `` c `` | Сохранить изменения | Commit staged changes. |
| `` w `` | Закоммитить изменения без предварительного хука коммита | | | `` w `` | Закоммитить изменения без предварительного хука коммита | |
| `` A `` | Правка последнего коммита | | | `` A `` | Правка последнего коммита | |
| `` C `` | Сохранить изменения с помощью редактора git | | | `` C `` | Сохранить изменения с помощью редактора git | |
| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
| `` e `` | Редактировать файл | | | `` e `` | Edit | Open file in external editor. |
| `` o `` | Открыть файл | | | `` o `` | Открыть файл | Open file in default application. |
| `` i `` | Игнорировать или исключить файл | | | `` i `` | Игнорировать или исключить файл | |
| `` r `` | Обновить файлы | | | `` r `` | Обновить файлы | |
| `` s `` | Припрятать все изменения | | | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
| `` S `` | Просмотреть параметры хранилища | | | `` S `` | Просмотреть параметры хранилища | View stash options (e.g. stash all, stash staged, stash unstaged). |
| `` a `` | Все проиндексированные/непроиндексированные | | | `` a `` | Все проиндексированные/непроиндексированные | Toggle staged/unstaged for all files in working tree. |
| `` <enter> `` | Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога | | | `` <enter> `` | Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
| `` d `` | Просмотреть параметры «отмены изменении» | | | `` d `` | Просмотреть параметры «отмены изменении» | View options for discarding changes to the selected file. |
| `` g `` | Просмотреть параметры сброса upstream-ветки | | | `` g `` | Просмотреть параметры сброса upstream-ветки | |
| `` D `` | Просмотреть параметры сброса | | | `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
| `` ` `` | Переключить вид дерева файлов | | | `` ` `` | Переключить вид дерева файлов | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` M `` | Открыть внешний инструмент слияния (git mergetool) | | | `` M `` | Открыть внешний инструмент слияния (git mergetool) | Run `git mergetool`. |
| `` f `` | Получить изменения | | | `` f `` | Получить изменения | Fetch changes from remote. |
| `` / `` | Найти | | | `` / `` | Найти | |
## Хранилище ## Хранилище
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | Применить припрятанные изменения | | | `` <space> `` | Применить припрятанные изменения | Apply the stash entry to your working directory. |
| `` g `` | Применить припрятанные изменения и тут же удалить их из хранилища | | | `` g `` | Применить припрятанные изменения и тут же удалить их из хранилища | Apply the stash entry to your working directory and remove the stash entry. |
| `` d `` | Удалить припрятанные изменения из хранилища | | | `` d `` | Удалить припрятанные изменения из хранилища | Remove the stash entry from the stash list. |
| `` n `` | Новая ветка | | | `` n `` | Новая ветка | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
| `` r `` | Переименовать хранилище | | | `` r `` | Переименовать хранилище | |
| `` w `` | View worktree options | |
| `` <enter> `` | Просмотреть файлы выбранного элемента | | | `` <enter> `` | Просмотреть файлы выбранного элемента | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |

247
docs/keybindings/Keybindings_zh-CN.md
View File

@ -11,24 +11,26 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| `` <c-r> `` | 切换到最近的仓库 | | | `` <c-r> `` | 切换到最近的仓库 | |
| `` <pgup> (fn+up/shift+k) `` | 向上滚动主面板 | | | `` <pgup> (fn+up/shift+k) `` | 向上滚动主面板 | |
| `` <pgdown> (fn+down/shift+j) `` | 向下滚动主面板 | | | `` <pgdown> (fn+down/shift+j) `` | 向下滚动主面板 | |
| `` @ `` | 打开命令日志菜单 | | | `` @ `` | 打开命令日志菜单 | View options for the command log e.g. show/hide the command log and focus the command log. |
| `` } `` | 扩大差异视图中显示的上下文范围 | | | `` P `` | 推送 | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` { `` | 缩小差异视图中显示的上下文范围 | | | `` p `` | 拉取 | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` : `` | 执行自定义命令 | | | `` } `` | 扩大差异视图中显示的上下文范围 | Increase the amount of the context shown around changes in the diff view. |
| `` { `` | 缩小差异视图中显示的上下文范围 | Decrease the amount of the context shown around changes in the diff view. |
| `` : `` | 执行自定义命令 | Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands. |
| `` <c-p> `` | 查看自定义补丁选项 | | | `` <c-p> `` | 查看自定义补丁选项 | |
| `` m `` | 查看 合并/变基 选项 | | | `` m `` | 查看 合并/变基 选项 | View options to abort/continue/skip the current merge/rebase. |
| `` R `` | 刷新 | | | `` R `` | 刷新 | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
| `` + `` | 下一屏模式（正常/半屏/全屏） | | | `` + `` | 下一屏模式（正常/半屏/全屏） | |
| `` _ `` | 上一屏模式 | | | `` _ `` | 上一屏模式 | |
| `` ? `` | 打开菜单 | | | `` ? `` | 打开菜单 | |
| `` <c-s> `` | 查看按路径过滤选项 | | | `` <c-s> `` | 查看按路径过滤选项 | View options for filtering the commit log by a file path, so that only commits relating to that path are shown. |
| `` W `` | 打开 diff 菜单 | | | `` W `` | 打开 diff 菜单 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-e> `` | 打开 diff 菜单 | | | `` <c-e> `` | 打开 diff 菜单 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-w> `` | 切换是否在差异视图中显示空白字符差异 | | | `` q `` | 退出 | |
| `` <esc> `` | 取消 | |
| `` <c-w> `` | 切换是否在差异视图中显示空白字符差异 | Toggle whether or not whitespace changes are shown in the diff view. |
| `` z `` | （通过 reflog）撤销「实验功能」 | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | `` z `` | （通过 reflog）撤销「实验功能」 | The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
| `` <c-z> `` | （通过 reflog）重做「实验功能」 | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. | | `` <c-z> `` | （通过 reflog）重做「实验功能」 | The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration. |
| `` P `` | 推送 | |
| `` p `` | 拉取 | |
## 列表面板导航 ## 列表面板导航
@ -52,27 +54,26 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 将提交的 SHA 复制到剪贴板 | | | `` <c-o> `` | 将提交的 SHA 复制到剪贴板 | |
| `` w `` | View worktree options | | | `` <space> `` | 检出 | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | 检出提交 | | | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | Copy commit attribute | |
| `` o `` | 在浏览器中打开提交 | | | `` o `` | 在浏览器中打开提交 | |
| `` n `` | 从提交创建新分支 | | | `` n `` | 从提交创建新分支 | |
| `` g `` | 查看重置选项 | | | `` g `` | 查看重置选项 | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | 复制提交（拣选） | | | `` C `` | 复制提交（拣选） | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | 重置已拣选（复制）的提交 | | | `` <c-r> `` | 重置已拣选（复制）的提交 | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | 查看提交 | | | `` <enter> `` | 查看提交 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Worktrees ## Worktrees
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` n `` | Create worktree | | | `` n `` | New worktree | |
| `` <space> `` | Switch to worktree | | | `` <space> `` | Switch | Switch to the selected worktree. |
| `` <enter> `` | Switch to worktree | |
| `` o `` | Open in editor | | | `` o `` | Open in editor | |
| `` d `` | Remove worktree | | | `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 分支页面 ## 分支页面
@ -81,24 +82,24 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 将分支名称复制到剪贴板 | | | `` <c-o> `` | 将分支名称复制到剪贴板 | |
| `` i `` | 显示 git-flow 选项 | | | `` i `` | 显示 git-flow 选项 | |
| `` <space> `` | 检出 | | | `` <space> `` | 检出 | Checkout selected item. |
| `` n `` | 新分支 | | | `` n `` | 新分支 | |
| `` o `` | 创建抓取请求 | | | `` o `` | 创建抓取请求 | |
| `` O `` | 创建抓取请求选项 | | | `` O `` | 创建抓取请求选项 | |
| `` <c-y> `` | 将抓取请求 URL 复制到剪贴板 | | | `` <c-y> `` | 将抓取请求 URL 复制到剪贴板 | |
| `` c `` | 按名称检出 | | | `` c `` | 按名称检出 | Checkout by name. In the input box you can enter '-' to switch to the last branch. |
| `` F `` | 强制检出 | | | `` F `` | 强制检出 | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
| `` d `` | View delete options | | | `` d `` | Delete | View delete options for local/remote branch. |
| `` r `` | 将已检出的分支变基到该分支 | | | `` r `` | 将已检出的分支变基到该分支 | Rebase the checked-out branch onto the selected branch. |
| `` M `` | 合并到当前检出的分支 | | | `` M `` | 合并到当前检出的分支 | Merge selected branch into currently checked out branch. |
| `` f `` | 从上游快进此分支 | | | `` f `` | 从上游快进此分支 | Fast-forward selected branch from its upstream. |
| `` T `` | 创建标签 | | | `` T `` | 创建标签 | |
| `` s `` | Sort order | | | `` s `` | Sort order | |
| `` g `` | 查看重置选项 | | | `` g `` | 查看重置选项 | |
| `` R `` | 重命名分支 | | | `` R `` | 重命名分支 | |
| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
| `` w `` | View worktree options | |
| `` <enter> `` | 查看提交 | | | `` <enter> `` | 查看提交 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 子提交 ## 子提交
@ -106,16 +107,16 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 将提交的 SHA 复制到剪贴板 | | | `` <c-o> `` | 将提交的 SHA 复制到剪贴板 | |
| `` w `` | View worktree options | | | `` <space> `` | 检出 | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | 检出提交 | | | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | Copy commit attribute | |
| `` o `` | 在浏览器中打开提交 | | | `` o `` | 在浏览器中打开提交 | |
| `` n `` | 从提交创建新分支 | | | `` n `` | 从提交创建新分支 | |
| `` g `` | 查看重置选项 | | | `` g `` | 查看重置选项 | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | 复制提交（拣选） | | | `` C `` | 复制提交（拣选） | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | 重置已拣选（复制）的提交 | | | `` <c-r> `` | 重置已拣选（复制）的提交 | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | 查看提交的文件 | | | `` <enter> `` | 查看提交的文件 | |
| `` w `` | View worktree options | |
| `` / `` | 开始搜索 | | | `` / `` | 开始搜索 | |
## 子模块 ## 子模块
@ -123,13 +124,12 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 将子模块名称复制到剪贴板 | | | `` <c-o> `` | 将子模块名称复制到剪贴板 | |
| `` <enter> `` | 输入子模块 | | | `` <enter> `` | Enter | 输入子模块 |
| `` <space> `` | 输入子模块 | | | `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
| `` d `` | 删除子模块 | | | `` u `` | Update | 更新子模块 |
| `` u `` | 更新子模块 | |
| `` n `` | 添加新的子模块 | | | `` n `` | 添加新的子模块 | |
| `` e `` | 更新子模块 URL | | | `` e `` | 更新子模块 URL | |
| `` i `` | 初始化子模块 | | | `` i `` | Initialize | 初始化子模块 |
| `` b `` | 查看批量子模块选项 | | | `` b `` | 查看批量子模块选项 | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
@ -140,51 +140,51 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
| `` <c-o> `` | 将提交的 SHA 复制到剪贴板 | | | `` <c-o> `` | 将提交的 SHA 复制到剪贴板 | |
| `` <c-r> `` | 重置已拣选（复制）的提交 | | | `` <c-r> `` | 重置已拣选（复制）的提交 | |
| `` b `` | 查看二分查找选项 | | | `` b `` | 查看二分查找选项 | |
| `` s `` | 向下压缩 | | | `` s `` | 压缩 | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
| `` f `` | 修正提交（fixup） | | | `` f `` | 修正（fixup） | Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded. |
| `` r `` | 改写提交 | | | `` r `` | 改写提交 | Reword the selected commit's message. |
| `` R `` | 使用编辑器重命名提交 | | | `` R `` | 使用编辑器重命名提交 | |
| `` d `` | 删除提交 | | | `` d `` | 删除提交 | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
| `` e `` | 编辑提交 | | | `` e `` | Edit (start interactive rebase) | 编辑提交 |
| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
If you would instead like to start an interactive rebase from the selected commit, press `e`. | If you would instead like to start an interactive rebase from the selected commit, press `e`. |
| `` p `` | 选择提交（变基过程中） | | | `` p `` | Pick | 选择提交（变基过程中） |
| `` F `` | 创建修正提交 | | | `` F `` | Create fixup commit | 创建修正提交 |
| `` S `` | 压缩在所选提交之上的所有“fixup!”提交（自动压缩） | | | `` S `` | Apply fixup commits | 压缩在所选提交之上的所有“fixup!”提交（自动压缩） |
| `` <c-j> `` | 下移提交 | | | `` <c-j> `` | 下移提交 | |
| `` <c-k> `` | 上移提交 | | | `` <c-k> `` | 上移提交 | |
| `` V `` | 粘贴提交（拣选） | | | `` V `` | 粘贴提交（拣选） | |
| `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
| `` A `` | 用已暂存的更改来修补提交 | | | `` A `` | Amend | 用已暂存的更改来修补提交 |
| `` a `` | Set/Reset commit author | | | `` a `` | Amend commit attribute | Set/Reset commit author or set co-author. |
| `` t `` | 还原提交 | | | `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
| `` T `` | 标签提交 | | | `` T `` | 标签提交 | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
| `` <c-l> `` | 打开日志菜单 | | | `` <c-l> `` | 打开日志菜单 | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
| `` w `` | View worktree options | | | `` <space> `` | 检出 | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | 检出提交 | | | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | Copy commit attribute | |
| `` o `` | 在浏览器中打开提交 | | | `` o `` | 在浏览器中打开提交 | |
| `` n `` | 从提交创建新分支 | | | `` n `` | 从提交创建新分支 | |
| `` g `` | 查看重置选项 | | | `` g `` | 查看重置选项 | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | 复制提交（拣选） | | | `` C `` | 复制提交（拣选） | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | 查看提交的文件 | | | `` <enter> `` | 查看提交的文件 | |
| `` w `` | View worktree options | |
| `` / `` | 开始搜索 | | | `` / `` | 开始搜索 | |
## 提交文件 ## 提交文件
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 将提交的文件名复制到剪贴板 | | | `` <c-o> `` | 将文件名复制到剪贴板 | |
| `` c `` | 检出文件 | | | `` c `` | 检出 | 检出文件 |
| `` d `` | 放弃对此文件的提交更改 | | | `` d `` | Remove | 放弃对此文件的提交更改 |
| `` o `` | 打开文件 | | | `` o `` | 打开文件 | Open file in default application. |
| `` e `` | 编辑文件 | | | `` e `` | Edit | Open file in external editor. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <space> `` | 补丁中包含的切换文件 | | | `` <space> `` | 补丁中包含的切换文件 | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` a `` | Toggle all files included in patch | | | `` a `` | Toggle all files | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` <enter> `` | 输入文件以将所选行添加到补丁中（或切换目录折叠） | | | `` <enter> `` | 输入文件以将所选行添加到补丁中（或切换目录折叠） | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
| `` ` `` | 切换文件树视图 | | | `` ` `` | 切换文件树视图 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` / `` | 开始搜索 | | | `` / `` | 开始搜索 | |
## 提交讯息 ## 提交讯息
@ -199,29 +199,29 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 将文件名复制到剪贴板 | | | `` <c-o> `` | 将文件名复制到剪贴板 | |
| `` <space> `` | 切换暂存状态 | | | `` <space> `` | 切换暂存状态 | Toggle staged for selected file. |
| `` <c-b> `` | Filter files by status | | | `` <c-b> `` | Filter files by status | |
| `` y `` | Copy to clipboard | | | `` y `` | Copy to clipboard | |
| `` c `` | 提交更改 | | | `` c `` | 提交更改 | Commit staged changes. |
| `` w `` | 提交更改而无需预先提交钩子 | | | `` w `` | 提交更改而无需预先提交钩子 | |
| `` A `` | 修补最后一次提交 | | | `` A `` | 修补最后一次提交 | |
| `` C `` | 提交更改（使用编辑器编辑提交信息） | | | `` C `` | 提交更改（使用编辑器编辑提交信息） | |
| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
| `` e `` | 编辑文件 | | | `` e `` | Edit | Open file in external editor. |
| `` o `` | 打开文件 | | | `` o `` | 打开文件 | Open file in default application. |
| `` i `` | 忽略文件 | | | `` i `` | 忽略文件 | |
| `` r `` | 刷新文件 | | | `` r `` | 刷新文件 | |
| `` s `` | 将所有更改加入贮藏 | | | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
| `` S `` | 查看贮藏选项 | | | `` S `` | 查看贮藏选项 | View stash options (e.g. stash all, stash staged, stash unstaged). |
| `` a `` | 切换所有文件的暂存状态 | | | `` a `` | 切换所有文件的暂存状态 | Toggle staged/unstaged for all files in working tree. |
| `` <enter> `` | 暂存单个 块/行 用于文件, 或 折叠/展开 目录 | | | `` <enter> `` | 暂存单个 块/行 用于文件, 或 折叠/展开 目录 | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
| `` d `` | 查看'放弃更改'选项 | | | `` d `` | 查看'放弃更改'选项 | View options for discarding changes to the selected file. |
| `` g `` | 查看上游重置选项 | | | `` g `` | 查看上游重置选项 | |
| `` D `` | 查看重置选项 | | | `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
| `` ` `` | 切换文件树视图 | | | `` ` `` | 切换文件树视图 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` M `` | 打开外部合并工具 (git mergetool) | | | `` M `` | 打开外部合并工具 (git mergetool) | Run `git mergetool`. |
| `` f `` | 抓取 | | | `` f `` | 抓取 | Fetch changes from remote. |
| `` / `` | 开始搜索 | | | `` / `` | 开始搜索 | |
## 构建补丁中 ## 构建补丁中
@ -231,10 +231,10 @@ If you would instead like to start an interactive rebase from the selected commi
| `` <left> `` | 选择上一个区块 | | | `` <left> `` | 选择上一个区块 | |
| `` <right> `` | 选择下一个区块 | | | `` <right> `` | 选择下一个区块 | |
| `` v `` | 切换拖动选择 | | | `` v `` | 切换拖动选择 | |
| `` a `` | 切换选择区块 | | | `` a `` | 切换选择区块 | Toggle hunk selection mode. |
| `` <c-o> `` | 将选中文本复制到剪贴板 | | | `` <c-o> `` | 将选中文本复制到剪贴板 | |
| `` o `` | 打开文件 | | | `` o `` | 打开文件 | Open file in default application. |
| `` e `` | 编辑文件 | | | `` e `` | 编辑文件 | Open file in external editor. |
| `` <space> `` | 添加/移除 行到补丁 | | | `` <space> `` | 添加/移除 行到补丁 | |
| `` <esc> `` | 退出逐行模式 | | | `` <esc> `` | 退出逐行模式 | |
| `` / `` | 开始搜索 | | | `` / `` | 开始搜索 | |
@ -243,29 +243,29 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | 检出 | | | `` <space> `` | 检出 | Checkout the selected tag tag as a detached HEAD. |
| `` d `` | View delete options | | | `` n `` | 创建标签 | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
| `` P `` | 推送标签 | | | `` d `` | Delete | View delete options for local/remote tag. |
| `` n `` | 创建标签 | | | `` P `` | 推送标签 | Push the selected tag to a remote. You'll be prompted to select a remote. |
| `` g `` | 查看重置选项 | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | 查看提交 | | | `` <enter> `` | 查看提交 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 正在合并 ## 正在合并
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` e `` | 编辑文件 | |
| `` o `` | 打开文件 | |
| `` <left> `` | 选择上一个冲突 | |
| `` <right> `` | 选择下一个冲突 | |
| `` <up> `` | 选择顶部块 | |
| `` <down> `` | 选择底部块 | |
| `` z `` | 撤销 | |
| `` M `` | 打开外部合并工具 (git mergetool) | |
| `` <space> `` | 选中区块 | | | `` <space> `` | 选中区块 | |
| `` b `` | 选中所有区块 | | | `` b `` | 选中所有区块 | |
| `` <up> `` | 选择顶部块 | |
| `` <down> `` | 选择底部块 | |
| `` <left> `` | 选择上一个冲突 | |
| `` <right> `` | 选择下一个冲突 | |
| `` z `` | 撤销 | Undo last merge conflict resolution. |
| `` e `` | 编辑文件 | Open file in external editor. |
| `` o `` | 打开文件 | Open file in default application. |
| `` M `` | 打开外部合并工具 (git mergetool) | Run `git mergetool`. |
| `` <esc> `` | 返回文件面板 | | | `` <esc> `` | 返回文件面板 | |
## 正在暂存 ## 正在暂存
@ -275,16 +275,16 @@ If you would instead like to start an interactive rebase from the selected commi
| `` <left> `` | 选择上一个区块 | | | `` <left> `` | 选择上一个区块 | |
| `` <right> `` | 选择下一个区块 | | | `` <right> `` | 选择下一个区块 | |
| `` v `` | 切换拖动选择 | | | `` v `` | 切换拖动选择 | |
| `` a `` | 切换选择区块 | | | `` a `` | 切换选择区块 | Toggle hunk selection mode. |
| `` <c-o> `` | 将选中文本复制到剪贴板 | | | `` <c-o> `` | 将选中文本复制到剪贴板 | |
| `` o `` | 打开文件 | | | `` <space> `` | 切换暂存状态 | 切换行暂存状态 |
| `` e `` | 编辑文件 | | | `` d `` | 取消变更 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
| `` o `` | 打开文件 | Open file in default application. |
| `` e `` | 编辑文件 | Open file in external editor. |
| `` <esc> `` | 返回文件面板 | | | `` <esc> `` | 返回文件面板 | |
| `` <tab> `` | 切换到其他面板 | | | `` <tab> `` | 切换到其他面板 | Switch to other view (staged/unstaged changes). |
| `` <space> `` | 切换行暂存状态 | | | `` E `` | Edit hunk | Edit selected hunk in external editor. |
| `` d `` | 取消变更 (git reset) | | | `` c `` | 提交更改 | Commit staged changes. |
| `` E `` | Edit hunk | |
| `` c `` | 提交更改 | |
| `` w `` | 提交更改而无需预先提交钩子 | | | `` w `` | 提交更改而无需预先提交钩子 | |
| `` C `` | 提交更改（使用编辑器编辑提交信息） | | | `` C `` | 提交更改（使用编辑器编辑提交信息） | |
| `` / `` | 开始搜索 | | | `` / `` | 开始搜索 | |
@ -300,8 +300,8 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` o `` | 打开配置文件 | | | `` o `` | 打开配置文件 | Open file in default application. |
| `` e `` | 编辑配置文件 | | | `` e `` | 编辑配置文件 | Open file in external editor. |
| `` u `` | 检查更新 | | | `` u `` | 检查更新 | |
| `` <enter> `` | 切换到最近的仓库 | | | `` <enter> `` | 切换到最近的仓库 | |
| `` a `` | 显示所有分支的日志 | | | `` a `` | 显示所有分支的日志 | |
@ -325,13 +325,13 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | 应用 | | | `` <space> `` | 应用 | Apply the stash entry to your working directory. |
| `` g `` | 应用并删除 | | | `` g `` | 应用并删除 | Apply the stash entry to your working directory and remove the stash entry. |
| `` d `` | 删除 | | | `` d `` | 删除 | Remove the stash entry from the stash list. |
| `` n `` | 新分支 | | | `` n `` | 新分支 | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
| `` r `` | Rename stash | | | `` r `` | Rename stash | |
| `` w `` | View worktree options | |
| `` <enter> `` | 查看提交的文件 | | | `` <enter> `` | 查看提交的文件 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 远程分支 ## 远程分支
@ -339,24 +339,25 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 将分支名称复制到剪贴板 | | | `` <c-o> `` | 将分支名称复制到剪贴板 | |
| `` <space> `` | 检出 | | | `` <space> `` | 检出 | Checkout a new local branch based on the selected remote branch. The new branch will track the remote branch. |
| `` n `` | 新分支 | | | `` n `` | 新分支 | |
| `` M `` | 合并到当前检出的分支 | | | `` M `` | 合并到当前检出的分支 | Merge selected branch into currently checked out branch. |
| `` r `` | 将已检出的分支变基到该分支 | | | `` r `` | 将已检出的分支变基到该分支 | Rebase the checked-out branch onto the selected branch. |
| `` d `` | Delete remote tag | | | `` d `` | Delete | Delete the remote branch from the remote. |
| `` u `` | 设置为检出分支的上游 | | | `` u `` | Set as upstream | 设置为检出分支的上游 |
| `` s `` | Sort order | | | `` s `` | Sort order | |
| `` g `` | 查看重置选项 | | | `` g `` | 查看重置选项 | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | 查看提交 | | | `` <enter> `` | 查看提交 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 远程页面 ## 远程页面
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` f `` | 抓取远程仓库 | | | `` <enter> `` | View branches | |
| `` n `` | 添加新的远程仓库 | | | `` n `` | 添加新的远程仓库 | |
| `` d `` | 删除远程 | | | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
| `` e `` | 编辑远程仓库 | | | `` e `` | Edit | 编辑远程仓库 |
| `` f `` | 抓取 | 抓取远程仓库 |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |

247
docs/keybindings/Keybindings_zh-TW.md
View File

@ -11,24 +11,26 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
| `` <c-r> `` | 切換到最近使用的版本庫 | | | `` <c-r> `` | 切換到最近使用的版本庫 | |
| `` <pgup> (fn+up/shift+k) `` | 向上捲動主面板 | | | `` <pgup> (fn+up/shift+k) `` | 向上捲動主面板 | |
| `` <pgdown> (fn+down/shift+j) `` | 向下捲動主面板 | | | `` <pgdown> (fn+down/shift+j) `` | 向下捲動主面板 | |
| `` @ `` | 開啟命令記錄選單 | | | `` @ `` | 開啟命令記錄選單 | View options for the command log e.g. show/hide the command log and focus the command log. |
| `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 | | | `` P `` | 推送 | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 | | | `` p `` | 拉取 | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
| `` : `` | 執行自訂命令 | | | `` } `` | 增加差異檢視中顯示變更周圍上下文的大小 | Increase the amount of the context shown around changes in the diff view. |
| `` { `` | 減小差異檢視中顯示變更周圍上下文的大小 | Decrease the amount of the context shown around changes in the diff view. |
| `` : `` | 執行自訂命令 | Bring up a prompt where you can enter a shell command to execute. Not to be confused with pre-configured custom commands. |
| `` <c-p> `` | 檢視自訂補丁選項 | | | `` <c-p> `` | 檢視自訂補丁選項 | |
| `` m `` | 查看合併/變基選項 | | | `` m `` | 查看合併/變基選項 | View options to abort/continue/skip the current merge/rebase. |
| `` R `` | 重新整理 | | | `` R `` | 重新整理 | Refresh the git state (i.e. run `git status`, `git branch`, etc in background to update the contents of panels). This does not run `git fetch`. |
| `` + `` | 下一個螢幕模式（常規/半螢幕/全螢幕） | | | `` + `` | 下一個螢幕模式（常規/半螢幕/全螢幕） | |
| `` _ `` | 上一個螢幕模式 | | | `` _ `` | 上一個螢幕模式 | |
| `` ? `` | 開啟選單 | | | `` ? `` | 開啟選單 | |
| `` <c-s> `` | 檢視篩選路徑選項 | | | `` <c-s> `` | 檢視篩選路徑選項 | View options for filtering the commit log by a file path, so that only commits relating to that path are shown. |
| `` W `` | 開啟差異比較選單 | | | `` W `` | 開啟差異比較選單 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-e> `` | 開啟差異比較選單 | | | `` <c-e> `` | 開啟差異比較選單 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
| `` <c-w> `` | 切換是否在差異檢視中顯示空格變更 | | | `` q `` | 結束 | |
| `` <esc> `` | 取消 | |
| `` <c-w> `` | 切換是否在差異檢視中顯示空格變更 | Toggle whether or not whitespace changes are shown in the diff view. |
| `` z `` | 復原 | 將使用 reflog 確定要運行哪個 git 命令以復原上一個 git 命令。這不包括工作區的更改；只考慮提交。 | | `` z `` | 復原 | 將使用 reflog 確定要運行哪個 git 命令以復原上一個 git 命令。這不包括工作區的更改；只考慮提交。 |
| `` <c-z> `` | 取消復原 | 將使用 reflog 確定要運行哪個 git 命令以重作上一個 git 命令。這不包括工作區的更改；只考慮提交。 | | `` <c-z> `` | 取消復原 | 將使用 reflog 確定要運行哪個 git 命令以重作上一個 git 命令。這不包括工作區的更改；只考慮提交。 |
| `` P `` | 推送 | |
| `` p `` | 拉取 | |
## 列表面板導航 ## 列表面板導航
@ -52,27 +54,26 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 複製提交 SHA 到剪貼簿 | | | `` <c-o> `` | 複製提交 SHA 到剪貼簿 | |
| `` w `` | View worktree options | | | `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | 檢出提交 | | | `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | 複製提交屬性 | |
| `` o `` | 在瀏覽器中開啟提交 | | | `` o `` | 在瀏覽器中開啟提交 | |
| `` n `` | 從提交建立新分支 | | | `` n `` | 從提交建立新分支 | |
| `` g `` | 檢視重設選項 | | | `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | 複製提交 (揀選) | | | `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | 重設選定的揀選 (複製) 提交 | | | `` <c-r> `` | 重設選定的揀選 (複製) 提交 | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | 檢視提交 | | | `` <enter> `` | 檢視提交 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## Worktrees ## Worktrees
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` n `` | Create worktree | | | `` n `` | New worktree | |
| `` <space> `` | Switch to worktree | | | `` <space> `` | Switch | Switch to the selected worktree. |
| `` <enter> `` | Switch to worktree | |
| `` o `` | Open in editor | | | `` o `` | Open in editor | |
| `` d `` | Remove worktree | | | `` d `` | Remove | Remove the selected worktree. This will both delete the worktree's directory, as well as metadata about the worktree in the .git directory. |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 主視窗 (一般) ## 主視窗 (一般)
@ -86,16 +87,16 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` e `` | 編輯檔案 | |
| `` o `` | 開啟檔案 | |
| `` <left> `` | 選擇上一個衝突 | |
| `` <right> `` | 選擇下一個衝突 | |
| `` <up> `` | 選擇上一段 | |
| `` <down> `` | 選擇下一段 | |
| `` z `` | 復原 | |
| `` M `` | 開啟外部合併工具 (git mergetool) | |
| `` <space> `` | 挑選程式碼片段 | | | `` <space> `` | 挑選程式碼片段 | |
| `` b `` | 挑選所有程式碼片段 | | | `` b `` | 挑選所有程式碼片段 | |
| `` <up> `` | 選擇上一段 | |
| `` <down> `` | 選擇下一段 | |
| `` <left> `` | 選擇上一個衝突 | |
| `` <right> `` | 選擇下一個衝突 | |
| `` z `` | 復原 | Undo last merge conflict resolution. |
| `` e `` | 編輯檔案 | Open file in external editor. |
| `` o `` | 開啟檔案 | Open file in default application. |
| `` M `` | 開啟外部合併工具 (git mergetool) | Run `git mergetool`. |
| `` <esc> `` | 返回檔案面板 | | | `` <esc> `` | 返回檔案面板 | |
## 主視窗 (預存中) ## 主視窗 (預存中)
@ -105,16 +106,16 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
| `` <left> `` | 選擇上一段 | | | `` <left> `` | 選擇上一段 | |
| `` <right> `` | 選擇下一段 | | | `` <right> `` | 選擇下一段 | |
| `` v `` | 切換拖曳選擇 | | | `` v `` | 切換拖曳選擇 | |
| `` a `` | 切換選擇程式碼塊 | | | `` a `` | 切換選擇程式碼塊 | Toggle hunk selection mode. |
| `` <c-o> `` | 複製所選文本至剪貼簿 | | | `` <c-o> `` | 複製所選文本至剪貼簿 | |
| `` o `` | 開啟檔案 | | | `` <space> `` | 切換預存 | 切換現有行的狀態 (已預存/未預存) |
| `` e `` | 編輯檔案 | | | `` d `` | 刪除變更 (git reset) | When unstaged change is selected, discard the change using `git reset`. When staged change is selected, unstage the change. |
| `` o `` | 開啟檔案 | Open file in default application. |
| `` e `` | 編輯檔案 | Open file in external editor. |
| `` <esc> `` | 返回檔案面板 | | | `` <esc> `` | 返回檔案面板 | |
| `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | | | `` <tab> `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). |
| `` <space> `` | 切換現有行的狀態 (已預存/未預存) | | | `` E `` | 編輯程式碼塊 | Edit selected hunk in external editor. |
| `` d `` | 刪除變更 (git reset) | | | `` c `` | 提交變更 | Commit staged changes. |
| `` E `` | 編輯程式碼塊 | |
| `` c `` | 提交變更 | |
| `` w `` | 沒有預提交 hook 就提交更改 | | | `` w `` | 沒有預提交 hook 就提交更改 | |
| `` C `` | 使用 git 編輯器提交變更 | | | `` C `` | 使用 git 編輯器提交變更 | |
| `` / `` | 開始搜尋 | | | `` / `` | 開始搜尋 | |
@ -126,10 +127,10 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
| `` <left> `` | 選擇上一段 | | | `` <left> `` | 選擇上一段 | |
| `` <right> `` | 選擇下一段 | | | `` <right> `` | 選擇下一段 | |
| `` v `` | 切換拖曳選擇 | | | `` v `` | 切換拖曳選擇 | |
| `` a `` | 切換選擇程式碼塊 | | | `` a `` | 切換選擇程式碼塊 | Toggle hunk selection mode. |
| `` <c-o> `` | 複製所選文本至剪貼簿 | | | `` <c-o> `` | 複製所選文本至剪貼簿 | |
| `` o `` | 開啟檔案 | | | `` o `` | 開啟檔案 | Open file in default application. |
| `` e `` | 編輯檔案 | | | `` e `` | 編輯檔案 | Open file in external editor. |
| `` <space> `` | 向 (或從) 補丁中添加/刪除行 | | | `` <space> `` | 向 (或從) 補丁中添加/刪除行 | |
| `` <esc> `` | 退出自訂補丁建立器 | | | `` <esc> `` | 退出自訂補丁建立器 | |
| `` / `` | 開始搜尋 | | | `` / `` | 開始搜尋 | |
@ -147,16 +148,16 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 複製提交 SHA 到剪貼簿 | | | `` <c-o> `` | 複製提交 SHA 到剪貼簿 | |
| `` w `` | View worktree options | | | `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | 檢出提交 | | | `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | 複製提交屬性 | |
| `` o `` | 在瀏覽器中開啟提交 | | | `` o `` | 在瀏覽器中開啟提交 | |
| `` n `` | 從提交建立新分支 | | | `` n `` | 從提交建立新分支 | |
| `` g `` | 檢視重設選項 | | | `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | 複製提交 (揀選) | | | `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-r> `` | 重設選定的揀選 (複製) 提交 | | | `` <c-r> `` | 重設選定的揀選 (複製) 提交 | |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | 檢視所選項目的檔案 | | | `` <enter> `` | 檢視所選項目的檔案 | |
| `` w `` | View worktree options | |
| `` / `` | 開始搜尋 | | | `` / `` | 開始搜尋 | |
## 子模組 ## 子模組
@ -164,13 +165,12 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 複製子模組名稱到剪貼簿 | | | `` <c-o> `` | 複製子模組名稱到剪貼簿 | |
| `` <enter> `` | 進入子模組 | | | `` <enter> `` | Enter | 進入子模組 |
| `` <space> `` | 進入子模組 | | | `` d `` | Remove | Remove the selected submodule and its corresponding directory. |
| `` d `` | 移除子模組 | | | `` u `` | Update | 更新子模組 |
| `` u `` | 更新子模組 | |
| `` n `` | 新增子模組 | | | `` n `` | 新增子模組 | |
| `` e `` | 更新子模組 URL | | | `` e `` | 更新子模組 URL | |
| `` i `` | 初始化子模組 | | | `` i `` | Initialize | 初始化子模組 |
| `` b `` | 查看批量子模組選項 | | | `` b `` | 查看批量子模組選項 | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
@ -181,35 +181,35 @@ _說明：`<c-b>` 表示 Ctrl+B、`<a-b>` 表示 Alt+B，`B`表示 Shift+B_
| `` <c-o> `` | 複製提交 SHA 到剪貼簿 | | | `` <c-o> `` | 複製提交 SHA 到剪貼簿 | |
| `` <c-r> `` | 重設選定的揀選 (複製) 提交 | | | `` <c-r> `` | 重設選定的揀選 (複製) 提交 | |
| `` b `` | 查看二分選項 | | | `` b `` | 查看二分選項 | |
| `` s `` | 向下壓縮 | | | `` s `` | 壓縮 (Squash) | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
| `` f `` | 修復提交 (Fixup) | | | `` f `` | 修復 (Fixup) | Meld the selected commit into the commit below it. Similar to fixup, but the selected commit's message will be discarded. |
| `` r `` | 改寫提交 | | | `` r `` | 改寫提交 | Reword the selected commit's message. |
| `` R `` | 使用編輯器改寫提交 | | | `` R `` | 使用編輯器改寫提交 | |
| `` d `` | 刪除提交 | | | `` d `` | 刪除提交 | Drop the selected commit. This will remove the commit from the branch via a rebase. If the commit makes changes that later commits depend on, you may need to resolve merge conflicts. |
| `` e `` | 編輯提交 | | | `` e `` | Edit (start interactive rebase) | 編輯提交 |
| `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit. | `` i `` | Start interactive rebase | Start an interactive rebase for the commits on your branch. This will include all commits from the HEAD commit down to the first merge commit or main branch commit.
If you would instead like to start an interactive rebase from the selected commit, press `e`. | If you would instead like to start an interactive rebase from the selected commit, press `e`. |
| `` p `` | 挑選提交 (於變基過程中) | | | `` p `` | Pick | 挑選提交 (於變基過程中) |
| `` F `` | 為此提交建立修復提交 | | | `` F `` | Create fixup commit | 為此提交建立修復提交 |
| `` S `` | 壓縮上方所有的“fixup!”提交 (自動壓縮) | | | `` S `` | Apply fixup commits | 壓縮上方所有的“fixup!”提交 (自動壓縮) |
| `` <c-j> `` | 向下移動提交 | | | `` <c-j> `` | 向下移動提交 | |
| `` <c-k> `` | 向上移動提交 | | | `` <c-k> `` | 向上移動提交 | |
| `` V `` | 貼上提交 (揀選) | | | `` V `` | 貼上提交 (揀選) | |
| `` B `` | Mark commit as base commit for rebase | Select a base commit for the next rebase; this will effectively perform a 'git rebase --onto'. | | `` B `` | Mark as base commit for rebase | Select a base commit for the next rebase. When you rebase onto a branch, only commits above the base commit will be brought across. This uses the `git rebase --onto` command. |
| `` A `` | 使用已預存的更改修正提交 | | | `` A `` | Amend | 使用已預存的更改修正提交 |
| `` a `` | 設置/重設提交作者 | | | `` a `` | 設置/重設提交作者 | Set/Reset commit author or set co-author. |
| `` t `` | 還原提交 | | | `` t `` | Revert | Create a revert commit for the selected commit, which applies the selected commit's changes in reverse. |
| `` T `` | 打標籤到提交 | | | `` T `` | 打標籤到提交 | Create a new tag pointing at the selected commit. You'll be prompted to enter a tag name and optional description. |
| `` <c-l> `` | 開啟記錄選單 | | | `` <c-l> `` | 開啟記錄選單 | View options for commit log e.g. changing sort order, hiding the git graph, showing the whole git graph. |
| `` w `` | View worktree options | | | `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
| `` <space> `` | 檢出提交 | | | `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
| `` y `` | 複製提交屬性 | |
| `` o `` | 在瀏覽器中開啟提交 | | | `` o `` | 在瀏覽器中開啟提交 | |
| `` n `` | 從提交建立新分支 | | | `` n `` | 從提交建立新分支 | |
| `` g `` | 檢視重設選項 | | | `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` C `` | 複製提交 (揀選) | | | `` C `` | 複製提交 (揀選) | Mark commit as copied. Then, within the local commits view, you can press `V` to paste (cherry-pick) the copied commit(s) into your checked out branch. At any time you can press `<esc>` to cancel the selection. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <enter> `` | 檢視所選項目的檔案 | | | `` <enter> `` | 檢視所選項目的檔案 | |
| `` w `` | View worktree options | |
| `` / `` | 開始搜尋 | | | `` / `` | 開始搜尋 | |
## 提交摘要 ## 提交摘要
@ -223,29 +223,29 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 複製提交的檔案名稱到剪貼簿 | | | `` <c-o> `` | 複製檔案名稱到剪貼簿 | |
| `` c `` | 檢出檔案 | | | `` c `` | 檢出 | 檢出檔案 |
| `` d `` | 捨棄此提交對此檔案的更改 | | | `` d `` | Remove | 捨棄此提交對此檔案的更改 |
| `` o `` | 開啟檔案 | | | `` o `` | 開啟檔案 | Open file in default application. |
| `` e `` | 編輯檔案 | | | `` e `` | Edit | Open file in external editor. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` <space> `` | 切換檔案是否包含在補丁中 | | | `` <space> `` | 切換檔案是否包含在補丁中 | Toggle whether the file is included in the custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` a `` | 切換所有檔案是否包含在補丁中 | | | `` a `` | 切換所有檔案是否包含在補丁中 | Add/remove all commit's files to custom patch. See https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches. |
| `` <enter> `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | | | `` <enter> `` | 輸入檔案以將選定的行添加至補丁（或切換目錄折疊） | If a file is selected, enter the file so that you can add/remove individual lines to the custom patch. If a directory is selected, toggle the directory. |
| `` ` `` | 切換檔案樹狀視圖 | | | `` ` `` | 切換檔案樹狀視圖 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` / `` | 開始搜尋 | | | `` / `` | 開始搜尋 | |
## 收藏 (Stash) ## 收藏 (Stash)
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | 套用 | | | `` <space> `` | 套用 | Apply the stash entry to your working directory. |
| `` g `` | 還原 | | | `` g `` | 還原 | Apply the stash entry to your working directory and remove the stash entry. |
| `` d `` | 捨棄 | | | `` d `` | 捨棄 | Remove the stash entry from the stash list. |
| `` n `` | 新分支 | | | `` n `` | 新分支 | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. |
| `` r `` | 重新命名收藏 | | | `` r `` | 重新命名收藏 | |
| `` w `` | View worktree options | |
| `` <enter> `` | 檢視所選項目的檔案 | | | `` <enter> `` | 檢視所選項目的檔案 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 本地分支 ## 本地分支
@ -254,37 +254,37 @@ If you would instead like to start an interactive rebase from the selected commi
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 複製分支名稱到剪貼簿 | | | `` <c-o> `` | 複製分支名稱到剪貼簿 | |
| `` i `` | 顯示 git-flow 選項 | | | `` i `` | 顯示 git-flow 選項 | |
| `` <space> `` | 檢出 | | | `` <space> `` | 檢出 | Checkout selected item. |
| `` n `` | 新分支 | | | `` n `` | 新分支 | |
| `` o `` | 建立拉取請求 | | | `` o `` | 建立拉取請求 | |
| `` O `` | 建立拉取請求選項 | | | `` O `` | 建立拉取請求選項 | |
| `` <c-y> `` | 複製拉取請求的 URL 到剪貼板 | | | `` <c-y> `` | 複製拉取請求的 URL 到剪貼板 | |
| `` c `` | 根據名稱檢出 | | | `` c `` | 根據名稱檢出 | Checkout by name. In the input box you can enter '-' to switch to the last branch. |
| `` F `` | 強制檢出 | | | `` F `` | 強制檢出 | Force checkout selected branch. This will discard all local changes in your working directory before checking out the selected branch. |
| `` d `` | View delete options | | | `` d `` | Delete | View delete options for local/remote branch. |
| `` r `` | 將已檢出的分支變基至此分支 | | | `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. |
| `` M `` | 合併到當前檢出的分支 | | | `` M `` | 合併到當前檢出的分支 | Merge selected branch into currently checked out branch. |
| `` f `` | 從上游快進此分支 | | | `` f `` | 從上游快進此分支 | Fast-forward selected branch from its upstream. |
| `` T `` | 建立標籤 | | | `` T `` | 建立標籤 | |
| `` s `` | Sort order | | | `` s `` | Sort order | |
| `` g `` | 檢視重設選項 | | | `` g `` | 檢視重設選項 | |
| `` R `` | 重新命名分支 | | | `` R `` | 重新命名分支 | |
| `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream | | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. |
| `` w `` | View worktree options | |
| `` <enter> `` | 檢視提交 | | | `` <enter> `` | 檢視提交 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 標籤 ## 標籤
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <space> `` | 檢出 | | | `` <space> `` | 檢出 | Checkout the selected tag tag as a detached HEAD. |
| `` d `` | View delete options | | | `` n `` | 建立標籤 | Create new tag from current commit. You'll be prompted to enter a tag name and optional description. |
| `` P `` | 推送標籤 | | | `` d `` | Delete | View delete options for local/remote tag. |
| `` n `` | 建立標籤 | | | `` P `` | 推送標籤 | Push the selected tag to a remote. You'll be prompted to select a remote. |
| `` g `` | 檢視重設選項 | | | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | 檢視提交 | | | `` <enter> `` | 檢視提交 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 檔案 ## 檔案
@ -292,37 +292,37 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 複製檔案名稱到剪貼簿 | | | `` <c-o> `` | 複製檔案名稱到剪貼簿 | |
| `` <space> `` | 切換預存 | | | `` <space> `` | 切換預存 | Toggle staged for selected file. |
| `` <c-b> `` | 篩選檔案 (預存/未預存) | | | `` <c-b> `` | 篩選檔案 (預存/未預存) | |
| `` y `` | Copy to clipboard | | | `` y `` | Copy to clipboard | |
| `` c `` | 提交變更 | | | `` c `` | 提交變更 | Commit staged changes. |
| `` w `` | 沒有預提交 hook 就提交更改 | | | `` w `` | 沒有預提交 hook 就提交更改 | |
| `` A `` | 修正上次提交 | | | `` A `` | 修正上次提交 | |
| `` C `` | 使用 git 編輯器提交變更 | | | `` C `` | 使用 git 編輯器提交變更 | |
| `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> | | `` <c-f> `` | Find base commit for fixup | Find the commit that your current changes are building upon, for the sake of amending/fixing up the commit. This spares you from having to look through your branch's commits one-by-one to see which commit should be amended/fixed up. See docs: <https://github.com/jesseduffield/lazygit/tree/master/docs/Fixup_Commits.md> |
| `` e `` | 編輯檔案 | | | `` e `` | Edit | Open file in external editor. |
| `` o `` | 開啟檔案 | | | `` o `` | 開啟檔案 | Open file in default application. |
| `` i `` | 忽略或排除檔案 | | | `` i `` | 忽略或排除檔案 | |
| `` r `` | 重新整理檔案 | | | `` r `` | 重新整理檔案 | |
| `` s `` | 收藏所有變更 | | | `` s `` | Stash | Stash all changes. For other variations of stashing, use the view stash options keybinding. |
| `` S `` | 檢視收藏選項 | | | `` S `` | 檢視收藏選項 | View stash options (e.g. stash all, stash staged, stash unstaged). |
| `` a `` | 全部預存/取消預存 | | | `` a `` | 全部預存/取消預存 | Toggle staged/unstaged for all files in working tree. |
| `` <enter> `` | 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄 | | | `` <enter> `` | 選擇檔案中的單個程式碼塊/行，或展開/折疊目錄 | If the selected item is a file, focus the staging view so you can stage individual hunks/lines. If the selected item is a directory, collapse/expand it. |
| `` d `` | 檢視“捨棄更改”的選項 | | | `` d `` | 檢視“捨棄更改”的選項 | View options for discarding changes to the selected file. |
| `` g `` | 檢視上游重設選項 | | | `` g `` | 檢視上游重設選項 | |
| `` D `` | 檢視重設選項 | | | `` D `` | Reset | View reset options for working tree (e.g. nuking the working tree). |
| `` ` `` | 切換檔案樹狀視圖 | | | `` ` `` | 切換檔案樹狀視圖 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory. |
| `` <c-t> `` | Open external diff tool (git difftool) | | | `` <c-t> `` | Open external diff tool (git difftool) | |
| `` M `` | 開啟外部合併工具 (git mergetool) | | | `` M `` | 開啟外部合併工具 (git mergetool) | Run `git mergetool`. |
| `` f `` | 擷取 | | | `` f `` | 擷取 | Fetch changes from remote. |
| `` / `` | 開始搜尋 | | | `` / `` | 開始搜尋 | |
## 狀態 ## 狀態
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` o `` | 開啟設定檔案 | | | `` o `` | 開啟設定檔案 | Open file in default application. |
| `` e `` | 編輯設定檔案 | | | `` e `` | 編輯設定檔案 | Open file in external editor. |
| `` u `` | 檢查更新 | | | `` u `` | 檢查更新 | |
| `` <enter> `` | 切換到最近使用的版本庫 | | | `` <enter> `` | 切換到最近使用的版本庫 | |
| `` a `` | 顯示所有分支日誌 | | | `` a `` | 顯示所有分支日誌 | |
@ -338,10 +338,11 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` f `` | 擷取遠端 | | | `` <enter> `` | View branches | |
| `` n `` | 新增遠端 | | | `` n `` | 新增遠端 | |
| `` d `` | 移除遠端 | | | `` d `` | Remove | Remove the selected remote. Any local branches tracking a remote branch from the remote will be unaffected. |
| `` e `` | 編輯遠端 | | | `` e `` | Edit | 編輯遠端 |
| `` f `` | 擷取 | 擷取遠端 |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |
## 遠端分支 ## 遠端分支
@ -349,14 +350,14 @@ If you would instead like to start an interactive rebase from the selected commi
| Key | Action | Info | | Key | Action | Info |
|-----|--------|-------------| |-----|--------|-------------|
| `` <c-o> `` | 複製分支名稱到剪貼簿 | | | `` <c-o> `` | 複製分支名稱到剪貼簿 | |
| `` <space> `` | 檢出 | | | `` <space> `` | 檢出 | Checkout a new local branch based on the selected remote branch. The new branch will track the remote branch. |
| `` n `` | 新分支 | | | `` n `` | 新分支 | |
| `` M `` | 合併到當前檢出的分支 | | | `` M `` | 合併到當前檢出的分支 | Merge selected branch into currently checked out branch. |
| `` r `` | 將已檢出的分支變基至此分支 | | | `` r `` | 將已檢出的分支變基至此分支 | Rebase the checked-out branch onto the selected branch. |
| `` d `` | Delete remote tag | | | `` d `` | Delete | Delete the remote branch from the remote. |
| `` u `` | 將此分支設為當前分支之上游 | | | `` u `` | Set as upstream | 將此分支設為當前分支之上游 |
| `` s `` | Sort order | | | `` s `` | Sort order | |
| `` g `` | 檢視重設選項 | | | `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. |
| `` w `` | View worktree options | |
| `` <enter> `` | 檢視提交 | | | `` <enter> `` | 檢視提交 | |
| `` w `` | View worktree options | |
| `` / `` | Filter the current view by text | | | `` / `` | Filter the current view by text | |

2
pkg/constants/links.go
View File

@ -8,6 +8,7 @@ type Docs struct {
Undoing string Undoing string
Config string Config string
Tutorial string Tutorial string
CustomPatchDemo string
} }
var Links = struct { var Links = struct {
@ -31,5 +32,6 @@ var Links = struct {
Undoing: "https://github.com/jesseduffield/lazygit/blob/master/docs/Undoing.md", Undoing: "https://github.com/jesseduffield/lazygit/blob/master/docs/Undoing.md",
Config: "https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md", Config: "https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md",
Tutorial: "https://youtu.be/VDXvbHZYeKY", Tutorial: "https://youtu.be/VDXvbHZYeKY",
CustomPatchDemo: "https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches",
}, },
} }

34
pkg/gui/controllers.go
View File

@ -16,6 +16,9 @@ func (gui *Gui) Helpers() *helpers.Helpers {
return gui.helpers return gui.helpers
} }
// Note, the order of controllers determines the order in which keybindings appear
// in the keybinding menu: the earlier that the controller is attached to a context,
// the lower in the list the keybindings will appear.
func (gui *Gui) resetHelpersAndControllers() { func (gui *Gui) resetHelpersAndControllers() {
helperCommon := gui.c helperCommon := gui.c
recordDirectoryHelper := helpers.NewRecordDirectoryHelper(helperCommon) recordDirectoryHelper := helpers.NewRecordDirectoryHelper(helperCommon)
@ -199,6 +202,18 @@ func (gui *Gui) resetHelpersAndControllers() {
controllers.AttachControllers(context, searchControllerFactory.Create(context)) controllers.AttachControllers(context, searchControllerFactory.Create(context))
} }
for _, context := range []controllers.CanViewWorktreeOptions{
gui.State.Contexts.LocalCommits,
gui.State.Contexts.ReflogCommits,
gui.State.Contexts.SubCommits,
gui.State.Contexts.Stash,
gui.State.Contexts.Branches,
gui.State.Contexts.RemoteBranches,
gui.State.Contexts.Tags,
} {
controllers.AttachControllers(context, controllers.NewWorktreeOptionsController(common, context))
}
// allow for navigating between side window contexts // allow for navigating between side window contexts
for _, context := range []types.Context{ for _, context := range []types.Context{
gui.State.Contexts.Status, gui.State.Contexts.Status,
@ -247,18 +262,6 @@ func (gui *Gui) resetHelpersAndControllers() {
controllers.AttachControllers(context, controllers.NewBasicCommitsController(common, context)) controllers.AttachControllers(context, controllers.NewBasicCommitsController(common, context))
} }
for _, context := range []controllers.CanViewWorktreeOptions{
gui.State.Contexts.LocalCommits,
gui.State.Contexts.ReflogCommits,
gui.State.Contexts.SubCommits,
gui.State.Contexts.Stash,
gui.State.Contexts.Branches,
gui.State.Contexts.RemoteBranches,
gui.State.Contexts.Tags,
} {
controllers.AttachControllers(context, controllers.NewWorktreeOptionsController(common, context))
}
controllers.AttachControllers(gui.State.Contexts.ReflogCommits, controllers.AttachControllers(gui.State.Contexts.ReflogCommits,
reflogCommitsController, reflogCommitsController,
) )
@ -306,11 +309,6 @@ func (gui *Gui) resetHelpersAndControllers() {
submodulesController, submodulesController,
) )
controllers.AttachControllers(gui.State.Contexts.LocalCommits,
localCommitsController,
bisectController,
)
controllers.AttachControllers(gui.State.Contexts.Branches, controllers.AttachControllers(gui.State.Contexts.Branches,
branchesController, branchesController,
gitFlowController, gitFlowController,
@ -374,11 +372,11 @@ func (gui *Gui) resetHelpersAndControllers() {
) )
controllers.AttachControllers(gui.State.Contexts.Global, controllers.AttachControllers(gui.State.Contexts.Global,
syncController,
undoController, undoController,
globalController, globalController,
contextLinesController, contextLinesController,
jumpToSideWindowController, jumpToSideWindowController,
syncController,
) )
controllers.AttachControllers(gui.State.Contexts.Snake, controllers.AttachControllers(gui.State.Contexts.Snake,

13
pkg/gui/controllers/basic_commits_controller.go
View File

@ -5,7 +5,9 @@ import (
"github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/git_commands"
"github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
"github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/gui/types"
"github.com/jesseduffield/lazygit/pkg/utils"
) )
// This controller is for all contexts that contain a list of commits. // This controller is for all contexts that contain a list of commits.
@ -48,13 +50,15 @@ func (self *BasicCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
Key: opts.GetKey(opts.Config.Commits.CheckoutCommit), Key: opts.GetKey(opts.Config.Commits.CheckoutCommit),
Handler: self.withItem(self.checkout), Handler: self.withItem(self.checkout),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.CheckoutCommit, Description: self.c.Tr.Checkout,
Tooltip: self.c.Tr.CheckoutCommitTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Commits.CopyCommitAttributeToClipboard), Key: opts.GetKey(opts.Config.Commits.CopyCommitAttributeToClipboard),
Handler: self.withItem(self.copyCommitAttribute), Handler: self.withItem(self.copyCommitAttribute),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.CopyCommitAttributeToClipboard, Description: self.c.Tr.CopyCommitAttributeToClipboard,
Tooltip: self.c.Tr.CopyCommitAttributeToClipboardTooltip,
OpensMenu: true, OpensMenu: true,
}, },
{ {
@ -74,12 +78,19 @@ func (self *BasicCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
Handler: self.withItem(self.createResetMenu), Handler: self.withItem(self.createResetMenu),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.ViewResetOptions, Description: self.c.Tr.ViewResetOptions,
Tooltip: self.c.Tr.ResetTooltip,
OpensMenu: true, OpensMenu: true,
}, },
{ {
Key: opts.GetKey(opts.Config.Commits.CherryPickCopy), Key: opts.GetKey(opts.Config.Commits.CherryPickCopy),
Handler: self.withItem(self.copyRange), Handler: self.withItem(self.copyRange),
Description: self.c.Tr.CherryPickCopy, Description: self.c.Tr.CherryPickCopy,
Tooltip: utils.ResolvePlaceholderString(self.c.Tr.CherryPickCopyTooltip,
map[string]string{
"paste": keybindings.Label(opts.Config.Commits.PasteCommits),
"escape": keybindings.Label(opts.Config.Universal.Return),
},
),
}, },
{ {
Key: opts.GetKey(opts.Config.Commits.ResetCherryPick), Key: opts.GetKey(opts.Config.Commits.ResetCherryPick),

14
pkg/gui/controllers/branches_controller.go
View File

@ -48,6 +48,7 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty
self.notPulling, self.notPulling,
), ),
Description: self.c.Tr.Checkout, Description: self.c.Tr.Checkout,
Tooltip: self.c.Tr.CheckoutTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.New), Key: opts.GetKey(opts.Config.Universal.New),
@ -78,18 +79,21 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty
Key: opts.GetKey(opts.Config.Branches.CheckoutBranchByName), Key: opts.GetKey(opts.Config.Branches.CheckoutBranchByName),
Handler: self.checkoutByName, Handler: self.checkoutByName,
Description: self.c.Tr.CheckoutByName, Description: self.c.Tr.CheckoutByName,
Tooltip: self.c.Tr.CheckoutByNameTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Branches.ForceCheckoutBranch), Key: opts.GetKey(opts.Config.Branches.ForceCheckoutBranch),
Handler: self.forceCheckout, Handler: self.forceCheckout,
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.ForceCheckout, Description: self.c.Tr.ForceCheckout,
Tooltip: self.c.Tr.ForceCheckoutTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Remove), Key: opts.GetKey(opts.Config.Universal.Remove),
Handler: self.withItem(self.delete), Handler: self.withItem(self.delete),
GetDisabledReason: self.require(self.singleItemSelected(self.branchIsReal)), GetDisabledReason: self.require(self.singleItemSelected(self.branchIsReal)),
Description: self.c.Tr.ViewDeleteOptions, Description: self.c.Tr.Delete,
Tooltip: self.c.Tr.BranchDeleteTooltip,
OpensMenu: true, OpensMenu: true,
}, },
{ {
@ -99,24 +103,27 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty
self.singleItemSelected(self.notRebasingOntoSelf), self.singleItemSelected(self.notRebasingOntoSelf),
), ),
Description: self.c.Tr.RebaseBranch, Description: self.c.Tr.RebaseBranch,
Tooltip: self.c.Tr.RebaseBranchTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch), Key: opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch),
Handler: opts.Guards.OutsideFilterMode(self.merge), Handler: opts.Guards.OutsideFilterMode(self.merge),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.MergeIntoCurrentBranch, Description: self.c.Tr.Merge,
Tooltip: self.c.Tr.MergeBranchTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Branches.FastForward), Key: opts.GetKey(opts.Config.Branches.FastForward),
Handler: self.withItem(self.fastForward), Handler: self.withItem(self.fastForward),
GetDisabledReason: self.require(self.singleItemSelected(self.branchIsReal)), GetDisabledReason: self.require(self.singleItemSelected(self.branchIsReal)),
Description: self.c.Tr.FastForward, Description: self.c.Tr.FastForward,
Tooltip: self.c.Tr.FastForwardTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Branches.CreateTag), Key: opts.GetKey(opts.Config.Branches.CreateTag),
Handler: self.withItem(self.createTag), Handler: self.withItem(self.createTag),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.CreateTag, Description: self.c.Tr.NewTag,
}, },
{ {
Key: opts.GetKey(opts.Config.Branches.SortOrder), Key: opts.GetKey(opts.Config.Branches.SortOrder),
@ -142,6 +149,7 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.ViewBranchUpstreamOptions, Description: self.c.Tr.ViewBranchUpstreamOptions,
Tooltip: self.c.Tr.ViewBranchUpstreamOptionsTooltip, Tooltip: self.c.Tr.ViewBranchUpstreamOptionsTooltip,
ShortDescription: self.c.Tr.Upstream,
OpensMenu: true, OpensMenu: true,
}, },
} }

22
pkg/gui/controllers/commits_files_controller.go
View File

@ -5,9 +5,11 @@ import (
"github.com/jesseduffield/lazygit/pkg/commands/git_commands" "github.com/jesseduffield/lazygit/pkg/commands/git_commands"
"github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/commands/patch" "github.com/jesseduffield/lazygit/pkg/commands/patch"
"github.com/jesseduffield/lazygit/pkg/constants"
"github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/context"
"github.com/jesseduffield/lazygit/pkg/gui/filetree" "github.com/jesseduffield/lazygit/pkg/gui/filetree"
"github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/gui/types"
"github.com/jesseduffield/lazygit/pkg/utils"
) )
type CommitFilesController struct { type CommitFilesController struct {
@ -39,25 +41,29 @@ func (self *CommitFilesController) GetKeybindings(opts types.KeybindingsOpts) []
Key: opts.GetKey(opts.Config.CommitFiles.CheckoutCommitFile), Key: opts.GetKey(opts.Config.CommitFiles.CheckoutCommitFile),
Handler: self.withItem(self.checkout), Handler: self.withItem(self.checkout),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.CheckoutCommitFile, Description: self.c.Tr.Checkout,
Tooltip: self.c.Tr.CheckoutCommitFileTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Remove), Key: opts.GetKey(opts.Config.Universal.Remove),
Handler: self.withItem(self.discard), Handler: self.withItem(self.discard),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.DiscardOldFileChange, Description: self.c.Tr.Remove,
Tooltip: self.c.Tr.DiscardOldFileChangeTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.OpenFile), Key: opts.GetKey(opts.Config.Universal.OpenFile),
Handler: self.withItem(self.open), Handler: self.withItem(self.open),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.OpenFile, Description: self.c.Tr.OpenFile,
Tooltip: self.c.Tr.OpenFileTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Edit), Key: opts.GetKey(opts.Config.Universal.Edit),
Handler: self.withItem(self.edit), Handler: self.withItem(self.edit),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.EditFile, Description: self.c.Tr.Edit,
Tooltip: self.c.Tr.EditFileTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.OpenDiffTool), Key: opts.GetKey(opts.Config.Universal.OpenDiffTool),
@ -70,22 +76,30 @@ func (self *CommitFilesController) GetKeybindings(opts types.KeybindingsOpts) []
Handler: self.withItem(self.toggleForPatch), Handler: self.withItem(self.toggleForPatch),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.ToggleAddToPatch, Description: self.c.Tr.ToggleAddToPatch,
Tooltip: utils.ResolvePlaceholderString(self.c.Tr.ToggleAddToPatchTooltip,
map[string]string{"doc": constants.Links.Docs.CustomPatchDemo},
),
}, },
{ {
Key: opts.GetKey(opts.Config.Files.ToggleStagedAll), Key: opts.GetKey(opts.Config.Files.ToggleStagedAll),
Handler: self.withItem(self.toggleAllForPatch), Handler: self.withItem(self.toggleAllForPatch),
Description: self.c.Tr.ToggleAllInPatch, Description: self.c.Tr.ToggleAllInPatch,
Tooltip: utils.ResolvePlaceholderString(self.c.Tr.ToggleAllInPatchTooltip,
map[string]string{"doc": constants.Links.Docs.CustomPatchDemo},
),
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.GoInto), Key: opts.GetKey(opts.Config.Universal.GoInto),
Handler: self.withItem(self.enter), Handler: self.withItem(self.enter),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.EnterFile, Description: self.c.Tr.EnterCommitFile,
Tooltip: self.c.Tr.EnterCommitFileTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Files.ToggleTreeView), Key: opts.GetKey(opts.Config.Files.ToggleTreeView),
Handler: self.toggleTreeView, Handler: self.toggleTreeView,
Description: self.c.Tr.ToggleTreeView, Description: self.c.Tr.ToggleTreeView,
Tooltip: self.c.Tr.ToggleTreeViewTooltip,
}, },
} }

2
pkg/gui/controllers/context_lines_controller.go
View File

@ -45,11 +45,13 @@ func (self *ContextLinesController) GetKeybindings(opts types.KeybindingsOpts) [
Key: opts.GetKey(opts.Config.Universal.IncreaseContextInDiffView), Key: opts.GetKey(opts.Config.Universal.IncreaseContextInDiffView),
Handler: self.Increase, Handler: self.Increase,
Description: self.c.Tr.IncreaseContextInDiffView, Description: self.c.Tr.IncreaseContextInDiffView,
Tooltip: self.c.Tr.IncreaseContextInDiffViewTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.DecreaseContextInDiffView), Key: opts.GetKey(opts.Config.Universal.DecreaseContextInDiffView),
Handler: self.Decrease, Handler: self.Decrease,
Description: self.c.Tr.DecreaseContextInDiffView, Description: self.c.Tr.DecreaseContextInDiffView,
Tooltip: self.c.Tr.DecreaseContextInDiffViewTooltip,
}, },
} }

7
pkg/gui/controllers/custom_patch_options_menu_action.go
View File

@ -25,16 +25,19 @@ func (self *CustomPatchOptionsMenuAction) Call() error {
menuItems := []*types.MenuItem{ menuItems := []*types.MenuItem{
{ {
Label: self.c.Tr.ResetPatch, Label: self.c.Tr.ResetPatch,
Tooltip: self.c.Tr.ResetPatchTooltip,
OnPress: self.c.Helpers().PatchBuilding.Reset, OnPress: self.c.Helpers().PatchBuilding.Reset,
Key: 'c', Key: 'c',
}, },
{ {
Label: self.c.Tr.ApplyPatch, Label: self.c.Tr.ApplyPatch,
Tooltip: self.c.Tr.ApplyPatchTooltip,
OnPress: func() error { return self.handleApplyPatch(false) }, OnPress: func() error { return self.handleApplyPatch(false) },
Key: 'a', Key: 'a',
}, },
{ {
Label: self.c.Tr.ApplyPatchInReverse, Label: self.c.Tr.ApplyPatchInReverse,
Tooltip: self.c.Tr.ApplyPatchInReverseTooltip,
OnPress: func() error { return self.handleApplyPatch(true) }, OnPress: func() error { return self.handleApplyPatch(true) },
Key: 'r', Key: 'r',
}, },
@ -44,16 +47,19 @@ func (self *CustomPatchOptionsMenuAction) Call() error {
menuItems = append(menuItems, []*types.MenuItem{ menuItems = append(menuItems, []*types.MenuItem{
{ {
Label: fmt.Sprintf(self.c.Tr.RemovePatchFromOriginalCommit, self.c.Git().Patch.PatchBuilder.To), Label: fmt.Sprintf(self.c.Tr.RemovePatchFromOriginalCommit, self.c.Git().Patch.PatchBuilder.To),
Tooltip: self.c.Tr.RemovePatchFromOriginalCommitTooltip,
OnPress: self.handleDeletePatchFromCommit, OnPress: self.handleDeletePatchFromCommit,
Key: 'd', Key: 'd',
}, },
{ {
Label: self.c.Tr.MovePatchOutIntoIndex, Label: self.c.Tr.MovePatchOutIntoIndex,
Tooltip: self.c.Tr.MovePatchOutIntoIndexTooltip,
OnPress: self.handleMovePatchIntoWorkingTree, OnPress: self.handleMovePatchIntoWorkingTree,
Key: 'i', Key: 'i',
}, },
{ {
Label: self.c.Tr.MovePatchIntoNewCommit, Label: self.c.Tr.MovePatchIntoNewCommit,
Tooltip: self.c.Tr.MovePatchIntoNewCommitTooltip,
OnPress: self.handlePullPatchIntoNewCommit, OnPress: self.handlePullPatchIntoNewCommit,
Key: 'n', Key: 'n',
}, },
@ -75,6 +81,7 @@ func (self *CustomPatchOptionsMenuAction) Call() error {
[]*types.MenuItem{ []*types.MenuItem{
{ {
Label: fmt.Sprintf(self.c.Tr.MovePatchToSelectedCommit, selectedCommit.Sha), Label: fmt.Sprintf(self.c.Tr.MovePatchToSelectedCommit, selectedCommit.Sha),
Tooltip: self.c.Tr.MovePatchToSelectedCommitTooltip,
OnPress: self.handleMovePatchToSelectedCommit, OnPress: self.handleMovePatchToSelectedCommit,
Key: 'm', Key: 'm',
DisabledReason: disabledReason, DisabledReason: disabledReason,

25
pkg/gui/controllers/files_controller.go
View File

@ -41,7 +41,8 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types
Key: opts.GetKey(opts.Config.Universal.Select), Key: opts.GetKey(opts.Config.Universal.Select),
Handler: self.withItems(self.press), Handler: self.withItems(self.press),
GetDisabledReason: self.require(self.itemsSelected()), GetDisabledReason: self.require(self.itemsSelected()),
Description: self.c.Tr.ToggleStaged, Description: self.c.Tr.Stage,
Tooltip: self.c.Tr.StageTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Files.OpenStatusFilter), Key: opts.GetKey(opts.Config.Files.OpenStatusFilter),
@ -57,7 +58,8 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types
{ {
Key: opts.GetKey(opts.Config.Files.CommitChanges), Key: opts.GetKey(opts.Config.Files.CommitChanges),
Handler: self.c.Helpers().WorkingTree.HandleCommitPress, Handler: self.c.Helpers().WorkingTree.HandleCommitPress,
Description: self.c.Tr.CommitChanges, Description: self.c.Tr.Commit,
Tooltip: self.c.Tr.CommitTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Files.CommitChangesWithoutHook), Key: opts.GetKey(opts.Config.Files.CommitChangesWithoutHook),
@ -84,13 +86,15 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types
Key: opts.GetKey(opts.Config.Universal.Edit), Key: opts.GetKey(opts.Config.Universal.Edit),
Handler: self.withItem(self.edit), Handler: self.withItem(self.edit),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.EditFile, Description: self.c.Tr.Edit,
Tooltip: self.c.Tr.EditFileTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.OpenFile), Key: opts.GetKey(opts.Config.Universal.OpenFile),
Handler: self.Open, Handler: self.Open,
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.OpenFile, Description: self.c.Tr.OpenFile,
Tooltip: self.c.Tr.OpenFileTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Files.IgnoreFile), Key: opts.GetKey(opts.Config.Files.IgnoreFile),
@ -107,30 +111,35 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types
{ {
Key: opts.GetKey(opts.Config.Files.StashAllChanges), Key: opts.GetKey(opts.Config.Files.StashAllChanges),
Handler: self.stash, Handler: self.stash,
Description: self.c.Tr.StashAllChanges, Description: self.c.Tr.Stash,
Tooltip: self.c.Tr.StashTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Files.ViewStashOptions), Key: opts.GetKey(opts.Config.Files.ViewStashOptions),
Handler: self.createStashMenu, Handler: self.createStashMenu,
Description: self.c.Tr.ViewStashOptions, Description: self.c.Tr.ViewStashOptions,
Tooltip: self.c.Tr.ViewStashOptionsTooltip,
OpensMenu: true, OpensMenu: true,
}, },
{ {
Key: opts.GetKey(opts.Config.Files.ToggleStagedAll), Key: opts.GetKey(opts.Config.Files.ToggleStagedAll),
Handler: self.toggleStagedAll, Handler: self.toggleStagedAll,
Description: self.c.Tr.ToggleStagedAll, Description: self.c.Tr.ToggleStagedAll,
Tooltip: self.c.Tr.ToggleStagedAllTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.GoInto), Key: opts.GetKey(opts.Config.Universal.GoInto),
Handler: self.enter, Handler: self.enter,
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.FileEnter, Description: self.c.Tr.FileEnter,
Tooltip: self.c.Tr.FileEnterTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Remove), Key: opts.GetKey(opts.Config.Universal.Remove),
Handler: self.withItems(self.remove), Handler: self.withItems(self.remove),
GetDisabledReason: self.require(self.itemsSelected(self.canRemove)), GetDisabledReason: self.require(self.itemsSelected(self.canRemove)),
Description: self.c.Tr.ViewDiscardOptions, Description: self.c.Tr.Discard,
Tooltip: self.c.Tr.DiscardFileChangesTooltip,
OpensMenu: true, OpensMenu: true,
}, },
{ {
@ -142,13 +151,15 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types
{ {
Key: opts.GetKey(opts.Config.Files.ViewResetOptions), Key: opts.GetKey(opts.Config.Files.ViewResetOptions),
Handler: self.createResetMenu, Handler: self.createResetMenu,
Description: self.c.Tr.ViewResetOptions, Description: self.c.Tr.Reset,
Tooltip: self.c.Tr.FileResetOptionsTooltip,
OpensMenu: true, OpensMenu: true,
}, },
{ {
Key: opts.GetKey(opts.Config.Files.ToggleTreeView), Key: opts.GetKey(opts.Config.Files.ToggleTreeView),
Handler: self.toggleTreeView, Handler: self.toggleTreeView,
Description: self.c.Tr.ToggleTreeView, Description: self.c.Tr.ToggleTreeView,
Tooltip: self.c.Tr.ToggleTreeViewTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.OpenDiffTool), Key: opts.GetKey(opts.Config.Universal.OpenDiffTool),
@ -160,11 +171,13 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types
Key: opts.GetKey(opts.Config.Files.OpenMergeTool), Key: opts.GetKey(opts.Config.Files.OpenMergeTool),
Handler: self.c.Helpers().WorkingTree.OpenMergeTool, Handler: self.c.Helpers().WorkingTree.OpenMergeTool,
Description: self.c.Tr.OpenMergeTool, Description: self.c.Tr.OpenMergeTool,
Tooltip: self.c.Tr.OpenMergeToolTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Files.Fetch), Key: opts.GetKey(opts.Config.Files.Fetch),
Handler: self.fetch, Handler: self.fetch,
Description: self.c.Tr.Fetch, Description: self.c.Tr.Fetch,
Tooltip: self.c.Tr.FetchTooltip,
}, },
} }
} }

17
pkg/gui/controllers/global_controller.go
View File

@ -25,6 +25,8 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type
Key: opts.GetKey(opts.Config.Universal.ExecuteCustomCommand), Key: opts.GetKey(opts.Config.Universal.ExecuteCustomCommand),
Handler: self.customCommand, Handler: self.customCommand,
Description: self.c.Tr.ExecuteCustomCommand, Description: self.c.Tr.ExecuteCustomCommand,
Tooltip: self.c.Tr.ExecuteCustomCommandTooltip,
OpensMenu: true,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.CreatePatchOptionsMenu), Key: opts.GetKey(opts.Config.Universal.CreatePatchOptionsMenu),
@ -36,12 +38,14 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type
Key: opts.GetKey(opts.Config.Universal.CreateRebaseOptionsMenu), Key: opts.GetKey(opts.Config.Universal.CreateRebaseOptionsMenu),
Handler: self.c.Helpers().MergeAndRebase.CreateRebaseOptionsMenu, Handler: self.c.Helpers().MergeAndRebase.CreateRebaseOptionsMenu,
Description: self.c.Tr.ViewMergeRebaseOptions, Description: self.c.Tr.ViewMergeRebaseOptions,
Tooltip: self.c.Tr.ViewMergeRebaseOptionsTooltip,
OpensMenu: true, OpensMenu: true,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Refresh), Key: opts.GetKey(opts.Config.Universal.Refresh),
Handler: self.refresh, Handler: self.refresh,
Description: self.c.Tr.Refresh, Description: self.c.Tr.Refresh,
Tooltip: self.c.Tr.RefreshTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.NextScreenMode), Key: opts.GetKey(opts.Config.Universal.NextScreenMode),
@ -65,31 +69,36 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
// we have the description on the alt key and not the main key for legacy reasons // we have the description on the alt key and not the main key for legacy reasons
// (the original main key was 'x' but we've reassigned that to other purposes) // (the original main key was 'x' but we've reassigned that to other purposes)
Description: self.c.Tr.OpenMenu, Description: self.c.Tr.OpenKeybindingsMenu,
Handler: self.createOptionsMenu, Handler: self.createOptionsMenu,
ShortDescription: self.c.Tr.Keybindings,
}, },
{ {
ViewName: "", ViewName: "",
Key: opts.GetKey(opts.Config.Universal.FilteringMenu), Key: opts.GetKey(opts.Config.Universal.FilteringMenu),
Handler: self.createFilteringMenu, Handler: self.createFilteringMenu,
Description: self.c.Tr.OpenFilteringMenu, Description: self.c.Tr.OpenFilteringMenu,
Tooltip: self.c.Tr.OpenFilteringMenuTooltip,
OpensMenu: true, OpensMenu: true,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.DiffingMenu), Key: opts.GetKey(opts.Config.Universal.DiffingMenu),
Handler: self.createDiffingMenu, Handler: self.createDiffingMenu,
Description: self.c.Tr.OpenDiffingMenu, Description: self.c.Tr.ViewDiffingOptions,
Tooltip: self.c.Tr.ViewDiffingOptionsTooltip,
OpensMenu: true, OpensMenu: true,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.DiffingMenuAlt), Key: opts.GetKey(opts.Config.Universal.DiffingMenuAlt),
Handler: self.createDiffingMenu, Handler: self.createDiffingMenu,
Description: self.c.Tr.OpenDiffingMenu, Description: self.c.Tr.ViewDiffingOptions,
Tooltip: self.c.Tr.ViewDiffingOptionsTooltip,
OpensMenu: true, OpensMenu: true,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Quit), Key: opts.GetKey(opts.Config.Universal.Quit),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Description: self.c.Tr.Quit,
Handler: self.quit, Handler: self.quit,
}, },
{ {
@ -106,11 +115,13 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type
Key: opts.GetKey(opts.Config.Universal.Return), Key: opts.GetKey(opts.Config.Universal.Return),
Modifier: gocui.ModNone, Modifier: gocui.ModNone,
Handler: self.escape, Handler: self.escape,
Description: self.c.Tr.Cancel,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.ToggleWhitespaceInDiffView), Key: opts.GetKey(opts.Config.Universal.ToggleWhitespaceInDiffView),
Handler: self.toggleWhitespace, Handler: self.toggleWhitespace,
Description: self.c.Tr.ToggleWhitespaceInDiffView, Description: self.c.Tr.ToggleWhitespaceInDiffView,
Tooltip: self.c.Tr.ToggleWhitespaceInDiffViewTooltip,
}, },
} }
} }

40
pkg/gui/controllers/local_commits_controller.go
View File

@ -11,6 +11,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/context"
"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers" "github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
"github.com/jesseduffield/lazygit/pkg/gui/keybindings" "github.com/jesseduffield/lazygit/pkg/gui/keybindings"
"github.com/jesseduffield/lazygit/pkg/gui/style"
"github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/gui/types"
"github.com/jesseduffield/lazygit/pkg/utils" "github.com/jesseduffield/lazygit/pkg/utils"
"github.com/samber/lo" "github.com/samber/lo"
@ -63,7 +64,8 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
self.canSquashOrFixup, self.canSquashOrFixup,
), ),
), ),
Description: self.c.Tr.SquashDown, Description: self.c.Tr.Squash,
Tooltip: self.c.Tr.SquashTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Commits.MarkCommitAsFixup), Key: opts.GetKey(opts.Config.Commits.MarkCommitAsFixup),
@ -74,7 +76,8 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
self.canSquashOrFixup, self.canSquashOrFixup,
), ),
), ),
Description: self.c.Tr.FixupCommit, Description: self.c.Tr.Fixup,
Tooltip: self.c.Tr.FixupTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Commits.RenameCommit), Key: opts.GetKey(opts.Config.Commits.RenameCommit),
@ -82,7 +85,9 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
GetDisabledReason: self.require( GetDisabledReason: self.require(
self.singleItemSelected(self.rewordEnabled), self.singleItemSelected(self.rewordEnabled),
), ),
Description: self.c.Tr.RewordCommit, Description: self.c.Tr.Reword,
Tooltip: self.c.Tr.CommitRewordTooltip,
OpensMenu: true,
}, },
{ {
Key: opts.GetKey(opts.Config.Commits.RenameCommitWithEditor), Key: opts.GetKey(opts.Config.Commits.RenameCommitWithEditor),
@ -90,7 +95,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
GetDisabledReason: self.require( GetDisabledReason: self.require(
self.singleItemSelected(self.rewordEnabled), self.singleItemSelected(self.rewordEnabled),
), ),
Description: self.c.Tr.RenameCommitEditor, Description: self.c.Tr.RewordCommitEditor,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Remove), Key: opts.GetKey(opts.Config.Universal.Remove),
@ -100,7 +105,8 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
self.midRebaseCommandEnabled, self.midRebaseCommandEnabled,
), ),
), ),
Description: self.c.Tr.DeleteCommit, Description: self.c.Tr.DropCommit,
Tooltip: self.c.Tr.DropCommitTooltip,
}, },
{ {
Key: opts.GetKey(editCommitKey), Key: opts.GetKey(editCommitKey),
@ -110,6 +116,8 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
self.itemRangeSelected(self.midRebaseCommandEnabled), self.itemRangeSelected(self.midRebaseCommandEnabled),
), ),
Description: self.c.Tr.EditCommit, Description: self.c.Tr.EditCommit,
ShortDescription: self.c.Tr.Edit,
Tooltip: self.c.Tr.EditCommitTooltip,
}, },
{ {
// The user-facing description here is 'Start interactive rebase' but internally // The user-facing description here is 'Start interactive rebase' but internally
@ -129,13 +137,20 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
GetDisabledReason: self.require( GetDisabledReason: self.require(
self.itemRangeSelected(self.pickEnabled), self.itemRangeSelected(self.pickEnabled),
), ),
Description: self.c.Tr.PickCommit, Description: self.c.Tr.Pick,
Tooltip: self.c.Tr.PickCommitTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Commits.CreateFixupCommit), Key: opts.GetKey(opts.Config.Commits.CreateFixupCommit),
Handler: self.withItem(self.createFixupCommit), Handler: self.withItem(self.createFixupCommit),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.CreateFixupCommitDescription, Description: self.c.Tr.CreateFixupCommitDescription,
Tooltip: utils.ResolvePlaceholderString(
self.c.Tr.CreateFixupCommitTooltip,
map[string]string{
"squashAbove": keybindings.Label(opts.Config.Commits.SquashAboveCommits),
},
),
}, },
{ {
Key: opts.GetKey(opts.Config.Commits.SquashAboveCommits), Key: opts.GetKey(opts.Config.Commits.SquashAboveCommits),
@ -145,6 +160,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
self.singleItemSelected(), self.singleItemSelected(),
), ),
Description: self.c.Tr.SquashAboveCommits, Description: self.c.Tr.SquashAboveCommits,
Tooltip: self.c.Tr.SquashAboveCommitsTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Commits.MoveDownCommit), Key: opts.GetKey(opts.Config.Commits.MoveDownCommit),
@ -169,6 +185,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
Handler: self.paste, Handler: self.paste,
GetDisabledReason: self.require(self.canPaste), GetDisabledReason: self.require(self.canPaste),
Description: self.c.Tr.PasteCommits, Description: self.c.Tr.PasteCommits,
DisplayStyle: &style.FgCyan,
}, },
{ {
Key: opts.GetKey(opts.Config.Commits.MarkCommitAsBaseForRebase), Key: opts.GetKey(opts.Config.Commits.MarkCommitAsBaseForRebase),
@ -202,31 +219,36 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
Key: opts.GetKey(opts.Config.Commits.AmendToCommit), Key: opts.GetKey(opts.Config.Commits.AmendToCommit),
Handler: self.withItem(self.amendTo), Handler: self.withItem(self.amendTo),
GetDisabledReason: self.require(self.singleItemSelected(self.canAmend)), GetDisabledReason: self.require(self.singleItemSelected(self.canAmend)),
Description: self.c.Tr.AmendToCommit, Description: self.c.Tr.Amend,
Tooltip: self.c.Tr.AmendCommitTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Commits.ResetCommitAuthor), Key: opts.GetKey(opts.Config.Commits.ResetCommitAuthor),
Handler: self.withItem(self.amendAttribute), Handler: self.withItem(self.amendAttribute),
GetDisabledReason: self.require(self.singleItemSelected(self.canAmend)), GetDisabledReason: self.require(self.singleItemSelected(self.canAmend)),
Description: self.c.Tr.SetResetCommitAuthor, Description: self.c.Tr.AmendCommitAttribute,
Tooltip: self.c.Tr.AmendCommitAttributeTooltip,
OpensMenu: true, OpensMenu: true,
}, },
{ {
Key: opts.GetKey(opts.Config.Commits.RevertCommit), Key: opts.GetKey(opts.Config.Commits.RevertCommit),
Handler: self.withItem(self.revert), Handler: self.withItem(self.revert),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.RevertCommit, Description: self.c.Tr.Revert,
Tooltip: self.c.Tr.RevertCommitTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Commits.CreateTag), Key: opts.GetKey(opts.Config.Commits.CreateTag),
Handler: self.withItem(self.createTag), Handler: self.withItem(self.createTag),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.TagCommit, Description: self.c.Tr.TagCommit,
Tooltip: self.c.Tr.TagCommitTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Commits.OpenLogMenu), Key: opts.GetKey(opts.Config.Commits.OpenLogMenu),
Handler: self.handleOpenLogMenu, Handler: self.handleOpenLogMenu,
Description: self.c.Tr.OpenLogMenu, Description: self.c.Tr.OpenLogMenu,
Tooltip: self.c.Tr.OpenLogMenuTooltip,
OpensMenu: true, OpensMenu: true,
}, },
}...) }...)

60
pkg/gui/controllers/merge_conflicts_controller.go
View File

@ -28,14 +28,24 @@ func NewMergeConflictsController(
func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
bindings := []*types.Binding{ bindings := []*types.Binding{
{ {
Key: opts.GetKey(opts.Config.Universal.Edit), Key: opts.GetKey(opts.Config.Universal.Select),
Handler: self.HandleEditFile, Handler: self.withRenderAndFocus(self.HandlePickHunk),
Description: self.c.Tr.EditFile, Description: self.c.Tr.PickHunk,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.OpenFile), Key: opts.GetKey(opts.Config.Main.PickBothHunks),
Handler: self.HandleOpenFile, Handler: self.withRenderAndFocus(self.HandlePickAllHunks),
Description: self.c.Tr.OpenFile, Description: self.c.Tr.PickAllHunks,
},
{
Key: opts.GetKey(opts.Config.Universal.PrevItem),
Handler: self.withRenderAndFocus(self.PrevConflictHunk),
Description: self.c.Tr.SelectPrevHunk,
},
{
Key: opts.GetKey(opts.Config.Universal.NextItem),
Handler: self.withRenderAndFocus(self.NextConflictHunk),
Description: self.c.Tr.SelectNextHunk,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.PrevBlock), Key: opts.GetKey(opts.Config.Universal.PrevBlock),
@ -50,17 +60,25 @@ func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts)
Display: true, Display: true,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.PrevItem), Key: opts.GetKey(opts.Config.Universal.Undo),
Handler: self.withRenderAndFocus(self.PrevConflictHunk), Handler: self.withRenderAndFocus(self.HandleUndo),
Description: self.c.Tr.SelectPrevHunk, Description: self.c.Tr.Undo,
Tooltip: self.c.Tr.UndoMergeResolveTooltip,
Display: true, Display: true,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.NextItem), Key: opts.GetKey(opts.Config.Universal.Edit),
Handler: self.withRenderAndFocus(self.NextConflictHunk), Handler: self.HandleEditFile,
Description: self.c.Tr.SelectNextHunk, Description: self.c.Tr.EditFile,
Tooltip: self.c.Tr.EditFileTooltip,
Display: true, Display: true,
}, },
{
Key: opts.GetKey(opts.Config.Universal.OpenFile),
Handler: self.HandleOpenFile,
Description: self.c.Tr.OpenFile,
Tooltip: self.c.Tr.OpenFileTooltip,
},
{ {
Key: opts.GetKey(opts.Config.Universal.PrevBlockAlt), Key: opts.GetKey(opts.Config.Universal.PrevBlockAlt),
Handler: self.withRenderAndFocus(self.PrevConflict), Handler: self.withRenderAndFocus(self.PrevConflict),
@ -89,27 +107,11 @@ func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts)
Description: self.c.Tr.ScrollRight, Description: self.c.Tr.ScrollRight,
Tag: "navigation", Tag: "navigation",
}, },
{
Key: opts.GetKey(opts.Config.Universal.Undo),
Handler: self.withRenderAndFocus(self.HandleUndo),
Description: self.c.Tr.Undo,
Display: true,
},
{ {
Key: opts.GetKey(opts.Config.Files.OpenMergeTool), Key: opts.GetKey(opts.Config.Files.OpenMergeTool),
Handler: self.c.Helpers().WorkingTree.OpenMergeTool, Handler: self.c.Helpers().WorkingTree.OpenMergeTool,
Description: self.c.Tr.OpenMergeTool, Description: self.c.Tr.OpenMergeTool,
}, Tooltip: self.c.Tr.OpenMergeToolTooltip,
{
Key: opts.GetKey(opts.Config.Universal.Select),
Handler: self.withRenderAndFocus(self.HandlePickHunk),
Description: self.c.Tr.PickHunk,
Display: true,
},
{
Key: opts.GetKey(opts.Config.Main.PickBothHunks),
Handler: self.withRenderAndFocus(self.HandlePickAllHunks),
Description: self.c.Tr.PickAllHunks,
Display: true, Display: true,
}, },
{ {

2
pkg/gui/controllers/patch_building_controller.go
View File

@ -28,11 +28,13 @@ func (self *PatchBuildingController) GetKeybindings(opts types.KeybindingsOpts)
Key: opts.GetKey(opts.Config.Universal.OpenFile), Key: opts.GetKey(opts.Config.Universal.OpenFile),
Handler: self.OpenFile, Handler: self.OpenFile,
Description: self.c.Tr.OpenFile, Description: self.c.Tr.OpenFile,
Tooltip: self.c.Tr.OpenFileTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Edit), Key: opts.GetKey(opts.Config.Universal.Edit),
Handler: self.EditFile, Handler: self.EditFile,
Description: self.c.Tr.EditFile, Description: self.c.Tr.EditFile,
Tooltip: self.c.Tr.EditFileTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Select), Key: opts.GetKey(opts.Config.Universal.Select),

3
pkg/gui/controllers/patch_explorer_controller.go
View File

@ -95,6 +95,7 @@ func (self *PatchExplorerController) GetKeybindings(opts types.KeybindingsOpts)
Key: opts.GetKey(opts.Config.Main.ToggleSelectHunk), Key: opts.GetKey(opts.Config.Main.ToggleSelectHunk),
Handler: self.withRenderAndFocus(self.HandleToggleSelectHunk), Handler: self.withRenderAndFocus(self.HandleToggleSelectHunk),
Description: self.c.Tr.ToggleSelectHunk, Description: self.c.Tr.ToggleSelectHunk,
Tooltip: self.c.Tr.ToggleSelectHunkTooltip,
}, },
{ {
Tag: "navigation", Tag: "navigation",
@ -133,7 +134,7 @@ func (self *PatchExplorerController) GetKeybindings(opts types.KeybindingsOpts)
{ {
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
Handler: self.withLock(self.CopySelectedToClipboard), Handler: self.withLock(self.CopySelectedToClipboard),
Description: self.c.Tr.CopySelectedTexToClipboard, Description: self.c.Tr.CopySelectedTextToClipboard,
}, },
} }
} }

10
pkg/gui/controllers/remote_branches_controller.go
View File

@ -40,6 +40,7 @@ func (self *RemoteBranchesController) GetKeybindings(opts types.KeybindingsOpts)
Handler: self.withItem(self.newLocalBranch), Handler: self.withItem(self.newLocalBranch),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.Checkout, Description: self.c.Tr.Checkout,
Tooltip: self.c.Tr.RemoteBranchCheckoutTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.New), Key: opts.GetKey(opts.Config.Universal.New),
@ -51,25 +52,29 @@ func (self *RemoteBranchesController) GetKeybindings(opts types.KeybindingsOpts)
Key: opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch), Key: opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch),
Handler: opts.Guards.OutsideFilterMode(self.withItem(self.merge)), Handler: opts.Guards.OutsideFilterMode(self.withItem(self.merge)),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.MergeIntoCurrentBranch, Description: self.c.Tr.Merge,
Tooltip: self.c.Tr.MergeBranchTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Branches.RebaseBranch), Key: opts.GetKey(opts.Config.Branches.RebaseBranch),
Handler: opts.Guards.OutsideFilterMode(self.withItem(self.rebase)), Handler: opts.Guards.OutsideFilterMode(self.withItem(self.rebase)),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.RebaseBranch, Description: self.c.Tr.RebaseBranch,
Tooltip: self.c.Tr.RebaseBranchTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Remove), Key: opts.GetKey(opts.Config.Universal.Remove),
Handler: self.withItem(self.delete), Handler: self.withItem(self.delete),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.DeleteRemoteTag, Description: self.c.Tr.Delete,
Tooltip: self.c.Tr.DeleteRemoteBranchTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Branches.SetUpstream), Key: opts.GetKey(opts.Config.Branches.SetUpstream),
Handler: self.withItem(self.setAsUpstream), Handler: self.withItem(self.setAsUpstream),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.SetAsUpstream, Description: self.c.Tr.SetAsUpstream,
Tooltip: self.c.Tr.SetAsUpstreamTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Branches.SortOrder), Key: opts.GetKey(opts.Config.Branches.SortOrder),
@ -82,6 +87,7 @@ func (self *RemoteBranchesController) GetKeybindings(opts types.KeybindingsOpts)
Handler: self.withItem(self.createResetMenu), Handler: self.withItem(self.createResetMenu),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.ViewResetOptions, Description: self.c.Tr.ViewResetOptions,
Tooltip: self.c.Tr.ResetTooltip,
OpensMenu: true, OpensMenu: true,
}, },
} }

22
pkg/gui/controllers/remotes_controller.go
View File

@ -45,29 +45,33 @@ func (self *RemotesController) GetKeybindings(opts types.KeybindingsOpts) []*typ
Key: opts.GetKey(opts.Config.Universal.GoInto), Key: opts.GetKey(opts.Config.Universal.GoInto),
Handler: self.withItem(self.enter), Handler: self.withItem(self.enter),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
}, Description: self.c.Tr.ViewBranches,
{
Key: opts.GetKey(opts.Config.Branches.FetchRemote),
Handler: self.withItem(self.fetch),
GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.FetchRemote,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.New), Key: opts.GetKey(opts.Config.Universal.New),
Handler: self.add, Handler: self.add,
Description: self.c.Tr.AddNewRemote, Description: self.c.Tr.NewRemote,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Remove), Key: opts.GetKey(opts.Config.Universal.Remove),
Handler: self.withItem(self.remove), Handler: self.withItem(self.remove),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.RemoveRemote, Description: self.c.Tr.Remove,
Tooltip: self.c.Tr.RemoveRemoteTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Edit), Key: opts.GetKey(opts.Config.Universal.Edit),
Handler: self.withItem(self.edit), Handler: self.withItem(self.edit),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.EditRemote, Description: self.c.Tr.Edit,
Tooltip: self.c.Tr.EditRemoteTooltip,
},
{
Key: opts.GetKey(opts.Config.Branches.FetchRemote),
Handler: self.withItem(self.fetch),
GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.Fetch,
Tooltip: self.c.Tr.FetchRemoteTooltip,
}, },
} }

31
pkg/gui/controllers/staging_controller.go
View File

@ -39,15 +39,29 @@ func NewStagingController(
func (self *StagingController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding { func (self *StagingController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
return []*types.Binding{ return []*types.Binding{
{
Key: opts.GetKey(opts.Config.Universal.Select),
Handler: self.ToggleStaged,
Description: self.c.Tr.Stage,
Tooltip: self.c.Tr.StageSelectionTooltip,
},
{
Key: opts.GetKey(opts.Config.Universal.Remove),
Handler: self.DiscardSelection,
Description: self.c.Tr.DiscardSelection,
Tooltip: self.c.Tr.DiscardSelectionTooltip,
},
{ {
Key: opts.GetKey(opts.Config.Universal.OpenFile), Key: opts.GetKey(opts.Config.Universal.OpenFile),
Handler: self.OpenFile, Handler: self.OpenFile,
Description: self.c.Tr.OpenFile, Description: self.c.Tr.OpenFile,
Tooltip: self.c.Tr.OpenFileTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Edit), Key: opts.GetKey(opts.Config.Universal.Edit),
Handler: self.EditFile, Handler: self.EditFile,
Description: self.c.Tr.EditFile, Description: self.c.Tr.EditFile,
Tooltip: self.c.Tr.EditFileTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Return), Key: opts.GetKey(opts.Config.Universal.Return),
@ -57,27 +71,20 @@ func (self *StagingController) GetKeybindings(opts types.KeybindingsOpts) []*typ
{ {
Key: opts.GetKey(opts.Config.Universal.TogglePanel), Key: opts.GetKey(opts.Config.Universal.TogglePanel),
Handler: self.TogglePanel, Handler: self.TogglePanel,
Description: self.c.Tr.ToggleStagingPanel, Description: self.c.Tr.ToggleStagingView,
}, Tooltip: self.c.Tr.ToggleStagingViewTooltip,
{
Key: opts.GetKey(opts.Config.Universal.Select),
Handler: self.ToggleStaged,
Description: self.c.Tr.StageSelection,
},
{
Key: opts.GetKey(opts.Config.Universal.Remove),
Handler: self.DiscardSelection,
Description: self.c.Tr.DiscardSelection,
}, },
{ {
Key: opts.GetKey(opts.Config.Main.EditSelectHunk), Key: opts.GetKey(opts.Config.Main.EditSelectHunk),
Handler: self.EditHunkAndRefresh, Handler: self.EditHunkAndRefresh,
Description: self.c.Tr.EditHunk, Description: self.c.Tr.EditHunk,
Tooltip: self.c.Tr.EditHunkTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Files.CommitChanges), Key: opts.GetKey(opts.Config.Files.CommitChanges),
Handler: self.c.Helpers().WorkingTree.HandleCommitPress, Handler: self.c.Helpers().WorkingTree.HandleCommitPress,
Description: self.c.Tr.CommitChanges, Description: self.c.Tr.Commit,
Tooltip: self.c.Tr.CommitTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Files.CommitChangesWithoutHook), Key: opts.GetKey(opts.Config.Files.CommitChangesWithoutHook),

4
pkg/gui/controllers/stash_controller.go
View File

@ -37,24 +37,28 @@ func (self *StashController) GetKeybindings(opts types.KeybindingsOpts) []*types
Handler: self.withItem(self.handleStashApply), Handler: self.withItem(self.handleStashApply),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.Apply, Description: self.c.Tr.Apply,
Tooltip: self.c.Tr.StashApplyTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Stash.PopStash), Key: opts.GetKey(opts.Config.Stash.PopStash),
Handler: self.withItem(self.handleStashPop), Handler: self.withItem(self.handleStashPop),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.Pop, Description: self.c.Tr.Pop,
Tooltip: self.c.Tr.StashPopTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Remove), Key: opts.GetKey(opts.Config.Universal.Remove),
Handler: self.withItem(self.handleStashDrop), Handler: self.withItem(self.handleStashDrop),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.Drop, Description: self.c.Tr.Drop,
Tooltip: self.c.Tr.StashDropTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.New), Key: opts.GetKey(opts.Config.Universal.New),
Handler: self.withItem(self.handleNewBranchOffStashEntry), Handler: self.withItem(self.handleNewBranchOffStashEntry),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.NewBranch, Description: self.c.Tr.NewBranch,
Tooltip: self.c.Tr.NewBranchFromStashTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Stash.RenameStash), Key: opts.GetKey(opts.Config.Stash.RenameStash),

2
pkg/gui/controllers/status_controller.go
View File

@ -36,11 +36,13 @@ func (self *StatusController) GetKeybindings(opts types.KeybindingsOpts) []*type
Key: opts.GetKey(opts.Config.Universal.OpenFile), Key: opts.GetKey(opts.Config.Universal.OpenFile),
Handler: self.openConfig, Handler: self.openConfig,
Description: self.c.Tr.OpenConfig, Description: self.c.Tr.OpenConfig,
Tooltip: self.c.Tr.OpenFileTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Edit), Key: opts.GetKey(opts.Config.Universal.Edit),
Handler: self.editConfig, Handler: self.editConfig,
Description: self.c.Tr.EditConfig, Description: self.c.Tr.EditConfig,
Tooltip: self.c.Tr.EditFileTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Status.CheckForUpdate), Key: opts.GetKey(opts.Config.Status.CheckForUpdate),

18
pkg/gui/controllers/submodules_controller.go
View File

@ -8,8 +8,10 @@ import (
"github.com/jesseduffield/gocui" "github.com/jesseduffield/gocui"
"github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/gui/context" "github.com/jesseduffield/lazygit/pkg/gui/context"
"github.com/jesseduffield/lazygit/pkg/gui/keybindings"
"github.com/jesseduffield/lazygit/pkg/gui/style" "github.com/jesseduffield/lazygit/pkg/gui/style"
"github.com/jesseduffield/lazygit/pkg/gui/types" "github.com/jesseduffield/lazygit/pkg/gui/types"
"github.com/jesseduffield/lazygit/pkg/utils"
) )
type SubmodulesController struct { type SubmodulesController struct {
@ -41,30 +43,33 @@ func (self *SubmodulesController) GetKeybindings(opts types.KeybindingsOpts) []*
Key: opts.GetKey(opts.Config.Universal.GoInto), Key: opts.GetKey(opts.Config.Universal.GoInto),
Handler: self.withItem(self.enter), Handler: self.withItem(self.enter),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.EnterSubmodule, Description: self.c.Tr.Enter,
Tooltip: utils.ResolvePlaceholderString(self.c.Tr.EnterSubmoduleTooltip,
map[string]string{"escape": keybindings.Label(opts.Config.Universal.Return)}),
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Select), Key: opts.GetKey(opts.Config.Universal.Select),
Handler: self.withItem(self.enter), Handler: self.withItem(self.enter),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.EnterSubmodule,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Remove), Key: opts.GetKey(opts.Config.Universal.Remove),
Handler: self.withItem(self.remove), Handler: self.withItem(self.remove),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.RemoveSubmodule, Description: self.c.Tr.Remove,
Tooltip: self.c.Tr.RemoveSubmoduleTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Submodules.Update), Key: opts.GetKey(opts.Config.Submodules.Update),
Handler: self.withItem(self.update), Handler: self.withItem(self.update),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.SubmoduleUpdate, Description: self.c.Tr.Update,
Tooltip: self.c.Tr.SubmoduleUpdateTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.New), Key: opts.GetKey(opts.Config.Universal.New),
Handler: self.add, Handler: self.add,
Description: self.c.Tr.AddSubmodule, Description: self.c.Tr.NewSubmodule,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Edit), Key: opts.GetKey(opts.Config.Universal.Edit),
@ -76,7 +81,8 @@ func (self *SubmodulesController) GetKeybindings(opts types.KeybindingsOpts) []*
Key: opts.GetKey(opts.Config.Submodules.Init), Key: opts.GetKey(opts.Config.Submodules.Init),
Handler: self.withItem(self.init), Handler: self.withItem(self.init),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.InitSubmodule, Description: self.c.Tr.Initialize,
Tooltip: self.c.Tr.InitSubmoduleTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Submodules.BulkMenu), Key: opts.GetKey(opts.Config.Submodules.BulkMenu),

2
pkg/gui/controllers/sync_controller.go
View File

@ -35,12 +35,14 @@ func (self *SyncController) GetKeybindings(opts types.KeybindingsOpts) []*types.
Handler: opts.Guards.NoPopupPanel(self.HandlePush), Handler: opts.Guards.NoPopupPanel(self.HandlePush),
GetDisabledReason: self.getDisabledReasonForPushOrPull, GetDisabledReason: self.getDisabledReasonForPushOrPull,
Description: self.c.Tr.Push, Description: self.c.Tr.Push,
Tooltip: self.c.Tr.PushTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Pull), Key: opts.GetKey(opts.Config.Universal.Pull),
Handler: opts.Guards.NoPopupPanel(self.HandlePull), Handler: opts.Guards.NoPopupPanel(self.HandlePull),
GetDisabledReason: self.getDisabledReasonForPushOrPull, GetDisabledReason: self.getDisabledReasonForPushOrPull,
Description: self.c.Tr.Pull, Description: self.c.Tr.Pull,
Tooltip: self.c.Tr.PullTooltip,
}, },
} }

19
pkg/gui/controllers/tags_controller.go
View File

@ -38,12 +38,20 @@ func (self *TagsController) GetKeybindings(opts types.KeybindingsOpts) []*types.
Handler: self.withItem(self.checkout), Handler: self.withItem(self.checkout),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.Checkout, Description: self.c.Tr.Checkout,
Tooltip: self.c.Tr.TagCheckoutTooltip,
},
{
Key: opts.GetKey(opts.Config.Universal.New),
Handler: self.create,
Description: self.c.Tr.NewTag,
Tooltip: self.c.Tr.NewTagTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Remove), Key: opts.GetKey(opts.Config.Universal.Remove),
Handler: self.withItem(self.delete), Handler: self.withItem(self.delete),
Description: self.c.Tr.ViewDeleteOptions, Description: self.c.Tr.Delete,
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Tooltip: self.c.Tr.TagDeleteTooltip,
OpensMenu: true, OpensMenu: true,
}, },
{ {
@ -51,17 +59,14 @@ func (self *TagsController) GetKeybindings(opts types.KeybindingsOpts) []*types.
Handler: self.withItem(self.push), Handler: self.withItem(self.push),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.PushTag, Description: self.c.Tr.PushTag,
}, Tooltip: self.c.Tr.PushTagTooltip,
{
Key: opts.GetKey(opts.Config.Universal.New),
Handler: self.create,
Description: self.c.Tr.CreateTag,
}, },
{ {
Key: opts.GetKey(opts.Config.Commits.ViewResetOptions), Key: opts.GetKey(opts.Config.Commits.ViewResetOptions),
Handler: self.withItem(self.createResetMenu), Handler: self.withItem(self.createResetMenu),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.ViewResetOptions, Description: self.c.Tr.Reset,
Tooltip: self.c.Tr.ResetTooltip,
OpensMenu: true, OpensMenu: true,
}, },
} }

9
pkg/gui/controllers/worktrees_controller.go
View File

@ -39,19 +39,19 @@ func (self *WorktreesController) GetKeybindings(opts types.KeybindingsOpts) []*t
{ {
Key: opts.GetKey(opts.Config.Universal.New), Key: opts.GetKey(opts.Config.Universal.New),
Handler: self.add, Handler: self.add,
Description: self.c.Tr.CreateWorktree, Description: self.c.Tr.NewWorktree,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Select), Key: opts.GetKey(opts.Config.Universal.Select),
Handler: self.withItem(self.enter), Handler: self.withItem(self.enter),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.SwitchToWorktree, Description: self.c.Tr.Switch,
Tooltip: self.c.Tr.SwitchToWorktreeTooltip,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.Confirm), Key: opts.GetKey(opts.Config.Universal.Confirm),
Handler: self.withItem(self.enter), Handler: self.withItem(self.enter),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.SwitchToWorktree,
}, },
{ {
Key: opts.GetKey(opts.Config.Universal.OpenFile), Key: opts.GetKey(opts.Config.Universal.OpenFile),
@ -63,7 +63,8 @@ func (self *WorktreesController) GetKeybindings(opts types.KeybindingsOpts) []*t
Key: opts.GetKey(opts.Config.Universal.Remove), Key: opts.GetKey(opts.Config.Universal.Remove),
Handler: self.withItem(self.remove), Handler: self.withItem(self.remove),
GetDisabledReason: self.require(self.singleItemSelected()), GetDisabledReason: self.require(self.singleItemSelected()),
Description: self.c.Tr.RemoveWorktree, Description: self.c.Tr.Remove,
Tooltip: self.c.Tr.RemoveWorktreeTooltip,
}, },
} }

11
pkg/gui/keybindings.go
View File

@ -89,14 +89,14 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi
Key: opts.GetKey(opts.Config.Universal.ScrollUpMain), Key: opts.GetKey(opts.Config.Universal.ScrollUpMain),
Handler: self.scrollUpMain, Handler: self.scrollUpMain,
Alternative: "fn+up/shift+k", Alternative: "fn+up/shift+k",
Description: self.c.Tr.ScrollUpMainPanel, Description: self.c.Tr.ScrollUpMainWindow,
}, },
{ {
ViewName: "", ViewName: "",
Key: opts.GetKey(opts.Config.Universal.ScrollDownMain), Key: opts.GetKey(opts.Config.Universal.ScrollDownMain),
Handler: self.scrollDownMain, Handler: self.scrollDownMain,
Alternative: "fn+down/shift+j", Alternative: "fn+down/shift+j",
Description: self.c.Tr.ScrollDownMainPanel, Description: self.c.Tr.ScrollDownMainWindow,
}, },
{ {
ViewName: "", ViewName: "",
@ -127,7 +127,7 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
Handler: self.handleCopySelectedSideContextItemToClipboard, Handler: self.handleCopySelectedSideContextItemToClipboard,
GetDisabledReason: self.getCopySelectedSideContextItemToClipboardDisabledReason, GetDisabledReason: self.getCopySelectedSideContextItemToClipboardDisabledReason,
Description: self.c.Tr.CopyFileNameToClipboard, Description: self.c.Tr.CopyPathToClipboard,
}, },
{ {
ViewName: "localBranches", ViewName: "localBranches",
@ -181,13 +181,14 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
Handler: self.handleCopySelectedSideContextItemToClipboard, Handler: self.handleCopySelectedSideContextItemToClipboard,
GetDisabledReason: self.getCopySelectedSideContextItemToClipboardDisabledReason, GetDisabledReason: self.getCopySelectedSideContextItemToClipboardDisabledReason,
Description: self.c.Tr.CopyCommitFileNameToClipboard, Description: self.c.Tr.CopyPathToClipboard,
}, },
{ {
ViewName: "", ViewName: "",
Key: opts.GetKey(opts.Config.Universal.ExtrasMenu), Key: opts.GetKey(opts.Config.Universal.ExtrasMenu),
Handler: self.handleCreateExtrasMenuPanel, Handler: self.handleCreateExtrasMenuPanel,
Description: self.c.Tr.OpenExtrasMenu, Description: self.c.Tr.OpenCommandLogMenu,
Tooltip: self.c.Tr.OpenCommandLogMenuTooltip,
OpensMenu: true, OpensMenu: true,
}, },
{ {

7
pkg/gui/types/keybindings.go
View File

@ -1,6 +1,9 @@
package types package types
import "github.com/jesseduffield/gocui" import (
"github.com/jesseduffield/gocui"
"github.com/jesseduffield/lazygit/pkg/gui/style"
)
type Key interface{} // FIXME: find out how to get `gocui.Key | rune` type Key interface{} // FIXME: find out how to get `gocui.Key | rune`
@ -13,6 +16,7 @@ type Binding struct {
Key Key Key Key
Modifier gocui.Modifier Modifier gocui.Modifier
Description string Description string
ShortDescription string
Alternative string Alternative string
Tag string // e.g. 'navigation'. Used for grouping things in the cheatsheet Tag string // e.g. 'navigation'. Used for grouping things in the cheatsheet
OpensMenu bool OpensMenu bool
@ -22,6 +26,7 @@ type Binding struct {
// will be displayed instead. // will be displayed instead.
// TODO: implement this // TODO: implement this
Display bool Display bool
DisplayStyle *style.TextStyle
// to be displayed if the keybinding is highlighted from within a menu // to be displayed if the keybinding is highlighted from within a menu
Tooltip string Tooltip string

70
pkg/i18n/chinese.go
View File

@ -52,7 +52,7 @@ func chineseTranslationSet() TranslationSet {
CredentialsPassword: "密码", CredentialsPassword: "密码",
CredentialsPassphrase: "输入 SSH 密钥的密码", CredentialsPassphrase: "输入 SSH 密钥的密码",
PassUnameWrong: "密码 和/或 用户名错误", PassUnameWrong: "密码 和/或 用户名错误",
CommitChanges: "提交更改", Commit: "提交更改",
AmendLastCommit: "修补最后一次提交", AmendLastCommit: "修补最后一次提交",
AmendLastCommitTitle: "修补最后一次提交", AmendLastCommitTitle: "修补最后一次提交",
SureToAmend: "您确定要修补上一次提交吗？之后您可以从提交面板更改提交消息。", SureToAmend: "您确定要修补上一次提交吗？之后您可以从提交面板更改提交消息。",
@ -61,7 +61,7 @@ func chineseTranslationSet() TranslationSet {
StatusTitle: "状态", StatusTitle: "状态",
Menu: "菜单", Menu: "菜单",
Execute: "执行", Execute: "执行",
ToggleStaged: "切换暂存状态", Stage: "切换暂存状态",
ToggleStagedAll: "切换所有文件的暂存状态", ToggleStagedAll: "切换所有文件的暂存状态",
ToggleTreeView: "切换文件树视图", ToggleTreeView: "切换文件树视图",
OpenMergeTool: "打开外部合并工具 (git mergetool)", OpenMergeTool: "打开外部合并工具 (git mergetool)",
@ -92,23 +92,21 @@ func chineseTranslationSet() TranslationSet {
Confirm: "确认", Confirm: "确认",
Close: "关闭", Close: "关闭",
Quit: "退出", Quit: "退出",
SquashDown: "向下压缩",
FixupCommit: "修正提交（fixup）",
NoCommitsThisBranch: "该分支没有提交", NoCommitsThisBranch: "该分支没有提交",
CannotSquashOrFixupFirstCommit: "There's no commit below to squash into", CannotSquashOrFixupFirstCommit: "There's no commit below to squash into",
Fixup: "修正（fixup）", Fixup: "修正（fixup）",
SureFixupThisCommit: "您确定要“修正”此提交吗？它将合并到下面的提交中", SureFixupThisCommit: "您确定要“修正”此提交吗？它将合并到下面的提交中",
SureSquashThisCommit: "您确定要将这个提交压缩到下面的提交中吗？", SureSquashThisCommit: "您确定要将这个提交压缩到下面的提交中吗？",
Squash: "压缩", Squash: "压缩",
PickCommit: "选择提交（变基过程中）", PickCommitTooltip: "选择提交（变基过程中）",
RevertCommit: "还原提交", RevertCommit: "还原提交",
RewordCommit: "改写提交", Reword: "改写提交",
DeleteCommit: "删除提交", DropCommit: "删除提交",
MoveDownCommit: "下移提交", MoveDownCommit: "下移提交",
MoveUpCommit: "上移提交", MoveUpCommit: "上移提交",
EditCommit: "编辑提交", EditCommitTooltip: "编辑提交",
AmendToCommit: "用已暂存的更改来修补提交", AmendCommitTooltip: "用已暂存的更改来修补提交",
RenameCommitEditor: "使用编辑器重命名提交", RewordCommitEditor: "使用编辑器重命名提交",
Error: "错误", Error: "错误",
PickHunk: "选中区块", PickHunk: "选中区块",
PickAllHunks: "选中所有区块", PickAllHunks: "选中所有区块",
@ -148,7 +146,7 @@ func chineseTranslationSet() TranslationSet {
OpenFile: `打开文件`, OpenFile: `打开文件`,
IgnoreFile: `添加到 .gitignore`, IgnoreFile: `添加到 .gitignore`,
RefreshFiles: `刷新文件`, RefreshFiles: `刷新文件`,
MergeIntoCurrentBranch: `合并到当前检出的分支`, Merge: `合并到当前检出的分支`,
ConfirmQuit: `您确定要退出吗？`, ConfirmQuit: `您确定要退出吗？`,
SwitchRepo: `切换到最近的仓库`, SwitchRepo: `切换到最近的仓库`,
AllBranchesLogGraph: `显示所有分支的日志`, AllBranchesLogGraph: `显示所有分支的日志`,
@ -161,12 +159,12 @@ func chineseTranslationSet() TranslationSet {
NoAutomaticGitFetchBody: `Lazygit 不能在私人仓库中使用 "git fetch"; 请在文件面板中使用 'f' 手动运行 "git fetch"`, NoAutomaticGitFetchBody: `Lazygit 不能在私人仓库中使用 "git fetch"; 请在文件面板中使用 'f' 手动运行 "git fetch"`,
FileEnter: `暂存单个 块/行 用于文件, 或 折叠/展开 目录`, FileEnter: `暂存单个 块/行 用于文件, 或 折叠/展开 目录`,
FileStagingRequirements: `只能暂存跟踪文件的单独行`, FileStagingRequirements: `只能暂存跟踪文件的单独行`,
StageSelection: `切换行暂存状态`, StageSelectionTooltip: `切换行暂存状态`,
DiscardSelection: `取消变更 (git reset)`, DiscardSelection: `取消变更 (git reset)`,
ToggleRangeSelect: `切换拖动选择`, ToggleRangeSelect: `切换拖动选择`,
ToggleSelectHunk: `切换选择区块`, ToggleSelectHunk: `切换选择区块`,
ToggleSelectionForPatch: `添加/移除 行到补丁`, ToggleSelectionForPatch: `添加/移除 行到补丁`,
ToggleStagingPanel: `切换到其他面板`, ToggleStagingView: `切换到其他面板`,
ReturnToFilesPanel: `返回文件面板`, ReturnToFilesPanel: `返回文件面板`,
FastForward: `从上游快进此分支`, FastForward: `从上游快进此分支`,
FastForwarding: "抓取并快进", FastForwarding: "抓取并快进",
@ -213,8 +211,8 @@ func chineseTranslationSet() TranslationSet {
SelectNextHunk: "选择底部块", SelectNextHunk: "选择底部块",
ScrollDown: "向下滚动", ScrollDown: "向下滚动",
ScrollUp: "向上滚动", ScrollUp: "向上滚动",
ScrollUpMainPanel: "向上滚动主面板", ScrollUpMainWindow: "向上滚动主面板",
ScrollDownMainPanel: "向下滚动主面板", ScrollDownMainWindow: "向下滚动主面板",
AmendCommitTitle: "修改提交", AmendCommitTitle: "修改提交",
AmendCommitPrompt: "您确定要使用暂存文件来修改此提交吗？", AmendCommitPrompt: "您确定要使用暂存文件来修改此提交吗？",
DropCommitTitle: "删除提交", DropCommitTitle: "删除提交",
@ -236,8 +234,8 @@ func chineseTranslationSet() TranslationSet {
CommitFiles: "提交文件", CommitFiles: "提交文件",
ViewItemFiles: "查看提交的文件", ViewItemFiles: "查看提交的文件",
CommitFilesTitle: "提交文件", CommitFilesTitle: "提交文件",
CheckoutCommitFile: "检出文件", CheckoutCommitFileTooltip: "检出文件",
DiscardOldFileChange: "放弃对此文件的提交更改", DiscardOldFileChangeTooltip: "放弃对此文件的提交更改",
DiscardFileChangesTitle: "放弃文件更改", DiscardFileChangesTitle: "放弃文件更改",
DiscardFileChangesPrompt: "您确定要舍弃此提交对该文件的更改吗？如果此文件是在此提交中创建的，它将被删除", DiscardFileChangesPrompt: "您确定要舍弃此提交对该文件的更改吗？如果此文件是在此提交中创建的，它将被删除",
DisabledForGPG: "该功能不适用于使用 GPG 的用户", DisabledForGPG: "该功能不适用于使用 GPG 的用户",
@ -245,7 +243,7 @@ func chineseTranslationSet() TranslationSet {
AutoStashTitle: "自动存储？", AutoStashTitle: "自动存储？",
AutoStashPrompt: "您必须隐藏并弹出更改以使更改生效。自动执行？(enter/esc)", AutoStashPrompt: "您必须隐藏并弹出更改以使更改生效。自动执行？(enter/esc)",
StashPrefix: "自动隐藏更改 ", StashPrefix: "自动隐藏更改 ",
ViewDiscardOptions: "查看'放弃更改'选项", Discard: "查看'放弃更改'选项",
Cancel: "取消", Cancel: "取消",
DiscardAllChanges: "放弃所有更改", DiscardAllChanges: "放弃所有更改",
DiscardUnstagedChanges: "放弃未暂存的变更", DiscardUnstagedChanges: "放弃未暂存的变更",
@ -255,9 +253,9 @@ func chineseTranslationSet() TranslationSet {
HardReset: "硬重置", HardReset: "硬重置",
ViewResetOptions: `查看重置选项`, ViewResetOptions: `查看重置选项`,
CreateFixupCommit: `为此提交创建修正`, CreateFixupCommit: `为此提交创建修正`,
SquashAboveCommits: `压缩在所选提交之上的所有“fixup!”提交（自动压缩）`, SquashAboveCommitsTooltip: `压缩在所选提交之上的所有“fixup!”提交（自动压缩）`,
SureSquashAboveCommits: `您确定要压缩在 {{.commit}} 之上的所有“fixup!”提交吗?`, SureSquashAboveCommits: `您确定要压缩在 {{.commit}} 之上的所有“fixup!”提交吗?`,
CreateFixupCommitDescription: `创建修正提交`, CreateFixupCommitTooltip: `创建修正提交`,
SureCreateFixupCommit: `您确定要对 {{.commit}} 创建修正提交吗？`, SureCreateFixupCommit: `您确定要对 {{.commit}} 创建修正提交吗？`,
ExecuteCustomCommand: "执行自定义命令", ExecuteCustomCommand: "执行自定义命令",
CustomCommand: "自定义命令：", CustomCommand: "自定义命令：",
@ -281,12 +279,12 @@ func chineseTranslationSet() TranslationSet {
ViewPatchOptions: "查看自定义补丁选项", ViewPatchOptions: "查看自定义补丁选项",
PatchOptionsTitle: "补丁选项", PatchOptionsTitle: "补丁选项",
NoPatchError: "尚未创建补丁。你可以在提交中的文件上按下“空格”或使用“回车”添加其中的特定行以开始构建补丁", NoPatchError: "尚未创建补丁。你可以在提交中的文件上按下“空格”或使用“回车”添加其中的特定行以开始构建补丁",
EnterFile: "输入文件以将所选行添加到补丁中（或切换目录折叠）", EnterCommitFile: "输入文件以将所选行添加到补丁中（或切换目录折叠）",
ExitCustomPatchBuilder: `退出逐行模式`, ExitCustomPatchBuilder: `退出逐行模式`,
EnterUpstream: `以这种格式输入上游：'<远程仓库> <分支名称>'`, EnterUpstream: `以这种格式输入上游：'<远程仓库> <分支名称>'`,
InvalidUpstream: "上游格式无效，格式应当为：'<remote> <branchname>'", InvalidUpstream: "上游格式无效，格式应当为：'<remote> <branchname>'",
ReturnToRemotesList: `返回远程仓库列表`, ReturnToRemotesList: `返回远程仓库列表`,
AddNewRemote: `添加新的远程仓库`, NewRemote: `添加新的远程仓库`,
NewRemoteName: `新远程仓库名称:`, NewRemoteName: `新远程仓库名称:`,
NewRemoteUrl: `新远程仓库 URL:`, NewRemoteUrl: `新远程仓库 URL:`,
EditRemoteName: `输入远程仓库 {{.remoteName}} 的新名称：`, EditRemoteName: `输入远程仓库 {{.remoteName}} 的新名称：`,
@ -296,10 +294,10 @@ func chineseTranslationSet() TranslationSet {
DeleteRemoteBranch: "删除远程分支", DeleteRemoteBranch: "删除远程分支",
DeleteRemoteBranchMessage: "您确定要删除远程分支吗？", DeleteRemoteBranchMessage: "您确定要删除远程分支吗？",
SetUpstream: "设置为检出分支的上游", SetUpstream: "设置为检出分支的上游",
SetAsUpstream: "设置为检出分支的上游", SetAsUpstreamTooltip: "设置为检出分支的上游",
SetUpstreamTitle: "设置上游分支", SetUpstreamTitle: "设置上游分支",
SetUpstreamMessage: "您确定要将 {{.checkedOut}} 的上游分支设置为 {{.selected}} 吗？", SetUpstreamMessage: "您确定要将 {{.checkedOut}} 的上游分支设置为 {{.selected}} 吗？",
EditRemote: "编辑远程仓库", EditRemoteTooltip: "编辑远程仓库",
TagCommit: "标签提交", TagCommit: "标签提交",
TagMenuTitle: "创建标签", TagMenuTitle: "创建标签",
TagNameTitle: "标签名称", TagNameTitle: "标签名称",
@ -308,8 +306,9 @@ func chineseTranslationSet() TranslationSet {
LightweightTag: "轻量标签", LightweightTag: "轻量标签",
PushTagTitle: "将 {{.tagName}} 推送到远程仓库：", PushTagTitle: "将 {{.tagName}} 推送到远程仓库：",
PushTag: "推送标签", PushTag: "推送标签",
CreateTag: "创建标签", NewTag: "创建标签",
FetchRemote: "抓取远程仓库", FetchRemoteTooltip: "抓取远程仓库",
FetchingRemoteStatus: "抓取远程仓库中",
CheckoutCommit: "检出提交", CheckoutCommit: "检出提交",
SureCheckoutThisCommit: "您确定要检出此提交吗?", SureCheckoutThisCommit: "您确定要检出此提交吗?",
GitFlowOptions: "显示 git-flow 选项", GitFlowOptions: "显示 git-flow 选项",
@ -326,7 +325,7 @@ func chineseTranslationSet() TranslationSet {
RenameBranch: "重命名分支", RenameBranch: "重命名分支",
NewBranchNamePrompt: "输入分支的新名称", NewBranchNamePrompt: "输入分支的新名称",
RenameBranchWarning: "该分支正在跟踪远程仓库。此操作将仅会重命名本地分支名称，而不会重命名远程分支的名称。确定继续？", RenameBranchWarning: "该分支正在跟踪远程仓库。此操作将仅会重命名本地分支名称，而不会重命名远程分支的名称。确定继续？",
OpenMenu: "打开菜单", OpenKeybindingsMenu: "打开菜单",
ResetCherryPick: "重置已拣选（复制）的提交", ResetCherryPick: "重置已拣选（复制）的提交",
NextTab: "下一个标签", NextTab: "下一个标签",
PrevTab: "上一个标签", PrevTab: "上一个标签",
@ -355,16 +354,15 @@ func chineseTranslationSet() TranslationSet {
ExitDiffMode: "退出差异模式", ExitDiffMode: "退出差异模式",
DiffingMenuTitle: "正在 diff", DiffingMenuTitle: "正在 diff",
SwapDiff: "反向 diff", SwapDiff: "反向 diff",
OpenDiffingMenu: "打开 diff 菜单", ViewDiffingOptions: "打开 diff 菜单",
// 实际视图 (actual view) 是附加视图 (extras view)，未来,我打算为附加视图提供更多选项卡，但现在，上面的文本只需要提及“命令日志”这个部分 // 实际视图 (actual view) 是附加视图 (extras view)，未来,我打算为附加视图提供更多选项卡，但现在，上面的文本只需要提及“命令日志”这个部分
OpenExtrasMenu: "打开命令日志菜单", OpenCommandLogMenu: "打开命令日志菜单",
ShowingGitDiff: "显示输出：", ShowingGitDiff: "显示输出：",
CopyCommitShaToClipboard: "将提交的 SHA 复制到剪贴板", CopyCommitShaToClipboard: "将提交的 SHA 复制到剪贴板",
CopyCommitMessageToClipboard: "将提交消息复制到剪贴板", CopyCommitMessageToClipboard: "将提交消息复制到剪贴板",
CopyBranchNameToClipboard: "将分支名称复制到剪贴板", CopyBranchNameToClipboard: "将分支名称复制到剪贴板",
CopyFileNameToClipboard: "将文件名复制到剪贴板", CopyPathToClipboard: "将文件名复制到剪贴板",
CopyCommitFileNameToClipboard: "将提交的文件名复制到剪贴板", CopySelectedTextToClipboard: "将选中文本复制到剪贴板",
CopySelectedTexToClipboard: "将选中文本复制到剪贴板",
CommitPrefixPatternError: "提交前缀模式错误", CommitPrefixPatternError: "提交前缀模式错误",
NoFilesStagedTitle: "没有暂存文件", NoFilesStagedTitle: "没有暂存文件",
NoFilesStagedPrompt: "您尚未暂存任何文件。提交所有文件？", NoFilesStagedPrompt: "您尚未暂存任何文件。提交所有文件？",
@ -379,7 +377,7 @@ func chineseTranslationSet() TranslationSet {
RunningCustomCommandStatus: "正在运行自定义命令", RunningCustomCommandStatus: "正在运行自定义命令",
SubmoduleStashAndReset: "存放未提交的子模块更改和更新", SubmoduleStashAndReset: "存放未提交的子模块更改和更新",
AndResetSubmodules: "和重置子模块", AndResetSubmodules: "和重置子模块",
EnterSubmodule: "输入子模块", EnterSubmoduleTooltip: "输入子模块",
CopySubmoduleNameToClipboard: "将子模块名称复制到剪贴板", CopySubmoduleNameToClipboard: "将子模块名称复制到剪贴板",
RemoveSubmodule: "删除子模块", RemoveSubmodule: "删除子模块",
RemoveSubmodulePrompt: "您确定要删除子模块 '%s' 及其对应的目录吗？这是不可逆的。", RemoveSubmodulePrompt: "您确定要删除子模块 '%s' 及其对应的目录吗？这是不可逆的。",
@ -387,14 +385,14 @@ func chineseTranslationSet() TranslationSet {
NewSubmoduleName: "新的子模块名称：", NewSubmoduleName: "新的子模块名称：",
NewSubmoduleUrl: "新的子模块 URL：", NewSubmoduleUrl: "新的子模块 URL：",
NewSubmodulePath: "新的子模块路径：", NewSubmodulePath: "新的子模块路径：",
AddSubmodule: "添加新的子模块", NewSubmodule: "添加新的子模块",
AddingSubmoduleStatus: "添加子模块", AddingSubmoduleStatus: "添加子模块",
UpdateSubmoduleUrl: "更新子模块 '%s' 的 URL", UpdateSubmoduleUrl: "更新子模块 '%s' 的 URL",
UpdatingSubmoduleUrlStatus: "更新 URL 中", UpdatingSubmoduleUrlStatus: "更新 URL 中",
EditSubmoduleUrl: "更新子模块 URL", EditSubmoduleUrl: "更新子模块 URL",
InitializingSubmoduleStatus: "正在初始化子模块", InitializingSubmoduleStatus: "正在初始化子模块",
InitSubmodule: "初始化子模块", InitSubmoduleTooltip: "初始化子模块",
SubmoduleUpdate: "更新子模块", SubmoduleUpdateTooltip: "更新子模块",
UpdatingSubmoduleStatus: "正在更新子模块", UpdatingSubmoduleStatus: "正在更新子模块",
BulkInitSubmodules: "批量初始化子模块", BulkInitSubmodules: "批量初始化子模块",
BulkUpdateSubmodules: "批量更新子模块", BulkUpdateSubmodules: "批量更新子模块",

64
pkg/i18n/dutch.go
View File

@ -18,7 +18,7 @@ func dutchTranslationSet() TranslationSet {
CredentialsPassword: "Wachtwoord", CredentialsPassword: "Wachtwoord",
CredentialsPassphrase: "Voer een wachtwoordzin in voor de SSH-sleutel", CredentialsPassphrase: "Voer een wachtwoordzin in voor de SSH-sleutel",
PassUnameWrong: "Wachtwoord en/of gebruikersnaam verkeerd", PassUnameWrong: "Wachtwoord en/of gebruikersnaam verkeerd",
CommitChanges: "Commit veranderingen", Commit: "Commit veranderingen",
AmendLastCommit: "Wijzig laatste commit", AmendLastCommit: "Wijzig laatste commit",
AmendLastCommitTitle: "Wijzig laatste commit", AmendLastCommitTitle: "Wijzig laatste commit",
SureToAmend: "Weet je zeker dat je de laatste commit wilt wijzigen? U kunt het commit-bericht wijzigen vanuit het commits-paneel.", SureToAmend: "Weet je zeker dat je de laatste commit wilt wijzigen? U kunt het commit-bericht wijzigen vanuit het commits-paneel.",
@ -27,7 +27,7 @@ func dutchTranslationSet() TranslationSet {
StatusTitle: "Status", StatusTitle: "Status",
Menu: "Menu", Menu: "Menu",
Execute: "Uitvoeren", Execute: "Uitvoeren",
ToggleStaged: "Toggle staged", Stage: "Toggle staged",
ToggleStagedAll: "Toggle staged alle", ToggleStagedAll: "Toggle staged alle",
Refresh: "Verversen", Refresh: "Verversen",
Push: "Push", Push: "Push",
@ -58,22 +58,20 @@ func dutchTranslationSet() TranslationSet {
Confirm: "Bevestig", Confirm: "Bevestig",
Close: "Sluiten", Close: "Sluiten",
Quit: "Quit", Quit: "Quit",
SquashDown: "Squash beneden",
FixupCommit: "Fixup commit",
CannotSquashOrFixupFirstCommit: "There's no commit below to squash into", CannotSquashOrFixupFirstCommit: "There's no commit below to squash into",
Fixup: "Fixup", Fixup: "Fixup",
SureFixupThisCommit: "Weet je zeker dat je fixup wil uitvoeren op deze commit? De commit hieronder zol worden squashed in deze", SureFixupThisCommit: "Weet je zeker dat je fixup wil uitvoeren op deze commit? De commit hieronder zol worden squashed in deze",
SureSquashThisCommit: "Weet je zeker dat je deze commit wil samenvoegen met de commit hieronder?", SureSquashThisCommit: "Weet je zeker dat je deze commit wil samenvoegen met de commit hieronder?",
Squash: "Squash", Squash: "Squash",
PickCommit: "Kies commit (wanneer midden in rebase)", PickCommitTooltip: "Kies commit (wanneer midden in rebase)",
RevertCommit: "Commit ongedaan maken", RevertCommit: "Commit ongedaan maken",
RewordCommit: "Hernoem commit", Reword: "Hernoem commit",
DeleteCommit: "Verwijder commit", DropCommit: "Verwijder commit",
MoveDownCommit: "Verplaats commit 1 naar beneden", MoveDownCommit: "Verplaats commit 1 naar beneden",
MoveUpCommit: "Verplaats commit 1 naar boven", MoveUpCommit: "Verplaats commit 1 naar boven",
EditCommit: "Wijzig commit", EditCommitTooltip: "Wijzig commit",
AmendToCommit: "Wijzig commit met staged veranderingen", AmendCommitTooltip: "Wijzig commit met staged veranderingen",
RenameCommitEditor: "Hernoem commit met editor", RewordCommitEditor: "Hernoem commit met editor",
NoCommitsThisBranch: "Geen commits in deze branch", NoCommitsThisBranch: "Geen commits in deze branch",
Error: "Foutmelding", Error: "Foutmelding",
PickHunk: "Kies stuk", PickHunk: "Kies stuk",
@ -113,7 +111,7 @@ func dutchTranslationSet() TranslationSet {
OpenFile: `Open bestand`, OpenFile: `Open bestand`,
IgnoreFile: `Voeg toe aan .gitignore`, IgnoreFile: `Voeg toe aan .gitignore`,
RefreshFiles: `Refresh bestanden`, RefreshFiles: `Refresh bestanden`,
MergeIntoCurrentBranch: `Merge in met huidige checked out branch`, Merge: `Merge in met huidige checked out branch`,
ConfirmQuit: `Weet je zeker dat je dit programma wil sluiten?`, ConfirmQuit: `Weet je zeker dat je dit programma wil sluiten?`,
SwitchRepo: "Wissel naar een recente repo", SwitchRepo: "Wissel naar een recente repo",
AllBranchesLogGraph: `Alle logs van de branch laten zien`, AllBranchesLogGraph: `Alle logs van de branch laten zien`,
@ -126,12 +124,12 @@ func dutchTranslationSet() TranslationSet {
NoAutomaticGitFetchBody: `Lazygit kan niet "git fetch" uitvoeren in een privé repository, gebruik f in het branches paneel om "git fetch" manueel uit te voeren`, NoAutomaticGitFetchBody: `Lazygit kan niet "git fetch" uitvoeren in een privé repository, gebruik f in het branches paneel om "git fetch" manueel uit te voeren`,
FileEnter: `Stage individuele hunks/lijnen`, FileEnter: `Stage individuele hunks/lijnen`,
FileStagingRequirements: `Kan alleen individuele lijnen stagen van getrackte bestanden met onstaged veranderingen`, FileStagingRequirements: `Kan alleen individuele lijnen stagen van getrackte bestanden met onstaged veranderingen`,
StageSelection: `Toggle lijnen staged / unstaged`, StageSelectionTooltip: `Toggle lijnen staged / unstaged`,
DiscardSelection: `Verwijdert change (git reset)`, DiscardSelection: `Verwijdert change (git reset)`,
ToggleRangeSelect: `Toggle drag selecteer`, ToggleRangeSelect: `Toggle drag selecteer`,
ToggleSelectHunk: `Toggle selecteer hunk`, ToggleSelectHunk: `Toggle selecteer hunk`,
ToggleSelectionForPatch: `Voeg toe/verwijder lijn(en) in patch`, ToggleSelectionForPatch: `Voeg toe/verwijder lijn(en) in patch`,
ToggleStagingPanel: `Ga naar een ander paneel`, ToggleStagingView: `Ga naar een ander paneel`,
ReturnToFilesPanel: `Ga terug naar het bestanden paneel`, ReturnToFilesPanel: `Ga terug naar het bestanden paneel`,
FastForward: `Fast-forward deze branch vanaf zijn upstream`, FastForward: `Fast-forward deze branch vanaf zijn upstream`,
FastForwarding: "Fast-forwarding", FastForwarding: "Fast-forwarding",
@ -177,8 +175,8 @@ func dutchTranslationSet() TranslationSet {
SelectNextHunk: "Selecteer onderste hunk", SelectNextHunk: "Selecteer onderste hunk",
ScrollDown: "Scroll omlaag", ScrollDown: "Scroll omlaag",
ScrollUp: "Scroll omhoog", ScrollUp: "Scroll omhoog",
ScrollUpMainPanel: "Scroll naar beneden vanaf hoofdpaneel", ScrollUpMainWindow: "Scroll naar beneden vanaf hoofdpaneel",
ScrollDownMainPanel: "Scroll naar beneden vanaf hoofdpaneel", ScrollDownMainWindow: "Scroll naar beneden vanaf hoofdpaneel",
AmendCommitTitle: "Commit wijzigen", AmendCommitTitle: "Commit wijzigen",
AmendCommitPrompt: "Weet je zeker dat je deze commit wil wijzigen met de vorige staged bestanden?", AmendCommitPrompt: "Weet je zeker dat je deze commit wil wijzigen met de vorige staged bestanden?",
DropCommitTitle: "Verwijder commit", DropCommitTitle: "Verwijder commit",
@ -199,8 +197,8 @@ func dutchTranslationSet() TranslationSet {
CommitFiles: "Commit bestanden", CommitFiles: "Commit bestanden",
ViewItemFiles: "Bekijk gecommite bestanden", ViewItemFiles: "Bekijk gecommite bestanden",
CommitFilesTitle: "Commit bestanden", CommitFilesTitle: "Commit bestanden",
CheckoutCommitFile: "Bestand uitchecken", CheckoutCommitFileTooltip: "Bestand uitchecken",
DiscardOldFileChange: "Uitsluit deze commit zijn veranderingen aan dit bestand", DiscardOldFileChangeTooltip: "Uitsluit deze commit zijn veranderingen aan dit bestand",
DiscardFileChangesTitle: "Uitsluit bestand zijn veranderingen", DiscardFileChangesTitle: "Uitsluit bestand zijn veranderingen",
DiscardFileChangesPrompt: "Weet je zeker dat je de wijzigingen van deze commit in dit bestand wilt weggooien? Als dit bestand is gecreëerd in deze commit dan zal dit bestand worden verwijdert", DiscardFileChangesPrompt: "Weet je zeker dat je de wijzigingen van deze commit in dit bestand wilt weggooien? Als dit bestand is gecreëerd in deze commit dan zal dit bestand worden verwijdert",
DisabledForGPG: "Onderdelen niet beschikbaar voor gebruikers die GPG gebruiken", DisabledForGPG: "Onderdelen niet beschikbaar voor gebruikers die GPG gebruiken",
@ -208,7 +206,7 @@ func dutchTranslationSet() TranslationSet {
AutoStashTitle: "Autostash?", AutoStashTitle: "Autostash?",
AutoStashPrompt: "Je moet je veranderingen stashen en poppen om ze over te brengen. Dit automatisch doen? (enter/esc)", AutoStashPrompt: "Je moet je veranderingen stashen en poppen om ze over te brengen. Dit automatisch doen? (enter/esc)",
StashPrefix: "Auto-stashing veranderingen voor ", StashPrefix: "Auto-stashing veranderingen voor ",
ViewDiscardOptions: "Bekijk 'veranderingen ongedaan maken' opties", Discard: "Bekijk 'veranderingen ongedaan maken' opties",
Cancel: "Annuleren", Cancel: "Annuleren",
DiscardAllChanges: "Negeer alle wijzigingen", DiscardAllChanges: "Negeer alle wijzigingen",
DiscardUnstagedChanges: "Negeer unstaged wijzigingen", DiscardUnstagedChanges: "Negeer unstaged wijzigingen",
@ -218,9 +216,9 @@ func dutchTranslationSet() TranslationSet {
ViewResetOptions: `Bekijk reset opties`, ViewResetOptions: `Bekijk reset opties`,
HardReset: "Harde reset", HardReset: "Harde reset",
CreateFixupCommit: `Creëer fixup commit voor deze commit`, CreateFixupCommit: `Creëer fixup commit voor deze commit`,
SquashAboveCommits: `Squash bovenstaande commits`, SquashAboveCommitsTooltip: `Squash bovenstaande commits`,
SureSquashAboveCommits: `Weet je zeker dat je alles wil squash/fixup! voor de bovenstaand commits {{.commit}}?`, SureSquashAboveCommits: `Weet je zeker dat je alles wil squash/fixup! voor de bovenstaand commits {{.commit}}?`,
CreateFixupCommitDescription: `Creëer fixup commit`, CreateFixupCommitTooltip: `Creëer fixup commit`,
SureCreateFixupCommit: `Weet je zeker dat je een fixup wil maken! commit voor commit {{.commit}}?`, SureCreateFixupCommit: `Weet je zeker dat je een fixup wil maken! commit voor commit {{.commit}}?`,
ExecuteCustomCommand: "Voer aangepaste commando uit", ExecuteCustomCommand: "Voer aangepaste commando uit",
CustomCommand: "Aangepaste commando:", CustomCommand: "Aangepaste commando:",
@ -241,11 +239,11 @@ func dutchTranslationSet() TranslationSet {
ViewPatchOptions: "Bekijk aangepaste patch opties", ViewPatchOptions: "Bekijk aangepaste patch opties",
PatchOptionsTitle: "Patch opties", PatchOptionsTitle: "Patch opties",
NoPatchError: "Nog geen patch gecreëerd. Om een patch te bouwen gebruik 'space' op een commit bestand of 'enter' om een spesiefieke lijnen toe te voegen", NoPatchError: "Nog geen patch gecreëerd. Om een patch te bouwen gebruik 'space' op een commit bestand of 'enter' om een spesiefieke lijnen toe te voegen",
EnterFile: "Enter bestand om geselecteerde regels toe te voegen aan de patch", EnterCommitFile: "Enter bestand om geselecteerde regels toe te voegen aan de patch",
ExitCustomPatchBuilder: `Sluit lijn-bij-lijn modus`, ExitCustomPatchBuilder: `Sluit lijn-bij-lijn modus`,
EnterUpstream: `Enter upstream als '<remote> <branchnaam>'`, EnterUpstream: `Enter upstream als '<remote> <branchnaam>'`,
ReturnToRemotesList: `Ga terug naar remotes lijst`, ReturnToRemotesList: `Ga terug naar remotes lijst`,
AddNewRemote: `Voeg een nieuwe remote toe`, NewRemote: `Voeg een nieuwe remote toe`,
NewRemoteName: `Nieuwe remote name:`, NewRemoteName: `Nieuwe remote name:`,
NewRemoteUrl: `Nieuwe remote url:`, NewRemoteUrl: `Nieuwe remote url:`,
EditRemoteName: `Enter updated remote naam voor {{.remoteName}}:`, EditRemoteName: `Enter updated remote naam voor {{.remoteName}}:`,
@ -255,16 +253,17 @@ func dutchTranslationSet() TranslationSet {
DeleteRemoteBranch: "Verwijder remote branch", DeleteRemoteBranch: "Verwijder remote branch",
DeleteRemoteBranchMessage: "Weet je zeker dat je deze remote branch wilt verwijderen", DeleteRemoteBranchMessage: "Weet je zeker dat je deze remote branch wilt verwijderen",
SetUpstream: "Stel in als upstream van uitgecheckte branch", SetUpstream: "Stel in als upstream van uitgecheckte branch",
SetAsUpstream: "Stel in als upstream van uitgecheckte branch", SetAsUpstreamTooltip: "Stel in als upstream van uitgecheckte branch",
SetUpstreamTitle: "Stel in als upstream branch", SetUpstreamTitle: "Stel in als upstream branch",
SetUpstreamMessage: "Weet je zeker dat je de upstream branch van '{{.checkedOut}}' naar '{{.selected}}' wilt zetten", SetUpstreamMessage: "Weet je zeker dat je de upstream branch van '{{.checkedOut}}' naar '{{.selected}}' wilt zetten",
EditRemote: "Wijzig remote", EditRemoteTooltip: "Wijzig remote",
TagCommit: "Tag commit", TagCommit: "Tag commit",
TagNameTitle: "Tag naam:", TagNameTitle: "Tag naam:",
PushTagTitle: "Remote om tag '{{.tagName}}' te pushen naar:", PushTagTitle: "Remote om tag '{{.tagName}}' te pushen naar:",
PushTag: "Push tag", PushTag: "Push tag",
CreateTag: "Creëer tag", NewTag: "Creëer tag",
FetchRemote: "Fetch remote", FetchRemoteTooltip: "Fetch remote",
FetchingRemoteStatus: "Remote fetchen",
CheckoutCommit: "Checkout commit", CheckoutCommit: "Checkout commit",
SureCheckoutThisCommit: "Weet je zeker dat je deze commit wil uitchecken?", SureCheckoutThisCommit: "Weet je zeker dat je deze commit wil uitchecken?",
GitFlowOptions: "Laat git-flow opties zien", GitFlowOptions: "Laat git-flow opties zien",
@ -281,7 +280,7 @@ func dutchTranslationSet() TranslationSet {
RenameBranch: "Hernoem branch", RenameBranch: "Hernoem branch",
NewBranchNamePrompt: "Noem een nieuwe branch naam", NewBranchNamePrompt: "Noem een nieuwe branch naam",
RenameBranchWarning: "Deze branch volgt een remote. Deze actie zal alleen de locale branch name wijzigen niet de naam van de remote branch. Verder gaan?", RenameBranchWarning: "Deze branch volgt een remote. Deze actie zal alleen de locale branch name wijzigen niet de naam van de remote branch. Verder gaan?",
OpenMenu: "Open menu", OpenKeybindingsMenu: "Open menu",
ResetCherryPick: "Reset cherry-picked (gekopieerde) commits selectie", ResetCherryPick: "Reset cherry-picked (gekopieerde) commits selectie",
NextTab: "Volgende tabblad", NextTab: "Volgende tabblad",
PrevTab: "Vorige tabblad", PrevTab: "Vorige tabblad",
@ -310,13 +309,12 @@ func dutchTranslationSet() TranslationSet {
ExitDiffMode: "Sluit diff mode", ExitDiffMode: "Sluit diff mode",
DiffingMenuTitle: "Diffen", DiffingMenuTitle: "Diffen",
SwapDiff: "Keer diff richting om", SwapDiff: "Keer diff richting om",
OpenDiffingMenu: "Open diff menu", ViewDiffingOptions: "Open diff menu",
ShowingGitDiff: "Laat output zien voor:", ShowingGitDiff: "Laat output zien voor:",
CopyCommitShaToClipboard: "Kopieer commit SHA naar klembord", CopyCommitShaToClipboard: "Kopieer commit SHA naar klembord",
CopyCommitMessageToClipboard: "Kopieer commit bericht naar klembord", CopyCommitMessageToClipboard: "Kopieer commit bericht naar klembord",
CopyBranchNameToClipboard: "Kopieer branch name naar klembord", CopyBranchNameToClipboard: "Kopieer branch name naar klembord",
CopyFileNameToClipboard: "Kopieer de bestandsnaam naar het klembord", CopyPathToClipboard: "Kopieer de bestandsnaam naar het klembord",
CopyCommitFileNameToClipboard: "Kopieer de vastgelegde bestandsnaam naar het klembord",
CommitPrefixPatternError: "Fout in commitPrefix patroon", CommitPrefixPatternError: "Fout in commitPrefix patroon",
NoFilesStagedTitle: "Geen bestanden gestaged", NoFilesStagedTitle: "Geen bestanden gestaged",
NoFilesStagedPrompt: "Je hebt geen bestanden gestaged. Commit alle bestanden?", NoFilesStagedPrompt: "Je hebt geen bestanden gestaged. Commit alle bestanden?",
@ -330,9 +328,9 @@ func dutchTranslationSet() TranslationSet {
ToggleTreeView: "Toggle bestandsboom weergave", ToggleTreeView: "Toggle bestandsboom weergave",
CreateNewBranchFromCommit: "Creëer nieuwe branch van commit", CreateNewBranchFromCommit: "Creëer nieuwe branch van commit",
CopySubmoduleNameToClipboard: "Kopieer submodule naam naar klembord", CopySubmoduleNameToClipboard: "Kopieer submodule naam naar klembord",
EnterSubmodule: "Enter submodule", EnterSubmoduleTooltip: "Enter submodule",
AddSubmodule: "Voeg nieuwe submodule toe", NewSubmodule: "Voeg nieuwe submodule toe",
InitSubmodule: "Initialiseer submodule", InitSubmoduleTooltip: "Initialiseer submodule",
ViewBulkSubmoduleOptions: "Bekijk bulk submodule opties", ViewBulkSubmoduleOptions: "Bekijk bulk submodule opties",
CreatePullRequestOptions: "Bekijk opties voor pull-aanvraag", CreatePullRequestOptions: "Bekijk opties voor pull-aanvraag",
ConfirmRevertCommit: "Weet u zeker dat u {{.selectedCommit}} ongedaan wilt maken?", ConfirmRevertCommit: "Weet u zeker dat u {{.selectedCommit}} ongedaan wilt maken?",

422
pkg/i18n/english.go
View File

File diff suppressed because it is too large Load Diff

55
pkg/i18n/japanese.go
View File

@ -39,7 +39,7 @@ func japaneseTranslationSet() TranslationSet {
CredentialsPassword: "パスワード", CredentialsPassword: "パスワード",
CredentialsPassphrase: "SSH鍵のパスフレーズを入力", CredentialsPassphrase: "SSH鍵のパスフレーズを入力",
PassUnameWrong: "パスワード, パスフレーズまたはユーザ名が間違っています。", PassUnameWrong: "パスワード, パスフレーズまたはユーザ名が間違っています。",
CommitChanges: "変更をコミット", Commit: "変更をコミット",
AmendLastCommit: "最新のコミットにamend", AmendLastCommit: "最新のコミットにamend",
AmendLastCommitTitle: "最新のコミットにamend", AmendLastCommitTitle: "最新のコミットにamend",
SureToAmend: "最新のコミットに変更をamendします。よろしいですか? コミットメッセージはコミットパネルから変更できます。", SureToAmend: "最新のコミットに変更をamendします。よろしいですか? コミットメッセージはコミットパネルから変更できます。",
@ -48,7 +48,7 @@ func japaneseTranslationSet() TranslationSet {
StatusTitle: "ステータス", StatusTitle: "ステータス",
Menu: "メニュー", Menu: "メニュー",
Execute: "実行", Execute: "実行",
ToggleStaged: "ステージ/アンステージ", Stage: "ステージ/アンステージ",
ToggleStagedAll: "すべての変更をステージ/アンステージ", ToggleStagedAll: "すべての変更をステージ/アンステージ",
ToggleTreeView: "ファイルツリーの表示を切り替え", ToggleTreeView: "ファイルツリーの表示を切り替え",
OpenMergeTool: "Git mergetoolを開く", OpenMergeTool: "Git mergetoolを開く",
@ -82,7 +82,6 @@ func japaneseTranslationSet() TranslationSet {
Confirm: "確認", Confirm: "確認",
Close: "閉じる", Close: "閉じる",
Quit: "終了", Quit: "終了",
// LcSquashDown: "Squash down",
// LcFixupCommit: "Fixup commit", // LcFixupCommit: "Fixup commit",
// NoCommitsThisBranch: "No commits for this branch", // NoCommitsThisBranch: "No commits for this branch",
// CannotSquashOrFixupFirstCommit: "There's no commit below to squash into", // CannotSquashOrFixupFirstCommit: "There's no commit below to squash into",
@ -92,13 +91,13 @@ func japaneseTranslationSet() TranslationSet {
// Squash: "Squash", // Squash: "Squash",
// LcPickCommit: "Pick commit (when mid-rebase)", // LcPickCommit: "Pick commit (when mid-rebase)",
RevertCommit: "コミットをrevert", RevertCommit: "コミットをrevert",
RewordCommit: "コミットメッセージを変更", Reword: "コミットメッセージを変更",
DeleteCommit: "コミットを削除", DropCommit: "コミットを削除",
MoveDownCommit: "コミットを1つ下に移動", MoveDownCommit: "コミットを1つ下に移動",
MoveUpCommit: "コミットを1つ上に移動", MoveUpCommit: "コミットを1つ上に移動",
EditCommit: "コミットを編集", EditCommitTooltip: "コミットを編集",
AmendToCommit: "ステージされた変更でamendコミット", AmendCommitTooltip: "ステージされた変更でamendコミット",
RenameCommitEditor: "エディタでコミットメッセージを編集", RewordCommitEditor: "エディタでコミットメッセージを編集",
Error: "エラー", Error: "エラー",
// LcPickHunk: "Pick hunk", // LcPickHunk: "Pick hunk",
// LcPickAllHunks: "Pick all hunks", // LcPickAllHunks: "Pick all hunks",
@ -147,7 +146,7 @@ func japaneseTranslationSet() TranslationSet {
OpenFile: `ファイルを開く`, OpenFile: `ファイルを開く`,
IgnoreFile: `.gitignoreに追加`, IgnoreFile: `.gitignoreに追加`,
RefreshFiles: `ファイルをリフレッシュ`, RefreshFiles: `ファイルをリフレッシュ`,
MergeIntoCurrentBranch: `現在のブランチにマージ`, Merge: `現在のブランチにマージ`,
ConfirmQuit: `終了します。よろしいですか?`, ConfirmQuit: `終了します。よろしいですか?`,
SwitchRepo: `最近使用したリポジトリに切り替え`, SwitchRepo: `最近使用したリポジトリに切り替え`,
AllBranchesLogGraph: `すべてのブランチログを表示`, AllBranchesLogGraph: `すべてのブランチログを表示`,
@ -160,12 +159,12 @@ func japaneseTranslationSet() TranslationSet {
// NoAutomaticGitFetchBody: `Lazygit can't use "git fetch" in a private repo; use 'f' in the files panel to run "git fetch" manually`, // NoAutomaticGitFetchBody: `Lazygit can't use "git fetch" in a private repo; use 'f' in the files panel to run "git fetch" manually`,
// FileEnter: `stage individual hunks/lines for file, or collapse/expand for directory`, // FileEnter: `stage individual hunks/lines for file, or collapse/expand for directory`,
// FileStagingRequirements: `Can only stage individual lines for tracked files`, // FileStagingRequirements: `Can only stage individual lines for tracked files`,
StageSelection: `選択行をステージ/アンステージ`, StageSelectionTooltip: `選択行をステージ/アンステージ`,
DiscardSelection: `変更を削除 (git reset)`, DiscardSelection: `変更を削除 (git reset)`,
ToggleRangeSelect: `範囲選択を切り替え`, ToggleRangeSelect: `範囲選択を切り替え`,
ToggleSelectHunk: `Hunk選択を切り替え`, ToggleSelectHunk: `Hunk選択を切り替え`,
ToggleSelectionForPatch: `行をパッチに追加/削除`, ToggleSelectionForPatch: `行をパッチに追加/削除`,
ToggleStagingPanel: `パネルを切り替え`, ToggleStagingView: `パネルを切り替え`,
ReturnToFilesPanel: `ファイル一覧に戻る`, ReturnToFilesPanel: `ファイル一覧に戻る`,
// FastForward: `fast-forward this branch from its upstream`, // FastForward: `fast-forward this branch from its upstream`,
// Fetching: "Fetching and fast-forwarding {{.from}} -> {{.to}} ...", // Fetching: "Fetching and fast-forwarding {{.from}} -> {{.to}} ...",
@ -217,8 +216,8 @@ func japaneseTranslationSet() TranslationSet {
SelectNextHunk: "次のhunkを選択", SelectNextHunk: "次のhunkを選択",
ScrollDown: "下にスクロール", ScrollDown: "下にスクロール",
ScrollUp: "上にスクロール", ScrollUp: "上にスクロール",
ScrollUpMainPanel: "メインパネルを上にスクロール", ScrollUpMainWindow: "メインパネルを上にスクロール",
ScrollDownMainPanel: "メインパネルを下にスクロール", ScrollDownMainWindow: "メインパネルを下にスクロール",
AmendCommitTitle: "Amendコミット", AmendCommitTitle: "Amendコミット",
AmendCommitPrompt: "ステージされたファイルで現在のコミットをamendします。よろしいですか?", AmendCommitPrompt: "ステージされたファイルで現在のコミットをamendします。よろしいですか?",
DropCommitTitle: "コミットを削除", DropCommitTitle: "コミットを削除",
@ -261,7 +260,7 @@ func japaneseTranslationSet() TranslationSet {
// LcDiscardUntrackedFiles: "Discard untracked files", // LcDiscardUntrackedFiles: "Discard untracked files",
HardReset: "hardリセット", HardReset: "hardリセット",
// LcViewResetOptions: `view reset options`, // LcViewResetOptions: `view reset options`,
CreateFixupCommitDescription: `このコミットに対するfixupコミットを作成`, CreateFixupCommitTooltip: `このコミットに対するfixupコミットを作成`,
// LcSquashAboveCommits: `squash all 'fixup!' commits above selected commit (autosquash)`, // LcSquashAboveCommits: `squash all 'fixup!' commits above selected commit (autosquash)`,
// SquashAboveCommits: `Squash all 'fixup!' commits above selected commit (autosquash)`, // SquashAboveCommits: `Squash all 'fixup!' commits above selected commit (autosquash)`,
SureSquashAboveCommits: `{{.commit}}に対するすべての fixup! コミットをsquashします。よろしいですか?`, SureSquashAboveCommits: `{{.commit}}に対するすべての fixup! コミットをsquashします。よろしいですか?`,
@ -296,7 +295,7 @@ func japaneseTranslationSet() TranslationSet {
EnterUpstream: `'<remote> <branchname>' の形式でupstreamを入力`, EnterUpstream: `'<remote> <branchname>' の形式でupstreamを入力`,
InvalidUpstream: "Upstreamの形式が正しくありません。'<remote> <branchname>' の形式で入力してください。", InvalidUpstream: "Upstreamの形式が正しくありません。'<remote> <branchname>' の形式で入力してください。",
ReturnToRemotesList: `リモート一覧に戻る`, ReturnToRemotesList: `リモート一覧に戻る`,
AddNewRemote: `リモートを新規追加`, NewRemote: `リモートを新規追加`,
NewRemoteName: `新規リモート名:`, NewRemoteName: `新規リモート名:`,
NewRemoteUrl: `新規リモートURL:`, NewRemoteUrl: `新規リモートURL:`,
EditRemoteName: `{{.remoteName}} の新しいリモート名を入力:`, EditRemoteName: `{{.remoteName}} の新しいリモート名を入力:`,
@ -308,7 +307,7 @@ func japaneseTranslationSet() TranslationSet {
// LcSetUpstream: "Set as upstream of checked-out branch", // LcSetUpstream: "Set as upstream of checked-out branch",
// SetUpstreamTitle: "Set upstream branch", // SetUpstreamTitle: "Set upstream branch",
// SetUpstreamMessage: "Are you sure you want to set the upstream branch of '{{.checkedOut}}' to '{{.selected}}'", // SetUpstreamMessage: "Are you sure you want to set the upstream branch of '{{.checkedOut}}' to '{{.selected}}'",
EditRemote: "リモートを編集", EditRemoteTooltip: "リモートを編集",
TagCommit: "タグを作成", TagCommit: "タグを作成",
TagMenuTitle: "タグを作成", TagMenuTitle: "タグを作成",
TagNameTitle: "タグ名", TagNameTitle: "タグ名",
@ -317,8 +316,9 @@ func japaneseTranslationSet() TranslationSet {
LightweightTag: "軽量タグ", LightweightTag: "軽量タグ",
PushTagTitle: "リモートにタグ '{{.tagName}}' をpush", PushTagTitle: "リモートにタグ '{{.tagName}}' をpush",
PushTag: "タグをpush", PushTag: "タグをpush",
CreateTag: "タグを作成", NewTag: "タグを作成",
FetchRemote: "リモートをfetch", FetchRemoteTooltip: "リモートをfetch",
FetchingRemoteStatus: "リモートをfetch",
CheckoutCommit: "コミットをチェックアウト", CheckoutCommit: "コミットをチェックアウト",
SureCheckoutThisCommit: "選択されたコミットをチェックアウトします。よろしいですか?", SureCheckoutThisCommit: "選択されたコミットをチェックアウトします。よろしいですか?",
// LcGitFlowOptions: "Show git-flow options", // LcGitFlowOptions: "Show git-flow options",
@ -335,7 +335,7 @@ func japaneseTranslationSet() TranslationSet {
RenameBranch: "ブランチ名を変更", RenameBranch: "ブランチ名を変更",
NewBranchNamePrompt: "新しいブランチ名を入力", NewBranchNamePrompt: "新しいブランチ名を入力",
// RenameBranchWarning: "This branch is tracking a remote. This action will only rename the local branch name, not the name of the remote branch. Continue?", // RenameBranchWarning: "This branch is tracking a remote. This action will only rename the local branch name, not the name of the remote branch. Continue?",
OpenMenu: "メニューを開く", OpenKeybindingsMenu: "メニューを開く",
// LcResetCherryPick: "Reset cherry-picked (copied) commits selection", // LcResetCherryPick: "Reset cherry-picked (copied) commits selection",
NextTab: "次のタブ", NextTab: "次のタブ",
PrevTab: "前のタブ", PrevTab: "前のタブ",
@ -364,9 +364,9 @@ func japaneseTranslationSet() TranslationSet {
ExitDiffMode: "差分モードを終了", ExitDiffMode: "差分モードを終了",
DiffingMenuTitle: "差分", DiffingMenuTitle: "差分",
// LcSwapDiff: "Reverse diff direction", // LcSwapDiff: "Reverse diff direction",
OpenDiffingMenu: "差分メニューを開く", ViewDiffingOptions: "差分メニューを開く",
// // the actual view is the extras view which I intend to give more tabs in future but for now we'll only mention the command log part // // the actual view is the extras view which I intend to give more tabs in future but for now we'll only mention the command log part
OpenExtrasMenu: "コマンドログメニューを開く", OpenCommandLogMenu: "コマンドログメニューを開く",
// LcShowingGitDiff: "Showing output for:", // LcShowingGitDiff: "Showing output for:",
CommitDiff: "コミットの差分", CommitDiff: "コミットの差分",
CopyCommitShaToClipboard: "コミットのSHAをクリップボードにコピー", CopyCommitShaToClipboard: "コミットのSHAをクリップボードにコピー",
@ -377,9 +377,8 @@ func japaneseTranslationSet() TranslationSet {
CommitAuthor: "コミットの作成者名", CommitAuthor: "コミットの作成者名",
CopyCommitAttributeToClipboard: "コミットの情報をコピー", CopyCommitAttributeToClipboard: "コミットの情報をコピー",
CopyBranchNameToClipboard: "ブランチ名をクリップボードにコピー", CopyBranchNameToClipboard: "ブランチ名をクリップボードにコピー",
CopyFileNameToClipboard: "ファイル名をクリップボードにコピー", CopyPathToClipboard: "ファイル名をクリップボードにコピー",
CopyCommitFileNameToClipboard: "コミットされたファイル名をクリップボードにコピー", CopySelectedTextToClipboard: "選択されたテキストをクリップボードにコピー",
CopySelectedTexToClipboard: "選択されたテキストをクリップボードにコピー",
// LcCommitPrefixPatternError: "Error in commitPrefix pattern", // LcCommitPrefixPatternError: "Error in commitPrefix pattern",
NoFilesStagedTitle: "ファイルがステージされていません", NoFilesStagedTitle: "ファイルがステージされていません",
NoFilesStagedPrompt: "ファイルがステージされていません。すべての変更をコミットしますか?", NoFilesStagedPrompt: "ファイルがステージされていません。すべての変更をコミットしますか?",
@ -394,7 +393,7 @@ func japaneseTranslationSet() TranslationSet {
RunningCustomCommandStatus: "カスタムコマンドを実行", RunningCustomCommandStatus: "カスタムコマンドを実行",
// LcSubmoduleStashAndReset: "Stash uncommitted submodule changes and update", // LcSubmoduleStashAndReset: "Stash uncommitted submodule changes and update",
// LcAndResetSubmodules: "And reset submodules", // LcAndResetSubmodules: "And reset submodules",
EnterSubmodule: "サブモジュールを開く", EnterSubmoduleTooltip: "サブモジュールを開く",
CopySubmoduleNameToClipboard: "サブモジュール名をクリップボードにコピー", CopySubmoduleNameToClipboard: "サブモジュール名をクリップボードにコピー",
RemoveSubmodule: "サブモジュールを削除", RemoveSubmodule: "サブモジュールを削除",
RemoveSubmodulePrompt: "サブモジュール '%s' とそのディレクトリを削除します。よろしいですか? この操作は取り消せません。", RemoveSubmodulePrompt: "サブモジュール '%s' とそのディレクトリを削除します。よろしいですか? この操作は取り消せません。",
@ -402,14 +401,14 @@ func japaneseTranslationSet() TranslationSet {
NewSubmoduleName: "新規サブモジュール名:", NewSubmoduleName: "新規サブモジュール名:",
NewSubmoduleUrl: "新規サブモジュールのURL:", NewSubmoduleUrl: "新規サブモジュールのURL:",
NewSubmodulePath: "新規サブモジュールのパス:", NewSubmodulePath: "新規サブモジュールのパス:",
AddSubmodule: "サブモジュールを新規追加", NewSubmodule: "サブモジュールを新規追加",
AddingSubmoduleStatus: "サブモジュールを新規追加", AddingSubmoduleStatus: "サブモジュールを新規追加",
UpdateSubmoduleUrl: "サブモジュール '%s' のURLを更新", UpdateSubmoduleUrl: "サブモジュール '%s' のURLを更新",
UpdatingSubmoduleUrlStatus: "URLを更新", UpdatingSubmoduleUrlStatus: "URLを更新",
EditSubmoduleUrl: "サブモジュールのURLを更新", EditSubmoduleUrl: "サブモジュールのURLを更新",
InitializingSubmoduleStatus: "サブモジュールを初期化", InitializingSubmoduleStatus: "サブモジュールを初期化",
InitSubmodule: "サブモジュールを初期化", InitSubmoduleTooltip: "サブモジュールを初期化",
SubmoduleUpdate: "サブモジュールを更新", SubmoduleUpdateTooltip: "サブモジュールを更新",
UpdatingSubmoduleStatus: "サブモジュールを更新", UpdatingSubmoduleStatus: "サブモジュールを更新",
BulkInitSubmodules: "サブモジュールを一括初期化", BulkInitSubmodules: "サブモジュールを一括初期化",
BulkUpdateSubmodules: "サブモジュールを一括更新", BulkUpdateSubmodules: "サブモジュールを一括更新",

68
pkg/i18n/korean.go
View File

@ -38,7 +38,7 @@ func koreanTranslationSet() TranslationSet {
CredentialsPassword: "패스워드", CredentialsPassword: "패스워드",
CredentialsPassphrase: "SSH키의 passphrase 입력", CredentialsPassphrase: "SSH키의 passphrase 입력",
PassUnameWrong: "패스워드, passphrase 또는 사용자 이름이 잘못되었습니다.", PassUnameWrong: "패스워드, passphrase 또는 사용자 이름이 잘못되었습니다.",
CommitChanges: "커밋 변경내용", Commit: "커밋 변경내용",
AmendLastCommit: "마지맛 커밋 수정", AmendLastCommit: "마지맛 커밋 수정",
AmendLastCommitTitle: "마지막 커밋 수정", AmendLastCommitTitle: "마지막 커밋 수정",
SureToAmend: "마지막 커밋을 수정하시겠습니까? 그런 다음 커밋 패널에서 커밋 메시지를 변경할 수 있습니다.", SureToAmend: "마지막 커밋을 수정하시겠습니까? 그런 다음 커밋 패널에서 커밋 메시지를 변경할 수 있습니다.",
@ -47,7 +47,7 @@ func koreanTranslationSet() TranslationSet {
StatusTitle: "상태", StatusTitle: "상태",
Menu: "메뉴", Menu: "메뉴",
Execute: "실행", Execute: "실행",
ToggleStaged: "Staged 전환", Stage: "Staged 전환",
ToggleStagedAll: "모든 변경을 Staged/unstaged으로 전환", ToggleStagedAll: "모든 변경을 Staged/unstaged으로 전환",
ToggleTreeView: "파일 트리뷰로 전환", ToggleTreeView: "파일 트리뷰로 전환",
OpenMergeTool: "Git mergetool를 열기", OpenMergeTool: "Git mergetool를 열기",
@ -82,25 +82,23 @@ func koreanTranslationSet() TranslationSet {
Confirm: "확인", Confirm: "확인",
Close: "닫기", Close: "닫기",
Quit: "종료", Quit: "종료",
SquashDown: "Squash down",
FixupCommit: "Fixup commit",
NoCommitsThisBranch: "이 브랜치에 커밋이 없습니다.", NoCommitsThisBranch: "이 브랜치에 커밋이 없습니다.",
CannotSquashOrFixupFirstCommit: "There's no commit below to squash into", CannotSquashOrFixupFirstCommit: "There's no commit below to squash into",
Fixup: "Fixup", Fixup: "Fixup",
SureFixupThisCommit: "Are you sure you want to 'fixup' this commit? It will be merged into the commit below", SureFixupThisCommit: "Are you sure you want to 'fixup' this commit? It will be merged into the commit below",
SureSquashThisCommit: "Are you sure you want to squash this commit into the commit below?", SureSquashThisCommit: "Are you sure you want to squash this commit into the commit below?",
Squash: "Squash", Squash: "Squash",
PickCommit: "Pick commit (when mid-rebase)", PickCommitTooltip: "Pick commit (when mid-rebase)",
RevertCommit: "커밋 되돌리기", RevertCommit: "커밋 되돌리기",
RewordCommit: "커밋메시지 변경", Reword: "커밋메시지 변경",
DeleteCommit: "커밋 삭제", DropCommit: "커밋 삭제",
MoveDownCommit: "커밋을 1개 아래로 이동", MoveDownCommit: "커밋을 1개 아래로 이동",
MoveUpCommit: "커밋을 1개 위로 이동", MoveUpCommit: "커밋을 1개 위로 이동",
EditCommit: "커밋을 편집", EditCommitTooltip: "커밋을 편집",
AmendToCommit: "Amend commit with staged changes", AmendCommitTooltip: "Amend commit with staged changes",
ResetAuthor: "Reset commit author", ResetAuthor: "Reset commit author",
SureResetCommitAuthor: "The author field of this commit will be updated to match the configured user. This also renews the author timestamp. Continue?", SureResetCommitAuthor: "The author field of this commit will be updated to match the configured user. This also renews the author timestamp. Continue?",
RenameCommitEditor: "에디터에서 커밋메시지 수정", RewordCommitEditor: "에디터에서 커밋메시지 수정",
Error: "오류", Error: "오류",
PickHunk: "Pick hunk", PickHunk: "Pick hunk",
PickAllHunks: "Pick all hunks", PickAllHunks: "Pick all hunks",
@ -149,7 +147,7 @@ func koreanTranslationSet() TranslationSet {
OpenFile: `파일 닫기`, OpenFile: `파일 닫기`,
IgnoreFile: `.gitignore에 추가`, IgnoreFile: `.gitignore에 추가`,
RefreshFiles: `파일 새로고침`, RefreshFiles: `파일 새로고침`,
MergeIntoCurrentBranch: `현재 브랜치에 병합`, Merge: `현재 브랜치에 병합`,
ConfirmQuit: `정말로 종료하시겠습니까?`, ConfirmQuit: `정말로 종료하시겠습니까?`,
SwitchRepo: `최근에 사용한 저장소로 전환`, SwitchRepo: `최근에 사용한 저장소로 전환`,
AllBranchesLogGraph: `모든 브랜치 로그 표시`, AllBranchesLogGraph: `모든 브랜치 로그 표시`,
@ -162,12 +160,12 @@ func koreanTranslationSet() TranslationSet {
NoAutomaticGitFetchBody: `Lazygit은 private 저장소에서 "git fetch"를 사용할 수 없습니다. 파일 패널에서 'f'를 사용하여 "git fetch"를 수동으로 실행하세요.`, NoAutomaticGitFetchBody: `Lazygit은 private 저장소에서 "git fetch"를 사용할 수 없습니다. 파일 패널에서 'f'를 사용하여 "git fetch"를 수동으로 실행하세요.`,
FileEnter: `Stage individual hunks/lines for file, or collapse/expand for directory`, FileEnter: `Stage individual hunks/lines for file, or collapse/expand for directory`,
FileStagingRequirements: `추적된 파일에 대해 개별 라인만 stage할 수 있습니다.`, FileStagingRequirements: `추적된 파일에 대해 개별 라인만 stage할 수 있습니다.`,
StageSelection: `선택한 행을 staged / unstaged`, StageSelectionTooltip: `선택한 행을 staged / unstaged`,
DiscardSelection: `변경을 삭제 (git reset)`, DiscardSelection: `변경을 삭제 (git reset)`,
ToggleRangeSelect: `드래그 선택 전환`, ToggleRangeSelect: `드래그 선택 전환`,
ToggleSelectHunk: `Toggle select hunk`, ToggleSelectHunk: `Toggle select hunk`,
ToggleSelectionForPatch: `Line(s)을 패치에 추가/삭제`, ToggleSelectionForPatch: `Line(s)을 패치에 추가/삭제`,
ToggleStagingPanel: `패널 전환`, ToggleStagingView: `패널 전환`,
ReturnToFilesPanel: `파일 목록으로 돌아가기`, ReturnToFilesPanel: `파일 목록으로 돌아가기`,
FastForward: `Fast-forward this branch from its upstream`, FastForward: `Fast-forward this branch from its upstream`,
FastForwarding: "Fast-forwarding", FastForwarding: "Fast-forwarding",
@ -214,8 +212,8 @@ func koreanTranslationSet() TranslationSet {
SelectNextHunk: "다음 hunk를 선택", SelectNextHunk: "다음 hunk를 선택",
ScrollDown: "아래로 스크롤", ScrollDown: "아래로 스크롤",
ScrollUp: "위로 스크롤", ScrollUp: "위로 스크롤",
ScrollUpMainPanel: "메인 패널을 위로 스크롤", ScrollUpMainWindow: "메인 패널을 위로 스크롤",
ScrollDownMainPanel: "메인 패널을 아래로로 스크롤", ScrollDownMainWindow: "메인 패널을 아래로로 스크롤",
AmendCommitTitle: "Amend commit", AmendCommitTitle: "Amend commit",
AmendCommitPrompt: "Are you sure you want to amend this commit with your staged files?", AmendCommitPrompt: "Are you sure you want to amend this commit with your staged files?",
DropCommitTitle: "커밋 삭제", DropCommitTitle: "커밋 삭제",
@ -240,8 +238,8 @@ func koreanTranslationSet() TranslationSet {
RemoteBranchesDynamicTitle: "원격브랜치 (%s)", RemoteBranchesDynamicTitle: "원격브랜치 (%s)",
ViewItemFiles: "View selected item's files", ViewItemFiles: "View selected item's files",
CommitFilesTitle: "커밋 파일", CommitFilesTitle: "커밋 파일",
CheckoutCommitFile: "Checkout file", CheckoutCommitFileTooltip: "Checkout file",
DiscardOldFileChange: "Discard this commit's changes to this file", DiscardOldFileChangeTooltip: "Discard this commit's changes to this file",
DiscardFileChangesTitle: "파일 변경 사항 버리기", DiscardFileChangesTitle: "파일 변경 사항 버리기",
DiscardFileChangesPrompt: "Are you sure you want to discard this commit's changes to this file? If this file was created in this commit, it will be deleted", DiscardFileChangesPrompt: "Are you sure you want to discard this commit's changes to this file? If this file was created in this commit, it will be deleted",
DisabledForGPG: "Feature not available for users using GPG", DisabledForGPG: "Feature not available for users using GPG",
@ -249,7 +247,7 @@ func koreanTranslationSet() TranslationSet {
AutoStashTitle: "Autostash?", AutoStashTitle: "Autostash?",
AutoStashPrompt: "You must stash and pop your changes to bring them across. Do this automatically? (enter/esc)", AutoStashPrompt: "You must stash and pop your changes to bring them across. Do this automatically? (enter/esc)",
StashPrefix: "Auto-stashing changes for ", StashPrefix: "Auto-stashing changes for ",
ViewDiscardOptions: "View 'discard changes' options", Discard: "View 'discard changes' options",
Cancel: "취소", Cancel: "취소",
DiscardAllChanges: "모든 변경사항 버리기", DiscardAllChanges: "모든 변경사항 버리기",
DiscardUnstagedChanges: "Discard unstaged changes", DiscardUnstagedChanges: "Discard unstaged changes",
@ -258,8 +256,8 @@ func koreanTranslationSet() TranslationSet {
DiscardUntrackedFiles: "Discard untracked files", DiscardUntrackedFiles: "Discard untracked files",
HardReset: "Hard reset", HardReset: "Hard reset",
ViewResetOptions: `View reset options`, ViewResetOptions: `View reset options`,
CreateFixupCommitDescription: `Create fixup commit for this commit`, CreateFixupCommitTooltip: `Create fixup commit for this commit`,
SquashAboveCommits: `Squash all 'fixup!' commits above selected commit (autosquash)`, SquashAboveCommitsTooltip: `Squash all 'fixup!' commits above selected commit (autosquash)`,
SureSquashAboveCommits: `Are you sure you want to squash all fixup! commits above {{.commit}}?`, SureSquashAboveCommits: `Are you sure you want to squash all fixup! commits above {{.commit}}?`,
CreateFixupCommit: `Create fixup commit`, CreateFixupCommit: `Create fixup commit`,
SureCreateFixupCommit: `Are you sure you want to create a fixup! commit for commit {{.commit}}?`, SureCreateFixupCommit: `Are you sure you want to create a fixup! commit for commit {{.commit}}?`,
@ -287,12 +285,12 @@ func koreanTranslationSet() TranslationSet {
ViewPatchOptions: "커스텀 Patch 옵션 보기", ViewPatchOptions: "커스텀 Patch 옵션 보기",
PatchOptionsTitle: "Patch 옵션", PatchOptionsTitle: "Patch 옵션",
NoPatchError: "No patch created yet. To start building a patch, use 'space' on a commit file or enter to add specific lines", NoPatchError: "No patch created yet. To start building a patch, use 'space' on a commit file or enter to add specific lines",
EnterFile: "Enter file to add selected lines to the patch (or toggle directory collapsed)", EnterCommitFile: "Enter file to add selected lines to the patch (or toggle directory collapsed)",
// ExitCustomPatchBuilder: ``, // ExitCustomPatchBuilder: ``,
EnterUpstream: `'<remote> <branchname>'와 같은 형식으로 입력하세요.`, EnterUpstream: `'<remote> <branchname>'와 같은 형식으로 입력하세요.`,
InvalidUpstream: "Upstream의 형식이 잘못되었습니다.'<remote> <branchname>' 와 같은 형식으로 입력하세요.", InvalidUpstream: "Upstream의 형식이 잘못되었습니다.'<remote> <branchname>' 와 같은 형식으로 입력하세요.",
ReturnToRemotesList: `원격목록으로 돌아가기`, ReturnToRemotesList: `원격목록으로 돌아가기`,
AddNewRemote: `새로운 Remote 추가`, NewRemote: `새로운 Remote 추가`,
NewRemoteName: `새로운 Remote 이름:`, NewRemoteName: `새로운 Remote 이름:`,
NewRemoteUrl: `새로운 Remote URL:`, NewRemoteUrl: `새로운 Remote URL:`,
EditRemoteName: `{{.remoteName}} 의 새로운 Remote 이름 입력:`, EditRemoteName: `{{.remoteName}} 의 새로운 Remote 이름 입력:`,
@ -304,7 +302,7 @@ func koreanTranslationSet() TranslationSet {
SetUpstream: "Set as upstream of checked-out branch", SetUpstream: "Set as upstream of checked-out branch",
SetUpstreamTitle: "Set upstream branch", SetUpstreamTitle: "Set upstream branch",
SetUpstreamMessage: "Are you sure you want to set the upstream branch of '{{.checkedOut}}' to '{{.selected}}'", SetUpstreamMessage: "Are you sure you want to set the upstream branch of '{{.checkedOut}}' to '{{.selected}}'",
EditRemote: "Remote를 수정", EditRemoteTooltip: "Remote를 수정",
TagCommit: "Tag commit", TagCommit: "Tag commit",
TagMenuTitle: "태그 작성", TagMenuTitle: "태그 작성",
TagNameTitle: "태그 이름", TagNameTitle: "태그 이름",
@ -313,8 +311,9 @@ func koreanTranslationSet() TranslationSet {
LightweightTag: "Lightweight tag", LightweightTag: "Lightweight tag",
PushTagTitle: "원격에 태그 '{{.tagName}}' 를 푸시", PushTagTitle: "원격에 태그 '{{.tagName}}' 를 푸시",
PushTag: "태그를 push", PushTag: "태그를 push",
CreateTag: "태그를 생성", NewTag: "태그를 생성",
FetchRemote: "원격을 업데이트", FetchRemoteTooltip: "원격을 업데이트",
FetchingRemoteStatus: "원격을 업데이트 중",
CheckoutCommit: "커밋을 체크아웃", CheckoutCommit: "커밋을 체크아웃",
SureCheckoutThisCommit: "정말로 선택한 커밋을 체크아웃 하시겠습니까?", SureCheckoutThisCommit: "정말로 선택한 커밋을 체크아웃 하시겠습니까?",
GitFlowOptions: "Git-flow 옵션 보기", GitFlowOptions: "Git-flow 옵션 보기",
@ -331,7 +330,7 @@ func koreanTranslationSet() TranslationSet {
RenameBranch: "브랜치 이름 변경", RenameBranch: "브랜치 이름 변경",
NewBranchNamePrompt: "새로운 브랜치 이름 입력", NewBranchNamePrompt: "새로운 브랜치 이름 입력",
RenameBranchWarning: "This branch is tracking a remote. This action will only rename the local branch name, not the name of the remote branch. Continue?", RenameBranchWarning: "This branch is tracking a remote. This action will only rename the local branch name, not the name of the remote branch. Continue?",
OpenMenu: "매뉴 열기", OpenKeybindingsMenu: "매뉴 열기",
ResetCherryPick: "Reset cherry-picked (copied) commits selection", ResetCherryPick: "Reset cherry-picked (copied) commits selection",
NextTab: "이전 탭", NextTab: "이전 탭",
PrevTab: "다음 탭", PrevTab: "다음 탭",
@ -360,9 +359,9 @@ func koreanTranslationSet() TranslationSet {
ExitDiffMode: "Diff 모드 종료", ExitDiffMode: "Diff 모드 종료",
DiffingMenuTitle: "Diff", DiffingMenuTitle: "Diff",
SwapDiff: "Reverse diff direction", SwapDiff: "Reverse diff direction",
OpenDiffingMenu: "Diff 메뉴 열기", ViewDiffingOptions: "Diff 메뉴 열기",
// the actual view is the extras view which I intend to give more tabs in future but for now we'll only mention the command log part // the actual view is the extras view which I intend to give more tabs in future but for now we'll only mention the command log part
OpenExtrasMenu: "명령어 로그 메뉴 열기", OpenCommandLogMenu: "명령어 로그 메뉴 열기",
ShowingGitDiff: "Showing output for:", ShowingGitDiff: "Showing output for:",
CommitDiff: "커밋의 iff", CommitDiff: "커밋의 iff",
CopyCommitShaToClipboard: "커밋 SHA를 클립보드에 복사", CopyCommitShaToClipboard: "커밋 SHA를 클립보드에 복사",
@ -373,9 +372,8 @@ func koreanTranslationSet() TranslationSet {
CommitAuthor: "커밋 작성자", CommitAuthor: "커밋 작성자",
CopyCommitAttributeToClipboard: "커밋 attribute 복사", CopyCommitAttributeToClipboard: "커밋 attribute 복사",
CopyBranchNameToClipboard: "브랜치명을 클립보드에 복사", CopyBranchNameToClipboard: "브랜치명을 클립보드에 복사",
CopyFileNameToClipboard: "파일명을 클립보드에 복사", CopyPathToClipboard: "파일명을 클립보드에 복사",
CopyCommitFileNameToClipboard: "커밋한 파일명을 클립보드에 복사", CopySelectedTextToClipboard: "선택한 텍스트를 클립보드에 복사",
CopySelectedTexToClipboard: "선택한 텍스트를 클립보드에 복사",
CommitPrefixPatternError: "Error in commitPrefix pattern", CommitPrefixPatternError: "Error in commitPrefix pattern",
NoFilesStagedTitle: "파일이 Staged 되지 않았습니다.", NoFilesStagedTitle: "파일이 Staged 되지 않았습니다.",
NoFilesStagedPrompt: "파일이 Staged 되지 않았습니다. 모든 파일을 커밋하시겠습니까?", NoFilesStagedPrompt: "파일이 Staged 되지 않았습니다. 모든 파일을 커밋하시겠습니까?",
@ -390,7 +388,7 @@ func koreanTranslationSet() TranslationSet {
RunningCustomCommandStatus: "커스텀 명령어 실행", RunningCustomCommandStatus: "커스텀 명령어 실행",
SubmoduleStashAndReset: "Stash uncommitted submodule changes and update", SubmoduleStashAndReset: "Stash uncommitted submodule changes and update",
AndResetSubmodules: "And reset submodules", AndResetSubmodules: "And reset submodules",
EnterSubmodule: "서브모듈 열기", EnterSubmoduleTooltip: "서브모듈 열기",
CopySubmoduleNameToClipboard: "서브모듈 이름을 클립보드에 복사", CopySubmoduleNameToClipboard: "서브모듈 이름을 클립보드에 복사",
RemoveSubmodule: "서브모듈 삭제", RemoveSubmodule: "서브모듈 삭제",
RemoveSubmodulePrompt: "정말로 서브모듈 '%s'및 해당 디렉토리를 제거하시겠습니까? 이것은 되돌릴 수 없습니다.", RemoveSubmodulePrompt: "정말로 서브모듈 '%s'및 해당 디렉토리를 제거하시겠습니까? 이것은 되돌릴 수 없습니다.",
@ -398,14 +396,14 @@ func koreanTranslationSet() TranslationSet {
NewSubmoduleName: "새로운 서브모듈이름 :", NewSubmoduleName: "새로운 서브모듈이름 :",
NewSubmoduleUrl: "새로운 서브모듈의 URL:", NewSubmoduleUrl: "새로운 서브모듈의 URL:",
NewSubmodulePath: "새로운 서브모듈의 경로", NewSubmodulePath: "새로운 서브모듈의 경로",
AddSubmodule: "새로운 서브모듈 추가", NewSubmodule: "새로운 서브모듈 추가",
AddingSubmoduleStatus: "새로운 서브모듈 추가", AddingSubmoduleStatus: "새로운 서브모듈 추가",
UpdateSubmoduleUrl: "서브모듈 '%s' 의 URL을 업데이트", UpdateSubmoduleUrl: "서브모듈 '%s' 의 URL을 업데이트",
UpdatingSubmoduleUrlStatus: "Updating URL", UpdatingSubmoduleUrlStatus: "Updating URL",
EditSubmoduleUrl: "서브모듈의 URL을 수정", EditSubmoduleUrl: "서브모듈의 URL을 수정",
InitializingSubmoduleStatus: "서브모듈 초기화", InitializingSubmoduleStatus: "서브모듈 초기화",
InitSubmodule: "서브모듈 초기화", InitSubmoduleTooltip: "서브모듈 초기화",
SubmoduleUpdate: "서브모듈 업데이트", SubmoduleUpdateTooltip: "서브모듈 업데이트",
UpdatingSubmoduleStatus: "서브모듈 업데이트", UpdatingSubmoduleStatus: "서브모듈 업데이트",
BulkInitSubmodules: "서브모듈 일괄 초기화", BulkInitSubmodules: "서브모듈 일괄 초기화",
BulkUpdateSubmodules: "서브모듈 일괄 업데이트", BulkUpdateSubmodules: "서브모듈 일괄 업데이트",

30
pkg/i18n/polish.go
View File

@ -15,7 +15,7 @@ func polishTranslationSet() TranslationSet {
CredentialsPassword: "Hasło", CredentialsPassword: "Hasło",
CredentialsPassphrase: "Fraza", CredentialsPassphrase: "Fraza",
PassUnameWrong: "Niewłaściwe hasło, fraza lub nazwa użytkownika", PassUnameWrong: "Niewłaściwe hasło, fraza lub nazwa użytkownika",
CommitChanges: "Zatwierdź zmiany", Commit: "Zatwierdź zmiany",
AmendLastCommit: "Zmień ostatni commit", AmendLastCommit: "Zmień ostatni commit",
AmendLastCommitTitle: "Zmień ostatni commit", AmendLastCommitTitle: "Zmień ostatni commit",
SureToAmend: "Czy na pewno chcesz zmienić ostatni commit? Możesz zmienić komunikat commitu z panelu commitów.", SureToAmend: "Czy na pewno chcesz zmienić ostatni commit? Możesz zmienić komunikat commitu z panelu commitów.",
@ -25,7 +25,7 @@ func polishTranslationSet() TranslationSet {
GlobalTitle: "Globalne", GlobalTitle: "Globalne",
Menu: "Menu", Menu: "Menu",
Execute: "Wykonaj", Execute: "Wykonaj",
ToggleStaged: "Przełącz stan poczekalni", Stage: "Przełącz stan poczekalni",
ToggleStagedAll: "Przełącz stan poczekalni wszystkich", ToggleStagedAll: "Przełącz stan poczekalni wszystkich",
Refresh: "Odśwież", Refresh: "Odśwież",
Scroll: "Przewiń", Scroll: "Przewiń",
@ -52,14 +52,12 @@ func polishTranslationSet() TranslationSet {
CloseCancel: "Zamknij", CloseCancel: "Zamknij",
Confirm: "Potwierdź", Confirm: "Potwierdź",
Close: "Zamknij", Close: "Zamknij",
SquashDown: "Ściśnij",
FixupCommit: "Napraw commit",
NoCommitsThisBranch: "Brak commitów dla tej gałęzi", NoCommitsThisBranch: "Brak commitów dla tej gałęzi",
CannotSquashOrFixupFirstCommit: "There's no commit below to squash into", CannotSquashOrFixupFirstCommit: "There's no commit below to squash into",
Fixup: "Napraw", Fixup: "Napraw",
SureFixupThisCommit: "Jesteś pewny, ze chcesz naprawić ten commit? Commit poniżej zostanie spłaszczony w górę wraz z tym", SureFixupThisCommit: "Jesteś pewny, ze chcesz naprawić ten commit? Commit poniżej zostanie spłaszczony w górę wraz z tym",
RewordCommit: "Zmień nazwę commita", Reword: "Zmień nazwę commita",
RenameCommitEditor: "Zmień nazwę commita w edytorze", RewordCommitEditor: "Zmień nazwę commita w edytorze",
Error: "Błąd", Error: "Błąd",
PickHunk: "Wybierz kawałek", PickHunk: "Wybierz kawałek",
PickAllHunks: "Wybierz oba kawałki", PickAllHunks: "Wybierz oba kawałki",
@ -89,7 +87,7 @@ func polishTranslationSet() TranslationSet {
OpenFile: "Otwórz plik", OpenFile: "Otwórz plik",
IgnoreFile: "Dodaj do .gitignore", IgnoreFile: "Dodaj do .gitignore",
RefreshFiles: "Odśwież pliki", RefreshFiles: "Odśwież pliki",
MergeIntoCurrentBranch: "Scal do obecnej gałęzi", Merge: "Scal do obecnej gałęzi",
ConfirmQuit: "Na pewno chcesz wyjść z programu?", ConfirmQuit: "Na pewno chcesz wyjść z programu?",
AllBranchesLogGraph: "Pokaż wszystkie logi gałęzi", AllBranchesLogGraph: "Pokaż wszystkie logi gałęzi",
UnsupportedGitService: "Nieobsługiwana usługa git", UnsupportedGitService: "Nieobsługiwana usługa git",
@ -113,13 +111,13 @@ func polishTranslationSet() TranslationSet {
SoftReset: "Miękki reset", SoftReset: "Miękki reset",
SureSquashThisCommit: "Czy na pewno spłaszczyć ten commit do commita niżej?", SureSquashThisCommit: "Czy na pewno spłaszczyć ten commit do commita niżej?",
Squash: "Spłaszcz", Squash: "Spłaszcz",
PickCommit: "Wybierz commit (podczas zmiany bazy)", PickCommitTooltip: "Wybierz commit (podczas zmiany bazy)",
RevertCommit: "Odwróć commit", RevertCommit: "Odwróć commit",
DeleteCommit: "Usuń commit", DropCommit: "Usuń commit",
MoveDownCommit: "Przenieś commit 1 w dół", MoveDownCommit: "Przenieś commit 1 w dół",
MoveUpCommit: "Przenieś commit 1 w górę", MoveUpCommit: "Przenieś commit 1 w górę",
EditCommit: "Edytuj commit", EditCommitTooltip: "Edytuj commit",
AmendToCommit: "Popraw commit zmianami z poczekalni", AmendCommitTooltip: "Popraw commit zmianami z poczekalni",
FoundConflictsTitle: "Konflikty!", FoundConflictsTitle: "Konflikty!",
ViewMergeRebaseOptions: "Widok scalenia/opcje zmiany bazy", ViewMergeRebaseOptions: "Widok scalenia/opcje zmiany bazy",
NotMergingOrRebasing: "W tej chwili nie scalasz ani nie zmieniasz bazy", NotMergingOrRebasing: "W tej chwili nie scalasz ani nie zmieniasz bazy",
@ -162,8 +160,8 @@ func polishTranslationSet() TranslationSet {
CommitFiles: "Pliki commita", CommitFiles: "Pliki commita",
ViewItemFiles: "Przeglądaj pliki commita", ViewItemFiles: "Przeglądaj pliki commita",
CommitFilesTitle: "Pliki commita", CommitFilesTitle: "Pliki commita",
CheckoutCommitFile: "Plik wybierania", CheckoutCommitFileTooltip: "Plik wybierania",
DiscardOldFileChange: "Porzuć zmiany commita dla tego pliku", DiscardOldFileChangeTooltip: "Porzuć zmiany commita dla tego pliku",
DiscardFileChangesTitle: "Porzuć zmiany w pliku", DiscardFileChangesTitle: "Porzuć zmiany w pliku",
DiscardFileChangesPrompt: "Czy na pewno porzucić zmiany w tym pliku? Jeśli ten plik był utworzony w tym commicie, zostanie usunięty", DiscardFileChangesPrompt: "Czy na pewno porzucić zmiany w tym pliku? Jeśli ten plik był utworzony w tym commicie, zostanie usunięty",
DisabledForGPG: "Funkcja niedostępna dla użytkowników GPG", DisabledForGPG: "Funkcja niedostępna dla użytkowników GPG",
@ -171,7 +169,7 @@ func polishTranslationSet() TranslationSet {
AutoStashTitle: "Automatyczny schowek", AutoStashTitle: "Automatyczny schowek",
AutoStashPrompt: "Musisz schować i wyciągnąć zmiany żeby je przenosić. Robić to automatycznie? (enter/esc)", AutoStashPrompt: "Musisz schować i wyciągnąć zmiany żeby je przenosić. Robić to automatycznie? (enter/esc)",
StashPrefix: "Automatyczne dodawanie zmian do schowka dla ", StashPrefix: "Automatyczne dodawanie zmian do schowka dla ",
ViewDiscardOptions: "Pokaż opcje porzucania zmian", Discard: "Pokaż opcje porzucania zmian",
Cancel: "Anuluj", Cancel: "Anuluj",
DiscardAllChanges: "Porzuć wszystkie zmiany", DiscardAllChanges: "Porzuć wszystkie zmiany",
DiscardUnstagedChanges: "Porzuć zmiany poza poczekalnią", DiscardUnstagedChanges: "Porzuć zmiany poza poczekalnią",
@ -180,8 +178,8 @@ func polishTranslationSet() TranslationSet {
DiscardUntrackedFiles: "Porzuć pliki nieśledzone", DiscardUntrackedFiles: "Porzuć pliki nieśledzone",
HardReset: "Twardy reset", HardReset: "Twardy reset",
ViewResetOptions: "Wyświetl opcje resetu", ViewResetOptions: "Wyświetl opcje resetu",
CreateFixupCommitDescription: "Utwórz commit naprawczy dla tego commita", CreateFixupCommitTooltip: "Utwórz commit naprawczy dla tego commita",
SquashAboveCommits: `Spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash)`, SquashAboveCommitsTooltip: `Spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash)`,
SureSquashAboveCommits: `Na pewno chcesz spłaszczyć wszystkie commity naprawcze powyżej {{.commit}}?`, SureSquashAboveCommits: `Na pewno chcesz spłaszczyć wszystkie commity naprawcze powyżej {{.commit}}?`,
CreateFixupCommit: `Utwóż commit naprawczy`, CreateFixupCommit: `Utwóż commit naprawczy`,
SureCreateFixupCommit: `Na pewno utworzyć commit naprawczy dla commita {{.commit}}?`, SureCreateFixupCommit: `Na pewno utworzyć commit naprawczy dla commita {{.commit}}?`,

72
pkg/i18n/russian.go
View File

@ -57,7 +57,7 @@ func RussianTranslationSet() TranslationSet {
CredentialsPassphrase: "Введите пароль для SSH ключа", CredentialsPassphrase: "Введите пароль для SSH ключа",
CredentialsPIN: "Введите PIN-код для SSH ключа", CredentialsPIN: "Введите PIN-код для SSH ключа",
PassUnameWrong: "Неверный пароль, кодовая фраза и/или имя пользователя", PassUnameWrong: "Неверный пароль, кодовая фраза и/или имя пользователя",
CommitChanges: "Сохранить изменения", Commit: "Сохранить изменения",
AmendLastCommit: "Правка последнего коммита", AmendLastCommit: "Правка последнего коммита",
AmendLastCommitTitle: "Правка Последнего Коммита", AmendLastCommitTitle: "Правка Последнего Коммита",
SureToAmend: "Вы уверены, что хотите править последний коммит? Впоследствии можно изменить сообщение коммита на панели коммитов.", SureToAmend: "Вы уверены, что хотите править последний коммит? Впоследствии можно изменить сообщение коммита на панели коммитов.",
@ -66,7 +66,7 @@ func RussianTranslationSet() TranslationSet {
StatusTitle: "Статус", StatusTitle: "Статус",
Menu: "Меню", Menu: "Меню",
Execute: "Выполнить", Execute: "Выполнить",
ToggleStaged: "Переключить индекс", Stage: "Переключить индекс",
ToggleStagedAll: "Все проиндексированные/непроиндексированные", ToggleStagedAll: "Все проиндексированные/непроиндексированные",
ToggleTreeView: "Переключить вид дерева файлов", ToggleTreeView: "Переключить вид дерева файлов",
OpenMergeTool: "Открыть внешний инструмент слияния (git mergetool)", OpenMergeTool: "Открыть внешний инструмент слияния (git mergetool)",
@ -101,8 +101,6 @@ func RussianTranslationSet() TranslationSet {
CloseCancel: "Закрыть/отменить", CloseCancel: "Закрыть/отменить",
Confirm: "Подтвердить", Confirm: "Подтвердить",
Quit: "Выйти", Quit: "Выйти",
SquashDown: "Объединить несколько коммитов в один нижний",
FixupCommit: "Объединить несколько коммитов в один отбросив сообщение коммита",
NoCommitsThisBranch: "Нет коммитов для этой ветки", NoCommitsThisBranch: "Нет коммитов для этой ветки",
UpdateRefHere: "Обновить ветку '{{.ref}}' здесь", UpdateRefHere: "Обновить ветку '{{.ref}}' здесь",
CannotSquashOrFixupFirstCommit: "Ниже нет коммита, который можно было бы объединить", CannotSquashOrFixupFirstCommit: "Ниже нет коммита, который можно было бы объединить",
@ -110,20 +108,20 @@ func RussianTranslationSet() TranslationSet {
SureFixupThisCommit: "Вы уверены, что хотите объединить несколько коммитов, отбросив сообщение коммита? Он будет объединён с коммитом ниже", SureFixupThisCommit: "Вы уверены, что хотите объединить несколько коммитов, отбросив сообщение коммита? Он будет объединён с коммитом ниже",
SureSquashThisCommit: "Вы уверены, что хотите объединить несколько коммитов в нижний коммит?", SureSquashThisCommit: "Вы уверены, что хотите объединить несколько коммитов в нижний коммит?",
Squash: "Объединить коммиты (Squash)", Squash: "Объединить коммиты (Squash)",
PickCommit: "Выбрать коммит (в середине перебазирования)", PickCommitTooltip: "Выбрать коммит (в середине перебазирования)",
RevertCommit: "Отменить коммит", RevertCommit: "Отменить коммит",
RewordCommit: "Перефразировать коммит", Reword: "Перефразировать коммит",
DeleteCommit: "Удалить коммит", DropCommit: "Удалить коммит",
MoveDownCommit: "Переместить коммит вниз на один", MoveDownCommit: "Переместить коммит вниз на один",
MoveUpCommit: "Переместить коммит вверх на один", MoveUpCommit: "Переместить коммит вверх на один",
EditCommit: "Изменить коммит", EditCommitTooltip: "Изменить коммит",
AmendToCommit: "Править последний коммит с проиндексированными изменениями", AmendCommitTooltip: "Править последний коммит с проиндексированными изменениями",
ResetAuthor: "Сброс автора коммита", ResetAuthor: "Сброс автора коммита",
SetAuthor: "Установить автора", SetAuthor: "Установить автора",
SetResetCommitAuthor: "Установить/убрать автора коммита", AmendCommitAttribute: "Установить/убрать автора коммита",
SetAuthorPromptTitle: "Установить автора (должно выглядеть как «Имя <Email>»)", SetAuthorPromptTitle: "Установить автора (должно выглядеть как «Имя <Email>»)",
SureResetCommitAuthor: "Поле автора этого автора будет обновлено в соответствии с настроенным пользователем. Это также обновляет временную метку автора. Продолжить?", SureResetCommitAuthor: "Поле автора этого автора будет обновлено в соответствии с настроенным пользователем. Это также обновляет временную метку автора. Продолжить?",
RenameCommitEditor: "Переписать коммит с помощью редактора", RewordCommitEditor: "Переписать коммит с помощью редактора",
Error: "Ошибка", Error: "Ошибка",
PickHunk: "Выбрать эту часть", PickHunk: "Выбрать эту часть",
PickAllHunks: "Выбрать все части", PickAllHunks: "Выбрать все части",
@ -179,7 +177,7 @@ func RussianTranslationSet() TranslationSet {
IgnoreFile: `Добавить в .gitignore`, IgnoreFile: `Добавить в .gitignore`,
ExcludeFile: `Добавить в .git/info/exclude`, ExcludeFile: `Добавить в .git/info/exclude`,
RefreshFiles: `Обновить файлы`, RefreshFiles: `Обновить файлы`,
MergeIntoCurrentBranch: `Слияние с текущей переключённой веткой`, Merge: `Слияние с текущей переключённой веткой`,
ConfirmQuit: `Вы уверены, что хотите выйти?`, ConfirmQuit: `Вы уверены, что хотите выйти?`,
SwitchRepo: `Переключиться на последний репозиторий`, SwitchRepo: `Переключиться на последний репозиторий`,
AllBranchesLogGraph: `Показать все логи ветки`, AllBranchesLogGraph: `Показать все логи ветки`,
@ -192,13 +190,13 @@ func RussianTranslationSet() TranslationSet {
NoAutomaticGitFetchBody: `Lazygit не может использовать «git fetch» в приватном репозитории; используйте «f» на панели файлов, чтобы запустить «git fetch» вручную`, NoAutomaticGitFetchBody: `Lazygit не может использовать «git fetch» в приватном репозитории; используйте «f» на панели файлов, чтобы запустить «git fetch» вручную`,
FileEnter: `Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога`, FileEnter: `Проиндексировать отдельные части/строки для файла или свернуть/развернуть для каталога`,
FileStagingRequirements: `Можно проиндексировать только отдельные строки для отслеживаемых файлов`, FileStagingRequirements: `Можно проиндексировать только отдельные строки для отслеживаемых файлов`,
StageSelection: `Переключить строку в проиндексированные / непроиндексированные`, StageSelectionTooltip: `Переключить строку в проиндексированные / непроиндексированные`,
DiscardSelection: `Отменить изменение (git reset)`, DiscardSelection: `Отменить изменение (git reset)`,
ToggleRangeSelect: `Переключить выборку перетаскивания`, ToggleRangeSelect: `Переключить выборку перетаскивания`,
ToggleSelectHunk: `Переключить выборку частей`, ToggleSelectHunk: `Переключить выборку частей`,
ToggleSelectionForPatch: `Добавить/удалить строку(и) для патча`, ToggleSelectionForPatch: `Добавить/удалить строку(и) для патча`,
EditHunk: `Изменить эту часть`, EditHunk: `Изменить эту часть`,
ToggleStagingPanel: `Переключиться на другую панель (проиндексированные/непроиндексированные изменения)`, ToggleStagingView: `Переключиться на другую панель (проиндексированные/непроиндексированные изменения)`,
ReturnToFilesPanel: `Вернуться к панели файлов`, ReturnToFilesPanel: `Вернуться к панели файлов`,
FastForward: `Перемотать эту ветку вперёд из её upstream-ветки`, FastForward: `Перемотать эту ветку вперёд из её upstream-ветки`,
FastForwarding: "Получить изменения и перемотать вперёд", FastForwarding: "Получить изменения и перемотать вперёд",
@ -258,8 +256,8 @@ func RussianTranslationSet() TranslationSet {
SelectNextHunk: "Выбрать следующую часть", SelectNextHunk: "Выбрать следующую часть",
ScrollDown: "Прокрутить вниз", ScrollDown: "Прокрутить вниз",
ScrollUp: "Прокрутить вверх", ScrollUp: "Прокрутить вверх",
ScrollUpMainPanel: "Прокрутить вверх главную панель", ScrollUpMainWindow: "Прокрутить вверх главную панель",
ScrollDownMainPanel: "Прокрутить вниз главную панель", ScrollDownMainWindow: "Прокрутить вниз главную панель",
AmendCommitTitle: "Править коммит (amend)", AmendCommitTitle: "Править коммит (amend)",
AmendCommitPrompt: "Вы уверены, что хотите править этот коммит проиндексированными файлами?", AmendCommitPrompt: "Вы уверены, что хотите править этот коммит проиндексированными файлами?",
DropCommitTitle: "Удалить коммит", DropCommitTitle: "Удалить коммит",
@ -287,9 +285,9 @@ func RussianTranslationSet() TranslationSet {
RemoteBranchesDynamicTitle: "Удалённые ветки (%s)", RemoteBranchesDynamicTitle: "Удалённые ветки (%s)",
ViewItemFiles: "Просмотреть файлы выбранного элемента", ViewItemFiles: "Просмотреть файлы выбранного элемента",
CommitFilesTitle: "Сохранить Изменения Файлов", CommitFilesTitle: "Сохранить Изменения Файлов",
CheckoutCommitFile: "Переключить файл", CheckoutCommitFileTooltip: "Переключить файл",
CanOnlyDiscardFromLocalCommits: "Изменения можно отменить только из локальных коммитов.", CanOnlyDiscardFromLocalCommits: "Изменения можно отменить только из локальных коммитов.",
DiscardOldFileChange: "Отменить изменения коммита в этом файле", DiscardOldFileChangeTooltip: "Отменить изменения коммита в этом файле",
DiscardFileChangesTitle: "Отменить изменения файла", DiscardFileChangesTitle: "Отменить изменения файла",
DiscardFileChangesPrompt: "Вы уверены, что хотите отменить изменения коммита в этом файле? Если файл был создан в этом коммите, он будет удалён", DiscardFileChangesPrompt: "Вы уверены, что хотите отменить изменения коммита в этом файле? Если файл был создан в этом коммите, он будет удалён",
DiscardAddedFileChangesPrompt: "Вы уверены, что хотите отменить изменения, внесённые в этот файл коммитом? Файл был добавлен в этот коммит, поэтому он снова будет удален.", DiscardAddedFileChangesPrompt: "Вы уверены, что хотите отменить изменения, внесённые в этот файл коммитом? Файл был добавлен в этот коммит, поэтому он снова будет удален.",
@ -304,7 +302,7 @@ func RussianTranslationSet() TranslationSet {
AutoStashTitle: "Автосохранить изменения?", AutoStashTitle: "Автосохранить изменения?",
AutoStashPrompt: "Чтобы перенести изменения, их нужно сохранить и вынуть. Сделать это автоматически? (enter/esc)", AutoStashPrompt: "Чтобы перенести изменения, их нужно сохранить и вынуть. Сделать это автоматически? (enter/esc)",
StashPrefix: "Автосохранение изменений для", StashPrefix: "Автосохранение изменений для",
ViewDiscardOptions: "Просмотреть параметры «отмены изменении»", Discard: "Просмотреть параметры «отмены изменении»",
Cancel: "Отменить", Cancel: "Отменить",
DiscardAllChanges: "Отменить все изменения", DiscardAllChanges: "Отменить все изменения",
DiscardUnstagedChanges: "Отменить непроиндексированные изменения", DiscardUnstagedChanges: "Отменить непроиндексированные изменения",
@ -314,8 +312,8 @@ func RussianTranslationSet() TranslationSet {
DiscardStagedChanges: "Отменить проиндексированные изменения", DiscardStagedChanges: "Отменить проиндексированные изменения",
HardReset: "Жёсткий сброс", HardReset: "Жёсткий сброс",
ViewResetOptions: `Просмотреть параметры сброса`, ViewResetOptions: `Просмотреть параметры сброса`,
CreateFixupCommitDescription: `Создать fixup коммит для этого коммита`, CreateFixupCommitTooltip: `Создать fixup коммит для этого коммита`,
SquashAboveCommits: `Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение)`, SquashAboveCommitsTooltip: `Объединить все 'fixup!' коммиты выше в выбранный коммит (автосохранение)`,
SureSquashAboveCommits: `Вы уверены, что хотите объединить все fixup! коммиты выше {{.commit}}?`, SureSquashAboveCommits: `Вы уверены, что хотите объединить все fixup! коммиты выше {{.commit}}?`,
CreateFixupCommit: `Создать fixup коммит`, CreateFixupCommit: `Создать fixup коммит`,
SureCreateFixupCommit: `Вы уверены, что хотите создать fixup! коммит для коммита {{.commit}}?`, SureCreateFixupCommit: `Вы уверены, что хотите создать fixup! коммит для коммита {{.commit}}?`,
@ -346,12 +344,12 @@ func RussianTranslationSet() TranslationSet {
ViewPatchOptions: "Просмотреть пользовательские параметры патча", ViewPatchOptions: "Просмотреть пользовательские параметры патча",
PatchOptionsTitle: "Параметры патча", PatchOptionsTitle: "Параметры патча",
NoPatchError: "Патч ещё не создан. Чтобы начать сборку патча, используйте «пробел» в файле коммита или введите, чтобы добавить определённые строки.", NoPatchError: "Патч ещё не создан. Чтобы начать сборку патча, используйте «пробел» в файле коммита или введите, чтобы добавить определённые строки.",
EnterFile: "Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения)", EnterCommitFile: "Введите файл, чтобы добавить выбранные строки в патч (или свернуть каталог переключения)",
ExitCustomPatchBuilder: `Выйти из сборщика пользовательских патчей`, ExitCustomPatchBuilder: `Выйти из сборщика пользовательских патчей`,
EnterUpstream: `Введите upstream как '<remote> <branchname>'`, EnterUpstream: `Введите upstream как '<remote> <branchname>'`,
InvalidUpstream: "Недействительный upstream. Должен быть в формате '<remote> <branchname>'", InvalidUpstream: "Недействительный upstream. Должен быть в формате '<remote> <branchname>'",
ReturnToRemotesList: `Вернуться к списку удалённых репозитории`, ReturnToRemotesList: `Вернуться к списку удалённых репозитории`,
AddNewRemote: `Добавить новую удалённую ветку`, NewRemote: `Добавить новую удалённую ветку`,
NewRemoteName: `Название новой удалённой ветки`, NewRemoteName: `Название новой удалённой ветки`,
NewRemoteUrl: `Ссылка новой удалённой ветки`, NewRemoteUrl: `Ссылка новой удалённой ветки`,
EditRemoteName: `Введите новое название для удалённое ветки {{.remoteName}}:`, EditRemoteName: `Введите новое название для удалённое ветки {{.remoteName}}:`,
@ -360,12 +358,12 @@ func RussianTranslationSet() TranslationSet {
RemoveRemotePrompt: "Вы уверены, что хотите удалить удалённую ветку?", RemoveRemotePrompt: "Вы уверены, что хотите удалить удалённую ветку?",
DeleteRemoteBranch: "Удалить Удалённую Ветку", DeleteRemoteBranch: "Удалить Удалённую Ветку",
DeleteRemoteBranchMessage: "Вы уверены, что хотите удалить удалённую ветку", DeleteRemoteBranchMessage: "Вы уверены, что хотите удалить удалённую ветку",
SetAsUpstream: "Установить как upstream-ветку переключённую ветку", SetAsUpstreamTooltip: "Установить как upstream-ветку переключённую ветку",
SetUpstream: "Установить upstream-ветку из выбранной ветки", SetUpstream: "Установить upstream-ветку из выбранной ветки",
UnsetUpstream: "Убрать upstream-ветку из выбранной ветки", UnsetUpstream: "Убрать upstream-ветку из выбранной ветки",
SetUpstreamTitle: "Установить upstream-ветку", SetUpstreamTitle: "Установить upstream-ветку",
SetUpstreamMessage: "Вы уверены, что хотите установить upstream-ветвь '{{.checkedOut}}' на '{{.selected}}'", SetUpstreamMessage: "Вы уверены, что хотите установить upstream-ветвь '{{.checkedOut}}' на '{{.selected}}'",
EditRemote: "Редактировать удалённый репозитории", EditRemoteTooltip: "Редактировать удалённый репозитории",
TagCommit: "Пометить коммит тегом", TagCommit: "Пометить коммит тегом",
TagMenuTitle: "Создать тег", TagMenuTitle: "Создать тег",
TagNameTitle: "Название тега", TagNameTitle: "Название тега",
@ -375,8 +373,9 @@ func RussianTranslationSet() TranslationSet {
DeleteTagTitle: "Удалить тег", DeleteTagTitle: "Удалить тег",
PushTagTitle: "Удалённый репозитории для отправки тега '{{.tagName}}' в:", PushTagTitle: "Удалённый репозитории для отправки тега '{{.tagName}}' в:",
PushTag: "Отправить тег", PushTag: "Отправить тег",
CreateTag: "Создать тег", NewTag: "Создать тег",
FetchRemote: "Получение изменения из удалённого репозитория", FetchRemoteTooltip: "Получение изменения из удалённого репозитория",
FetchingRemoteStatus: "Получение статуса удалённого репозитория",
CheckoutCommit: "Переключить коммит", CheckoutCommit: "Переключить коммит",
SureCheckoutThisCommit: "Вы уверены, что хотите переключить коммит?", SureCheckoutThisCommit: "Вы уверены, что хотите переключить коммит?",
GitFlowOptions: "Показать параметры git-flow", GitFlowOptions: "Показать параметры git-flow",
@ -395,7 +394,7 @@ func RussianTranslationSet() TranslationSet {
RenameBranch: "Переименовать ветку", RenameBranch: "Переименовать ветку",
NewBranchNamePrompt: "Введите новое название ветки", NewBranchNamePrompt: "Введите новое название ветки",
RenameBranchWarning: "Эта ветвь отслеживает удалённый репозитории. Это действие переименует только имя локальной ветки, а не имя удалённой ветки. Продолжать?", RenameBranchWarning: "Эта ветвь отслеживает удалённый репозитории. Это действие переименует только имя локальной ветки, а не имя удалённой ветки. Продолжать?",
OpenMenu: "Открыть меню", OpenKeybindingsMenu: "Открыть меню",
ResetCherryPick: "Сбросить отобранную (скопированную | cherry-picked) выборку коммитов", ResetCherryPick: "Сбросить отобранную (скопированную | cherry-picked) выборку коммитов",
NextTab: "Следующая вкладка", NextTab: "Следующая вкладка",
PrevTab: "Предыдущая вкладка", PrevTab: "Предыдущая вкладка",
@ -424,9 +423,9 @@ func RussianTranslationSet() TranslationSet {
ExitDiffMode: "Выйти из режима сравнения", ExitDiffMode: "Выйти из режима сравнения",
DiffingMenuTitle: "Сравнение", DiffingMenuTitle: "Сравнение",
SwapDiff: "Обратное направление сравнении", SwapDiff: "Обратное направление сравнении",
OpenDiffingMenu: "Открыть меню сравнении", ViewDiffingOptions: "Открыть меню сравнении",
// the actual view is the extras view which I intend to give more tabs in future but for now we'll only mention the command log part // the actual view is the extras view which I intend to give more tabs in future but for now we'll only mention the command log part
OpenExtrasMenu: "Открыть меню журнала команд", OpenCommandLogMenu: "Открыть меню журнала команд",
ShowingGitDiff: "Показывает вывод для:", ShowingGitDiff: "Показывает вывод для:",
CommitDiff: "Разница коммита", CommitDiff: "Разница коммита",
CopyCommitShaToClipboard: "Скопировать SHA коммита в буфер обмена", CopyCommitShaToClipboard: "Скопировать SHA коммита в буфер обмена",
@ -438,9 +437,8 @@ func RussianTranslationSet() TranslationSet {
CommitAuthor: "Автор коммита", CommitAuthor: "Автор коммита",
CopyCommitAttributeToClipboard: "Скопировать атрибут коммита", CopyCommitAttributeToClipboard: "Скопировать атрибут коммита",
CopyBranchNameToClipboard: "Скопировать название ветки в буфер обмена", CopyBranchNameToClipboard: "Скопировать название ветки в буфер обмена",
CopyFileNameToClipboard: "Скопировать название файла в буфер обмена", CopyPathToClipboard: "Скопировать название файла в буфер обмена",
CopyCommitFileNameToClipboard: "Скопировать закомиченное имя файла в буфер обмена", CopySelectedTextToClipboard: "Скопировать выделенный текст в буфер обмена",
CopySelectedTexToClipboard: "Скопировать выделенный текст в буфер обмена",
CommitPrefixPatternError: "Ошибка в шаблоне commitPrefix", CommitPrefixPatternError: "Ошибка в шаблоне commitPrefix",
NoFilesStagedTitle: "Нет проиндексированных файлов", NoFilesStagedTitle: "Нет проиндексированных файлов",
NoFilesStagedPrompt: "Нет проиндексированых файлов. Закоммитить все файлы?", NoFilesStagedPrompt: "Нет проиндексированых файлов. Закоммитить все файлы?",
@ -456,7 +454,7 @@ func RussianTranslationSet() TranslationSet {
RunningCustomCommandStatus: "Запуск пользовательской команды", RunningCustomCommandStatus: "Запуск пользовательской команды",
SubmoduleStashAndReset: "Спрятать непроиндексированные изменения подмодуля и обновить", SubmoduleStashAndReset: "Спрятать непроиндексированные изменения подмодуля и обновить",
AndResetSubmodules: "И сбросить подмодули", AndResetSubmodules: "И сбросить подмодули",
EnterSubmodule: "Ввести подмодуль", EnterSubmoduleTooltip: "Ввести подмодуль",
CopySubmoduleNameToClipboard: "Скопировать название подмодуля в буфер обмена", CopySubmoduleNameToClipboard: "Скопировать название подмодуля в буфер обмена",
RemoveSubmodule: "Удалить подмодуль", RemoveSubmodule: "Удалить подмодуль",
RemoveSubmodulePrompt: "Вы уверены, что хотите удалить подмодуль '%s' и соответствующий ему каталог? Это необратимо.", RemoveSubmodulePrompt: "Вы уверены, что хотите удалить подмодуль '%s' и соответствующий ему каталог? Это необратимо.",
@ -464,14 +462,14 @@ func RussianTranslationSet() TranslationSet {
NewSubmoduleName: "Названия нового подмодуля:", NewSubmoduleName: "Названия нового подмодуля:",
NewSubmoduleUrl: "URL нового подмодуля:", NewSubmoduleUrl: "URL нового подмодуля:",
NewSubmodulePath: "Путь нового подмодуля:", NewSubmodulePath: "Путь нового подмодуля:",
AddSubmodule: "Добавить новый подмодуль", NewSubmodule: "Добавить новый подмодуль",
AddingSubmoduleStatus: "Добавление подмодуля", AddingSubmoduleStatus: "Добавление подмодуля",
UpdateSubmoduleUrl: "Обновить URL подмодуля '%s'", UpdateSubmoduleUrl: "Обновить URL подмодуля '%s'",
UpdatingSubmoduleUrlStatus: "Обновление URL", UpdatingSubmoduleUrlStatus: "Обновление URL",
EditSubmoduleUrl: "Обновить URL подмодуля", EditSubmoduleUrl: "Обновить URL подмодуля",
InitializingSubmoduleStatus: "Инициализация подмодуля", InitializingSubmoduleStatus: "Инициализация подмодуля",
InitSubmodule: "Инициализировать подмодуль", InitSubmoduleTooltip: "Инициализировать подмодуль",
SubmoduleUpdate: "Обновить подмодуль", SubmoduleUpdateTooltip: "Обновить подмодуль",
UpdatingSubmoduleStatus: "Обновление подмодуля", UpdatingSubmoduleStatus: "Обновление подмодуля",
BulkInitSubmodules: "Массовая инициализация подмодулей", BulkInitSubmodules: "Массовая инициализация подмодулей",
BulkUpdateSubmodules: "Массовое обновление подмодулей", BulkUpdateSubmodules: "Массовое обновление подмодулей",

72
pkg/i18n/traditional_chinese.go
View File

@ -90,7 +90,7 @@ func traditionalChineseTranslationSet() TranslationSet {
CredentialsPassphrase: "輸入 SSH 金鑰的密碼", CredentialsPassphrase: "輸入 SSH 金鑰的密碼",
CredentialsPIN: "輸入 SSH 金鑰的 PIN 碼", CredentialsPIN: "輸入 SSH 金鑰的 PIN 碼",
PassUnameWrong: "密碼、密語或使用者名稱錯誤", PassUnameWrong: "密碼、密語或使用者名稱錯誤",
CommitChanges: "提交變更", Commit: "提交變更",
AmendLastCommit: "修正上次提交", AmendLastCommit: "修正上次提交",
AmendLastCommitTitle: "修正上次提交", AmendLastCommitTitle: "修正上次提交",
SureToAmend: "是否確定要修正上次提交？之後你可以從提交面板中再次更改此次提交的訊息。", SureToAmend: "是否確定要修正上次提交？之後你可以從提交面板中再次更改此次提交的訊息。",
@ -99,7 +99,7 @@ func traditionalChineseTranslationSet() TranslationSet {
StatusTitle: "狀態", StatusTitle: "狀態",
Menu: "功能表", Menu: "功能表",
Execute: "執行", Execute: "執行",
ToggleStaged: "切換預存", Stage: "切換預存",
ToggleStagedAll: "全部預存/取消預存", ToggleStagedAll: "全部預存/取消預存",
ToggleTreeView: "切換檔案樹狀視圖", ToggleTreeView: "切換檔案樹狀視圖",
OpenMergeTool: "開啟外部合併工具 (git mergetool)", OpenMergeTool: "開啟外部合併工具 (git mergetool)",
@ -134,8 +134,6 @@ func traditionalChineseTranslationSet() TranslationSet {
CloseCancel: "關閉/取消", CloseCancel: "關閉/取消",
Confirm: "確認", Confirm: "確認",
Quit: "結束", Quit: "結束",
SquashDown: "向下壓縮",
FixupCommit: "修復提交 (Fixup)",
NoCommitsThisBranch: "這個分支沒有提交", NoCommitsThisBranch: "這個分支沒有提交",
UpdateRefHere: "在這裡更新 '{{.ref}}' 分支", UpdateRefHere: "在這裡更新 '{{.ref}}' 分支",
CannotSquashOrFixupFirstCommit: "沒有可以壓縮的提交", CannotSquashOrFixupFirstCommit: "沒有可以壓縮的提交",
@ -143,20 +141,20 @@ func traditionalChineseTranslationSet() TranslationSet {
SureFixupThisCommit: "你確定要對這個提交進行 '修復' 嗎？ 它將被合併到下面的提交中", SureFixupThisCommit: "你確定要對這個提交進行 '修復' 嗎？ 它將被合併到下面的提交中",
SureSquashThisCommit: "你確定要把這個提交壓縮到下面的提交中嗎？", SureSquashThisCommit: "你確定要把這個提交壓縮到下面的提交中嗎？",
Squash: "壓縮 (Squash)", Squash: "壓縮 (Squash)",
PickCommit: "挑選提交 (於變基過程中)", PickCommitTooltip: "挑選提交 (於變基過程中)",
RevertCommit: "還原提交", RevertCommit: "還原提交",
RewordCommit: "改寫提交", Reword: "改寫提交",
DeleteCommit: "刪除提交", DropCommit: "刪除提交",
MoveDownCommit: "向下移動提交", MoveDownCommit: "向下移動提交",
MoveUpCommit: "向上移動提交", MoveUpCommit: "向上移動提交",
EditCommit: "編輯提交", EditCommitTooltip: "編輯提交",
AmendToCommit: "使用已預存的更改修正提交", AmendCommitTooltip: "使用已預存的更改修正提交",
ResetAuthor: "重設作者", ResetAuthor: "重設作者",
SetAuthor: "設置作者", SetAuthor: "設置作者",
SetResetCommitAuthor: "設置/重設提交作者", AmendCommitAttribute: "設置/重設提交作者",
SetAuthorPromptTitle: "設置作者 (格式如 '姓名 <電子郵件>')", SetAuthorPromptTitle: "設置作者 (格式如 '姓名 <電子郵件>')",
SureResetCommitAuthor: "此提交的作者欄位將被更新以符合已配置的使用者。它也會更新作者的時間戳。繼續嗎？", SureResetCommitAuthor: "此提交的作者欄位將被更新以符合已配置的使用者。它也會更新作者的時間戳。繼續嗎？",
RenameCommitEditor: "使用編輯器改寫提交", RewordCommitEditor: "使用編輯器改寫提交",
Error: "錯誤", Error: "錯誤",
PickHunk: "挑選程式碼片段", PickHunk: "挑選程式碼片段",
PickAllHunks: "挑選所有程式碼片段", PickAllHunks: "挑選所有程式碼片段",
@ -212,7 +210,7 @@ func traditionalChineseTranslationSet() TranslationSet {
IgnoreFile: `添加到 .gitignore`, IgnoreFile: `添加到 .gitignore`,
ExcludeFile: `添加到 .git/info/exclude`, ExcludeFile: `添加到 .git/info/exclude`,
RefreshFiles: `重新整理檔案`, RefreshFiles: `重新整理檔案`,
MergeIntoCurrentBranch: `合併到當前檢出的分支`, Merge: `合併到當前檢出的分支`,
ConfirmQuit: `你確定要結束嗎？`, ConfirmQuit: `你確定要結束嗎？`,
SwitchRepo: `切換到最近使用的版本庫`, SwitchRepo: `切換到最近使用的版本庫`,
AllBranchesLogGraph: `顯示所有分支日誌`, AllBranchesLogGraph: `顯示所有分支日誌`,
@ -225,13 +223,13 @@ func traditionalChineseTranslationSet() TranslationSet {
NoAutomaticGitFetchBody: `lazygit 無法在私有庫使用 "git 擷取"；在檔案面板中使用 'f' 手動執行 "git 擷取"`, NoAutomaticGitFetchBody: `lazygit 無法在私有庫使用 "git 擷取"；在檔案面板中使用 'f' 手動執行 "git 擷取"`,
FileEnter: `選擇檔案中的單個程式碼塊/行，或展開/折疊目錄`, FileEnter: `選擇檔案中的單個程式碼塊/行，或展開/折疊目錄`,
FileStagingRequirements: `只能選擇跟踪檔案中的單個行`, FileStagingRequirements: `只能選擇跟踪檔案中的單個行`,
StageSelection: `切換現有行的狀態 (已預存/未預存)`, StageSelectionTooltip: `切換現有行的狀態 (已預存/未預存)`,
DiscardSelection: `刪除變更 (git reset)`, DiscardSelection: `刪除變更 (git reset)`,
ToggleRangeSelect: `切換拖曳選擇`, ToggleRangeSelect: `切換拖曳選擇`,
ToggleSelectHunk: `切換選擇程式碼塊`, ToggleSelectHunk: `切換選擇程式碼塊`,
ToggleSelectionForPatch: `向 (或從) 補丁中添加/刪除行`, ToggleSelectionForPatch: `向 (或從) 補丁中添加/刪除行`,
EditHunk: `編輯程式碼塊`, EditHunk: `編輯程式碼塊`,
ToggleStagingPanel: `切換至另一個面板 (已預存/未預存更改)`, ToggleStagingView: `切換至另一個面板 (已預存/未預存更改)`,
ReturnToFilesPanel: `返回檔案面板`, ReturnToFilesPanel: `返回檔案面板`,
FastForward: `從上游快進此分支`, FastForward: `從上游快進此分支`,
FastForwarding: "的擷取和快進中", FastForwarding: "的擷取和快進中",
@ -289,8 +287,8 @@ func traditionalChineseTranslationSet() TranslationSet {
SelectNextHunk: "選擇下一段", SelectNextHunk: "選擇下一段",
ScrollDown: "向下捲動", ScrollDown: "向下捲動",
ScrollUp: "向上捲動", ScrollUp: "向上捲動",
ScrollUpMainPanel: "向上捲動主面板", ScrollUpMainWindow: "向上捲動主面板",
ScrollDownMainPanel: "向下捲動主面板", ScrollDownMainWindow: "向下捲動主面板",
AmendCommitTitle: "修正提交", AmendCommitTitle: "修正提交",
AmendCommitPrompt: "你確定要使用預存的檔案修正此提交嗎？", AmendCommitPrompt: "你確定要使用預存的檔案修正此提交嗎？",
DropCommitTitle: "刪除提交", DropCommitTitle: "刪除提交",
@ -318,8 +316,8 @@ func traditionalChineseTranslationSet() TranslationSet {
RemoteBranchesDynamicTitle: "遠端分支 (共 %s項)", RemoteBranchesDynamicTitle: "遠端分支 (共 %s項)",
ViewItemFiles: "檢視所選項目的檔案", ViewItemFiles: "檢視所選項目的檔案",
CommitFilesTitle: "提交檔案", CommitFilesTitle: "提交檔案",
CheckoutCommitFile: "檢出檔案", CheckoutCommitFileTooltip: "檢出檔案",
DiscardOldFileChange: "捨棄此提交對此檔案的更改", DiscardOldFileChangeTooltip: "捨棄此提交對此檔案的更改",
DiscardFileChangesTitle: "捨棄檔案更改", DiscardFileChangesTitle: "捨棄檔案更改",
DiscardFileChangesPrompt: "你確定要捨棄此提交對此檔案的更改嗎？如果這個檔案是在此提交中創建的，它將被刪除", DiscardFileChangesPrompt: "你確定要捨棄此提交對此檔案的更改嗎？如果這個檔案是在此提交中創建的，它將被刪除",
DisabledForGPG: "此功能不適用於使用GPG的使用者", DisabledForGPG: "此功能不適用於使用GPG的使用者",
@ -331,7 +329,7 @@ func traditionalChineseTranslationSet() TranslationSet {
AutoStashTitle: "自動儲存?", AutoStashTitle: "自動儲存?",
AutoStashPrompt: "你必須儲存和彈出你的更改才能帶它們到其他地方。是否自動執行此操作？（enter/esc）", AutoStashPrompt: "你必須儲存和彈出你的更改才能帶它們到其他地方。是否自動執行此操作？（enter/esc）",
StashPrefix: "正在自動儲存更改：", StashPrefix: "正在自動儲存更改：",
ViewDiscardOptions: "檢視“捨棄更改”的選項", Discard: "檢視“捨棄更改”的選項",
Cancel: "取消", Cancel: "取消",
DiscardAllChanges: "捨棄所有更改", DiscardAllChanges: "捨棄所有更改",
DiscardUnstagedChanges: "捨棄未預存的更改", DiscardUnstagedChanges: "捨棄未預存的更改",
@ -341,8 +339,8 @@ func traditionalChineseTranslationSet() TranslationSet {
DiscardStagedChanges: "捨棄已預存的更改", DiscardStagedChanges: "捨棄已預存的更改",
HardReset: "硬重設", HardReset: "硬重設",
ViewResetOptions: "檢視重設選項", ViewResetOptions: "檢視重設選項",
CreateFixupCommitDescription: "為此提交建立修復提交", CreateFixupCommitTooltip: "為此提交建立修復提交",
SquashAboveCommits: "壓縮上方所有的“fixup!”提交 (自動壓縮)", SquashAboveCommitsTooltip: "壓縮上方所有的“fixup!”提交 (自動壓縮)",
SureSquashAboveCommits: "你確定要壓縮{{.commit}}上方所有的fixup!提交嗎？", SureSquashAboveCommits: "你確定要壓縮{{.commit}}上方所有的fixup!提交嗎？",
CreateFixupCommit: "建立修復提交", CreateFixupCommit: "建立修復提交",
SureCreateFixupCommit: "你確定要為提交{{.commit}}建立fixup!提交嗎？", SureCreateFixupCommit: "你確定要為提交{{.commit}}建立fixup!提交嗎？",
@ -373,12 +371,12 @@ func traditionalChineseTranslationSet() TranslationSet {
ViewPatchOptions: "檢視自訂補丁選項", ViewPatchOptions: "檢視自訂補丁選項",
PatchOptionsTitle: "補丁選項", PatchOptionsTitle: "補丁選項",
NoPatchError: "尚未建立補丁。要開始建立補丁，請在提交檔案上使用空格或輸入以添加特定行", NoPatchError: "尚未建立補丁。要開始建立補丁，請在提交檔案上使用空格或輸入以添加特定行",
EnterFile: "輸入檔案以將選定的行添加至補丁（或切換目錄折疊）", EnterCommitFile: "輸入檔案以將選定的行添加至補丁（或切換目錄折疊）",
ExitCustomPatchBuilder: `退出自訂補丁建立器`, ExitCustomPatchBuilder: `退出自訂補丁建立器`,
EnterUpstream: `輸入上游為 '<remote> <branchname>'`, EnterUpstream: `輸入上游為 '<remote> <branchname>'`,
InvalidUpstream: "無效的上游。必須符合 '<remote> <branchname>' 的格式", InvalidUpstream: "無效的上游。必須符合 '<remote> <branchname>' 的格式",
ReturnToRemotesList: `返回遠端列表`, ReturnToRemotesList: `返回遠端列表`,
AddNewRemote: `新增遠端`, NewRemote: `新增遠端`,
NewRemoteName: `新遠端名稱：`, NewRemoteName: `新遠端名稱：`,
NewRemoteUrl: `新遠端 URL：`, NewRemoteUrl: `新遠端 URL：`,
EditRemoteName: `輸入更新 {{.remoteName}} 遠端名稱：`, EditRemoteName: `輸入更新 {{.remoteName}} 遠端名稱：`,
@ -387,12 +385,12 @@ func traditionalChineseTranslationSet() TranslationSet {
RemoveRemotePrompt: "你確定要移除遠端嗎？", RemoveRemotePrompt: "你確定要移除遠端嗎？",
DeleteRemoteBranch: "刪除遠端分支", DeleteRemoteBranch: "刪除遠端分支",
DeleteRemoteBranchMessage: "你確定要刪除遠端分支嗎？", DeleteRemoteBranchMessage: "你確定要刪除遠端分支嗎？",
SetAsUpstream: "將此分支設為當前分支之上游", SetAsUpstreamTooltip: "將此分支設為當前分支之上游",
SetUpstream: "設定所選分支之上游", SetUpstream: "設定所選分支之上游",
UnsetUpstream: "取消設定選定分支之上游", UnsetUpstream: "取消設定選定分支之上游",
SetUpstreamTitle: "設定上游分支", SetUpstreamTitle: "設定上游分支",
SetUpstreamMessage: "你確定要將 '{{. selected}}' 設為 '{{.checkedOut}}' 的上游分支嗎？", SetUpstreamMessage: "你確定要將 '{{. selected}}' 設為 '{{.checkedOut}}' 的上游分支嗎？",
EditRemote: "編輯遠端", EditRemoteTooltip: "編輯遠端",
TagCommit: "打標籤到提交", TagCommit: "打標籤到提交",
TagMenuTitle: "建立標籤", TagMenuTitle: "建立標籤",
TagNameTitle: "標籤名稱", TagNameTitle: "標籤名稱",
@ -401,8 +399,9 @@ func traditionalChineseTranslationSet() TranslationSet {
LightweightTag: "輕量標籤", LightweightTag: "輕量標籤",
PushTagTitle: "推送標籤 '{{.tagName}}' 至遠端：", PushTagTitle: "推送標籤 '{{.tagName}}' 至遠端：",
PushTag: "推送標籤", PushTag: "推送標籤",
CreateTag: "建立標籤", NewTag: "建立標籤",
FetchRemote: "擷取遠端", FetchRemoteTooltip: "擷取遠端",
FetchingRemoteStatus: "正在擷取遠端",
CheckoutCommit: "檢出提交", CheckoutCommit: "檢出提交",
SureCheckoutThisCommit: "你確定要檢出這個提交嗎？", SureCheckoutThisCommit: "你確定要檢出這個提交嗎？",
GitFlowOptions: "顯示 git-flow 選項", GitFlowOptions: "顯示 git-flow 選項",
@ -421,7 +420,7 @@ func traditionalChineseTranslationSet() TranslationSet {
RenameBranch: "重新命名分支", RenameBranch: "重新命名分支",
NewBranchNamePrompt: "為分支輸入新名稱", NewBranchNamePrompt: "為分支輸入新名稱",
RenameBranchWarning: "此分支正在追蹤遠端分支。此操作僅會重新命名本地分支名稱，而不是遠端分支的名稱。是否繼續？", RenameBranchWarning: "此分支正在追蹤遠端分支。此操作僅會重新命名本地分支名稱，而不是遠端分支的名稱。是否繼續？",
OpenMenu: "開啟選單", OpenKeybindingsMenu: "開啟選單",
ResetCherryPick: "重設選定的揀選 (複製) 提交", ResetCherryPick: "重設選定的揀選 (複製) 提交",
NextTab: "下一個索引標籤", NextTab: "下一個索引標籤",
PrevTab: "上一個索引標籤", PrevTab: "上一個索引標籤",
@ -450,9 +449,9 @@ func traditionalChineseTranslationSet() TranslationSet {
ExitDiffMode: "退出差異模式", ExitDiffMode: "退出差異模式",
DiffingMenuTitle: "差異比較", DiffingMenuTitle: "差異比較",
SwapDiff: "反轉差異方向", SwapDiff: "反轉差異方向",
OpenDiffingMenu: "開啟差異比較選單", ViewDiffingOptions: "開啟差異比較選單",
// the actual view is the extras view which I intend to give more tabs in future but for now we'll only mention the command log part // the actual view is the extras view which I intend to give more tabs in future but for now we'll only mention the command log part
OpenExtrasMenu: "開啟命令記錄選單", OpenCommandLogMenu: "開啟命令記錄選單",
ShowingGitDiff: "顯示輸出：", ShowingGitDiff: "顯示輸出：",
CommitDiff: "提交差異", CommitDiff: "提交差異",
CopyCommitShaToClipboard: "複製提交 SHA 到剪貼簿", CopyCommitShaToClipboard: "複製提交 SHA 到剪貼簿",
@ -463,9 +462,8 @@ func traditionalChineseTranslationSet() TranslationSet {
CommitAuthor: "提交者", CommitAuthor: "提交者",
CopyCommitAttributeToClipboard: "複製提交屬性", CopyCommitAttributeToClipboard: "複製提交屬性",
CopyBranchNameToClipboard: "複製分支名稱到剪貼簿", CopyBranchNameToClipboard: "複製分支名稱到剪貼簿",
CopyFileNameToClipboard: "複製檔案名稱到剪貼簿", CopyPathToClipboard: "複製檔案名稱到剪貼簿",
CopyCommitFileNameToClipboard: "複製提交的檔案名稱到剪貼簿", CopySelectedTextToClipboard: "複製所選文本至剪貼簿",
CopySelectedTexToClipboard: "複製所選文本至剪貼簿",
CommitPrefixPatternError: "commitPrefix 模式錯誤", CommitPrefixPatternError: "commitPrefix 模式錯誤",
NoFilesStagedTitle: "沒有檔案預存", NoFilesStagedTitle: "沒有檔案預存",
NoFilesStagedPrompt: "你沒有預存任何檔案。提交所有檔案嗎？", NoFilesStagedPrompt: "你沒有預存任何檔案。提交所有檔案嗎？",
@ -481,7 +479,7 @@ func traditionalChineseTranslationSet() TranslationSet {
RunningCustomCommandStatus: "正在執行自訂命令", RunningCustomCommandStatus: "正在執行自訂命令",
SubmoduleStashAndReset: "收藏未提交的子模組變更並更新", SubmoduleStashAndReset: "收藏未提交的子模組變更並更新",
AndResetSubmodules: "以及重設子模組", AndResetSubmodules: "以及重設子模組",
EnterSubmodule: "進入子模組", EnterSubmoduleTooltip: "進入子模組",
CopySubmoduleNameToClipboard: "複製子模組名稱到剪貼簿", CopySubmoduleNameToClipboard: "複製子模組名稱到剪貼簿",
RemoveSubmodule: "移除子模組", RemoveSubmodule: "移除子模組",
RemoveSubmodulePrompt: "是否確定要刪除子模組 '%s' 以及它相應的目錄？此操作是不可逆的。", RemoveSubmodulePrompt: "是否確定要刪除子模組 '%s' 以及它相應的目錄？此操作是不可逆的。",
@ -489,14 +487,14 @@ func traditionalChineseTranslationSet() TranslationSet {
NewSubmoduleName: "新子模組名稱：", NewSubmoduleName: "新子模組名稱：",
NewSubmoduleUrl: "新子模組 URL：", NewSubmoduleUrl: "新子模組 URL：",
NewSubmodulePath: "新子模組路徑：", NewSubmodulePath: "新子模組路徑：",
AddSubmodule: "新增子模組", NewSubmodule: "新增子模組",
AddingSubmoduleStatus: "正在新增子模組", AddingSubmoduleStatus: "正在新增子模組",
UpdateSubmoduleUrl: "更新子模組 '%s' 的 URL", UpdateSubmoduleUrl: "更新子模組 '%s' 的 URL",
UpdatingSubmoduleUrlStatus: "正在更新 URL", UpdatingSubmoduleUrlStatus: "正在更新 URL",
EditSubmoduleUrl: "更新子模組 URL", EditSubmoduleUrl: "更新子模組 URL",
InitializingSubmoduleStatus: "正在初始化子模組", InitializingSubmoduleStatus: "正在初始化子模組",
InitSubmodule: "初始化子模組", InitSubmoduleTooltip: "初始化子模組",
SubmoduleUpdate: "更新子模組", SubmoduleUpdateTooltip: "更新子模組",
UpdatingSubmoduleStatus: "正在更新子模組", UpdatingSubmoduleStatus: "正在更新子模組",
BulkInitSubmodules: "批量初始化子模組", BulkInitSubmodules: "批量初始化子模組",
BulkUpdateSubmodules: "批量更新子模組", BulkUpdateSubmodules: "批量更新子模組",

13
pkg/integration/tests/filter_and_search/filter_menu.go
View File

@ -23,19 +23,24 @@ var FilterMenu = NewIntegrationTest(NewIntegrationTestArgs{
Tap(func() { Tap(func() {
t.ExpectPopup().Menu(). t.ExpectPopup().Menu().
Title(Equals("Keybindings")). Title(Equals("Keybindings")).
Filter("Toggle staged"). Filter("Ignore").
Lines( Lines(
// menu has filtered down to the one item that matches the filter // menu has filtered down to the one item that matches the filter
Contains(`Toggle staged`).IsSelected(), Contains(`Ignore`).IsSelected(),
). ).
Confirm() Confirm()
t.ExpectPopup().Menu().
Title(Equals("Ignore or exclude file")).
Select(Contains("Add to .gitignore")).
Confirm()
}) })
t.Views().Files(). t.Views().Files().
IsFocused(). IsFocused().
Lines( Lines(
// file has been staged // file has been ignored
Contains(`A `).Contains(`myfile`).IsSelected(), Contains(`.gitignore`).IsSelected(),
). ).
// Upon opening the menu again, the filter should have been reset // Upon opening the menu again, the filter should have been reset
Press(keys.Universal.OptionMenu). Press(keys.Universal.OptionMenu).

4
pkg/integration/tests/filter_and_search/filter_menu_cancel_filter_with_escape.go
View File

@ -17,10 +17,10 @@ var FilterMenuCancelFilterWithEscape = NewIntegrationTest(NewIntegrationTestArgs
t.ExpectPopup().Menu(). t.ExpectPopup().Menu().
Title(Equals("Keybindings")). Title(Equals("Keybindings")).
Filter("Toggle staged"). Filter("Ignore").
Lines( Lines(
// menu has filtered down to the one item that matches the filter // menu has filtered down to the one item that matches the filter
Contains(`Toggle staged`).IsSelected(), Contains(`Ignore`).IsSelected(),
) )
// Escape should cancel the filter, not close the menu // Escape should cancel the filter, not close the menu

2
pkg/integration/tests/interactive_rebase/squash_fixups_above_first_commit.go
View File

@ -34,7 +34,7 @@ var SquashFixupsAboveFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{
Press(keys.Commits.SquashAboveCommits). Press(keys.Commits.SquashAboveCommits).
Tap(func() { Tap(func() {
t.ExpectPopup().Confirmation(). t.ExpectPopup().Confirmation().
Title(Equals("Squash all 'fixup!' commits above selected commit (autosquash)")). Title(Equals("Apply fixup commits")).
Content(Contains("Are you sure you want to squash all fixup! commits above")). Content(Contains("Are you sure you want to squash all fixup! commits above")).
Confirm() Confirm()
}). }).