mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-04-04 22:34:39 +02:00
Use sentence case everywhere
We have not been good at consistent casing so far. Now we use 'Sentence case' everywhere. EVERYWHERE. Also Removing 'Lc' prefix from i18n field names: the 'Lc' stood for lowercase but now that everything is in 'Sentence case' there's no need for the distinction. I've got a couple lower case things I've kept: namely, things that show up in parentheses.
This commit is contained in:
Jesse Duffield
parent
e5534d9781
commit
d772c9f1d4
@ -99,7 +99,9 @@ go install mvdan.cc/gofumpt@latest && gofumpt -l -w .
|
|||||||
|
|
||||||
## Internationalisation
|
## Internationalisation
|
||||||
|
|
||||||
Boy that's a hard word to spell. Anyway, lazygit is translated into several languages within the pkg/i18n package. If you need to render text to the user, you should add a new field to the TranslationSet struct in `pkg/i18n/english.go` and add the actual content within the `EnglishTranslationSet()` method in the same file. Then you can access via `gui.Tr.YourNewText` (or `app.Tr.YourNewText`, etc). Although it is appreciated if you translate the text into other languages, it's not expected of you (google translate will likely do a bad job anyway!).
|
Boy that's a hard word to spell. Anyway, lazygit is translated into several languages within the pkg/i18n package. If you need to render text to the user, you should add a new field to the TranslationSet struct in `pkg/i18n/english.go` and add the actual content within the `EnglishTranslationSet()` method in the same file. Then you can access via `gui.Tr.YourNewText` (or `self.c.Tr.YourNewText`, etc). Although it is appreciated if you translate the text into other languages, it's not expected of you (google translate will likely do a bad job anyway!).
|
||||||
|
|
||||||
|
Note, we use 'Sentence case' for everything (so no 'Title Case' or 'whatever-it's-called-when-there's-no-capital-letters-case')
|
||||||
|
|
||||||
## Debugging
|
## Debugging
|
||||||
|
|
||||||
|
|||||||
@ -4,317 +4,317 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
|
|
||||||
_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
||||||
|
|
||||||
## Global Keybindings
|
## Global keybindings
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-r></kbd>: switch to a recent repo
|
<kbd><c-r></kbd>: Switch to a recent repo
|
||||||
<kbd><pgup></kbd>: scroll up main panel (fn+up/shift+k)
|
<kbd><pgup></kbd>: Scroll up main panel (fn+up/shift+k)
|
||||||
<kbd><pgdown></kbd>: scroll down main panel (fn+down/shift+j)
|
<kbd><pgdown></kbd>: Scroll down main panel (fn+down/shift+j)
|
||||||
<kbd>@</kbd>: open command log menu
|
<kbd>@</kbd>: Open command log menu
|
||||||
<kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
|
<kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
|
||||||
<kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
|
<kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
|
||||||
<kbd>:</kbd>: execute custom command
|
<kbd>:</kbd>: Execute custom command
|
||||||
<kbd><c-p></kbd>: view custom patch options
|
<kbd><c-p></kbd>: View custom patch options
|
||||||
<kbd>m</kbd>: view merge/rebase options
|
<kbd>m</kbd>: View merge/rebase options
|
||||||
<kbd>R</kbd>: refresh
|
<kbd>R</kbd>: Refresh
|
||||||
<kbd>+</kbd>: next screen mode (normal/half/fullscreen)
|
<kbd>+</kbd>: Next screen mode (normal/half/fullscreen)
|
||||||
<kbd>_</kbd>: prev screen mode
|
<kbd>_</kbd>: Prev screen mode
|
||||||
<kbd>?</kbd>: open menu
|
<kbd>?</kbd>: Open menu
|
||||||
<kbd><c-s></kbd>: view filter-by-path options
|
<kbd><c-s></kbd>: View filter-by-path options
|
||||||
<kbd>W</kbd>: open diff menu
|
<kbd>W</kbd>: Open diff menu
|
||||||
<kbd><c-e></kbd>: open diff menu
|
<kbd><c-e></kbd>: Open diff menu
|
||||||
<kbd><c-w></kbd>: Toggle whether or not whitespace changes are shown in the diff view
|
<kbd><c-w></kbd>: Toggle whether or not whitespace changes are shown in the diff view
|
||||||
<kbd>z</kbd>: undo (via reflog) (experimental)
|
<kbd>z</kbd>: Undo
|
||||||
<kbd><c-z></kbd>: redo (via reflog) (experimental)
|
<kbd><c-z></kbd>: Redo
|
||||||
<kbd>P</kbd>: push
|
<kbd>P</kbd>: Push
|
||||||
<kbd>p</kbd>: pull
|
<kbd>p</kbd>: Pull
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## List Panel Navigation
|
## List panel navigation
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>,</kbd>: previous page
|
<kbd>,</kbd>: Previous page
|
||||||
<kbd>.</kbd>: next page
|
<kbd>.</kbd>: Next page
|
||||||
<kbd><</kbd>: scroll to top
|
<kbd><</kbd>: Scroll to top
|
||||||
<kbd>/</kbd>: start search
|
<kbd>/</kbd>: Start search
|
||||||
<kbd>></kbd>: scroll to bottom
|
<kbd>></kbd>: Scroll to bottom
|
||||||
<kbd>H</kbd>: scroll left
|
<kbd>H</kbd>: Scroll left
|
||||||
<kbd>L</kbd>: scroll right
|
<kbd>L</kbd>: Scroll right
|
||||||
<kbd>]</kbd>: next tab
|
<kbd>]</kbd>: Next tab
|
||||||
<kbd>[</kbd>: previous tab
|
<kbd>[</kbd>: Previous tab
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Commit Files
|
## Commit files
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy the committed file name to the clipboard
|
<kbd><c-o></kbd>: Copy the committed file name to the clipboard
|
||||||
<kbd>c</kbd>: checkout file
|
<kbd>c</kbd>: Checkout file
|
||||||
<kbd>d</kbd>: discard this commit's changes to this file
|
<kbd>d</kbd>: Discard this commit's changes to this file
|
||||||
<kbd>o</kbd>: open file
|
<kbd>o</kbd>: Open file
|
||||||
<kbd>e</kbd>: edit file
|
<kbd>e</kbd>: Edit file
|
||||||
<kbd><space></kbd>: toggle file included in patch
|
<kbd><space></kbd>: Toggle file included in patch
|
||||||
<kbd>a</kbd>: toggle all files included in patch
|
<kbd>a</kbd>: Toggle all files included in patch
|
||||||
<kbd><enter></kbd>: enter file to add selected lines to the patch (or toggle directory collapsed)
|
<kbd><enter></kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed)
|
||||||
<kbd>`</kbd>: toggle file tree view
|
<kbd>`</kbd>: Toggle file tree view
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Commit Summary
|
## Commit summary
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><enter></kbd>: confirm
|
<kbd><enter></kbd>: Confirm
|
||||||
<kbd><esc></kbd>: close
|
<kbd><esc></kbd>: Close
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Commits
|
## Commits
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy commit SHA to clipboard
|
<kbd><c-o></kbd>: Copy commit SHA to clipboard
|
||||||
<kbd><c-r></kbd>: reset cherry-picked (copied) commits selection
|
<kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection
|
||||||
<kbd>b</kbd>: view bisect options
|
<kbd>b</kbd>: View bisect options
|
||||||
<kbd>s</kbd>: squash down
|
<kbd>s</kbd>: Squash down
|
||||||
<kbd>f</kbd>: fixup commit
|
<kbd>f</kbd>: Fixup commit
|
||||||
<kbd>r</kbd>: reword commit
|
<kbd>r</kbd>: Reword commit
|
||||||
<kbd>R</kbd>: reword commit with editor
|
<kbd>R</kbd>: Reword commit with editor
|
||||||
<kbd>d</kbd>: delete commit
|
<kbd>d</kbd>: Delete commit
|
||||||
<kbd>e</kbd>: edit commit
|
<kbd>e</kbd>: Edit commit
|
||||||
<kbd>p</kbd>: pick commit (when mid-rebase)
|
<kbd>p</kbd>: Pick commit (when mid-rebase)
|
||||||
<kbd>F</kbd>: create fixup commit for this commit
|
<kbd>F</kbd>: Create fixup commit for this commit
|
||||||
<kbd>S</kbd>: squash all 'fixup!' commits above selected commit (autosquash)
|
<kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash)
|
||||||
<kbd><c-j></kbd>: move commit down one
|
<kbd><c-j></kbd>: Move commit down one
|
||||||
<kbd><c-k></kbd>: move commit up one
|
<kbd><c-k></kbd>: Move commit up one
|
||||||
<kbd>v</kbd>: paste commits (cherry-pick)
|
<kbd>v</kbd>: Paste commits (cherry-pick)
|
||||||
<kbd>A</kbd>: amend commit with staged changes
|
<kbd>A</kbd>: Amend commit with staged changes
|
||||||
<kbd>a</kbd>: reset commit author
|
<kbd>a</kbd>: Set/Reset commit author
|
||||||
<kbd>t</kbd>: revert commit
|
<kbd>t</kbd>: Revert commit
|
||||||
<kbd>T</kbd>: tag commit
|
<kbd>T</kbd>: Tag commit
|
||||||
<kbd><c-l></kbd>: open log menu
|
<kbd><c-l></kbd>: Open log menu
|
||||||
<kbd><space></kbd>: checkout commit
|
<kbd><space></kbd>: Checkout commit
|
||||||
<kbd>y</kbd>: copy commit attribute
|
<kbd>y</kbd>: Copy commit attribute
|
||||||
<kbd>o</kbd>: open commit in browser
|
<kbd>o</kbd>: Open commit in browser
|
||||||
<kbd>n</kbd>: create new branch off of commit
|
<kbd>n</kbd>: Create new branch off of commit
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd>c</kbd>: copy commit (cherry-pick)
|
<kbd>c</kbd>: Copy commit (cherry-pick)
|
||||||
<kbd>C</kbd>: copy commit range (cherry-pick)
|
<kbd>C</kbd>: Copy commit range (cherry-pick)
|
||||||
<kbd><enter></kbd>: view selected item's files
|
<kbd><enter></kbd>: View selected item's files
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Confirmation Panel
|
## Confirmation panel
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><enter></kbd>: confirm
|
<kbd><enter></kbd>: Confirm
|
||||||
<kbd><esc></kbd>: close/cancel
|
<kbd><esc></kbd>: Close/Cancel
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Files
|
## Files
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy the file name to the clipboard
|
<kbd><c-o></kbd>: Copy the file name to the clipboard
|
||||||
<kbd>d</kbd>: view 'discard changes' options
|
<kbd>d</kbd>: View 'discard changes' options
|
||||||
<kbd><space></kbd>: toggle staged
|
<kbd><space></kbd>: Toggle staged
|
||||||
<kbd><c-b></kbd>: Filter files (staged/unstaged)
|
<kbd><c-b></kbd>: Filter files (staged/unstaged)
|
||||||
<kbd>c</kbd>: commit changes
|
<kbd>c</kbd>: Commit changes
|
||||||
<kbd>w</kbd>: commit changes without pre-commit hook
|
<kbd>w</kbd>: Commit changes without pre-commit hook
|
||||||
<kbd>A</kbd>: amend last commit
|
<kbd>A</kbd>: Amend last commit
|
||||||
<kbd>C</kbd>: commit changes using git editor
|
<kbd>C</kbd>: Commit changes using git editor
|
||||||
<kbd>e</kbd>: edit file
|
<kbd>e</kbd>: Edit file
|
||||||
<kbd>o</kbd>: open file
|
<kbd>o</kbd>: Open file
|
||||||
<kbd>i</kbd>: ignore or exclude file
|
<kbd>i</kbd>: Ignore or exclude file
|
||||||
<kbd>r</kbd>: refresh files
|
<kbd>r</kbd>: Refresh files
|
||||||
<kbd>s</kbd>: stash all changes
|
<kbd>s</kbd>: Stash all changes
|
||||||
<kbd>S</kbd>: view stash options
|
<kbd>S</kbd>: View stash options
|
||||||
<kbd>a</kbd>: stage/unstage all
|
<kbd>a</kbd>: Stage/unstage all
|
||||||
<kbd><enter></kbd>: stage individual hunks/lines for file, or collapse/expand for directory
|
<kbd><enter></kbd>: Stage individual hunks/lines for file, or collapse/expand for directory
|
||||||
<kbd>g</kbd>: view upstream reset options
|
<kbd>g</kbd>: View upstream reset options
|
||||||
<kbd>D</kbd>: view reset options
|
<kbd>D</kbd>: View reset options
|
||||||
<kbd>`</kbd>: toggle file tree view
|
<kbd>`</kbd>: Toggle file tree view
|
||||||
<kbd>M</kbd>: open external merge tool (git mergetool)
|
<kbd>M</kbd>: Open external merge tool (git mergetool)
|
||||||
<kbd>f</kbd>: fetch
|
<kbd>f</kbd>: Fetch
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Local Branches
|
## Local branches
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy branch name to clipboard
|
<kbd><c-o></kbd>: Copy branch name to clipboard
|
||||||
<kbd>i</kbd>: show git-flow options
|
<kbd>i</kbd>: Show git-flow options
|
||||||
<kbd><space></kbd>: checkout
|
<kbd><space></kbd>: Checkout
|
||||||
<kbd>n</kbd>: new branch
|
<kbd>n</kbd>: New branch
|
||||||
<kbd>o</kbd>: create pull request
|
<kbd>o</kbd>: Create pull request
|
||||||
<kbd>O</kbd>: create pull request options
|
<kbd>O</kbd>: Create pull request options
|
||||||
<kbd><c-y></kbd>: copy pull request URL to clipboard
|
<kbd><c-y></kbd>: Copy pull request URL to clipboard
|
||||||
<kbd>c</kbd>: checkout by name
|
<kbd>c</kbd>: Checkout by name
|
||||||
<kbd>F</kbd>: force checkout
|
<kbd>F</kbd>: Force checkout
|
||||||
<kbd>d</kbd>: delete branch
|
<kbd>d</kbd>: Delete branch
|
||||||
<kbd>r</kbd>: rebase checked-out branch onto this branch
|
<kbd>r</kbd>: Rebase checked-out branch onto this branch
|
||||||
<kbd>M</kbd>: merge into currently checked out branch
|
<kbd>M</kbd>: Merge into currently checked out branch
|
||||||
<kbd>f</kbd>: fast-forward this branch from its upstream
|
<kbd>f</kbd>: Fast-forward this branch from its upstream
|
||||||
<kbd>T</kbd>: create tag
|
<kbd>T</kbd>: Create tag
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd>R</kbd>: rename branch
|
<kbd>R</kbd>: Rename branch
|
||||||
<kbd>u</kbd>: set/unset upstream
|
<kbd>u</kbd>: Set/Unset upstream
|
||||||
<kbd><enter></kbd>: view commits
|
<kbd><enter></kbd>: View commits
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Main Panel (Merging)
|
## Main panel (merging)
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>e</kbd>: edit file
|
<kbd>e</kbd>: Edit file
|
||||||
<kbd>o</kbd>: open file
|
<kbd>o</kbd>: Open file
|
||||||
<kbd><left></kbd>: select previous conflict
|
<kbd><left></kbd>: Select previous conflict
|
||||||
<kbd><right></kbd>: select next conflict
|
<kbd><right></kbd>: Select next conflict
|
||||||
<kbd><up></kbd>: select previous hunk
|
<kbd><up></kbd>: Select previous hunk
|
||||||
<kbd><down></kbd>: select next hunk
|
<kbd><down></kbd>: Select next hunk
|
||||||
<kbd>z</kbd>: undo
|
<kbd>z</kbd>: Undo
|
||||||
<kbd>M</kbd>: open external merge tool (git mergetool)
|
<kbd>M</kbd>: Open external merge tool (git mergetool)
|
||||||
<kbd><space></kbd>: pick hunk
|
<kbd><space></kbd>: Pick hunk
|
||||||
<kbd>b</kbd>: pick all hunks
|
<kbd>b</kbd>: Pick all hunks
|
||||||
<kbd><esc></kbd>: return to files panel
|
<kbd><esc></kbd>: Return to files panel
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Main Panel (Normal)
|
## Main panel (normal)
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>mouse wheel down</kbd>: scroll down (fn+up)
|
<kbd>mouse wheel down</kbd>: Scroll down (fn+up)
|
||||||
<kbd>mouse wheel up</kbd>: scroll up (fn+down)
|
<kbd>mouse wheel up</kbd>: Scroll up (fn+down)
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Main Panel (Patch Building)
|
## Main panel (patch building)
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><left></kbd>: select previous hunk
|
<kbd><left></kbd>: Select previous hunk
|
||||||
<kbd><right></kbd>: select next hunk
|
<kbd><right></kbd>: Select next hunk
|
||||||
<kbd>v</kbd>: toggle drag select
|
<kbd>v</kbd>: Toggle drag select
|
||||||
<kbd>V</kbd>: toggle drag select
|
<kbd>V</kbd>: Toggle drag select
|
||||||
<kbd>a</kbd>: toggle select hunk
|
<kbd>a</kbd>: Toggle select hunk
|
||||||
<kbd><c-o></kbd>: copy the selected text to the clipboard
|
<kbd><c-o></kbd>: Copy the selected text to the clipboard
|
||||||
<kbd>o</kbd>: open file
|
<kbd>o</kbd>: Open file
|
||||||
<kbd>e</kbd>: edit file
|
<kbd>e</kbd>: Edit file
|
||||||
<kbd><space></kbd>: add/remove line(s) to patch
|
<kbd><space></kbd>: Add/Remove line(s) to patch
|
||||||
<kbd><esc></kbd>: exit custom patch builder
|
<kbd><esc></kbd>: Exit custom patch builder
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Main Panel (Staging)
|
## Main panel (staging)
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><left></kbd>: select previous hunk
|
<kbd><left></kbd>: Select previous hunk
|
||||||
<kbd><right></kbd>: select next hunk
|
<kbd><right></kbd>: Select next hunk
|
||||||
<kbd>v</kbd>: toggle drag select
|
<kbd>v</kbd>: Toggle drag select
|
||||||
<kbd>V</kbd>: toggle drag select
|
<kbd>V</kbd>: Toggle drag select
|
||||||
<kbd>a</kbd>: toggle select hunk
|
<kbd>a</kbd>: Toggle select hunk
|
||||||
<kbd><c-o></kbd>: copy the selected text to the clipboard
|
<kbd><c-o></kbd>: Copy the selected text to the clipboard
|
||||||
<kbd>o</kbd>: open file
|
<kbd>o</kbd>: Open file
|
||||||
<kbd>e</kbd>: edit file
|
<kbd>e</kbd>: Edit file
|
||||||
<kbd><esc></kbd>: return to files panel
|
<kbd><esc></kbd>: Return to files panel
|
||||||
<kbd><tab></kbd>: switch to other panel (staged/unstaged changes)
|
<kbd><tab></kbd>: Switch to other panel (staged/unstaged changes)
|
||||||
<kbd><space></kbd>: toggle line staged / unstaged
|
<kbd><space></kbd>: Toggle line staged / unstaged
|
||||||
<kbd>d</kbd>: delete change (git reset)
|
<kbd>d</kbd>: Delete change (git reset)
|
||||||
<kbd>E</kbd>: edit hunk
|
<kbd>E</kbd>: Edit hunk
|
||||||
<kbd>c</kbd>: commit changes
|
<kbd>c</kbd>: Commit changes
|
||||||
<kbd>w</kbd>: commit changes without pre-commit hook
|
<kbd>w</kbd>: Commit changes without pre-commit hook
|
||||||
<kbd>C</kbd>: commit changes using git editor
|
<kbd>C</kbd>: Commit changes using git editor
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Menu
|
## Menu
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><enter></kbd>: execute
|
<kbd><enter></kbd>: Execute
|
||||||
<kbd><esc></kbd>: close
|
<kbd><esc></kbd>: Close
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Reflog
|
## Reflog
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy commit SHA to clipboard
|
<kbd><c-o></kbd>: Copy commit SHA to clipboard
|
||||||
<kbd><space></kbd>: checkout commit
|
<kbd><space></kbd>: Checkout commit
|
||||||
<kbd>y</kbd>: copy commit attribute
|
<kbd>y</kbd>: Copy commit attribute
|
||||||
<kbd>o</kbd>: open commit in browser
|
<kbd>o</kbd>: Open commit in browser
|
||||||
<kbd>n</kbd>: create new branch off of commit
|
<kbd>n</kbd>: Create new branch off of commit
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd>c</kbd>: copy commit (cherry-pick)
|
<kbd>c</kbd>: Copy commit (cherry-pick)
|
||||||
<kbd>C</kbd>: copy commit range (cherry-pick)
|
<kbd>C</kbd>: Copy commit range (cherry-pick)
|
||||||
<kbd><c-r></kbd>: reset cherry-picked (copied) commits selection
|
<kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection
|
||||||
<kbd><enter></kbd>: view commits
|
<kbd><enter></kbd>: View commits
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Remote Branches
|
## Remote branches
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy branch name to clipboard
|
<kbd><c-o></kbd>: Copy branch name to clipboard
|
||||||
<kbd><space></kbd>: checkout
|
<kbd><space></kbd>: Checkout
|
||||||
<kbd>n</kbd>: new branch
|
<kbd>n</kbd>: New branch
|
||||||
<kbd>M</kbd>: merge into currently checked out branch
|
<kbd>M</kbd>: Merge into currently checked out branch
|
||||||
<kbd>r</kbd>: rebase checked-out branch onto this branch
|
<kbd>r</kbd>: Rebase checked-out branch onto this branch
|
||||||
<kbd>d</kbd>: delete branch
|
<kbd>d</kbd>: Delete branch
|
||||||
<kbd>u</kbd>: set as upstream of checked-out branch
|
<kbd>u</kbd>: Set as upstream of checked-out branch
|
||||||
<kbd><esc></kbd>: Return to remotes list
|
<kbd><esc></kbd>: Return to remotes list
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd><enter></kbd>: view commits
|
<kbd><enter></kbd>: View commits
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Remotes
|
## Remotes
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>f</kbd>: fetch remote
|
<kbd>f</kbd>: Fetch remote
|
||||||
<kbd>n</kbd>: add new remote
|
<kbd>n</kbd>: Add new remote
|
||||||
<kbd>d</kbd>: remove remote
|
<kbd>d</kbd>: Remove remote
|
||||||
<kbd>e</kbd>: edit remote
|
<kbd>e</kbd>: Edit remote
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Stash
|
## Stash
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><space></kbd>: apply
|
<kbd><space></kbd>: Apply
|
||||||
<kbd>g</kbd>: pop
|
<kbd>g</kbd>: Pop
|
||||||
<kbd>d</kbd>: drop
|
<kbd>d</kbd>: Drop
|
||||||
<kbd>n</kbd>: new branch
|
<kbd>n</kbd>: New branch
|
||||||
<kbd>r</kbd>: rename stash
|
<kbd>r</kbd>: Rename stash
|
||||||
<kbd><enter></kbd>: view selected item's files
|
<kbd><enter></kbd>: View selected item's files
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Status
|
## Status
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>o</kbd>: open config file
|
<kbd>o</kbd>: Open config file
|
||||||
<kbd>e</kbd>: edit config file
|
<kbd>e</kbd>: Edit config file
|
||||||
<kbd>u</kbd>: check for update
|
<kbd>u</kbd>: Check for update
|
||||||
<kbd><enter></kbd>: switch to a recent repo
|
<kbd><enter></kbd>: Switch to a recent repo
|
||||||
<kbd>a</kbd>: show all branch logs
|
<kbd>a</kbd>: Show all branch logs
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Sub-commits
|
## Sub-commits
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy commit SHA to clipboard
|
<kbd><c-o></kbd>: Copy commit SHA to clipboard
|
||||||
<kbd><space></kbd>: checkout commit
|
<kbd><space></kbd>: Checkout commit
|
||||||
<kbd>y</kbd>: copy commit attribute
|
<kbd>y</kbd>: Copy commit attribute
|
||||||
<kbd>o</kbd>: open commit in browser
|
<kbd>o</kbd>: Open commit in browser
|
||||||
<kbd>n</kbd>: create new branch off of commit
|
<kbd>n</kbd>: Create new branch off of commit
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd>c</kbd>: copy commit (cherry-pick)
|
<kbd>c</kbd>: Copy commit (cherry-pick)
|
||||||
<kbd>C</kbd>: copy commit range (cherry-pick)
|
<kbd>C</kbd>: Copy commit range (cherry-pick)
|
||||||
<kbd><c-r></kbd>: reset cherry-picked (copied) commits selection
|
<kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection
|
||||||
<kbd><enter></kbd>: view selected item's files
|
<kbd><enter></kbd>: View selected item's files
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Submodules
|
## Submodules
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy submodule name to clipboard
|
<kbd><c-o></kbd>: Copy submodule name to clipboard
|
||||||
<kbd><enter></kbd>: enter submodule
|
<kbd><enter></kbd>: Enter submodule
|
||||||
<kbd>d</kbd>: remove submodule
|
<kbd>d</kbd>: Remove submodule
|
||||||
<kbd>u</kbd>: update submodule
|
<kbd>u</kbd>: Update submodule
|
||||||
<kbd>n</kbd>: add new submodule
|
<kbd>n</kbd>: Add new submodule
|
||||||
<kbd>e</kbd>: update submodule URL
|
<kbd>e</kbd>: Update submodule URL
|
||||||
<kbd>i</kbd>: initialize submodule
|
<kbd>i</kbd>: Initialize submodule
|
||||||
<kbd>b</kbd>: view bulk submodule options
|
<kbd>b</kbd>: View bulk submodule options
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Tags
|
## Tags
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><space></kbd>: checkout
|
<kbd><space></kbd>: Checkout
|
||||||
<kbd>d</kbd>: delete tag
|
<kbd>d</kbd>: Delete tag
|
||||||
<kbd>P</kbd>: push tag
|
<kbd>P</kbd>: Push tag
|
||||||
<kbd>n</kbd>: create tag
|
<kbd>n</kbd>: Create tag
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd><enter></kbd>: view commits
|
<kbd><enter></kbd>: View commits
|
||||||
</pre>
|
</pre>
|
||||||
|
|||||||
@ -14,20 +14,20 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
|
<kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
|
||||||
<kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
|
<kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
|
||||||
<kbd>:</kbd>: カスタムコマンドを実行
|
<kbd>:</kbd>: カスタムコマンドを実行
|
||||||
<kbd><c-p></kbd>: view custom patch options
|
<kbd><c-p></kbd>: View custom patch options
|
||||||
<kbd>m</kbd>: view merge/rebase options
|
<kbd>m</kbd>: View merge/rebase options
|
||||||
<kbd>R</kbd>: リフレッシュ
|
<kbd>R</kbd>: リフレッシュ
|
||||||
<kbd>+</kbd>: 次のスクリーンモード (normal/half/fullscreen)
|
<kbd>+</kbd>: 次のスクリーンモード (normal/half/fullscreen)
|
||||||
<kbd>_</kbd>: 前のスクリーンモード
|
<kbd>_</kbd>: 前のスクリーンモード
|
||||||
<kbd>?</kbd>: メニューを開く
|
<kbd>?</kbd>: メニューを開く
|
||||||
<kbd><c-s></kbd>: view filter-by-path options
|
<kbd><c-s></kbd>: View filter-by-path options
|
||||||
<kbd>W</kbd>: 差分メニューを開く
|
<kbd>W</kbd>: 差分メニューを開く
|
||||||
<kbd><c-e></kbd>: 差分メニューを開く
|
<kbd><c-e></kbd>: 差分メニューを開く
|
||||||
<kbd><c-w></kbd>: 空白文字の差分の表示有無を切り替え
|
<kbd><c-w></kbd>: 空白文字の差分の表示有無を切り替え
|
||||||
<kbd>z</kbd>: アンドゥ (via reflog) (experimental)
|
<kbd>z</kbd>: アンドゥ (via reflog) (experimental)
|
||||||
<kbd><c-z></kbd>: リドゥ (via reflog) (experimental)
|
<kbd><c-z></kbd>: リドゥ (via reflog) (experimental)
|
||||||
<kbd>P</kbd>: push
|
<kbd>P</kbd>: Push
|
||||||
<kbd>p</kbd>: pull
|
<kbd>p</kbd>: Pull
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## 一覧パネルの操作
|
## 一覧パネルの操作
|
||||||
@ -48,11 +48,11 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><space></kbd>: 適用
|
<kbd><space></kbd>: 適用
|
||||||
<kbd>g</kbd>: pop
|
<kbd>g</kbd>: Pop
|
||||||
<kbd>d</kbd>: drop
|
<kbd>d</kbd>: Drop
|
||||||
<kbd>n</kbd>: 新しいブランチを作成
|
<kbd>n</kbd>: 新しいブランチを作成
|
||||||
<kbd>r</kbd>: Stashを変更
|
<kbd>r</kbd>: Stashを変更
|
||||||
<kbd><enter></kbd>: view selected item's files
|
<kbd><enter></kbd>: View selected item's files
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Sub-commits
|
## Sub-commits
|
||||||
@ -63,33 +63,33 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>y</kbd>: コミットの情報をコピー
|
<kbd>y</kbd>: コミットの情報をコピー
|
||||||
<kbd>o</kbd>: ブラウザでコミットを開く
|
<kbd>o</kbd>: ブラウザでコミットを開く
|
||||||
<kbd>n</kbd>: コミットにブランチを作成
|
<kbd>n</kbd>: コミットにブランチを作成
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd>c</kbd>: コミットをコピー (cherry-pick)
|
<kbd>c</kbd>: コミットをコピー (cherry-pick)
|
||||||
<kbd>C</kbd>: コミットを範囲コピー (cherry-pick)
|
<kbd>C</kbd>: コミットを範囲コピー (cherry-pick)
|
||||||
<kbd><c-r></kbd>: reset cherry-picked (copied) commits selection
|
<kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection
|
||||||
<kbd><enter></kbd>: view selected item's files
|
<kbd><enter></kbd>: View selected item's files
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## コミット
|
## コミット
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: コミットのSHAをクリップボードにコピー
|
<kbd><c-o></kbd>: コミットのSHAをクリップボードにコピー
|
||||||
<kbd><c-r></kbd>: reset cherry-picked (copied) commits selection
|
<kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection
|
||||||
<kbd>b</kbd>: view bisect options
|
<kbd>b</kbd>: View bisect options
|
||||||
<kbd>s</kbd>: squash down
|
<kbd>s</kbd>: Squash down
|
||||||
<kbd>f</kbd>: fixup commit
|
<kbd>f</kbd>: Fixup commit
|
||||||
<kbd>r</kbd>: コミットメッセージを変更
|
<kbd>r</kbd>: コミットメッセージを変更
|
||||||
<kbd>R</kbd>: エディタでコミットメッセージを編集
|
<kbd>R</kbd>: エディタでコミットメッセージを編集
|
||||||
<kbd>d</kbd>: コミットを削除
|
<kbd>d</kbd>: コミットを削除
|
||||||
<kbd>e</kbd>: コミットを編集
|
<kbd>e</kbd>: コミットを編集
|
||||||
<kbd>p</kbd>: pick commit (when mid-rebase)
|
<kbd>p</kbd>: Pick commit (when mid-rebase)
|
||||||
<kbd>F</kbd>: このコミットに対するfixupコミットを作成
|
<kbd>F</kbd>: このコミットに対するfixupコミットを作成
|
||||||
<kbd>S</kbd>: squash all 'fixup!' commits above selected commit (autosquash)
|
<kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash)
|
||||||
<kbd><c-j></kbd>: コミットを1つ下に移動
|
<kbd><c-j></kbd>: コミットを1つ下に移動
|
||||||
<kbd><c-k></kbd>: コミットを1つ上に移動
|
<kbd><c-k></kbd>: コミットを1つ上に移動
|
||||||
<kbd>v</kbd>: コミットを貼り付け (cherry-pick)
|
<kbd>v</kbd>: コミットを貼り付け (cherry-pick)
|
||||||
<kbd>A</kbd>: ステージされた変更でamendコミット
|
<kbd>A</kbd>: ステージされた変更でamendコミット
|
||||||
<kbd>a</kbd>: reset commit author
|
<kbd>a</kbd>: Set/Reset commit author
|
||||||
<kbd>t</kbd>: コミットをrevert
|
<kbd>t</kbd>: コミットをrevert
|
||||||
<kbd>T</kbd>: タグを作成
|
<kbd>T</kbd>: タグを作成
|
||||||
<kbd><c-l></kbd>: ログメニューを開く
|
<kbd><c-l></kbd>: ログメニューを開く
|
||||||
@ -97,23 +97,23 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>y</kbd>: コミットの情報をコピー
|
<kbd>y</kbd>: コミットの情報をコピー
|
||||||
<kbd>o</kbd>: ブラウザでコミットを開く
|
<kbd>o</kbd>: ブラウザでコミットを開く
|
||||||
<kbd>n</kbd>: コミットにブランチを作成
|
<kbd>n</kbd>: コミットにブランチを作成
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd>c</kbd>: コミットをコピー (cherry-pick)
|
<kbd>c</kbd>: コミットをコピー (cherry-pick)
|
||||||
<kbd>C</kbd>: コミットを範囲コピー (cherry-pick)
|
<kbd>C</kbd>: コミットを範囲コピー (cherry-pick)
|
||||||
<kbd><enter></kbd>: view selected item's files
|
<kbd><enter></kbd>: View selected item's files
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## コミットファイル
|
## コミットファイル
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: コミットされたファイル名をクリップボードにコピー
|
<kbd><c-o></kbd>: コミットされたファイル名をクリップボードにコピー
|
||||||
<kbd>c</kbd>: checkout file
|
<kbd>c</kbd>: Checkout file
|
||||||
<kbd>d</kbd>: discard this commit's changes to this file
|
<kbd>d</kbd>: Discard this commit's changes to this file
|
||||||
<kbd>o</kbd>: ファイルを開く
|
<kbd>o</kbd>: ファイルを開く
|
||||||
<kbd>e</kbd>: ファイルを編集
|
<kbd>e</kbd>: ファイルを編集
|
||||||
<kbd><space></kbd>: toggle file included in patch
|
<kbd><space></kbd>: Toggle file included in patch
|
||||||
<kbd>a</kbd>: toggle all files included in patch
|
<kbd>a</kbd>: Toggle all files included in patch
|
||||||
<kbd><enter></kbd>: enter file to add selected lines to the patch (or toggle directory collapsed)
|
<kbd><enter></kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed)
|
||||||
<kbd>`</kbd>: ファイルツリーの表示を切り替え
|
<kbd>`</kbd>: ファイルツリーの表示を切り替え
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
@ -134,7 +134,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>n</kbd>: サブモジュールを新規追加
|
<kbd>n</kbd>: サブモジュールを新規追加
|
||||||
<kbd>e</kbd>: サブモジュールのURLを更新
|
<kbd>e</kbd>: サブモジュールのURLを更新
|
||||||
<kbd>i</kbd>: サブモジュールを初期化
|
<kbd>i</kbd>: サブモジュールを初期化
|
||||||
<kbd>b</kbd>: view bulk submodule options
|
<kbd>b</kbd>: View bulk submodule options
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## ステータス
|
## ステータス
|
||||||
@ -154,7 +154,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>d</kbd>: タグを削除
|
<kbd>d</kbd>: タグを削除
|
||||||
<kbd>P</kbd>: タグをpush
|
<kbd>P</kbd>: タグをpush
|
||||||
<kbd>n</kbd>: タグを作成
|
<kbd>n</kbd>: タグを作成
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd><enter></kbd>: コミットを閲覧
|
<kbd><enter></kbd>: コミットを閲覧
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
@ -162,7 +162,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: ファイル名をクリップボードにコピー
|
<kbd><c-o></kbd>: ファイル名をクリップボードにコピー
|
||||||
<kbd>d</kbd>: view 'discard changes' options
|
<kbd>d</kbd>: View 'discard changes' options
|
||||||
<kbd><space></kbd>: ステージ/アンステージ
|
<kbd><space></kbd>: ステージ/アンステージ
|
||||||
<kbd><c-b></kbd>: ファイルをフィルタ (ステージ/アンステージ)
|
<kbd><c-b></kbd>: ファイルをフィルタ (ステージ/アンステージ)
|
||||||
<kbd>c</kbd>: 変更をコミット
|
<kbd>c</kbd>: 変更をコミット
|
||||||
@ -174,36 +174,36 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>i</kbd>: ファイルをignore
|
<kbd>i</kbd>: ファイルをignore
|
||||||
<kbd>r</kbd>: ファイルをリフレッシュ
|
<kbd>r</kbd>: ファイルをリフレッシュ
|
||||||
<kbd>s</kbd>: 変更をstash
|
<kbd>s</kbd>: 変更をstash
|
||||||
<kbd>S</kbd>: view stash options
|
<kbd>S</kbd>: View stash options
|
||||||
<kbd>a</kbd>: すべての変更をステージ/アンステージ
|
<kbd>a</kbd>: すべての変更をステージ/アンステージ
|
||||||
<kbd><enter></kbd>: stage individual hunks/lines for file, or collapse/expand for directory
|
<kbd><enter></kbd>: Stage individual hunks/lines for file, or collapse/expand for directory
|
||||||
<kbd>g</kbd>: view upstream reset options
|
<kbd>g</kbd>: View upstream reset options
|
||||||
<kbd>D</kbd>: view reset options
|
<kbd>D</kbd>: View reset options
|
||||||
<kbd>`</kbd>: ファイルツリーの表示を切り替え
|
<kbd>`</kbd>: ファイルツリーの表示を切り替え
|
||||||
<kbd>M</kbd>: git mergetoolを開く
|
<kbd>M</kbd>: Git mergetoolを開く
|
||||||
<kbd>f</kbd>: fetch
|
<kbd>f</kbd>: Fetch
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## ブランチ
|
## ブランチ
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: ブランチ名をクリップボードにコピー
|
<kbd><c-o></kbd>: ブランチ名をクリップボードにコピー
|
||||||
<kbd>i</kbd>: show git-flow options
|
<kbd>i</kbd>: Show git-flow options
|
||||||
<kbd><space></kbd>: チェックアウト
|
<kbd><space></kbd>: チェックアウト
|
||||||
<kbd>n</kbd>: 新しいブランチを作成
|
<kbd>n</kbd>: 新しいブランチを作成
|
||||||
<kbd>o</kbd>: Pull Requestを作成
|
<kbd>o</kbd>: Pull Requestを作成
|
||||||
<kbd>O</kbd>: create pull request options
|
<kbd>O</kbd>: Create pull request options
|
||||||
<kbd><c-y></kbd>: Pull RequestのURLをクリップボードにコピー
|
<kbd><c-y></kbd>: Pull RequestのURLをクリップボードにコピー
|
||||||
<kbd>c</kbd>: checkout by name
|
<kbd>c</kbd>: Checkout by name
|
||||||
<kbd>F</kbd>: force checkout
|
<kbd>F</kbd>: Force checkout
|
||||||
<kbd>d</kbd>: ブランチを削除
|
<kbd>d</kbd>: ブランチを削除
|
||||||
<kbd>r</kbd>: rebase checked-out branch onto this branch
|
<kbd>r</kbd>: Rebase checked-out branch onto this branch
|
||||||
<kbd>M</kbd>: 現在のブランチにマージ
|
<kbd>M</kbd>: 現在のブランチにマージ
|
||||||
<kbd>f</kbd>: fast-forward this branch from its upstream
|
<kbd>f</kbd>: Fast-forward this branch from its upstream
|
||||||
<kbd>T</kbd>: タグを作成
|
<kbd>T</kbd>: タグを作成
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd>R</kbd>: ブランチ名を変更
|
<kbd>R</kbd>: ブランチ名を変更
|
||||||
<kbd>u</kbd>: set/unset upstream
|
<kbd>u</kbd>: Set/Unset upstream
|
||||||
<kbd><enter></kbd>: コミットを閲覧
|
<kbd><enter></kbd>: コミットを閲覧
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
@ -217,9 +217,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd><up></kbd>: 前のhunkを選択
|
<kbd><up></kbd>: 前のhunkを選択
|
||||||
<kbd><down></kbd>: 次のhunkを選択
|
<kbd><down></kbd>: 次のhunkを選択
|
||||||
<kbd>z</kbd>: アンドゥ
|
<kbd>z</kbd>: アンドゥ
|
||||||
<kbd>M</kbd>: git mergetoolを開く
|
<kbd>M</kbd>: Git mergetoolを開く
|
||||||
<kbd><space></kbd>: pick hunk
|
<kbd><space></kbd>: Pick hunk
|
||||||
<kbd>b</kbd>: pick all hunks
|
<kbd>b</kbd>: Pick all hunks
|
||||||
<kbd><esc></kbd>: ファイル一覧に戻る
|
<kbd><esc></kbd>: ファイル一覧に戻る
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
@ -237,12 +237,12 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd><right></kbd>: 次のhunkを選択
|
<kbd><right></kbd>: 次のhunkを選択
|
||||||
<kbd>v</kbd>: 範囲選択を切り替え
|
<kbd>v</kbd>: 範囲選択を切り替え
|
||||||
<kbd>V</kbd>: 範囲選択を切り替え
|
<kbd>V</kbd>: 範囲選択を切り替え
|
||||||
<kbd>a</kbd>: hunk選択を切り替え
|
<kbd>a</kbd>: Hunk選択を切り替え
|
||||||
<kbd><c-o></kbd>: 選択されたテキストをクリップボードにコピー
|
<kbd><c-o></kbd>: 選択されたテキストをクリップボードにコピー
|
||||||
<kbd>o</kbd>: ファイルを開く
|
<kbd>o</kbd>: ファイルを開く
|
||||||
<kbd>e</kbd>: ファイルを編集
|
<kbd>e</kbd>: ファイルを編集
|
||||||
<kbd><space></kbd>: 行をパッチに追加/削除
|
<kbd><space></kbd>: 行をパッチに追加/削除
|
||||||
<kbd><esc></kbd>: exit custom patch builder
|
<kbd><esc></kbd>: Exit custom patch builder
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## メインパネル (Staging)
|
## メインパネル (Staging)
|
||||||
@ -252,7 +252,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd><right></kbd>: 次のhunkを選択
|
<kbd><right></kbd>: 次のhunkを選択
|
||||||
<kbd>v</kbd>: 範囲選択を切り替え
|
<kbd>v</kbd>: 範囲選択を切り替え
|
||||||
<kbd>V</kbd>: 範囲選択を切り替え
|
<kbd>V</kbd>: 範囲選択を切り替え
|
||||||
<kbd>a</kbd>: hunk選択を切り替え
|
<kbd>a</kbd>: Hunk選択を切り替え
|
||||||
<kbd><c-o></kbd>: 選択されたテキストをクリップボードにコピー
|
<kbd><c-o></kbd>: 選択されたテキストをクリップボードにコピー
|
||||||
<kbd>o</kbd>: ファイルを開く
|
<kbd>o</kbd>: ファイルを開く
|
||||||
<kbd>e</kbd>: ファイルを編集
|
<kbd>e</kbd>: ファイルを編集
|
||||||
@ -260,7 +260,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd><tab></kbd>: パネルを切り替え
|
<kbd><tab></kbd>: パネルを切り替え
|
||||||
<kbd><space></kbd>: 選択行をステージ/アンステージ
|
<kbd><space></kbd>: 選択行をステージ/アンステージ
|
||||||
<kbd>d</kbd>: 変更を削除 (git reset)
|
<kbd>d</kbd>: 変更を削除 (git reset)
|
||||||
<kbd>E</kbd>: edit hunk
|
<kbd>E</kbd>: Edit hunk
|
||||||
<kbd>c</kbd>: 変更をコミット
|
<kbd>c</kbd>: 変更をコミット
|
||||||
<kbd>w</kbd>: pre-commitフックを実行せずに変更をコミット
|
<kbd>w</kbd>: pre-commitフックを実行せずに変更をコミット
|
||||||
<kbd>C</kbd>: gitエディタを使用して変更をコミット
|
<kbd>C</kbd>: gitエディタを使用して変更をコミット
|
||||||
@ -289,11 +289,11 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd><space></kbd>: チェックアウト
|
<kbd><space></kbd>: チェックアウト
|
||||||
<kbd>n</kbd>: 新しいブランチを作成
|
<kbd>n</kbd>: 新しいブランチを作成
|
||||||
<kbd>M</kbd>: 現在のブランチにマージ
|
<kbd>M</kbd>: 現在のブランチにマージ
|
||||||
<kbd>r</kbd>: rebase checked-out branch onto this branch
|
<kbd>r</kbd>: Rebase checked-out branch onto this branch
|
||||||
<kbd>d</kbd>: ブランチを削除
|
<kbd>d</kbd>: ブランチを削除
|
||||||
<kbd>u</kbd>: set as upstream of checked-out branch
|
<kbd>u</kbd>: Set as upstream of checked-out branch
|
||||||
<kbd><esc></kbd>: リモート一覧に戻る
|
<kbd><esc></kbd>: リモート一覧に戻る
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd><enter></kbd>: コミットを閲覧
|
<kbd><enter></kbd>: コミットを閲覧
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
@ -305,10 +305,10 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>y</kbd>: コミットの情報をコピー
|
<kbd>y</kbd>: コミットの情報をコピー
|
||||||
<kbd>o</kbd>: ブラウザでコミットを開く
|
<kbd>o</kbd>: ブラウザでコミットを開く
|
||||||
<kbd>n</kbd>: コミットにブランチを作成
|
<kbd>n</kbd>: コミットにブランチを作成
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd>c</kbd>: コミットをコピー (cherry-pick)
|
<kbd>c</kbd>: コミットをコピー (cherry-pick)
|
||||||
<kbd>C</kbd>: コミットを範囲コピー (cherry-pick)
|
<kbd>C</kbd>: コミットを範囲コピー (cherry-pick)
|
||||||
<kbd><c-r></kbd>: reset cherry-picked (copied) commits selection
|
<kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection
|
||||||
<kbd><enter></kbd>: コミットを閲覧
|
<kbd><enter></kbd>: コミットを閲覧
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
|
|||||||
@ -11,16 +11,16 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd><pgup></kbd>: 메인 패널을 위로 스크롤 (fn+up/shift+k)
|
<kbd><pgup></kbd>: 메인 패널을 위로 스크롤 (fn+up/shift+k)
|
||||||
<kbd><pgdown></kbd>: 메인 패널을 아래로로 스크롤 (fn+down/shift+j)
|
<kbd><pgdown></kbd>: 메인 패널을 아래로로 스크롤 (fn+down/shift+j)
|
||||||
<kbd>@</kbd>: 명령어 로그 메뉴 열기
|
<kbd>@</kbd>: 명령어 로그 메뉴 열기
|
||||||
<kbd>}</kbd>: diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기
|
<kbd>}</kbd>: Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기
|
||||||
<kbd>{</kbd>: diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기
|
<kbd>{</kbd>: Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기
|
||||||
<kbd>:</kbd>: execute custom command
|
<kbd>:</kbd>: Execute custom command
|
||||||
<kbd><c-p></kbd>: 커스텀 Patch 옵션 보기
|
<kbd><c-p></kbd>: 커스텀 Patch 옵션 보기
|
||||||
<kbd>m</kbd>: view merge/rebase options
|
<kbd>m</kbd>: View merge/rebase options
|
||||||
<kbd>R</kbd>: 새로고침
|
<kbd>R</kbd>: 새로고침
|
||||||
<kbd>+</kbd>: 다음 스크린 모드 (normal/half/fullscreen)
|
<kbd>+</kbd>: 다음 스크린 모드 (normal/half/fullscreen)
|
||||||
<kbd>_</kbd>: 이전 스크린 모드
|
<kbd>_</kbd>: 이전 스크린 모드
|
||||||
<kbd>?</kbd>: 매뉴 열기
|
<kbd>?</kbd>: 매뉴 열기
|
||||||
<kbd><c-s></kbd>: view filter-by-path options
|
<kbd><c-s></kbd>: View filter-by-path options
|
||||||
<kbd>W</kbd>: Diff 메뉴 열기
|
<kbd>W</kbd>: Diff 메뉴 열기
|
||||||
<kbd><c-e></kbd>: Diff 메뉴 열기
|
<kbd><c-e></kbd>: Diff 메뉴 열기
|
||||||
<kbd><c-w></kbd>: 공백문자를 Diff 뷰에서 표시 여부 전환
|
<kbd><c-w></kbd>: 공백문자를 Diff 뷰에서 표시 여부 전환
|
||||||
@ -30,7 +30,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>p</kbd>: 업데이트
|
<kbd>p</kbd>: 업데이트
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## List Panel Navigation
|
## List panel navigation
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>,</kbd>: 이전 페이지
|
<kbd>,</kbd>: 이전 페이지
|
||||||
@ -52,10 +52,10 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>y</kbd>: 커밋 attribute 복사
|
<kbd>y</kbd>: 커밋 attribute 복사
|
||||||
<kbd>o</kbd>: 브라우저에서 커밋 열기
|
<kbd>o</kbd>: 브라우저에서 커밋 열기
|
||||||
<kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다.
|
<kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다.
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd>c</kbd>: 커밋을 복사 (cherry-pick)
|
<kbd>c</kbd>: 커밋을 복사 (cherry-pick)
|
||||||
<kbd>C</kbd>: 커밋을 범위로 복사 (cherry-pick)
|
<kbd>C</kbd>: 커밋을 범위로 복사 (cherry-pick)
|
||||||
<kbd><c-r></kbd>: reset cherry-picked (copied) commits selection
|
<kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection
|
||||||
<kbd><enter></kbd>: 커밋 보기
|
<kbd><enter></kbd>: 커밋 보기
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
@ -63,11 +63,11 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><space></kbd>: 적용
|
<kbd><space></kbd>: 적용
|
||||||
<kbd>g</kbd>: pop
|
<kbd>g</kbd>: Pop
|
||||||
<kbd>d</kbd>: drop
|
<kbd>d</kbd>: Drop
|
||||||
<kbd>n</kbd>: 새 브랜치 생성
|
<kbd>n</kbd>: 새 브랜치 생성
|
||||||
<kbd>r</kbd>: rename stash
|
<kbd>r</kbd>: Rename stash
|
||||||
<kbd><enter></kbd>: view selected item's files
|
<kbd><enter></kbd>: View selected item's files
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Sub-commits
|
## Sub-commits
|
||||||
@ -78,11 +78,11 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>y</kbd>: 커밋 attribute 복사
|
<kbd>y</kbd>: 커밋 attribute 복사
|
||||||
<kbd>o</kbd>: 브라우저에서 커밋 열기
|
<kbd>o</kbd>: 브라우저에서 커밋 열기
|
||||||
<kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다.
|
<kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다.
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd>c</kbd>: 커밋을 복사 (cherry-pick)
|
<kbd>c</kbd>: 커밋을 복사 (cherry-pick)
|
||||||
<kbd>C</kbd>: 커밋을 범위로 복사 (cherry-pick)
|
<kbd>C</kbd>: 커밋을 범위로 복사 (cherry-pick)
|
||||||
<kbd><c-r></kbd>: reset cherry-picked (copied) commits selection
|
<kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection
|
||||||
<kbd><enter></kbd>: view selected item's files
|
<kbd><enter></kbd>: View selected item's files
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## 메뉴
|
## 메뉴
|
||||||
@ -102,9 +102,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd><up></kbd>: 이전 hunk를 선택
|
<kbd><up></kbd>: 이전 hunk를 선택
|
||||||
<kbd><down></kbd>: 다음 hunk를 선택
|
<kbd><down></kbd>: 다음 hunk를 선택
|
||||||
<kbd>z</kbd>: 되돌리기
|
<kbd>z</kbd>: 되돌리기
|
||||||
<kbd>M</kbd>: git mergetool를 열기
|
<kbd>M</kbd>: Git mergetool를 열기
|
||||||
<kbd><space></kbd>: pick hunk
|
<kbd><space></kbd>: Pick hunk
|
||||||
<kbd>b</kbd>: pick all hunks
|
<kbd>b</kbd>: Pick all hunks
|
||||||
<kbd><esc></kbd>: 파일 목록으로 돌아가기
|
<kbd><esc></kbd>: 파일 목록으로 돌아가기
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
@ -122,12 +122,12 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd><right></kbd>: 다음 hunk를 선택
|
<kbd><right></kbd>: 다음 hunk를 선택
|
||||||
<kbd>v</kbd>: 드래그 선택 전환
|
<kbd>v</kbd>: 드래그 선택 전환
|
||||||
<kbd>V</kbd>: 드래그 선택 전환
|
<kbd>V</kbd>: 드래그 선택 전환
|
||||||
<kbd>a</kbd>: toggle select hunk
|
<kbd>a</kbd>: Toggle select hunk
|
||||||
<kbd><c-o></kbd>: 선택한 텍스트를 클립보드에 복사
|
<kbd><c-o></kbd>: 선택한 텍스트를 클립보드에 복사
|
||||||
<kbd>o</kbd>: 파일 닫기
|
<kbd>o</kbd>: 파일 닫기
|
||||||
<kbd>e</kbd>: 파일 편집
|
<kbd>e</kbd>: 파일 편집
|
||||||
<kbd><space></kbd>: line(s)을 패치에 추가/삭제
|
<kbd><space></kbd>: Line(s)을 패치에 추가/삭제
|
||||||
<kbd><esc></kbd>: exit custom patch builder
|
<kbd><esc></kbd>: Exit custom patch builder
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## 메인 패널 (Staging)
|
## 메인 패널 (Staging)
|
||||||
@ -137,7 +137,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd><right></kbd>: 다음 hunk를 선택
|
<kbd><right></kbd>: 다음 hunk를 선택
|
||||||
<kbd>v</kbd>: 드래그 선택 전환
|
<kbd>v</kbd>: 드래그 선택 전환
|
||||||
<kbd>V</kbd>: 드래그 선택 전환
|
<kbd>V</kbd>: 드래그 선택 전환
|
||||||
<kbd>a</kbd>: toggle select hunk
|
<kbd>a</kbd>: Toggle select hunk
|
||||||
<kbd><c-o></kbd>: 선택한 텍스트를 클립보드에 복사
|
<kbd><c-o></kbd>: 선택한 텍스트를 클립보드에 복사
|
||||||
<kbd>o</kbd>: 파일 닫기
|
<kbd>o</kbd>: 파일 닫기
|
||||||
<kbd>e</kbd>: 파일 편집
|
<kbd>e</kbd>: 파일 편집
|
||||||
@ -145,9 +145,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd><tab></kbd>: 패널 전환
|
<kbd><tab></kbd>: 패널 전환
|
||||||
<kbd><space></kbd>: 선택한 행을 staged / unstaged
|
<kbd><space></kbd>: 선택한 행을 staged / unstaged
|
||||||
<kbd>d</kbd>: 변경을 삭제 (git reset)
|
<kbd>d</kbd>: 변경을 삭제 (git reset)
|
||||||
<kbd>E</kbd>: edit hunk
|
<kbd>E</kbd>: Edit hunk
|
||||||
<kbd>c</kbd>: 커밋 변경내용
|
<kbd>c</kbd>: 커밋 변경내용
|
||||||
<kbd>w</kbd>: commit changes without pre-commit hook
|
<kbd>w</kbd>: Commit changes without pre-commit hook
|
||||||
<kbd>C</kbd>: Git 편집기를 사용하여 변경 내용을 커밋합니다.
|
<kbd>C</kbd>: Git 편집기를 사용하여 변경 내용을 커밋합니다.
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
@ -155,7 +155,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: 브랜치명을 클립보드에 복사
|
<kbd><c-o></kbd>: 브랜치명을 클립보드에 복사
|
||||||
<kbd>i</kbd>: git-flow 옵션 보기
|
<kbd>i</kbd>: Git-flow 옵션 보기
|
||||||
<kbd><space></kbd>: 체크아웃
|
<kbd><space></kbd>: 체크아웃
|
||||||
<kbd>n</kbd>: 새 브랜치 생성
|
<kbd>n</kbd>: 새 브랜치 생성
|
||||||
<kbd>o</kbd>: 풀 리퀘스트 생성
|
<kbd>o</kbd>: 풀 리퀘스트 생성
|
||||||
@ -166,11 +166,11 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>d</kbd>: 브랜치 삭제
|
<kbd>d</kbd>: 브랜치 삭제
|
||||||
<kbd>r</kbd>: 체크아웃된 브랜치를 이 브랜치에 리베이스
|
<kbd>r</kbd>: 체크아웃된 브랜치를 이 브랜치에 리베이스
|
||||||
<kbd>M</kbd>: 현재 브랜치에 병합
|
<kbd>M</kbd>: 현재 브랜치에 병합
|
||||||
<kbd>f</kbd>: fast-forward this branch from its upstream
|
<kbd>f</kbd>: Fast-forward this branch from its upstream
|
||||||
<kbd>T</kbd>: 태그를 생성
|
<kbd>T</kbd>: 태그를 생성
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd>R</kbd>: 브랜치 이름 변경
|
<kbd>R</kbd>: 브랜치 이름 변경
|
||||||
<kbd>u</kbd>: set/unset upstream
|
<kbd>u</kbd>: Set/Unset upstream
|
||||||
<kbd><enter></kbd>: 커밋 보기
|
<kbd><enter></kbd>: 커밋 보기
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
@ -194,7 +194,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>n</kbd>: 새로운 서브모듈 추가
|
<kbd>n</kbd>: 새로운 서브모듈 추가
|
||||||
<kbd>e</kbd>: 서브모듈의 URL을 수정
|
<kbd>e</kbd>: 서브모듈의 URL을 수정
|
||||||
<kbd>i</kbd>: 서브모듈 초기화
|
<kbd>i</kbd>: 서브모듈 초기화
|
||||||
<kbd>b</kbd>: view bulk submodule options
|
<kbd>b</kbd>: View bulk submodule options
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## 원격
|
## 원격
|
||||||
@ -215,9 +215,9 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>M</kbd>: 현재 브랜치에 병합
|
<kbd>M</kbd>: 현재 브랜치에 병합
|
||||||
<kbd>r</kbd>: 체크아웃된 브랜치를 이 브랜치에 리베이스
|
<kbd>r</kbd>: 체크아웃된 브랜치를 이 브랜치에 리베이스
|
||||||
<kbd>d</kbd>: 브랜치 삭제
|
<kbd>d</kbd>: 브랜치 삭제
|
||||||
<kbd>u</kbd>: set as upstream of checked-out branch
|
<kbd>u</kbd>: Set as upstream of checked-out branch
|
||||||
<kbd><esc></kbd>: 원격목록으로 돌아가기
|
<kbd><esc></kbd>: 원격목록으로 돌아가기
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd><enter></kbd>: 커밋 보기
|
<kbd><enter></kbd>: 커밋 보기
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
@ -225,46 +225,46 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: 커밋 SHA를 클립보드에 복사
|
<kbd><c-o></kbd>: 커밋 SHA를 클립보드에 복사
|
||||||
<kbd><c-r></kbd>: reset cherry-picked (copied) commits selection
|
<kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection
|
||||||
<kbd>b</kbd>: bisect 옵션 보기
|
<kbd>b</kbd>: Bisect 옵션 보기
|
||||||
<kbd>s</kbd>: squash down
|
<kbd>s</kbd>: Squash down
|
||||||
<kbd>f</kbd>: fixup commit
|
<kbd>f</kbd>: Fixup commit
|
||||||
<kbd>r</kbd>: 커밋메시지 변경
|
<kbd>r</kbd>: 커밋메시지 변경
|
||||||
<kbd>R</kbd>: 에디터에서 커밋메시지 수정
|
<kbd>R</kbd>: 에디터에서 커밋메시지 수정
|
||||||
<kbd>d</kbd>: 커밋 삭제
|
<kbd>d</kbd>: 커밋 삭제
|
||||||
<kbd>e</kbd>: 커밋을 편집
|
<kbd>e</kbd>: 커밋을 편집
|
||||||
<kbd>p</kbd>: pick commit (when mid-rebase)
|
<kbd>p</kbd>: Pick commit (when mid-rebase)
|
||||||
<kbd>F</kbd>: create fixup commit for this commit
|
<kbd>F</kbd>: Create fixup commit for this commit
|
||||||
<kbd>S</kbd>: squash all 'fixup!' commits above selected commit (autosquash)
|
<kbd>S</kbd>: Squash all 'fixup!' commits above selected commit (autosquash)
|
||||||
<kbd><c-j></kbd>: 커밋을 1개 아래로 이동
|
<kbd><c-j></kbd>: 커밋을 1개 아래로 이동
|
||||||
<kbd><c-k></kbd>: 커밋을 1개 위로 이동
|
<kbd><c-k></kbd>: 커밋을 1개 위로 이동
|
||||||
<kbd>v</kbd>: 커밋을 붙여넣기 (cherry-pick)
|
<kbd>v</kbd>: 커밋을 붙여넣기 (cherry-pick)
|
||||||
<kbd>A</kbd>: amend commit with staged changes
|
<kbd>A</kbd>: Amend commit with staged changes
|
||||||
<kbd>a</kbd>: reset commit author
|
<kbd>a</kbd>: Set/Reset commit author
|
||||||
<kbd>t</kbd>: 커밋 되돌리기
|
<kbd>t</kbd>: 커밋 되돌리기
|
||||||
<kbd>T</kbd>: tag commit
|
<kbd>T</kbd>: Tag commit
|
||||||
<kbd><c-l></kbd>: 로그 메뉴 열기
|
<kbd><c-l></kbd>: 로그 메뉴 열기
|
||||||
<kbd><space></kbd>: 커밋을 체크아웃
|
<kbd><space></kbd>: 커밋을 체크아웃
|
||||||
<kbd>y</kbd>: 커밋 attribute 복사
|
<kbd>y</kbd>: 커밋 attribute 복사
|
||||||
<kbd>o</kbd>: 브라우저에서 커밋 열기
|
<kbd>o</kbd>: 브라우저에서 커밋 열기
|
||||||
<kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다.
|
<kbd>n</kbd>: 커밋에서 새 브랜치를 만듭니다.
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd>c</kbd>: 커밋을 복사 (cherry-pick)
|
<kbd>c</kbd>: 커밋을 복사 (cherry-pick)
|
||||||
<kbd>C</kbd>: 커밋을 범위로 복사 (cherry-pick)
|
<kbd>C</kbd>: 커밋을 범위로 복사 (cherry-pick)
|
||||||
<kbd><enter></kbd>: view selected item's files
|
<kbd><enter></kbd>: View selected item's files
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## 커밋 파일
|
## 커밋 파일
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: 커밋한 파일명을 클립보드에 복사
|
<kbd><c-o></kbd>: 커밋한 파일명을 클립보드에 복사
|
||||||
<kbd>c</kbd>: checkout file
|
<kbd>c</kbd>: Checkout file
|
||||||
<kbd>d</kbd>: discard this commit's changes to this file
|
<kbd>d</kbd>: Discard this commit's changes to this file
|
||||||
<kbd>o</kbd>: 파일 닫기
|
<kbd>o</kbd>: 파일 닫기
|
||||||
<kbd>e</kbd>: 파일 편집
|
<kbd>e</kbd>: 파일 편집
|
||||||
<kbd><space></kbd>: toggle file included in patch
|
<kbd><space></kbd>: Toggle file included in patch
|
||||||
<kbd>a</kbd>: toggle all files included in patch
|
<kbd>a</kbd>: Toggle all files included in patch
|
||||||
<kbd><enter></kbd>: enter file to add selected lines to the patch (or toggle directory collapsed)
|
<kbd><enter></kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed)
|
||||||
<kbd>`</kbd>: 파일 트리뷰로 전환
|
<kbd>`</kbd>: 파일 트리뷰로 전환
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
@ -282,7 +282,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>d</kbd>: 태그 삭제
|
<kbd>d</kbd>: 태그 삭제
|
||||||
<kbd>P</kbd>: 태그를 push
|
<kbd>P</kbd>: 태그를 push
|
||||||
<kbd>n</kbd>: 태그를 생성
|
<kbd>n</kbd>: 태그를 생성
|
||||||
<kbd>g</kbd>: view reset options
|
<kbd>g</kbd>: View reset options
|
||||||
<kbd><enter></kbd>: 커밋 보기
|
<kbd><enter></kbd>: 커밋 보기
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
@ -290,26 +290,26 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: 파일명을 클립보드에 복사
|
<kbd><c-o></kbd>: 파일명을 클립보드에 복사
|
||||||
<kbd>d</kbd>: view 'discard changes' options
|
<kbd>d</kbd>: View 'discard changes' options
|
||||||
<kbd><space></kbd>: Staged 전환
|
<kbd><space></kbd>: Staged 전환
|
||||||
<kbd><c-b></kbd>: 파일을 필터하기 (Staged/unstaged)
|
<kbd><c-b></kbd>: 파일을 필터하기 (Staged/unstaged)
|
||||||
<kbd>c</kbd>: 커밋 변경내용
|
<kbd>c</kbd>: 커밋 변경내용
|
||||||
<kbd>w</kbd>: commit changes without pre-commit hook
|
<kbd>w</kbd>: Commit changes without pre-commit hook
|
||||||
<kbd>A</kbd>: 마지맛 커밋 수정
|
<kbd>A</kbd>: 마지맛 커밋 수정
|
||||||
<kbd>C</kbd>: Git 편집기를 사용하여 변경 내용을 커밋합니다.
|
<kbd>C</kbd>: Git 편집기를 사용하여 변경 내용을 커밋합니다.
|
||||||
<kbd>e</kbd>: 파일 편집
|
<kbd>e</kbd>: 파일 편집
|
||||||
<kbd>o</kbd>: 파일 닫기
|
<kbd>o</kbd>: 파일 닫기
|
||||||
<kbd>i</kbd>: ignore file
|
<kbd>i</kbd>: Ignore file
|
||||||
<kbd>r</kbd>: 파일 새로고침
|
<kbd>r</kbd>: 파일 새로고침
|
||||||
<kbd>s</kbd>: 변경사항을 Stash
|
<kbd>s</kbd>: 변경사항을 Stash
|
||||||
<kbd>S</kbd>: Stash 옵션 보기
|
<kbd>S</kbd>: Stash 옵션 보기
|
||||||
<kbd>a</kbd>: 모든 변경을 Staged/unstaged으로 전환
|
<kbd>a</kbd>: 모든 변경을 Staged/unstaged으로 전환
|
||||||
<kbd><enter></kbd>: stage individual hunks/lines for file, or collapse/expand for directory
|
<kbd><enter></kbd>: Stage individual hunks/lines for file, or collapse/expand for directory
|
||||||
<kbd>g</kbd>: view upstream reset options
|
<kbd>g</kbd>: View upstream reset options
|
||||||
<kbd>D</kbd>: view reset options
|
<kbd>D</kbd>: View reset options
|
||||||
<kbd>`</kbd>: 파일 트리뷰로 전환
|
<kbd>`</kbd>: 파일 트리뷰로 전환
|
||||||
<kbd>M</kbd>: git mergetool를 열기
|
<kbd>M</kbd>: Git mergetool를 열기
|
||||||
<kbd>f</kbd>: fetch
|
<kbd>f</kbd>: Fetch
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## 확인 패널
|
## 확인 패널
|
||||||
|
|||||||
@ -4,317 +4,317 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
|||||||
|
|
||||||
_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
_Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
||||||
|
|
||||||
## Globale Sneltoetsen
|
## Globale sneltoetsen
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-r></kbd>: wissel naar een recente repo
|
<kbd><c-r></kbd>: Wissel naar een recente repo
|
||||||
<kbd><pgup></kbd>: scroll naar beneden vanaf hoofdpaneel (fn+up/shift+k)
|
<kbd><pgup></kbd>: Scroll naar beneden vanaf hoofdpaneel (fn+up/shift+k)
|
||||||
<kbd><pgdown></kbd>: scroll naar beneden vanaf hoofdpaneel (fn+down/shift+j)
|
<kbd><pgdown></kbd>: Scroll naar beneden vanaf hoofdpaneel (fn+down/shift+j)
|
||||||
<kbd>@</kbd>: open command log menu
|
<kbd>@</kbd>: Open command log menu
|
||||||
<kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
|
<kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
|
||||||
<kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
|
<kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
|
||||||
<kbd>:</kbd>: voer aangepaste commando uit
|
<kbd>:</kbd>: Voer aangepaste commando uit
|
||||||
<kbd><c-p></kbd>: bekijk aangepaste patch opties
|
<kbd><c-p></kbd>: Bekijk aangepaste patch opties
|
||||||
<kbd>m</kbd>: bekijk merge/rebase opties
|
<kbd>m</kbd>: Bekijk merge/rebase opties
|
||||||
<kbd>R</kbd>: verversen
|
<kbd>R</kbd>: Verversen
|
||||||
<kbd>+</kbd>: volgende scherm modus (normaal/half/groot)
|
<kbd>+</kbd>: Volgende scherm modus (normaal/half/groot)
|
||||||
<kbd>_</kbd>: vorige scherm modus
|
<kbd>_</kbd>: Vorige scherm modus
|
||||||
<kbd>?</kbd>: open menu
|
<kbd>?</kbd>: Open menu
|
||||||
<kbd><c-s></kbd>: bekijk scoping opties
|
<kbd><c-s></kbd>: Bekijk scoping opties
|
||||||
<kbd>W</kbd>: open diff menu
|
<kbd>W</kbd>: Open diff menu
|
||||||
<kbd><c-e></kbd>: open diff menu
|
<kbd><c-e></kbd>: Open diff menu
|
||||||
<kbd><c-w></kbd>: Toggle whether or not whitespace changes are shown in the diff view
|
<kbd><c-w></kbd>: Toggle whether or not whitespace changes are shown in the diff view
|
||||||
<kbd>z</kbd>: ongedaan maken (via reflog) (experimenteel)
|
<kbd>z</kbd>: Ongedaan maken (via reflog) (experimenteel)
|
||||||
<kbd><c-z></kbd>: redo (via reflog) (experimenteel)
|
<kbd><c-z></kbd>: Redo (via reflog) (experimenteel)
|
||||||
<kbd>P</kbd>: push
|
<kbd>P</kbd>: Push
|
||||||
<kbd>p</kbd>: pull
|
<kbd>p</kbd>: Pull
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Lijstpaneel Navigatie
|
## Lijstpaneel navigatie
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>,</kbd>: vorige pagina
|
<kbd>,</kbd>: Vorige pagina
|
||||||
<kbd>.</kbd>: volgende pagina
|
<kbd>.</kbd>: Volgende pagina
|
||||||
<kbd><</kbd>: scroll naar boven
|
<kbd><</kbd>: Scroll naar boven
|
||||||
<kbd>/</kbd>: start met zoeken
|
<kbd>/</kbd>: Start met zoeken
|
||||||
<kbd>></kbd>: scroll naar beneden
|
<kbd>></kbd>: Scroll naar beneden
|
||||||
<kbd>H</kbd>: scroll left
|
<kbd>H</kbd>: Scroll left
|
||||||
<kbd>L</kbd>: scroll right
|
<kbd>L</kbd>: Scroll right
|
||||||
<kbd>]</kbd>: volgende tabblad
|
<kbd>]</kbd>: Volgende tabblad
|
||||||
<kbd>[</kbd>: vorige tabblad
|
<kbd>[</kbd>: Vorige tabblad
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Bestanden
|
## Bestanden
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: kopieer de bestandsnaam naar het klembord
|
<kbd><c-o></kbd>: Kopieer de bestandsnaam naar het klembord
|
||||||
<kbd>d</kbd>: bekijk 'veranderingen ongedaan maken' opties
|
<kbd>d</kbd>: Bekijk 'veranderingen ongedaan maken' opties
|
||||||
<kbd><space></kbd>: toggle staged
|
<kbd><space></kbd>: Toggle staged
|
||||||
<kbd><c-b></kbd>: Filter files (staged/unstaged)
|
<kbd><c-b></kbd>: Filter files (staged/unstaged)
|
||||||
<kbd>c</kbd>: commit veranderingen
|
<kbd>c</kbd>: Commit veranderingen
|
||||||
<kbd>w</kbd>: commit veranderingen zonder pre-commit hook
|
<kbd>w</kbd>: Commit veranderingen zonder pre-commit hook
|
||||||
<kbd>A</kbd>: wijzig laatste commit
|
<kbd>A</kbd>: Wijzig laatste commit
|
||||||
<kbd>C</kbd>: commit veranderingen met de git editor
|
<kbd>C</kbd>: Commit veranderingen met de git editor
|
||||||
<kbd>e</kbd>: verander bestand
|
<kbd>e</kbd>: Verander bestand
|
||||||
<kbd>o</kbd>: open bestand
|
<kbd>o</kbd>: Open bestand
|
||||||
<kbd>i</kbd>: ignore or exclude file
|
<kbd>i</kbd>: Ignore or exclude file
|
||||||
<kbd>r</kbd>: refresh bestanden
|
<kbd>r</kbd>: Refresh bestanden
|
||||||
<kbd>s</kbd>: stash-bestanden
|
<kbd>s</kbd>: Stash-bestanden
|
||||||
<kbd>S</kbd>: bekijk stash opties
|
<kbd>S</kbd>: Bekijk stash opties
|
||||||
<kbd>a</kbd>: toggle staged alle
|
<kbd>a</kbd>: Toggle staged alle
|
||||||
<kbd><enter></kbd>: stage individuele hunks/lijnen
|
<kbd><enter></kbd>: Stage individuele hunks/lijnen
|
||||||
<kbd>g</kbd>: bekijk upstream reset opties
|
<kbd>g</kbd>: Bekijk upstream reset opties
|
||||||
<kbd>D</kbd>: bekijk reset opties
|
<kbd>D</kbd>: Bekijk reset opties
|
||||||
<kbd>`</kbd>: toggle bestandsboom weergave
|
<kbd>`</kbd>: Toggle bestandsboom weergave
|
||||||
<kbd>M</kbd>: open external merge tool (git mergetool)
|
<kbd>M</kbd>: Open external merge tool (git mergetool)
|
||||||
<kbd>f</kbd>: fetch
|
<kbd>f</kbd>: Fetch
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Bevestigingspaneel
|
## Bevestigingspaneel
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><enter></kbd>: bevestig
|
<kbd><enter></kbd>: Bevestig
|
||||||
<kbd><esc></kbd>: sluiten
|
<kbd><esc></kbd>: Sluiten
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Branches
|
## Branches
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: kopieer branch name naar klembord
|
<kbd><c-o></kbd>: Kopieer branch name naar klembord
|
||||||
<kbd>i</kbd>: laat git-flow opties zien
|
<kbd>i</kbd>: Laat git-flow opties zien
|
||||||
<kbd><space></kbd>: uitchecken
|
<kbd><space></kbd>: Uitchecken
|
||||||
<kbd>n</kbd>: nieuwe branch
|
<kbd>n</kbd>: Nieuwe branch
|
||||||
<kbd>o</kbd>: maak een pull-request
|
<kbd>o</kbd>: Maak een pull-request
|
||||||
<kbd>O</kbd>: bekijk opties voor pull-aanvraag
|
<kbd>O</kbd>: Bekijk opties voor pull-aanvraag
|
||||||
<kbd><c-y></kbd>: kopieer de URL van het pull-verzoek naar het klembord
|
<kbd><c-y></kbd>: Kopieer de URL van het pull-verzoek naar het klembord
|
||||||
<kbd>c</kbd>: uitchecken bij naam
|
<kbd>c</kbd>: Uitchecken bij naam
|
||||||
<kbd>F</kbd>: forceer checkout
|
<kbd>F</kbd>: Forceer checkout
|
||||||
<kbd>d</kbd>: verwijder branch
|
<kbd>d</kbd>: Verwijder branch
|
||||||
<kbd>r</kbd>: rebase branch
|
<kbd>r</kbd>: Rebase branch
|
||||||
<kbd>M</kbd>: merge in met huidige checked out branch
|
<kbd>M</kbd>: Merge in met huidige checked out branch
|
||||||
<kbd>f</kbd>: fast-forward deze branch vanaf zijn upstream
|
<kbd>f</kbd>: Fast-forward deze branch vanaf zijn upstream
|
||||||
<kbd>T</kbd>: creëer tag
|
<kbd>T</kbd>: Creëer tag
|
||||||
<kbd>g</kbd>: bekijk reset opties
|
<kbd>g</kbd>: Bekijk reset opties
|
||||||
<kbd>R</kbd>: hernoem branch
|
<kbd>R</kbd>: Hernoem branch
|
||||||
<kbd>u</kbd>: set/unset upstream
|
<kbd>u</kbd>: Set/Unset upstream
|
||||||
<kbd><enter></kbd>: bekijk commits
|
<kbd><enter></kbd>: Bekijk commits
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Commit Bericht
|
## Commit bericht
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><enter></kbd>: bevestig
|
<kbd><enter></kbd>: Bevestig
|
||||||
<kbd><esc></kbd>: sluiten
|
<kbd><esc></kbd>: Sluiten
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Commit bestanden
|
## Commit bestanden
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: kopieer de vastgelegde bestandsnaam naar het klembord
|
<kbd><c-o></kbd>: Kopieer de vastgelegde bestandsnaam naar het klembord
|
||||||
<kbd>c</kbd>: bestand uitchecken
|
<kbd>c</kbd>: Bestand uitchecken
|
||||||
<kbd>d</kbd>: uitsluit deze commit zijn veranderingen aan dit bestand
|
<kbd>d</kbd>: Uitsluit deze commit zijn veranderingen aan dit bestand
|
||||||
<kbd>o</kbd>: open bestand
|
<kbd>o</kbd>: Open bestand
|
||||||
<kbd>e</kbd>: verander bestand
|
<kbd>e</kbd>: Verander bestand
|
||||||
<kbd><space></kbd>: toggle bestand inbegrepen in patch
|
<kbd><space></kbd>: Toggle bestand inbegrepen in patch
|
||||||
<kbd>a</kbd>: toggle all files included in patch
|
<kbd>a</kbd>: Toggle all files included in patch
|
||||||
<kbd><enter></kbd>: enter bestand om geselecteerde regels toe te voegen aan de patch
|
<kbd><enter></kbd>: Enter bestand om geselecteerde regels toe te voegen aan de patch
|
||||||
<kbd>`</kbd>: toggle bestandsboom weergave
|
<kbd>`</kbd>: Toggle bestandsboom weergave
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Commits
|
## Commits
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: kopieer commit SHA naar klembord
|
<kbd><c-o></kbd>: Kopieer commit SHA naar klembord
|
||||||
<kbd><c-r></kbd>: reset cherry-picked (gekopieerde) commits selectie
|
<kbd><c-r></kbd>: Reset cherry-picked (gekopieerde) commits selectie
|
||||||
<kbd>b</kbd>: view bisect options
|
<kbd>b</kbd>: View bisect options
|
||||||
<kbd>s</kbd>: squash beneden
|
<kbd>s</kbd>: Squash beneden
|
||||||
<kbd>f</kbd>: Fixup commit
|
<kbd>f</kbd>: Fixup commit
|
||||||
<kbd>r</kbd>: hernoem commit
|
<kbd>r</kbd>: Hernoem commit
|
||||||
<kbd>R</kbd>: hernoem commit met editor
|
<kbd>R</kbd>: Hernoem commit met editor
|
||||||
<kbd>d</kbd>: verwijder commit
|
<kbd>d</kbd>: Verwijder commit
|
||||||
<kbd>e</kbd>: wijzig commit
|
<kbd>e</kbd>: Wijzig commit
|
||||||
<kbd>p</kbd>: kies commit (wanneer midden in rebase)
|
<kbd>p</kbd>: Kies commit (wanneer midden in rebase)
|
||||||
<kbd>F</kbd>: creëer fixup commit voor deze commit
|
<kbd>F</kbd>: Creëer fixup commit
|
||||||
<kbd>S</kbd>: squash bovenstaande commits
|
<kbd>S</kbd>: Squash bovenstaande commits
|
||||||
<kbd><c-j></kbd>: verplaats commit 1 naar beneden
|
<kbd><c-j></kbd>: Verplaats commit 1 naar beneden
|
||||||
<kbd><c-k></kbd>: verplaats commit 1 naar boven
|
<kbd><c-k></kbd>: Verplaats commit 1 naar boven
|
||||||
<kbd>v</kbd>: plak commits (cherry-pick)
|
<kbd>v</kbd>: Plak commits (cherry-pick)
|
||||||
<kbd>A</kbd>: wijzig commit met staged veranderingen
|
<kbd>A</kbd>: Wijzig commit met staged veranderingen
|
||||||
<kbd>a</kbd>: reset commit author
|
<kbd>a</kbd>: Set/Reset commit author
|
||||||
<kbd>t</kbd>: commit ongedaan maken
|
<kbd>t</kbd>: Commit ongedaan maken
|
||||||
<kbd>T</kbd>: tag commit
|
<kbd>T</kbd>: Tag commit
|
||||||
<kbd><c-l></kbd>: open log menu
|
<kbd><c-l></kbd>: Open log menu
|
||||||
<kbd><space></kbd>: checkout commit
|
<kbd><space></kbd>: Checkout commit
|
||||||
<kbd>y</kbd>: copy commit attribute
|
<kbd>y</kbd>: Copy commit attribute
|
||||||
<kbd>o</kbd>: open commit in browser
|
<kbd>o</kbd>: Open commit in browser
|
||||||
<kbd>n</kbd>: creëer nieuwe branch van commit
|
<kbd>n</kbd>: Creëer nieuwe branch van commit
|
||||||
<kbd>g</kbd>: bekijk reset opties
|
<kbd>g</kbd>: Bekijk reset opties
|
||||||
<kbd>c</kbd>: kopieer commit (cherry-pick)
|
<kbd>c</kbd>: Kopieer commit (cherry-pick)
|
||||||
<kbd>C</kbd>: kopieer commit reeks (cherry-pick)
|
<kbd>C</kbd>: Kopieer commit reeks (cherry-pick)
|
||||||
<kbd><enter></kbd>: bekijk gecommite bestanden
|
<kbd><enter></kbd>: Bekijk gecommite bestanden
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Menu
|
## Menu
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><enter></kbd>: uitvoeren
|
<kbd><enter></kbd>: Uitvoeren
|
||||||
<kbd><esc></kbd>: sluiten
|
<kbd><esc></kbd>: Sluiten
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Mergen
|
## Mergen
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>e</kbd>: verander bestand
|
<kbd>e</kbd>: Verander bestand
|
||||||
<kbd>o</kbd>: open bestand
|
<kbd>o</kbd>: Open bestand
|
||||||
<kbd><left></kbd>: selecteer voorgaand conflict
|
<kbd><left></kbd>: Selecteer voorgaand conflict
|
||||||
<kbd><right></kbd>: selecteer volgende conflict
|
<kbd><right></kbd>: Selecteer volgende conflict
|
||||||
<kbd><up></kbd>: selecteer bovenste hunk
|
<kbd><up></kbd>: Selecteer bovenste hunk
|
||||||
<kbd><down></kbd>: selecteer onderste hunk
|
<kbd><down></kbd>: Selecteer onderste hunk
|
||||||
<kbd>z</kbd>: ongedaan maken
|
<kbd>z</kbd>: Ongedaan maken
|
||||||
<kbd>M</kbd>: open external merge tool (git mergetool)
|
<kbd>M</kbd>: Open external merge tool (git mergetool)
|
||||||
<kbd><space></kbd>: kies hunk
|
<kbd><space></kbd>: Kies stuk
|
||||||
<kbd>b</kbd>: kies bijde hunks
|
<kbd>b</kbd>: Kies beide stukken
|
||||||
<kbd><esc></kbd>: ga terug naar het bestanden paneel
|
<kbd><esc></kbd>: Ga terug naar het bestanden paneel
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Normaal
|
## Normaal
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>mouse wheel down</kbd>: scroll omlaag (fn+up)
|
<kbd>mouse wheel down</kbd>: Scroll omlaag (fn+up)
|
||||||
<kbd>mouse wheel up</kbd>: scroll omhoog (fn+down)
|
<kbd>mouse wheel up</kbd>: Scroll omhoog (fn+down)
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Patch Bouwen
|
## Patch bouwen
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><left></kbd>: selecteer de vorige hunk
|
<kbd><left></kbd>: Selecteer de vorige hunk
|
||||||
<kbd><right></kbd>: selecteer de volgende hunk
|
<kbd><right></kbd>: Selecteer de volgende hunk
|
||||||
<kbd>v</kbd>: toggle drag selecteer
|
<kbd>v</kbd>: Toggle drag selecteer
|
||||||
<kbd>V</kbd>: toggle drag selecteer
|
<kbd>V</kbd>: Toggle drag selecteer
|
||||||
<kbd>a</kbd>: toggle selecteer hunk
|
<kbd>a</kbd>: Toggle selecteer hunk
|
||||||
<kbd><c-o></kbd>: copy the selected text to the clipboard
|
<kbd><c-o></kbd>: Copy the selected text to the clipboard
|
||||||
<kbd>o</kbd>: open bestand
|
<kbd>o</kbd>: Open bestand
|
||||||
<kbd>e</kbd>: verander bestand
|
<kbd>e</kbd>: Verander bestand
|
||||||
<kbd><space></kbd>: voeg toe/verwijder lijn(en) in patch
|
<kbd><space></kbd>: Voeg toe/verwijder lijn(en) in patch
|
||||||
<kbd><esc></kbd>: sluit lijn-bij-lijn modus
|
<kbd><esc></kbd>: Sluit lijn-bij-lijn modus
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Reflog
|
## Reflog
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: kopieer commit SHA naar klembord
|
<kbd><c-o></kbd>: Kopieer commit SHA naar klembord
|
||||||
<kbd><space></kbd>: checkout commit
|
<kbd><space></kbd>: Checkout commit
|
||||||
<kbd>y</kbd>: copy commit attribute
|
<kbd>y</kbd>: Copy commit attribute
|
||||||
<kbd>o</kbd>: open commit in browser
|
<kbd>o</kbd>: Open commit in browser
|
||||||
<kbd>n</kbd>: creëer nieuwe branch van commit
|
<kbd>n</kbd>: Creëer nieuwe branch van commit
|
||||||
<kbd>g</kbd>: bekijk reset opties
|
<kbd>g</kbd>: Bekijk reset opties
|
||||||
<kbd>c</kbd>: kopieer commit (cherry-pick)
|
<kbd>c</kbd>: Kopieer commit (cherry-pick)
|
||||||
<kbd>C</kbd>: kopieer commit reeks (cherry-pick)
|
<kbd>C</kbd>: Kopieer commit reeks (cherry-pick)
|
||||||
<kbd><c-r></kbd>: reset cherry-picked (gekopieerde) commits selectie
|
<kbd><c-r></kbd>: Reset cherry-picked (gekopieerde) commits selectie
|
||||||
<kbd><enter></kbd>: bekijk commits
|
<kbd><enter></kbd>: Bekijk commits
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Remote Branches
|
## Remote branches
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: kopieer branch name naar klembord
|
<kbd><c-o></kbd>: Kopieer branch name naar klembord
|
||||||
<kbd><space></kbd>: uitchecken
|
<kbd><space></kbd>: Uitchecken
|
||||||
<kbd>n</kbd>: nieuwe branch
|
<kbd>n</kbd>: Nieuwe branch
|
||||||
<kbd>M</kbd>: merge in met huidige checked out branch
|
<kbd>M</kbd>: Merge in met huidige checked out branch
|
||||||
<kbd>r</kbd>: rebase branch
|
<kbd>r</kbd>: Rebase branch
|
||||||
<kbd>d</kbd>: verwijder branch
|
<kbd>d</kbd>: Verwijder branch
|
||||||
<kbd>u</kbd>: stel in als upstream van uitgecheckte branch
|
<kbd>u</kbd>: Stel in als upstream van uitgecheckte branch
|
||||||
<kbd><esc></kbd>: ga terug naar remotes lijst
|
<kbd><esc></kbd>: Ga terug naar remotes lijst
|
||||||
<kbd>g</kbd>: bekijk reset opties
|
<kbd>g</kbd>: Bekijk reset opties
|
||||||
<kbd><enter></kbd>: bekijk commits
|
<kbd><enter></kbd>: Bekijk commits
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Remotes
|
## Remotes
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>f</kbd>: fetch remote
|
<kbd>f</kbd>: Fetch remote
|
||||||
<kbd>n</kbd>: voeg een nieuwe remote toe
|
<kbd>n</kbd>: Voeg een nieuwe remote toe
|
||||||
<kbd>d</kbd>: verwijder remote
|
<kbd>d</kbd>: Verwijder remote
|
||||||
<kbd>e</kbd>: wijzig remote
|
<kbd>e</kbd>: Wijzig remote
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Staging
|
## Staging
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><left></kbd>: selecteer de vorige hunk
|
<kbd><left></kbd>: Selecteer de vorige hunk
|
||||||
<kbd><right></kbd>: selecteer de volgende hunk
|
<kbd><right></kbd>: Selecteer de volgende hunk
|
||||||
<kbd>v</kbd>: toggle drag selecteer
|
<kbd>v</kbd>: Toggle drag selecteer
|
||||||
<kbd>V</kbd>: toggle drag selecteer
|
<kbd>V</kbd>: Toggle drag selecteer
|
||||||
<kbd>a</kbd>: toggle selecteer hunk
|
<kbd>a</kbd>: Toggle selecteer hunk
|
||||||
<kbd><c-o></kbd>: copy the selected text to the clipboard
|
<kbd><c-o></kbd>: Copy the selected text to the clipboard
|
||||||
<kbd>o</kbd>: open bestand
|
<kbd>o</kbd>: Open bestand
|
||||||
<kbd>e</kbd>: verander bestand
|
<kbd>e</kbd>: Verander bestand
|
||||||
<kbd><esc></kbd>: ga terug naar het bestanden paneel
|
<kbd><esc></kbd>: Ga terug naar het bestanden paneel
|
||||||
<kbd><tab></kbd>: ga naar een ander paneel
|
<kbd><tab></kbd>: Ga naar een ander paneel
|
||||||
<kbd><space></kbd>: toggle lijnen staged / unstaged
|
<kbd><space></kbd>: Toggle lijnen staged / unstaged
|
||||||
<kbd>d</kbd>: verwijdert change (git reset)
|
<kbd>d</kbd>: Verwijdert change (git reset)
|
||||||
<kbd>E</kbd>: edit hunk
|
<kbd>E</kbd>: Edit hunk
|
||||||
<kbd>c</kbd>: commit veranderingen
|
<kbd>c</kbd>: Commit veranderingen
|
||||||
<kbd>w</kbd>: commit veranderingen zonder pre-commit hook
|
<kbd>w</kbd>: Commit veranderingen zonder pre-commit hook
|
||||||
<kbd>C</kbd>: commit veranderingen met de git editor
|
<kbd>C</kbd>: Commit veranderingen met de git editor
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Stash
|
## Stash
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><space></kbd>: toepassen
|
<kbd><space></kbd>: Toepassen
|
||||||
<kbd>g</kbd>: pop
|
<kbd>g</kbd>: Pop
|
||||||
<kbd>d</kbd>: laten vallen
|
<kbd>d</kbd>: Laten vallen
|
||||||
<kbd>n</kbd>: nieuwe branch
|
<kbd>n</kbd>: Nieuwe branch
|
||||||
<kbd>r</kbd>: rename stash
|
<kbd>r</kbd>: Rename stash
|
||||||
<kbd><enter></kbd>: bekijk gecommite bestanden
|
<kbd><enter></kbd>: Bekijk gecommite bestanden
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Status
|
## Status
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>o</kbd>: open config bestand
|
<kbd>o</kbd>: Open config bestand
|
||||||
<kbd>e</kbd>: verander config bestand
|
<kbd>e</kbd>: Verander config bestand
|
||||||
<kbd>u</kbd>: check voor updates
|
<kbd>u</kbd>: Check voor updates
|
||||||
<kbd><enter></kbd>: wissel naar een recente repo
|
<kbd><enter></kbd>: Wissel naar een recente repo
|
||||||
<kbd>a</kbd>: alle logs van de branch laten zien
|
<kbd>a</kbd>: Alle logs van de branch laten zien
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Sub-commits
|
## Sub-commits
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: kopieer commit SHA naar klembord
|
<kbd><c-o></kbd>: Kopieer commit SHA naar klembord
|
||||||
<kbd><space></kbd>: checkout commit
|
<kbd><space></kbd>: Checkout commit
|
||||||
<kbd>y</kbd>: copy commit attribute
|
<kbd>y</kbd>: Copy commit attribute
|
||||||
<kbd>o</kbd>: open commit in browser
|
<kbd>o</kbd>: Open commit in browser
|
||||||
<kbd>n</kbd>: creëer nieuwe branch van commit
|
<kbd>n</kbd>: Creëer nieuwe branch van commit
|
||||||
<kbd>g</kbd>: bekijk reset opties
|
<kbd>g</kbd>: Bekijk reset opties
|
||||||
<kbd>c</kbd>: kopieer commit (cherry-pick)
|
<kbd>c</kbd>: Kopieer commit (cherry-pick)
|
||||||
<kbd>C</kbd>: kopieer commit reeks (cherry-pick)
|
<kbd>C</kbd>: Kopieer commit reeks (cherry-pick)
|
||||||
<kbd><c-r></kbd>: reset cherry-picked (gekopieerde) commits selectie
|
<kbd><c-r></kbd>: Reset cherry-picked (gekopieerde) commits selectie
|
||||||
<kbd><enter></kbd>: bekijk gecommite bestanden
|
<kbd><enter></kbd>: Bekijk gecommite bestanden
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Submodules
|
## Submodules
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: kopieer submodule naam naar klembord
|
<kbd><c-o></kbd>: Kopieer submodule naam naar klembord
|
||||||
<kbd><enter></kbd>: enter submodule
|
<kbd><enter></kbd>: Enter submodule
|
||||||
<kbd>d</kbd>: remove submodule
|
<kbd>d</kbd>: Remove submodule
|
||||||
<kbd>u</kbd>: update submodule
|
<kbd>u</kbd>: Update submodule
|
||||||
<kbd>n</kbd>: voeg nieuwe submodule toe
|
<kbd>n</kbd>: Voeg nieuwe submodule toe
|
||||||
<kbd>e</kbd>: update submodule URL
|
<kbd>e</kbd>: Update submodule URL
|
||||||
<kbd>i</kbd>: initialiseer submodule
|
<kbd>i</kbd>: Initialiseer submodule
|
||||||
<kbd>b</kbd>: bekijk bulk submodule opties
|
<kbd>b</kbd>: Bekijk bulk submodule opties
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Tags
|
## Tags
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><space></kbd>: uitchecken
|
<kbd><space></kbd>: Uitchecken
|
||||||
<kbd>d</kbd>: verwijder tag
|
<kbd>d</kbd>: Verwijder tag
|
||||||
<kbd>P</kbd>: push tag
|
<kbd>P</kbd>: Push tag
|
||||||
<kbd>n</kbd>: creëer tag
|
<kbd>n</kbd>: Creëer tag
|
||||||
<kbd>g</kbd>: bekijk reset opties
|
<kbd>g</kbd>: Bekijk reset opties
|
||||||
<kbd><enter></kbd>: bekijk commits
|
<kbd><enter></kbd>: Bekijk commits
|
||||||
</pre>
|
</pre>
|
||||||
|
|||||||
@ -7,314 +7,314 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
## Globalne
|
## Globalne
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-r></kbd>: switch to a recent repo
|
<kbd><c-r></kbd>: Switch to a recent repo
|
||||||
<kbd><pgup></kbd>: scroll up main panel (fn+up/shift+k)
|
<kbd><pgup></kbd>: Scroll up main panel (fn+up/shift+k)
|
||||||
<kbd><pgdown></kbd>: scroll down main panel (fn+down/shift+j)
|
<kbd><pgdown></kbd>: Scroll down main panel (fn+down/shift+j)
|
||||||
<kbd>@</kbd>: open command log menu
|
<kbd>@</kbd>: Open command log menu
|
||||||
<kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
|
<kbd>}</kbd>: Increase the size of the context shown around changes in the diff view
|
||||||
<kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
|
<kbd>{</kbd>: Decrease the size of the context shown around changes in the diff view
|
||||||
<kbd>:</kbd>: wykonaj własną komendę
|
<kbd>:</kbd>: Wykonaj własną komendę
|
||||||
<kbd><c-p></kbd>: view custom patch options
|
<kbd><c-p></kbd>: View custom patch options
|
||||||
<kbd>m</kbd>: widok scalenia/opcje zmiany bazy
|
<kbd>m</kbd>: Widok scalenia/opcje zmiany bazy
|
||||||
<kbd>R</kbd>: odśwież
|
<kbd>R</kbd>: Odśwież
|
||||||
<kbd>+</kbd>: next screen mode (normal/half/fullscreen)
|
<kbd>+</kbd>: Next screen mode (normal/half/fullscreen)
|
||||||
<kbd>_</kbd>: prev screen mode
|
<kbd>_</kbd>: Prev screen mode
|
||||||
<kbd>?</kbd>: open menu
|
<kbd>?</kbd>: Open menu
|
||||||
<kbd><c-s></kbd>: view filter-by-path options
|
<kbd><c-s></kbd>: View filter-by-path options
|
||||||
<kbd>W</kbd>: open diff menu
|
<kbd>W</kbd>: Open diff menu
|
||||||
<kbd><c-e></kbd>: open diff menu
|
<kbd><c-e></kbd>: Open diff menu
|
||||||
<kbd><c-w></kbd>: Toggle whether or not whitespace changes are shown in the diff view
|
<kbd><c-w></kbd>: Toggle whether or not whitespace changes are shown in the diff view
|
||||||
<kbd>z</kbd>: undo (via reflog) (experimental)
|
<kbd>z</kbd>: Undo
|
||||||
<kbd><c-z></kbd>: redo (via reflog) (experimental)
|
<kbd><c-z></kbd>: Redo
|
||||||
<kbd>P</kbd>: push
|
<kbd>P</kbd>: Push
|
||||||
<kbd>p</kbd>: pull
|
<kbd>p</kbd>: Pull
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## List Panel Navigation
|
## List panel navigation
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>,</kbd>: previous page
|
<kbd>,</kbd>: Previous page
|
||||||
<kbd>.</kbd>: next page
|
<kbd>.</kbd>: Next page
|
||||||
<kbd><</kbd>: scroll to top
|
<kbd><</kbd>: Scroll to top
|
||||||
<kbd>/</kbd>: start search
|
<kbd>/</kbd>: Start search
|
||||||
<kbd>></kbd>: scroll to bottom
|
<kbd>></kbd>: Scroll to bottom
|
||||||
<kbd>H</kbd>: scroll left
|
<kbd>H</kbd>: Scroll left
|
||||||
<kbd>L</kbd>: scroll right
|
<kbd>L</kbd>: Scroll right
|
||||||
<kbd>]</kbd>: next tab
|
<kbd>]</kbd>: Next tab
|
||||||
<kbd>[</kbd>: previous tab
|
<kbd>[</kbd>: Previous tab
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Commit Summary
|
## Commit summary
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><enter></kbd>: potwierdź
|
<kbd><enter></kbd>: Potwierdź
|
||||||
<kbd><esc></kbd>: zamknij
|
<kbd><esc></kbd>: Zamknij
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Commity
|
## Commity
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy commit SHA to clipboard
|
<kbd><c-o></kbd>: Copy commit SHA to clipboard
|
||||||
<kbd><c-r></kbd>: reset cherry-picked (copied) commits selection
|
<kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection
|
||||||
<kbd>b</kbd>: view bisect options
|
<kbd>b</kbd>: View bisect options
|
||||||
<kbd>s</kbd>: ściśnij
|
<kbd>s</kbd>: Ściśnij
|
||||||
<kbd>f</kbd>: napraw commit
|
<kbd>f</kbd>: Napraw commit
|
||||||
<kbd>r</kbd>: zmień nazwę commita
|
<kbd>r</kbd>: Zmień nazwę commita
|
||||||
<kbd>R</kbd>: zmień nazwę commita w edytorze
|
<kbd>R</kbd>: Zmień nazwę commita w edytorze
|
||||||
<kbd>d</kbd>: usuń commit
|
<kbd>d</kbd>: Usuń commit
|
||||||
<kbd>e</kbd>: edytuj commit
|
<kbd>e</kbd>: Edytuj commit
|
||||||
<kbd>p</kbd>: wybierz commit (podczas zmiany bazy)
|
<kbd>p</kbd>: Wybierz commit (podczas zmiany bazy)
|
||||||
<kbd>F</kbd>: utwórz commit naprawczy dla tego commita
|
<kbd>F</kbd>: Utwórz commit naprawczy dla tego commita
|
||||||
<kbd>S</kbd>: spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash)
|
<kbd>S</kbd>: Spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash)
|
||||||
<kbd><c-j></kbd>: przenieś commit 1 w dół
|
<kbd><c-j></kbd>: Przenieś commit 1 w dół
|
||||||
<kbd><c-k></kbd>: przenieś commit 1 w górę
|
<kbd><c-k></kbd>: Przenieś commit 1 w górę
|
||||||
<kbd>v</kbd>: wklej commity (przebieranie)
|
<kbd>v</kbd>: Wklej commity (przebieranie)
|
||||||
<kbd>A</kbd>: popraw commit zmianami z poczekalni
|
<kbd>A</kbd>: Popraw commit zmianami z poczekalni
|
||||||
<kbd>a</kbd>: reset commit author
|
<kbd>a</kbd>: Set/Reset commit author
|
||||||
<kbd>t</kbd>: odwróć commit
|
<kbd>t</kbd>: Odwróć commit
|
||||||
<kbd>T</kbd>: tag commit
|
<kbd>T</kbd>: Tag commit
|
||||||
<kbd><c-l></kbd>: open log menu
|
<kbd><c-l></kbd>: Open log menu
|
||||||
<kbd><space></kbd>: checkout commit
|
<kbd><space></kbd>: Checkout commit
|
||||||
<kbd>y</kbd>: copy commit attribute
|
<kbd>y</kbd>: Copy commit attribute
|
||||||
<kbd>o</kbd>: open commit in browser
|
<kbd>o</kbd>: Open commit in browser
|
||||||
<kbd>n</kbd>: create new branch off of commit
|
<kbd>n</kbd>: Create new branch off of commit
|
||||||
<kbd>g</kbd>: wyświetl opcje resetu
|
<kbd>g</kbd>: Wyświetl opcje resetu
|
||||||
<kbd>c</kbd>: kopiuj commit (przebieranie)
|
<kbd>c</kbd>: Kopiuj commit (przebieranie)
|
||||||
<kbd>C</kbd>: kopiuj zakres commitów (przebieranie)
|
<kbd>C</kbd>: Kopiuj zakres commitów (przebieranie)
|
||||||
<kbd><enter></kbd>: przeglądaj pliki commita
|
<kbd><enter></kbd>: Przeglądaj pliki commita
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Confirmation Panel
|
## Confirmation panel
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><enter></kbd>: potwierdź
|
<kbd><enter></kbd>: Potwierdź
|
||||||
<kbd><esc></kbd>: zamknij
|
<kbd><esc></kbd>: Zamknij
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Local Branches
|
## Local branches
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy branch name to clipboard
|
<kbd><c-o></kbd>: Copy branch name to clipboard
|
||||||
<kbd>i</kbd>: show git-flow options
|
<kbd>i</kbd>: Show git-flow options
|
||||||
<kbd><space></kbd>: przełącz
|
<kbd><space></kbd>: Przełącz
|
||||||
<kbd>n</kbd>: nowa gałąź
|
<kbd>n</kbd>: Nowa gałąź
|
||||||
<kbd>o</kbd>: utwórz żądanie pobrania
|
<kbd>o</kbd>: Utwórz żądanie pobrania
|
||||||
<kbd>O</kbd>: utwórz opcje żądania ściągnięcia
|
<kbd>O</kbd>: Utwórz opcje żądania ściągnięcia
|
||||||
<kbd><c-y></kbd>: skopiuj adres URL żądania pobrania do schowka
|
<kbd><c-y></kbd>: Skopiuj adres URL żądania pobrania do schowka
|
||||||
<kbd>c</kbd>: przełącz używając nazwy
|
<kbd>c</kbd>: Przełącz używając nazwy
|
||||||
<kbd>F</kbd>: wymuś przełączenie
|
<kbd>F</kbd>: Wymuś przełączenie
|
||||||
<kbd>d</kbd>: usuń gałąź
|
<kbd>d</kbd>: Usuń gałąź
|
||||||
<kbd>r</kbd>: zmiana bazy gałęzi
|
<kbd>r</kbd>: Zmiana bazy gałęzi
|
||||||
<kbd>M</kbd>: scal do obecnej gałęzi
|
<kbd>M</kbd>: Scal do obecnej gałęzi
|
||||||
<kbd>f</kbd>: fast-forward this branch from its upstream
|
<kbd>f</kbd>: Fast-forward this branch from its upstream
|
||||||
<kbd>T</kbd>: create tag
|
<kbd>T</kbd>: Create tag
|
||||||
<kbd>g</kbd>: wyświetl opcje resetu
|
<kbd>g</kbd>: Wyświetl opcje resetu
|
||||||
<kbd>R</kbd>: rename branch
|
<kbd>R</kbd>: Rename branch
|
||||||
<kbd>u</kbd>: set/unset upstream
|
<kbd>u</kbd>: Set/Unset upstream
|
||||||
<kbd><enter></kbd>: view commits
|
<kbd><enter></kbd>: View commits
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Main Panel (Patch Building)
|
## Main panel (patch building)
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><left></kbd>: poprzedni kawałek
|
<kbd><left></kbd>: Poprzedni kawałek
|
||||||
<kbd><right></kbd>: następny kawałek
|
<kbd><right></kbd>: Następny kawałek
|
||||||
<kbd>v</kbd>: toggle drag select
|
<kbd>v</kbd>: Toggle drag select
|
||||||
<kbd>V</kbd>: toggle drag select
|
<kbd>V</kbd>: Toggle drag select
|
||||||
<kbd>a</kbd>: toggle select hunk
|
<kbd>a</kbd>: Toggle select hunk
|
||||||
<kbd><c-o></kbd>: copy the selected text to the clipboard
|
<kbd><c-o></kbd>: Copy the selected text to the clipboard
|
||||||
<kbd>o</kbd>: otwórz plik
|
<kbd>o</kbd>: Otwórz plik
|
||||||
<kbd>e</kbd>: edytuj plik
|
<kbd>e</kbd>: Edytuj plik
|
||||||
<kbd><space></kbd>: add/remove line(s) to patch
|
<kbd><space></kbd>: Add/Remove line(s) to patch
|
||||||
<kbd><esc></kbd>: wyście z trybu "linia po linii"
|
<kbd><esc></kbd>: Wyście z trybu "linia po linii"
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Menu
|
## Menu
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><enter></kbd>: wykonaj
|
<kbd><enter></kbd>: Wykonaj
|
||||||
<kbd><esc></kbd>: zamknij
|
<kbd><esc></kbd>: Zamknij
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Pliki
|
## Pliki
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy the file name to the clipboard
|
<kbd><c-o></kbd>: Copy the file name to the clipboard
|
||||||
<kbd>d</kbd>: pokaż opcje porzucania zmian
|
<kbd>d</kbd>: Pokaż opcje porzucania zmian
|
||||||
<kbd><space></kbd>: przełącz stan poczekalni
|
<kbd><space></kbd>: Przełącz stan poczekalni
|
||||||
<kbd><c-b></kbd>: Filter files (staged/unstaged)
|
<kbd><c-b></kbd>: Filter files (staged/unstaged)
|
||||||
<kbd>c</kbd>: Zatwierdź zmiany
|
<kbd>c</kbd>: Zatwierdź zmiany
|
||||||
<kbd>w</kbd>: zatwierdź zmiany bez skryptu pre-commit
|
<kbd>w</kbd>: Zatwierdź zmiany bez skryptu pre-commit
|
||||||
<kbd>A</kbd>: Zmień ostatni commit
|
<kbd>A</kbd>: Zmień ostatni commit
|
||||||
<kbd>C</kbd>: Zatwierdź zmiany używając edytora
|
<kbd>C</kbd>: Zatwierdź zmiany używając edytora
|
||||||
<kbd>e</kbd>: edytuj plik
|
<kbd>e</kbd>: Edytuj plik
|
||||||
<kbd>o</kbd>: otwórz plik
|
<kbd>o</kbd>: Otwórz plik
|
||||||
<kbd>i</kbd>: ignore or exclude file
|
<kbd>i</kbd>: Ignore or exclude file
|
||||||
<kbd>r</kbd>: odśwież pliki
|
<kbd>r</kbd>: Odśwież pliki
|
||||||
<kbd>s</kbd>: przechowaj zmiany
|
<kbd>s</kbd>: Przechowaj zmiany
|
||||||
<kbd>S</kbd>: wyświetl opcje schowka
|
<kbd>S</kbd>: Wyświetl opcje schowka
|
||||||
<kbd>a</kbd>: przełącz stan poczekalni wszystkich
|
<kbd>a</kbd>: Przełącz stan poczekalni wszystkich
|
||||||
<kbd><enter></kbd>: zatwierdź pojedyncze linie
|
<kbd><enter></kbd>: Zatwierdź pojedyncze linie
|
||||||
<kbd>g</kbd>: view upstream reset options
|
<kbd>g</kbd>: View upstream reset options
|
||||||
<kbd>D</kbd>: wyświetl opcje resetu
|
<kbd>D</kbd>: Wyświetl opcje resetu
|
||||||
<kbd>`</kbd>: toggle file tree view
|
<kbd>`</kbd>: Toggle file tree view
|
||||||
<kbd>M</kbd>: open external merge tool (git mergetool)
|
<kbd>M</kbd>: Open external merge tool (git mergetool)
|
||||||
<kbd>f</kbd>: pobierz
|
<kbd>f</kbd>: Pobierz
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Pliki commita
|
## Pliki commita
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy the committed file name to the clipboard
|
<kbd><c-o></kbd>: Copy the committed file name to the clipboard
|
||||||
<kbd>c</kbd>: plik wybierania
|
<kbd>c</kbd>: Plik wybierania
|
||||||
<kbd>d</kbd>: porzuć zmiany commita dla tego pliku
|
<kbd>d</kbd>: Porzuć zmiany commita dla tego pliku
|
||||||
<kbd>o</kbd>: otwórz plik
|
<kbd>o</kbd>: Otwórz plik
|
||||||
<kbd>e</kbd>: edytuj plik
|
<kbd>e</kbd>: Edytuj plik
|
||||||
<kbd><space></kbd>: toggle file included in patch
|
<kbd><space></kbd>: Toggle file included in patch
|
||||||
<kbd>a</kbd>: toggle all files included in patch
|
<kbd>a</kbd>: Toggle all files included in patch
|
||||||
<kbd><enter></kbd>: enter file to add selected lines to the patch (or toggle directory collapsed)
|
<kbd><enter></kbd>: Enter file to add selected lines to the patch (or toggle directory collapsed)
|
||||||
<kbd>`</kbd>: toggle file tree view
|
<kbd>`</kbd>: Toggle file tree view
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Poczekalnia
|
## Poczekalnia
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><left></kbd>: poprzedni kawałek
|
<kbd><left></kbd>: Poprzedni kawałek
|
||||||
<kbd><right></kbd>: następny kawałek
|
<kbd><right></kbd>: Następny kawałek
|
||||||
<kbd>v</kbd>: toggle drag select
|
<kbd>v</kbd>: Toggle drag select
|
||||||
<kbd>V</kbd>: toggle drag select
|
<kbd>V</kbd>: Toggle drag select
|
||||||
<kbd>a</kbd>: toggle select hunk
|
<kbd>a</kbd>: Toggle select hunk
|
||||||
<kbd><c-o></kbd>: copy the selected text to the clipboard
|
<kbd><c-o></kbd>: Copy the selected text to the clipboard
|
||||||
<kbd>o</kbd>: otwórz plik
|
<kbd>o</kbd>: Otwórz plik
|
||||||
<kbd>e</kbd>: edytuj plik
|
<kbd>e</kbd>: Edytuj plik
|
||||||
<kbd><esc></kbd>: wróć do panelu plików
|
<kbd><esc></kbd>: Wróć do panelu plików
|
||||||
<kbd><tab></kbd>: switch to other panel (staged/unstaged changes)
|
<kbd><tab></kbd>: Switch to other panel (staged/unstaged changes)
|
||||||
<kbd><space></kbd>: toggle line staged / unstaged
|
<kbd><space></kbd>: Toggle line staged / unstaged
|
||||||
<kbd>d</kbd>: delete change (git reset)
|
<kbd>d</kbd>: Delete change (git reset)
|
||||||
<kbd>E</kbd>: edit hunk
|
<kbd>E</kbd>: Edit hunk
|
||||||
<kbd>c</kbd>: Zatwierdź zmiany
|
<kbd>c</kbd>: Zatwierdź zmiany
|
||||||
<kbd>w</kbd>: zatwierdź zmiany bez skryptu pre-commit
|
<kbd>w</kbd>: Zatwierdź zmiany bez skryptu pre-commit
|
||||||
<kbd>C</kbd>: Zatwierdź zmiany używając edytora
|
<kbd>C</kbd>: Zatwierdź zmiany używając edytora
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Reflog
|
## Reflog
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy commit SHA to clipboard
|
<kbd><c-o></kbd>: Copy commit SHA to clipboard
|
||||||
<kbd><space></kbd>: checkout commit
|
<kbd><space></kbd>: Checkout commit
|
||||||
<kbd>y</kbd>: copy commit attribute
|
<kbd>y</kbd>: Copy commit attribute
|
||||||
<kbd>o</kbd>: open commit in browser
|
<kbd>o</kbd>: Open commit in browser
|
||||||
<kbd>n</kbd>: create new branch off of commit
|
<kbd>n</kbd>: Create new branch off of commit
|
||||||
<kbd>g</kbd>: wyświetl opcje resetu
|
<kbd>g</kbd>: Wyświetl opcje resetu
|
||||||
<kbd>c</kbd>: kopiuj commit (przebieranie)
|
<kbd>c</kbd>: Kopiuj commit (przebieranie)
|
||||||
<kbd>C</kbd>: kopiuj zakres commitów (przebieranie)
|
<kbd>C</kbd>: Kopiuj zakres commitów (przebieranie)
|
||||||
<kbd><c-r></kbd>: reset cherry-picked (copied) commits selection
|
<kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection
|
||||||
<kbd><enter></kbd>: view commits
|
<kbd><enter></kbd>: View commits
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Remote Branches
|
## Remote branches
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy branch name to clipboard
|
<kbd><c-o></kbd>: Copy branch name to clipboard
|
||||||
<kbd><space></kbd>: przełącz
|
<kbd><space></kbd>: Przełącz
|
||||||
<kbd>n</kbd>: nowa gałąź
|
<kbd>n</kbd>: Nowa gałąź
|
||||||
<kbd>M</kbd>: scal do obecnej gałęzi
|
<kbd>M</kbd>: Scal do obecnej gałęzi
|
||||||
<kbd>r</kbd>: zmiana bazy gałęzi
|
<kbd>r</kbd>: Zmiana bazy gałęzi
|
||||||
<kbd>d</kbd>: usuń gałąź
|
<kbd>d</kbd>: Usuń gałąź
|
||||||
<kbd>u</kbd>: set as upstream of checked-out branch
|
<kbd>u</kbd>: Set as upstream of checked-out branch
|
||||||
<kbd><esc></kbd>: wróć do listy repozytoriów zdalnych
|
<kbd><esc></kbd>: Wróć do listy repozytoriów zdalnych
|
||||||
<kbd>g</kbd>: wyświetl opcje resetu
|
<kbd>g</kbd>: Wyświetl opcje resetu
|
||||||
<kbd><enter></kbd>: view commits
|
<kbd><enter></kbd>: View commits
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Remotes
|
## Remotes
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>f</kbd>: fetch remote
|
<kbd>f</kbd>: Fetch remote
|
||||||
<kbd>n</kbd>: add new remote
|
<kbd>n</kbd>: Add new remote
|
||||||
<kbd>d</kbd>: remove remote
|
<kbd>d</kbd>: Remove remote
|
||||||
<kbd>e</kbd>: edit remote
|
<kbd>e</kbd>: Edit remote
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Scalanie
|
## Scalanie
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>e</kbd>: edytuj plik
|
<kbd>e</kbd>: Edytuj plik
|
||||||
<kbd>o</kbd>: otwórz plik
|
<kbd>o</kbd>: Otwórz plik
|
||||||
<kbd><left></kbd>: poprzedni konflikt
|
<kbd><left></kbd>: Poprzedni konflikt
|
||||||
<kbd><right></kbd>: następny konflikt
|
<kbd><right></kbd>: Następny konflikt
|
||||||
<kbd><up></kbd>: wybierz poprzedni kawałek
|
<kbd><up></kbd>: Wybierz poprzedni kawałek
|
||||||
<kbd><down></kbd>: wybierz następny kawałek
|
<kbd><down></kbd>: Wybierz następny kawałek
|
||||||
<kbd>z</kbd>: cofnij
|
<kbd>z</kbd>: Cofnij
|
||||||
<kbd>M</kbd>: open external merge tool (git mergetool)
|
<kbd>M</kbd>: Open external merge tool (git mergetool)
|
||||||
<kbd><space></kbd>: wybierz kawałek
|
<kbd><space></kbd>: Wybierz kawałek
|
||||||
<kbd>b</kbd>: wybierz wszystkie kawałki
|
<kbd>b</kbd>: Wybierz oba kawałki
|
||||||
<kbd><esc></kbd>: wróć do panelu plików
|
<kbd><esc></kbd>: Wróć do panelu plików
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Schowek
|
## Schowek
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><space></kbd>: zastosuj
|
<kbd><space></kbd>: Zastosuj
|
||||||
<kbd>g</kbd>: wyciągnij
|
<kbd>g</kbd>: Wyciągnij
|
||||||
<kbd>d</kbd>: porzuć
|
<kbd>d</kbd>: Porzuć
|
||||||
<kbd>n</kbd>: nowa gałąź
|
<kbd>n</kbd>: Nowa gałąź
|
||||||
<kbd>r</kbd>: rename stash
|
<kbd>r</kbd>: Rename stash
|
||||||
<kbd><enter></kbd>: przeglądaj pliki commita
|
<kbd><enter></kbd>: Przeglądaj pliki commita
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Status
|
## Status
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>o</kbd>: otwórz konfigurację
|
<kbd>o</kbd>: Otwórz konfigurację
|
||||||
<kbd>e</kbd>: edytuj konfigurację
|
<kbd>e</kbd>: Edytuj konfigurację
|
||||||
<kbd>u</kbd>: sprawdź aktualizacje
|
<kbd>u</kbd>: Sprawdź aktualizacje
|
||||||
<kbd><enter></kbd>: switch to a recent repo
|
<kbd><enter></kbd>: Switch to a recent repo
|
||||||
<kbd>a</kbd>: pokaż wszystkie logi gałęzi
|
<kbd>a</kbd>: Pokaż wszystkie logi gałęzi
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Sub-commits
|
## Sub-commits
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy commit SHA to clipboard
|
<kbd><c-o></kbd>: Copy commit SHA to clipboard
|
||||||
<kbd><space></kbd>: checkout commit
|
<kbd><space></kbd>: Checkout commit
|
||||||
<kbd>y</kbd>: copy commit attribute
|
<kbd>y</kbd>: Copy commit attribute
|
||||||
<kbd>o</kbd>: open commit in browser
|
<kbd>o</kbd>: Open commit in browser
|
||||||
<kbd>n</kbd>: create new branch off of commit
|
<kbd>n</kbd>: Create new branch off of commit
|
||||||
<kbd>g</kbd>: wyświetl opcje resetu
|
<kbd>g</kbd>: Wyświetl opcje resetu
|
||||||
<kbd>c</kbd>: kopiuj commit (przebieranie)
|
<kbd>c</kbd>: Kopiuj commit (przebieranie)
|
||||||
<kbd>C</kbd>: kopiuj zakres commitów (przebieranie)
|
<kbd>C</kbd>: Kopiuj zakres commitów (przebieranie)
|
||||||
<kbd><c-r></kbd>: reset cherry-picked (copied) commits selection
|
<kbd><c-r></kbd>: Reset cherry-picked (copied) commits selection
|
||||||
<kbd><enter></kbd>: przeglądaj pliki commita
|
<kbd><enter></kbd>: Przeglądaj pliki commita
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Submodules
|
## Submodules
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: copy submodule name to clipboard
|
<kbd><c-o></kbd>: Copy submodule name to clipboard
|
||||||
<kbd><enter></kbd>: enter submodule
|
<kbd><enter></kbd>: Enter submodule
|
||||||
<kbd>d</kbd>: remove submodule
|
<kbd>d</kbd>: Remove submodule
|
||||||
<kbd>u</kbd>: update submodule
|
<kbd>u</kbd>: Update submodule
|
||||||
<kbd>n</kbd>: add new submodule
|
<kbd>n</kbd>: Add new submodule
|
||||||
<kbd>e</kbd>: update submodule URL
|
<kbd>e</kbd>: Update submodule URL
|
||||||
<kbd>i</kbd>: initialize submodule
|
<kbd>i</kbd>: Initialize submodule
|
||||||
<kbd>b</kbd>: view bulk submodule options
|
<kbd>b</kbd>: View bulk submodule options
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Tags
|
## Tags
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd><space></kbd>: przełącz
|
<kbd><space></kbd>: Przełącz
|
||||||
<kbd>d</kbd>: delete tag
|
<kbd>d</kbd>: Delete tag
|
||||||
<kbd>P</kbd>: push tag
|
<kbd>P</kbd>: Push tag
|
||||||
<kbd>n</kbd>: create tag
|
<kbd>n</kbd>: Create tag
|
||||||
<kbd>g</kbd>: wyświetl opcje resetu
|
<kbd>g</kbd>: Wyświetl opcje resetu
|
||||||
<kbd><enter></kbd>: view commits
|
<kbd><enter></kbd>: View commits
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
## Zwykłe
|
## Zwykłe
|
||||||
|
|
||||||
<pre>
|
<pre>
|
||||||
<kbd>mouse wheel down</kbd>: przewiń w dół (fn+up)
|
<kbd>mouse wheel down</kbd>: Przewiń w dół (fn+up)
|
||||||
<kbd>mouse wheel up</kbd>: przewiń w górę (fn+down)
|
<kbd>mouse wheel up</kbd>: Przewiń w górę (fn+down)
|
||||||
</pre>
|
</pre>
|
||||||
|
|||||||
@ -49,7 +49,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: 将提交的 SHA 复制到剪贴板
|
<kbd><c-o></kbd>: 将提交的 SHA 复制到剪贴板
|
||||||
<kbd><space></kbd>: 检出提交
|
<kbd><space></kbd>: 检出提交
|
||||||
<kbd>y</kbd>: copy commit attribute
|
<kbd>y</kbd>: Copy commit attribute
|
||||||
<kbd>o</kbd>: 在浏览器中打开提交
|
<kbd>o</kbd>: 在浏览器中打开提交
|
||||||
<kbd>n</kbd>: 从提交创建新分支
|
<kbd>n</kbd>: 从提交创建新分支
|
||||||
<kbd>g</kbd>: 查看重置选项
|
<kbd>g</kbd>: 查看重置选项
|
||||||
@ -78,7 +78,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>T</kbd>: 创建标签
|
<kbd>T</kbd>: 创建标签
|
||||||
<kbd>g</kbd>: 查看重置选项
|
<kbd>g</kbd>: 查看重置选项
|
||||||
<kbd>R</kbd>: 重命名分支
|
<kbd>R</kbd>: 重命名分支
|
||||||
<kbd>u</kbd>: set/unset upstream
|
<kbd>u</kbd>: Set/Unset upstream
|
||||||
<kbd><enter></kbd>: 查看提交
|
<kbd><enter></kbd>: 查看提交
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
@ -87,7 +87,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<pre>
|
<pre>
|
||||||
<kbd><c-o></kbd>: 将提交的 SHA 复制到剪贴板
|
<kbd><c-o></kbd>: 将提交的 SHA 复制到剪贴板
|
||||||
<kbd><space></kbd>: 检出提交
|
<kbd><space></kbd>: 检出提交
|
||||||
<kbd>y</kbd>: copy commit attribute
|
<kbd>y</kbd>: Copy commit attribute
|
||||||
<kbd>o</kbd>: 在浏览器中打开提交
|
<kbd>o</kbd>: 在浏览器中打开提交
|
||||||
<kbd>n</kbd>: 从提交创建新分支
|
<kbd>n</kbd>: 从提交创建新分支
|
||||||
<kbd>g</kbd>: 查看重置选项
|
<kbd>g</kbd>: 查看重置选项
|
||||||
@ -123,18 +123,18 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>d</kbd>: 删除提交
|
<kbd>d</kbd>: 删除提交
|
||||||
<kbd>e</kbd>: 编辑提交
|
<kbd>e</kbd>: 编辑提交
|
||||||
<kbd>p</kbd>: 选择提交（变基过程中）
|
<kbd>p</kbd>: 选择提交（变基过程中）
|
||||||
<kbd>F</kbd>: 为此提交创建修正
|
<kbd>F</kbd>: 创建修正提交
|
||||||
<kbd>S</kbd>: 压缩在所选提交之上的所有“fixup!”提交（自动压缩）
|
<kbd>S</kbd>: 压缩在所选提交之上的所有“fixup!”提交（自动压缩）
|
||||||
<kbd><c-j></kbd>: 下移提交
|
<kbd><c-j></kbd>: 下移提交
|
||||||
<kbd><c-k></kbd>: 上移提交
|
<kbd><c-k></kbd>: 上移提交
|
||||||
<kbd>v</kbd>: 粘贴提交（拣选）
|
<kbd>v</kbd>: 粘贴提交（拣选）
|
||||||
<kbd>A</kbd>: 用已暂存的更改来修补提交
|
<kbd>A</kbd>: 用已暂存的更改来修补提交
|
||||||
<kbd>a</kbd>: reset commit author
|
<kbd>a</kbd>: Set/Reset commit author
|
||||||
<kbd>t</kbd>: 还原提交
|
<kbd>t</kbd>: 还原提交
|
||||||
<kbd>T</kbd>: 标签提交
|
<kbd>T</kbd>: 标签提交
|
||||||
<kbd><c-l></kbd>: 打开日志菜单
|
<kbd><c-l></kbd>: 打开日志菜单
|
||||||
<kbd><space></kbd>: 检出提交
|
<kbd><space></kbd>: 检出提交
|
||||||
<kbd>y</kbd>: copy commit attribute
|
<kbd>y</kbd>: Copy commit attribute
|
||||||
<kbd>o</kbd>: 在浏览器中打开提交
|
<kbd>o</kbd>: 在浏览器中打开提交
|
||||||
<kbd>n</kbd>: 从提交创建新分支
|
<kbd>n</kbd>: 从提交创建新分支
|
||||||
<kbd>g</kbd>: 查看重置选项
|
<kbd>g</kbd>: 查看重置选项
|
||||||
@ -152,7 +152,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>o</kbd>: 打开文件
|
<kbd>o</kbd>: 打开文件
|
||||||
<kbd>e</kbd>: 编辑文件
|
<kbd>e</kbd>: 编辑文件
|
||||||
<kbd><space></kbd>: 补丁中包含的切换文件
|
<kbd><space></kbd>: 补丁中包含的切换文件
|
||||||
<kbd>a</kbd>: toggle all files included in patch
|
<kbd>a</kbd>: Toggle all files included in patch
|
||||||
<kbd><enter></kbd>: 输入文件以将所选行添加到补丁中（或切换目录折叠）
|
<kbd><enter></kbd>: 输入文件以将所选行添加到补丁中（或切换目录折叠）
|
||||||
<kbd>`</kbd>: 切换文件树视图
|
<kbd>`</kbd>: 切换文件树视图
|
||||||
</pre>
|
</pre>
|
||||||
@ -247,7 +247,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd><tab></kbd>: 切换到其他面板
|
<kbd><tab></kbd>: 切换到其他面板
|
||||||
<kbd><space></kbd>: 切换行暂存状态
|
<kbd><space></kbd>: 切换行暂存状态
|
||||||
<kbd>d</kbd>: 取消变更 (git reset)
|
<kbd>d</kbd>: 取消变更 (git reset)
|
||||||
<kbd>E</kbd>: edit hunk
|
<kbd>E</kbd>: Edit hunk
|
||||||
<kbd>c</kbd>: 提交更改
|
<kbd>c</kbd>: 提交更改
|
||||||
<kbd>w</kbd>: 提交更改而无需预先提交钩子
|
<kbd>w</kbd>: 提交更改而无需预先提交钩子
|
||||||
<kbd>C</kbd>: 提交更改（使用编辑器编辑提交信息）
|
<kbd>C</kbd>: 提交更改（使用编辑器编辑提交信息）
|
||||||
@ -291,7 +291,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
|
|||||||
<kbd>g</kbd>: 应用并删除
|
<kbd>g</kbd>: 应用并删除
|
||||||
<kbd>d</kbd>: 删除
|
<kbd>d</kbd>: 删除
|
||||||
<kbd>n</kbd>: 新分支
|
<kbd>n</kbd>: 新分支
|
||||||
<kbd>r</kbd>: rename stash
|
<kbd>r</kbd>: Rename stash
|
||||||
<kbd><enter></kbd>: 查看提交的文件
|
<kbd><enter></kbd>: 查看提交的文件
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
|
|||||||
@ -54,7 +54,7 @@ func TestGetBindingSections(t *testing.T) {
|
|||||||
},
|
},
|
||||||
expected: []*bindingSection{
|
expected: []*bindingSection{
|
||||||
{
|
{
|
||||||
title: "Global Keybindings",
|
title: "Global keybindings",
|
||||||
bindings: []*types.Binding{
|
bindings: []*types.Binding{
|
||||||
{
|
{
|
||||||
ViewName: "",
|
ViewName: "",
|
||||||
@ -139,7 +139,7 @@ func TestGetBindingSections(t *testing.T) {
|
|||||||
},
|
},
|
||||||
expected: []*bindingSection{
|
expected: []*bindingSection{
|
||||||
{
|
{
|
||||||
title: "List Panel Navigation",
|
title: "List panel navigation",
|
||||||
bindings: []*types.Binding{
|
bindings: []*types.Binding{
|
||||||
{
|
{
|
||||||
ViewName: "files",
|
ViewName: "files",
|
||||||
@ -215,7 +215,7 @@ func TestGetBindingSections(t *testing.T) {
|
|||||||
},
|
},
|
||||||
expected: []*bindingSection{
|
expected: []*bindingSection{
|
||||||
{
|
{
|
||||||
title: "List Panel Navigation",
|
title: "List panel navigation",
|
||||||
bindings: []*types.Binding{
|
bindings: []*types.Binding{
|
||||||
{
|
{
|
||||||
ViewName: "files",
|
ViewName: "files",
|
||||||
|
|||||||
@ -1,3 +0,0 @@
|
|||||||
package constants
|
|
||||||
|
|
||||||
const SEARCH_PREFIX = "search: "
|
|
||||||
@ -37,44 +37,44 @@ func (self *BasicCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.CheckoutCommit),
|
Key: opts.GetKey(opts.Config.Commits.CheckoutCommit),
|
||||||
Handler: self.checkSelected(self.checkout),
|
Handler: self.checkSelected(self.checkout),
|
||||||
Description: self.c.Tr.LcCheckoutCommit,
|
Description: self.c.Tr.CheckoutCommit,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.CopyCommitAttributeToClipboard),
|
Key: opts.GetKey(opts.Config.Commits.CopyCommitAttributeToClipboard),
|
||||||
Handler: self.checkSelected(self.copyCommitAttribute),
|
Handler: self.checkSelected(self.copyCommitAttribute),
|
||||||
Description: self.c.Tr.LcCopyCommitAttributeToClipboard,
|
Description: self.c.Tr.CopyCommitAttributeToClipboard,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.OpenInBrowser),
|
Key: opts.GetKey(opts.Config.Commits.OpenInBrowser),
|
||||||
Handler: self.checkSelected(self.openInBrowser),
|
Handler: self.checkSelected(self.openInBrowser),
|
||||||
Description: self.c.Tr.LcOpenCommitInBrowser,
|
Description: self.c.Tr.OpenCommitInBrowser,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.New),
|
Key: opts.GetKey(opts.Config.Universal.New),
|
||||||
Handler: self.checkSelected(self.newBranch),
|
Handler: self.checkSelected(self.newBranch),
|
||||||
Description: self.c.Tr.LcCreateNewBranchFromCommit,
|
Description: self.c.Tr.CreateNewBranchFromCommit,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.ViewResetOptions),
|
Key: opts.GetKey(opts.Config.Commits.ViewResetOptions),
|
||||||
Handler: self.checkSelected(self.createResetMenu),
|
Handler: self.checkSelected(self.createResetMenu),
|
||||||
Description: self.c.Tr.LcViewResetOptions,
|
Description: self.c.Tr.ViewResetOptions,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.CherryPickCopy),
|
Key: opts.GetKey(opts.Config.Commits.CherryPickCopy),
|
||||||
Handler: self.checkSelected(self.copy),
|
Handler: self.checkSelected(self.copy),
|
||||||
Description: self.c.Tr.LcCherryPickCopy,
|
Description: self.c.Tr.CherryPickCopy,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.CherryPickCopyRange),
|
Key: opts.GetKey(opts.Config.Commits.CherryPickCopyRange),
|
||||||
Handler: self.checkSelected(self.copyRange),
|
Handler: self.checkSelected(self.copyRange),
|
||||||
Description: self.c.Tr.LcCherryPickCopyRange,
|
Description: self.c.Tr.CherryPickCopyRange,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.ResetCherryPick),
|
Key: opts.GetKey(opts.Config.Commits.ResetCherryPick),
|
||||||
Handler: self.c.Helpers().CherryPick.Reset,
|
Handler: self.c.Helpers().CherryPick.Reset,
|
||||||
Description: self.c.Tr.LcResetCherryPick,
|
Description: self.c.Tr.ResetCherryPick,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -101,35 +101,35 @@ func (self *BasicCommitsController) copyCommitAttribute(commit *models.Commit) e
|
|||||||
Title: self.c.Tr.Actions.CopyCommitAttributeToClipboard,
|
Title: self.c.Tr.Actions.CopyCommitAttributeToClipboard,
|
||||||
Items: []*types.MenuItem{
|
Items: []*types.MenuItem{
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcCommitSha,
|
Label: self.c.Tr.CommitSha,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.copyCommitSHAToClipboard(commit)
|
return self.copyCommitSHAToClipboard(commit)
|
||||||
},
|
},
|
||||||
Key: 's',
|
Key: 's',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcCommitURL,
|
Label: self.c.Tr.CommitURL,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.copyCommitURLToClipboard(commit)
|
return self.copyCommitURLToClipboard(commit)
|
||||||
},
|
},
|
||||||
Key: 'u',
|
Key: 'u',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcCommitDiff,
|
Label: self.c.Tr.CommitDiff,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.copyCommitDiffToClipboard(commit)
|
return self.copyCommitDiffToClipboard(commit)
|
||||||
},
|
},
|
||||||
Key: 'd',
|
Key: 'd',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcCommitMessage,
|
Label: self.c.Tr.CommitMessage,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.copyCommitMessageToClipboard(commit)
|
return self.copyCommitMessageToClipboard(commit)
|
||||||
},
|
},
|
||||||
Key: 'm',
|
Key: 'm',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcCommitAuthor,
|
Label: self.c.Tr.CommitAuthor,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.copyAuthorToClipboard(commit)
|
return self.copyAuthorToClipboard(commit)
|
||||||
},
|
},
|
||||||
@ -235,7 +235,7 @@ func (self *BasicCommitsController) createResetMenu(commit *models.Commit) error
|
|||||||
|
|
||||||
func (self *BasicCommitsController) checkout(commit *models.Commit) error {
|
func (self *BasicCommitsController) checkout(commit *models.Commit) error {
|
||||||
return self.c.Confirm(types.ConfirmOpts{
|
return self.c.Confirm(types.ConfirmOpts{
|
||||||
Title: self.c.Tr.LcCheckoutCommit,
|
Title: self.c.Tr.CheckoutCommit,
|
||||||
Prompt: self.c.Tr.SureCheckoutThisCommit,
|
Prompt: self.c.Tr.SureCheckoutThisCommit,
|
||||||
HandleConfirm: func() error {
|
HandleConfirm: func() error {
|
||||||
self.c.LogAction(self.c.Tr.Actions.CheckoutCommit)
|
self.c.LogAction(self.c.Tr.Actions.CheckoutCommit)
|
||||||
|
|||||||
@ -31,7 +31,7 @@ func (self *BisectController) GetKeybindings(opts types.KeybindingsOpts) []*type
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.ViewBisectOptions),
|
Key: opts.GetKey(opts.Config.Commits.ViewBisectOptions),
|
||||||
Handler: opts.Guards.OutsideFilterMode(self.checkSelected(self.openMenu)),
|
Handler: opts.Guards.OutsideFilterMode(self.checkSelected(self.openMenu)),
|
||||||
Description: self.c.Tr.LcViewBisectOptions,
|
Description: self.c.Tr.ViewBisectOptions,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,53 +33,53 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Select),
|
Key: opts.GetKey(opts.Config.Universal.Select),
|
||||||
Handler: self.checkSelected(self.press),
|
Handler: self.checkSelected(self.press),
|
||||||
Description: self.c.Tr.LcCheckout,
|
Description: self.c.Tr.Checkout,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.New),
|
Key: opts.GetKey(opts.Config.Universal.New),
|
||||||
Handler: self.checkSelected(self.newBranch),
|
Handler: self.checkSelected(self.newBranch),
|
||||||
Description: self.c.Tr.LcNewBranch,
|
Description: self.c.Tr.NewBranch,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.CreatePullRequest),
|
Key: opts.GetKey(opts.Config.Branches.CreatePullRequest),
|
||||||
Handler: self.checkSelected(self.handleCreatePullRequest),
|
Handler: self.checkSelected(self.handleCreatePullRequest),
|
||||||
Description: self.c.Tr.LcCreatePullRequest,
|
Description: self.c.Tr.CreatePullRequest,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.ViewPullRequestOptions),
|
Key: opts.GetKey(opts.Config.Branches.ViewPullRequestOptions),
|
||||||
Handler: self.checkSelected(self.handleCreatePullRequestMenu),
|
Handler: self.checkSelected(self.handleCreatePullRequestMenu),
|
||||||
Description: self.c.Tr.LcCreatePullRequestOptions,
|
Description: self.c.Tr.CreatePullRequestOptions,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.CopyPullRequestURL),
|
Key: opts.GetKey(opts.Config.Branches.CopyPullRequestURL),
|
||||||
Handler: self.copyPullRequestURL,
|
Handler: self.copyPullRequestURL,
|
||||||
Description: self.c.Tr.LcCopyPullRequestURL,
|
Description: self.c.Tr.CopyPullRequestURL,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.CheckoutBranchByName),
|
Key: opts.GetKey(opts.Config.Branches.CheckoutBranchByName),
|
||||||
Handler: self.checkoutByName,
|
Handler: self.checkoutByName,
|
||||||
Description: self.c.Tr.LcCheckoutByName,
|
Description: self.c.Tr.CheckoutByName,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.ForceCheckoutBranch),
|
Key: opts.GetKey(opts.Config.Branches.ForceCheckoutBranch),
|
||||||
Handler: self.forceCheckout,
|
Handler: self.forceCheckout,
|
||||||
Description: self.c.Tr.LcForceCheckout,
|
Description: self.c.Tr.ForceCheckout,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Remove),
|
Key: opts.GetKey(opts.Config.Universal.Remove),
|
||||||
Handler: self.checkSelectedAndReal(self.delete),
|
Handler: self.checkSelectedAndReal(self.delete),
|
||||||
Description: self.c.Tr.LcDeleteBranch,
|
Description: self.c.Tr.DeleteBranch,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.RebaseBranch),
|
Key: opts.GetKey(opts.Config.Branches.RebaseBranch),
|
||||||
Handler: opts.Guards.OutsideFilterMode(self.rebase),
|
Handler: opts.Guards.OutsideFilterMode(self.rebase),
|
||||||
Description: self.c.Tr.LcRebaseBranch,
|
Description: self.c.Tr.RebaseBranch,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
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),
|
||||||
Description: self.c.Tr.LcMergeIntoCurrentBranch,
|
Description: self.c.Tr.MergeIntoCurrentBranch,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.FastForward),
|
Key: opts.GetKey(opts.Config.Branches.FastForward),
|
||||||
@ -89,23 +89,23 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.CreateTag),
|
Key: opts.GetKey(opts.Config.Branches.CreateTag),
|
||||||
Handler: self.checkSelected(self.createTag),
|
Handler: self.checkSelected(self.createTag),
|
||||||
Description: self.c.Tr.LcCreateTag,
|
Description: self.c.Tr.CreateTag,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.ViewResetOptions),
|
Key: opts.GetKey(opts.Config.Commits.ViewResetOptions),
|
||||||
Handler: self.checkSelected(self.createResetMenu),
|
Handler: self.checkSelected(self.createResetMenu),
|
||||||
Description: self.c.Tr.LcViewResetOptions,
|
Description: self.c.Tr.ViewResetOptions,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.RenameBranch),
|
Key: opts.GetKey(opts.Config.Branches.RenameBranch),
|
||||||
Handler: self.checkSelectedAndReal(self.rename),
|
Handler: self.checkSelectedAndReal(self.rename),
|
||||||
Description: self.c.Tr.LcRenameBranch,
|
Description: self.c.Tr.RenameBranch,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.SetUpstream),
|
Key: opts.GetKey(opts.Config.Branches.SetUpstream),
|
||||||
Handler: self.checkSelected(self.setUpstream),
|
Handler: self.checkSelected(self.setUpstream),
|
||||||
Description: self.c.Tr.LcSetUnsetUpstream,
|
Description: self.c.Tr.SetUnsetUpstream,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -140,7 +140,7 @@ func (self *BranchesController) setUpstream(selectedBranch *models.Branch) error
|
|||||||
Title: self.c.Tr.Actions.SetUnsetUpstream,
|
Title: self.c.Tr.Actions.SetUnsetUpstream,
|
||||||
Items: []*types.MenuItem{
|
Items: []*types.MenuItem{
|
||||||
{
|
{
|
||||||
LabelColumns: []string{self.c.Tr.LcUnsetUpstream},
|
LabelColumns: []string{self.c.Tr.UnsetUpstream},
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
if err := self.c.Git().Branch.UnsetUpstream(selectedBranch.Name); err != nil {
|
if err := self.c.Git().Branch.UnsetUpstream(selectedBranch.Name); err != nil {
|
||||||
return self.c.Error(err)
|
return self.c.Error(err)
|
||||||
@ -159,7 +159,7 @@ func (self *BranchesController) setUpstream(selectedBranch *models.Branch) error
|
|||||||
Key: 'u',
|
Key: 'u',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
LabelColumns: []string{self.c.Tr.LcSetUpstream},
|
LabelColumns: []string{self.c.Tr.SetUpstream},
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.c.Helpers().Upstream.PromptForUpstreamWithoutInitialContent(selectedBranch, func(upstream string) error {
|
return self.c.Helpers().Upstream.PromptForUpstreamWithoutInitialContent(selectedBranch, func(upstream string) error {
|
||||||
upstreamRemote, upstreamBranch, err := self.c.Helpers().Upstream.ParseUpstream(upstream)
|
upstreamRemote, upstreamBranch, err := self.c.Helpers().Upstream.ParseUpstream(upstream)
|
||||||
@ -437,7 +437,7 @@ func (self *BranchesController) rename(branch *models.Branch) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return self.c.Confirm(types.ConfirmOpts{
|
return self.c.Confirm(types.ConfirmOpts{
|
||||||
Title: self.c.Tr.LcRenameBranch,
|
Title: self.c.Tr.RenameBranch,
|
||||||
Prompt: self.c.Tr.RenameBranchWarning,
|
Prompt: self.c.Tr.RenameBranchWarning,
|
||||||
HandleConfirm: promptForNewName,
|
HandleConfirm: promptForNewName,
|
||||||
})
|
})
|
||||||
@ -457,13 +457,13 @@ func (self *BranchesController) createPullRequestMenu(selectedBranch *models.Bra
|
|||||||
menuItemsForBranch := func(branch *models.Branch) []*types.MenuItem {
|
menuItemsForBranch := func(branch *models.Branch) []*types.MenuItem {
|
||||||
return []*types.MenuItem{
|
return []*types.MenuItem{
|
||||||
{
|
{
|
||||||
LabelColumns: fromToLabelColumns(branch.Name, self.c.Tr.LcDefaultBranch),
|
LabelColumns: fromToLabelColumns(branch.Name, self.c.Tr.DefaultBranch),
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.createPullRequest(branch.Name, "")
|
return self.createPullRequest(branch.Name, "")
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
LabelColumns: fromToLabelColumns(branch.Name, self.c.Tr.LcSelectBranch),
|
LabelColumns: fromToLabelColumns(branch.Name, self.c.Tr.SelectBranch),
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.c.Prompt(types.PromptOpts{
|
return self.c.Prompt(types.PromptOpts{
|
||||||
Title: branch.Name + " →",
|
Title: branch.Name + " →",
|
||||||
|
|||||||
@ -29,12 +29,12 @@ func (self *CommitMessageController) GetKeybindings(opts types.KeybindingsOpts)
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.SubmitEditorText),
|
Key: opts.GetKey(opts.Config.Universal.SubmitEditorText),
|
||||||
Handler: self.confirm,
|
Handler: self.confirm,
|
||||||
Description: self.c.Tr.LcConfirm,
|
Description: self.c.Tr.Confirm,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Return),
|
Key: opts.GetKey(opts.Config.Universal.Return),
|
||||||
Handler: self.close,
|
Handler: self.close,
|
||||||
Description: self.c.Tr.LcClose,
|
Description: self.c.Tr.Close,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.PrevItem),
|
Key: opts.GetKey(opts.Config.Universal.PrevItem),
|
||||||
|
|||||||
@ -30,42 +30,42 @@ func (self *CommitFilesController) GetKeybindings(opts types.KeybindingsOpts) []
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.CommitFiles.CheckoutCommitFile),
|
Key: opts.GetKey(opts.Config.CommitFiles.CheckoutCommitFile),
|
||||||
Handler: self.checkSelected(self.checkout),
|
Handler: self.checkSelected(self.checkout),
|
||||||
Description: self.c.Tr.LcCheckoutCommitFile,
|
Description: self.c.Tr.CheckoutCommitFile,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Remove),
|
Key: opts.GetKey(opts.Config.Universal.Remove),
|
||||||
Handler: self.checkSelected(self.discard),
|
Handler: self.checkSelected(self.discard),
|
||||||
Description: self.c.Tr.LcDiscardOldFileChange,
|
Description: self.c.Tr.DiscardOldFileChange,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.OpenFile),
|
Key: opts.GetKey(opts.Config.Universal.OpenFile),
|
||||||
Handler: self.checkSelected(self.open),
|
Handler: self.checkSelected(self.open),
|
||||||
Description: self.c.Tr.LcOpenFile,
|
Description: self.c.Tr.OpenFile,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Edit),
|
Key: opts.GetKey(opts.Config.Universal.Edit),
|
||||||
Handler: self.checkSelected(self.edit),
|
Handler: self.checkSelected(self.edit),
|
||||||
Description: self.c.Tr.LcEditFile,
|
Description: self.c.Tr.EditFile,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Select),
|
Key: opts.GetKey(opts.Config.Universal.Select),
|
||||||
Handler: self.checkSelected(self.toggleForPatch),
|
Handler: self.checkSelected(self.toggleForPatch),
|
||||||
Description: self.c.Tr.LcToggleAddToPatch,
|
Description: self.c.Tr.ToggleAddToPatch,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.ToggleStagedAll),
|
Key: opts.GetKey(opts.Config.Files.ToggleStagedAll),
|
||||||
Handler: self.checkSelected(self.toggleAllForPatch),
|
Handler: self.checkSelected(self.toggleAllForPatch),
|
||||||
Description: self.c.Tr.LcToggleAllInPatch,
|
Description: self.c.Tr.ToggleAllInPatch,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.GoInto),
|
Key: opts.GetKey(opts.Config.Universal.GoInto),
|
||||||
Handler: self.checkSelected(self.enter),
|
Handler: self.checkSelected(self.enter),
|
||||||
Description: self.c.Tr.LcEnterFile,
|
Description: self.c.Tr.EnterFile,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.ToggleTreeView),
|
Key: opts.GetKey(opts.Config.Files.ToggleTreeView),
|
||||||
Handler: self.toggleTreeView,
|
Handler: self.toggleTreeView,
|
||||||
Description: self.c.Tr.LcToggleTreeView,
|
Description: self.c.Tr.ToggleTreeView,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -189,7 +189,7 @@ func (self *CommitFilesController) edit(node *filetree.CommitFileNode) error {
|
|||||||
|
|
||||||
func (self *CommitFilesController) toggleForPatch(node *filetree.CommitFileNode) error {
|
func (self *CommitFilesController) toggleForPatch(node *filetree.CommitFileNode) error {
|
||||||
toggle := func() error {
|
toggle := func() error {
|
||||||
return self.c.WithWaitingStatus(self.c.Tr.LcUpdatingPatch, func() error {
|
return self.c.WithWaitingStatus(self.c.Tr.UpdatingPatch, func() error {
|
||||||
if !self.c.Git().Patch.PatchBuilder.Active() {
|
if !self.c.Git().Patch.PatchBuilder.Active() {
|
||||||
if err := self.startPatchBuilder(); err != nil {
|
if err := self.startPatchBuilder(); err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@ -26,13 +26,13 @@ func (self *ConfirmationController) GetKeybindings(opts types.KeybindingsOpts) [
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Confirm),
|
Key: opts.GetKey(opts.Config.Universal.Confirm),
|
||||||
Handler: func() error { return self.context().State.OnConfirm() },
|
Handler: func() error { return self.context().State.OnConfirm() },
|
||||||
Description: self.c.Tr.LcConfirm,
|
Description: self.c.Tr.Confirm,
|
||||||
Display: true,
|
Display: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Return),
|
Key: opts.GetKey(opts.Config.Universal.Return),
|
||||||
Handler: func() error { return self.context().State.OnClose() },
|
Handler: func() error { return self.context().State.OnClose() },
|
||||||
Description: self.c.Tr.LcCloseCancel,
|
Description: self.c.Tr.CloseCancel,
|
||||||
Display: true,
|
Display: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@ -18,17 +18,17 @@ func (self *CustomPatchOptionsMenuAction) Call() error {
|
|||||||
|
|
||||||
menuItems := []*types.MenuItem{
|
menuItems := []*types.MenuItem{
|
||||||
{
|
{
|
||||||
Label: "reset patch",
|
Label: self.c.Tr.ResetPatch,
|
||||||
OnPress: self.c.Helpers().PatchBuilding.Reset,
|
OnPress: self.c.Helpers().PatchBuilding.Reset,
|
||||||
Key: 'c',
|
Key: 'c',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Label: "apply patch",
|
Label: self.c.Tr.ApplyPatch,
|
||||||
OnPress: func() error { return self.handleApplyPatch(false) },
|
OnPress: func() error { return self.handleApplyPatch(false) },
|
||||||
Key: 'a',
|
Key: 'a',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Label: "apply patch in reverse",
|
Label: self.c.Tr.ApplyPatchInReverse,
|
||||||
OnPress: func() error { return self.handleApplyPatch(true) },
|
OnPress: func() error { return self.handleApplyPatch(true) },
|
||||||
Key: 'r',
|
Key: 'r',
|
||||||
},
|
},
|
||||||
@ -37,17 +37,17 @@ func (self *CustomPatchOptionsMenuAction) Call() error {
|
|||||||
if self.c.Git().Patch.PatchBuilder.CanRebase && self.c.Git().Status.WorkingTreeState() == enums.REBASE_MODE_NONE {
|
if self.c.Git().Patch.PatchBuilder.CanRebase && self.c.Git().Status.WorkingTreeState() == enums.REBASE_MODE_NONE {
|
||||||
menuItems = append(menuItems, []*types.MenuItem{
|
menuItems = append(menuItems, []*types.MenuItem{
|
||||||
{
|
{
|
||||||
Label: fmt.Sprintf("remove patch from original commit (%s)", self.c.Git().Patch.PatchBuilder.To),
|
Label: fmt.Sprintf(self.c.Tr.RemovePatchFromOriginalCommit, self.c.Git().Patch.PatchBuilder.To),
|
||||||
OnPress: self.handleDeletePatchFromCommit,
|
OnPress: self.handleDeletePatchFromCommit,
|
||||||
Key: 'd',
|
Key: 'd',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Label: "move patch out into index",
|
Label: self.c.Tr.MovePatchOutIntoIndex,
|
||||||
OnPress: self.handleMovePatchIntoWorkingTree,
|
OnPress: self.handleMovePatchIntoWorkingTree,
|
||||||
Key: 'i',
|
Key: 'i',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Label: "move patch into new commit",
|
Label: self.c.Tr.MovePatchIntoNewCommit,
|
||||||
OnPress: self.handlePullPatchIntoNewCommit,
|
OnPress: self.handlePullPatchIntoNewCommit,
|
||||||
Key: 'n',
|
Key: 'n',
|
||||||
},
|
},
|
||||||
@ -62,7 +62,7 @@ func (self *CustomPatchOptionsMenuAction) Call() error {
|
|||||||
append(
|
append(
|
||||||
[]*types.MenuItem{
|
[]*types.MenuItem{
|
||||||
{
|
{
|
||||||
Label: fmt.Sprintf("move patch to selected commit (%s)", selectedCommit.Sha),
|
Label: fmt.Sprintf(self.c.Tr.MovePatchToSelectedCommit, selectedCommit.Sha),
|
||||||
OnPress: self.handleMovePatchToSelectedCommit,
|
OnPress: self.handleMovePatchToSelectedCommit,
|
||||||
Key: 'm',
|
Key: 'm',
|
||||||
},
|
},
|
||||||
@ -75,7 +75,7 @@ func (self *CustomPatchOptionsMenuAction) Call() error {
|
|||||||
|
|
||||||
menuItems = append(menuItems, []*types.MenuItem{
|
menuItems = append(menuItems, []*types.MenuItem{
|
||||||
{
|
{
|
||||||
Label: "copy patch to clipboard",
|
Label: self.c.Tr.CopyPatchToClipboard,
|
||||||
OnPress: func() error { return self.copyPatchToClipboard() },
|
OnPress: func() error { return self.copyPatchToClipboard() },
|
||||||
Key: 'y',
|
Key: 'y',
|
||||||
},
|
},
|
||||||
|
|||||||
@ -20,7 +20,7 @@ func (self *DiffingMenuAction) Call() error {
|
|||||||
name := name
|
name := name
|
||||||
menuItems = append(menuItems, []*types.MenuItem{
|
menuItems = append(menuItems, []*types.MenuItem{
|
||||||
{
|
{
|
||||||
Label: fmt.Sprintf("%s %s", self.c.Tr.LcDiff, name),
|
Label: fmt.Sprintf("%s %s", self.c.Tr.Diff, name),
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
self.c.Modes().Diffing.Ref = name
|
self.c.Modes().Diffing.Ref = name
|
||||||
// can scope this down based on current view but too lazy right now
|
// can scope this down based on current view but too lazy right now
|
||||||
@ -32,10 +32,10 @@ func (self *DiffingMenuAction) Call() error {
|
|||||||
|
|
||||||
menuItems = append(menuItems, []*types.MenuItem{
|
menuItems = append(menuItems, []*types.MenuItem{
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcEnterRefToDiff,
|
Label: self.c.Tr.EnterRefToDiff,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.c.Prompt(types.PromptOpts{
|
return self.c.Prompt(types.PromptOpts{
|
||||||
Title: self.c.Tr.LcEnteRefName,
|
Title: self.c.Tr.EnteRefName,
|
||||||
FindSuggestionsFunc: self.c.Helpers().Suggestions.GetRefsSuggestionsFunc(),
|
FindSuggestionsFunc: self.c.Helpers().Suggestions.GetRefsSuggestionsFunc(),
|
||||||
HandleConfirm: func(response string) error {
|
HandleConfirm: func(response string) error {
|
||||||
self.c.Modes().Diffing.Ref = strings.TrimSpace(response)
|
self.c.Modes().Diffing.Ref = strings.TrimSpace(response)
|
||||||
@ -49,14 +49,14 @@ func (self *DiffingMenuAction) Call() error {
|
|||||||
if self.c.Modes().Diffing.Active() {
|
if self.c.Modes().Diffing.Active() {
|
||||||
menuItems = append(menuItems, []*types.MenuItem{
|
menuItems = append(menuItems, []*types.MenuItem{
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcSwapDiff,
|
Label: self.c.Tr.SwapDiff,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
self.c.Modes().Diffing.Reverse = !self.c.Modes().Diffing.Reverse
|
self.c.Modes().Diffing.Reverse = !self.c.Modes().Diffing.Reverse
|
||||||
return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
|
return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcExitDiffMode,
|
Label: self.c.Tr.ExitDiffMode,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
self.c.Modes().Diffing = diffing.New()
|
self.c.Modes().Diffing = diffing.New()
|
||||||
return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
|
return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC})
|
||||||
|
|||||||
@ -31,12 +31,12 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Select),
|
Key: opts.GetKey(opts.Config.Universal.Select),
|
||||||
Handler: self.checkSelectedFileNode(self.press),
|
Handler: self.checkSelectedFileNode(self.press),
|
||||||
Description: self.c.Tr.LcToggleStaged,
|
Description: self.c.Tr.ToggleStaged,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.OpenStatusFilter),
|
Key: opts.GetKey(opts.Config.Files.OpenStatusFilter),
|
||||||
Handler: self.handleStatusFilterPressed,
|
Handler: self.handleStatusFilterPressed,
|
||||||
Description: self.c.Tr.LcFileFilter,
|
Description: self.c.Tr.FileFilter,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.CommitChanges),
|
Key: opts.GetKey(opts.Config.Files.CommitChanges),
|
||||||
@ -46,7 +46,7 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.CommitChangesWithoutHook),
|
Key: opts.GetKey(opts.Config.Files.CommitChangesWithoutHook),
|
||||||
Handler: self.c.Helpers().WorkingTree.HandleWIPCommitPress,
|
Handler: self.c.Helpers().WorkingTree.HandleWIPCommitPress,
|
||||||
Description: self.c.Tr.LcCommitChangesWithoutHook,
|
Description: self.c.Tr.CommitChangesWithoutHook,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.AmendLastCommit),
|
Key: opts.GetKey(opts.Config.Files.AmendLastCommit),
|
||||||
@ -61,39 +61,39 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Edit),
|
Key: opts.GetKey(opts.Config.Universal.Edit),
|
||||||
Handler: self.checkSelectedFileNode(self.edit),
|
Handler: self.checkSelectedFileNode(self.edit),
|
||||||
Description: self.c.Tr.LcEditFile,
|
Description: self.c.Tr.EditFile,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.OpenFile),
|
Key: opts.GetKey(opts.Config.Universal.OpenFile),
|
||||||
Handler: self.Open,
|
Handler: self.Open,
|
||||||
Description: self.c.Tr.LcOpenFile,
|
Description: self.c.Tr.OpenFile,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.IgnoreFile),
|
Key: opts.GetKey(opts.Config.Files.IgnoreFile),
|
||||||
Handler: self.checkSelectedFileNode(self.ignoreOrExcludeMenu),
|
Handler: self.checkSelectedFileNode(self.ignoreOrExcludeMenu),
|
||||||
Description: self.c.Tr.Actions.LcIgnoreExcludeFile,
|
Description: self.c.Tr.Actions.IgnoreExcludeFile,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.RefreshFiles),
|
Key: opts.GetKey(opts.Config.Files.RefreshFiles),
|
||||||
Handler: self.refresh,
|
Handler: self.refresh,
|
||||||
Description: self.c.Tr.LcRefreshFiles,
|
Description: self.c.Tr.RefreshFiles,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.StashAllChanges),
|
Key: opts.GetKey(opts.Config.Files.StashAllChanges),
|
||||||
Handler: self.stash,
|
Handler: self.stash,
|
||||||
Description: self.c.Tr.LcStashAllChanges,
|
Description: self.c.Tr.StashAllChanges,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.ViewStashOptions),
|
Key: opts.GetKey(opts.Config.Files.ViewStashOptions),
|
||||||
Handler: self.createStashMenu,
|
Handler: self.createStashMenu,
|
||||||
Description: self.c.Tr.LcViewStashOptions,
|
Description: self.c.Tr.ViewStashOptions,
|
||||||
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.LcToggleStagedAll,
|
Description: self.c.Tr.ToggleStagedAll,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.GoInto),
|
Key: opts.GetKey(opts.Config.Universal.GoInto),
|
||||||
@ -103,29 +103,29 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.ViewResetOptions),
|
Key: opts.GetKey(opts.Config.Commits.ViewResetOptions),
|
||||||
Handler: self.createResetToUpstreamMenu,
|
Handler: self.createResetToUpstreamMenu,
|
||||||
Description: self.c.Tr.LcViewResetToUpstreamOptions,
|
Description: self.c.Tr.ViewResetToUpstreamOptions,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.ViewResetOptions),
|
Key: opts.GetKey(opts.Config.Files.ViewResetOptions),
|
||||||
Handler: self.createResetMenu,
|
Handler: self.createResetMenu,
|
||||||
Description: self.c.Tr.LcViewResetOptions,
|
Description: self.c.Tr.ViewResetOptions,
|
||||||
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.LcToggleTreeView,
|
Description: self.c.Tr.ToggleTreeView,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
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.LcOpenMergeTool,
|
Description: self.c.Tr.OpenMergeTool,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.Fetch),
|
Key: opts.GetKey(opts.Config.Files.Fetch),
|
||||||
Handler: self.fetch,
|
Handler: self.fetch,
|
||||||
Description: self.c.Tr.LcFetch,
|
Description: self.c.Tr.Fetch,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -559,7 +559,7 @@ func (self *FilesController) ignore(node *filetree.FileNode) error {
|
|||||||
if node.GetPath() == ".gitignore" {
|
if node.GetPath() == ".gitignore" {
|
||||||
return self.c.ErrorMsg(self.c.Tr.Actions.IgnoreFileErr)
|
return self.c.ErrorMsg(self.c.Tr.Actions.IgnoreFileErr)
|
||||||
}
|
}
|
||||||
err := self.ignoreOrExcludeFile(node, self.c.Tr.IgnoreTracked, self.c.Tr.IgnoreTrackedPrompt, self.c.Tr.Actions.LcIgnoreExcludeFile, self.c.Git().WorkingTree.Ignore)
|
err := self.ignoreOrExcludeFile(node, self.c.Tr.IgnoreTracked, self.c.Tr.IgnoreTrackedPrompt, self.c.Tr.Actions.IgnoreExcludeFile, self.c.Git().WorkingTree.Ignore)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -585,10 +585,10 @@ func (self *FilesController) exclude(node *filetree.FileNode) error {
|
|||||||
|
|
||||||
func (self *FilesController) ignoreOrExcludeMenu(node *filetree.FileNode) error {
|
func (self *FilesController) ignoreOrExcludeMenu(node *filetree.FileNode) error {
|
||||||
return self.c.Menu(types.CreateMenuOptions{
|
return self.c.Menu(types.CreateMenuOptions{
|
||||||
Title: self.c.Tr.Actions.LcIgnoreExcludeFile,
|
Title: self.c.Tr.Actions.IgnoreExcludeFile,
|
||||||
Items: []*types.MenuItem{
|
Items: []*types.MenuItem{
|
||||||
{
|
{
|
||||||
LabelColumns: []string{self.c.Tr.LcIgnoreFile},
|
LabelColumns: []string{self.c.Tr.IgnoreFile},
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
if err := self.ignore(node); err != nil {
|
if err := self.ignore(node); err != nil {
|
||||||
return self.c.Error(err)
|
return self.c.Error(err)
|
||||||
@ -598,7 +598,7 @@ func (self *FilesController) ignoreOrExcludeMenu(node *filetree.FileNode) error
|
|||||||
Key: 'i',
|
Key: 'i',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
LabelColumns: []string{self.c.Tr.LcExcludeFile},
|
LabelColumns: []string{self.c.Tr.ExcludeFile},
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
if err := self.exclude(node); err != nil {
|
if err := self.exclude(node); err != nil {
|
||||||
return self.c.Error(err)
|
return self.c.Error(err)
|
||||||
@ -690,10 +690,10 @@ func (self *FilesController) switchToMerge() error {
|
|||||||
|
|
||||||
func (self *FilesController) createStashMenu() error {
|
func (self *FilesController) createStashMenu() error {
|
||||||
return self.c.Menu(types.CreateMenuOptions{
|
return self.c.Menu(types.CreateMenuOptions{
|
||||||
Title: self.c.Tr.LcStashOptions,
|
Title: self.c.Tr.StashOptions,
|
||||||
Items: []*types.MenuItem{
|
Items: []*types.MenuItem{
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcStashAllChanges,
|
Label: self.c.Tr.StashAllChanges,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
if !self.c.Helpers().WorkingTree.IsWorkingTreeDirty() {
|
if !self.c.Helpers().WorkingTree.IsWorkingTreeDirty() {
|
||||||
return self.c.ErrorMsg(self.c.Tr.NoFilesToStash)
|
return self.c.ErrorMsg(self.c.Tr.NoFilesToStash)
|
||||||
@ -703,7 +703,7 @@ func (self *FilesController) createStashMenu() error {
|
|||||||
Key: 'a',
|
Key: 'a',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcStashAllChangesKeepIndex,
|
Label: self.c.Tr.StashAllChangesKeepIndex,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
if !self.c.Helpers().WorkingTree.IsWorkingTreeDirty() {
|
if !self.c.Helpers().WorkingTree.IsWorkingTreeDirty() {
|
||||||
return self.c.ErrorMsg(self.c.Tr.NoFilesToStash)
|
return self.c.ErrorMsg(self.c.Tr.NoFilesToStash)
|
||||||
@ -714,14 +714,14 @@ func (self *FilesController) createStashMenu() error {
|
|||||||
Key: 'i',
|
Key: 'i',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcStashIncludeUntrackedChanges,
|
Label: self.c.Tr.StashIncludeUntrackedChanges,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.handleStashSave(self.c.Git().Stash.StashIncludeUntrackedChanges, self.c.Tr.Actions.StashIncludeUntrackedChanges)
|
return self.handleStashSave(self.c.Git().Stash.StashIncludeUntrackedChanges, self.c.Tr.Actions.StashIncludeUntrackedChanges)
|
||||||
},
|
},
|
||||||
Key: 'U',
|
Key: 'U',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcStashStagedChanges,
|
Label: self.c.Tr.StashStagedChanges,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
// there must be something in staging otherwise the current implementation mucks the stash up
|
// there must be something in staging otherwise the current implementation mucks the stash up
|
||||||
if !self.c.Helpers().WorkingTree.AnyStagedFiles() {
|
if !self.c.Helpers().WorkingTree.AnyStagedFiles() {
|
||||||
@ -732,7 +732,7 @@ func (self *FilesController) createStashMenu() error {
|
|||||||
Key: 's',
|
Key: 's',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcStashUnstagedChanges,
|
Label: self.c.Tr.StashUnstagedChanges,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
if !self.c.Helpers().WorkingTree.IsWorkingTreeDirty() {
|
if !self.c.Helpers().WorkingTree.IsWorkingTreeDirty() {
|
||||||
return self.c.ErrorMsg(self.c.Tr.NoFilesToStash)
|
return self.c.ErrorMsg(self.c.Tr.NoFilesToStash)
|
||||||
|
|||||||
@ -31,7 +31,7 @@ func (self *FilesRemoveController) GetKeybindings(opts types.KeybindingsOpts) []
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Remove),
|
Key: opts.GetKey(opts.Config.Universal.Remove),
|
||||||
Handler: self.checkSelectedFileNode(self.remove),
|
Handler: self.checkSelectedFileNode(self.remove),
|
||||||
Description: self.c.Tr.LcViewDiscardOptions,
|
Description: self.c.Tr.ViewDiscardOptions,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -44,7 +44,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error {
|
|||||||
if node.File == nil {
|
if node.File == nil {
|
||||||
menuItems = []*types.MenuItem{
|
menuItems = []*types.MenuItem{
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcDiscardAllChanges,
|
Label: self.c.Tr.DiscardAllChanges,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
self.c.LogAction(self.c.Tr.Actions.DiscardAllChangesInDirectory)
|
self.c.LogAction(self.c.Tr.Actions.DiscardAllChangesInDirectory)
|
||||||
if err := self.c.Git().WorkingTree.DiscardAllDirChanges(node); err != nil {
|
if err := self.c.Git().WorkingTree.DiscardAllDirChanges(node); err != nil {
|
||||||
@ -64,7 +64,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error {
|
|||||||
|
|
||||||
if node.GetHasStagedChanges() && node.GetHasUnstagedChanges() {
|
if node.GetHasStagedChanges() && node.GetHasUnstagedChanges() {
|
||||||
menuItems = append(menuItems, &types.MenuItem{
|
menuItems = append(menuItems, &types.MenuItem{
|
||||||
Label: self.c.Tr.LcDiscardUnstagedChanges,
|
Label: self.c.Tr.DiscardUnstagedChanges,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
self.c.LogAction(self.c.Tr.Actions.DiscardUnstagedChangesInDirectory)
|
self.c.LogAction(self.c.Tr.Actions.DiscardUnstagedChangesInDirectory)
|
||||||
if err := self.c.Git().WorkingTree.DiscardUnstagedDirChanges(node); err != nil {
|
if err := self.c.Git().WorkingTree.DiscardUnstagedDirChanges(node); err != nil {
|
||||||
@ -91,7 +91,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error {
|
|||||||
|
|
||||||
menuItems = []*types.MenuItem{
|
menuItems = []*types.MenuItem{
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcSubmoduleStashAndReset,
|
Label: self.c.Tr.SubmoduleStashAndReset,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.ResetSubmodule(submodule)
|
return self.ResetSubmodule(submodule)
|
||||||
},
|
},
|
||||||
@ -100,7 +100,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error {
|
|||||||
} else {
|
} else {
|
||||||
menuItems = []*types.MenuItem{
|
menuItems = []*types.MenuItem{
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcDiscardAllChanges,
|
Label: self.c.Tr.DiscardAllChanges,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
self.c.LogAction(self.c.Tr.Actions.DiscardAllChangesInFile)
|
self.c.LogAction(self.c.Tr.Actions.DiscardAllChangesInFile)
|
||||||
if err := self.c.Git().WorkingTree.DiscardAllFileChanges(file); err != nil {
|
if err := self.c.Git().WorkingTree.DiscardAllFileChanges(file); err != nil {
|
||||||
@ -120,7 +120,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error {
|
|||||||
|
|
||||||
if file.HasStagedChanges && file.HasUnstagedChanges {
|
if file.HasStagedChanges && file.HasUnstagedChanges {
|
||||||
menuItems = append(menuItems, &types.MenuItem{
|
menuItems = append(menuItems, &types.MenuItem{
|
||||||
Label: self.c.Tr.LcDiscardUnstagedChanges,
|
Label: self.c.Tr.DiscardUnstagedChanges,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
self.c.LogAction(self.c.Tr.Actions.DiscardAllUnstagedChangesInFile)
|
self.c.LogAction(self.c.Tr.Actions.DiscardAllUnstagedChangesInFile)
|
||||||
if err := self.c.Git().WorkingTree.DiscardUnstagedFileChanges(file); err != nil {
|
if err := self.c.Git().WorkingTree.DiscardUnstagedFileChanges(file); err != nil {
|
||||||
@ -145,7 +145,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (self *FilesRemoveController) ResetSubmodule(submodule *models.SubmoduleConfig) error {
|
func (self *FilesRemoveController) ResetSubmodule(submodule *models.SubmoduleConfig) error {
|
||||||
return self.c.WithWaitingStatus(self.c.Tr.LcResettingSubmoduleStatus, func() error {
|
return self.c.WithWaitingStatus(self.c.Tr.ResettingSubmoduleStatus, func() error {
|
||||||
self.c.LogAction(self.c.Tr.Actions.ResetSubmodule)
|
self.c.LogAction(self.c.Tr.Actions.ResetSubmodule)
|
||||||
|
|
||||||
file := self.c.Helpers().WorkingTree.FileForSubmodule(submodule)
|
file := self.c.Helpers().WorkingTree.FileForSubmodule(submodule)
|
||||||
|
|||||||
@ -30,7 +30,7 @@ func (self *FilteringMenuAction) Call() error {
|
|||||||
|
|
||||||
if fileName != "" {
|
if fileName != "" {
|
||||||
menuItems = append(menuItems, &types.MenuItem{
|
menuItems = append(menuItems, &types.MenuItem{
|
||||||
Label: fmt.Sprintf("%s '%s'", self.c.Tr.LcFilterBy, fileName),
|
Label: fmt.Sprintf("%s '%s'", self.c.Tr.FilterBy, fileName),
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.setFiltering(fileName)
|
return self.setFiltering(fileName)
|
||||||
},
|
},
|
||||||
@ -38,7 +38,7 @@ func (self *FilteringMenuAction) Call() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
menuItems = append(menuItems, &types.MenuItem{
|
menuItems = append(menuItems, &types.MenuItem{
|
||||||
Label: self.c.Tr.LcFilterPathOption,
|
Label: self.c.Tr.FilterPathOption,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.c.Prompt(types.PromptOpts{
|
return self.c.Prompt(types.PromptOpts{
|
||||||
FindSuggestionsFunc: self.c.Helpers().Suggestions.GetFilePathSuggestionsFunc(),
|
FindSuggestionsFunc: self.c.Helpers().Suggestions.GetFilePathSuggestionsFunc(),
|
||||||
@ -52,7 +52,7 @@ func (self *FilteringMenuAction) Call() error {
|
|||||||
|
|
||||||
if self.c.Modes().Filtering.Active() {
|
if self.c.Modes().Filtering.Active() {
|
||||||
menuItems = append(menuItems, &types.MenuItem{
|
menuItems = append(menuItems, &types.MenuItem{
|
||||||
Label: self.c.Tr.LcExitFilterMode,
|
Label: self.c.Tr.ExitFilterMode,
|
||||||
OnPress: self.c.Helpers().Mode.ClearFiltering,
|
OnPress: self.c.Helpers().Mode.ClearFiltering,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,7 +30,7 @@ func (self *GitFlowController) GetKeybindings(opts types.KeybindingsOpts) []*typ
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.ViewGitFlowOptions),
|
Key: opts.GetKey(opts.Config.Branches.ViewGitFlowOptions),
|
||||||
Handler: self.checkSelected(self.handleCreateGitFlowMenu),
|
Handler: self.checkSelected(self.handleCreateGitFlowMenu),
|
||||||
Description: self.c.Tr.LcGitFlowOptions,
|
Description: self.c.Tr.GitFlowOptions,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@ -24,7 +24,7 @@ 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.LcExecuteCustomCommand,
|
Description: self.c.Tr.ExecuteCustomCommand,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.CreatePatchOptionsMenu),
|
Key: opts.GetKey(opts.Config.Universal.CreatePatchOptionsMenu),
|
||||||
@ -41,17 +41,17 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Refresh),
|
Key: opts.GetKey(opts.Config.Universal.Refresh),
|
||||||
Handler: self.refresh,
|
Handler: self.refresh,
|
||||||
Description: self.c.Tr.LcRefresh,
|
Description: self.c.Tr.Refresh,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.NextScreenMode),
|
Key: opts.GetKey(opts.Config.Universal.NextScreenMode),
|
||||||
Handler: self.nextScreenMode,
|
Handler: self.nextScreenMode,
|
||||||
Description: self.c.Tr.LcNextScreenMode,
|
Description: self.c.Tr.NextScreenMode,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.PrevScreenMode),
|
Key: opts.GetKey(opts.Config.Universal.PrevScreenMode),
|
||||||
Handler: self.prevScreenMode,
|
Handler: self.prevScreenMode,
|
||||||
Description: self.c.Tr.LcPrevScreenMode,
|
Description: self.c.Tr.PrevScreenMode,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ViewName: "",
|
ViewName: "",
|
||||||
@ -65,26 +65,26 @@ 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.LcOpenMenu,
|
Description: self.c.Tr.OpenMenu,
|
||||||
Handler: self.createOptionsMenu,
|
Handler: self.createOptionsMenu,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
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.LcOpenFilteringMenu,
|
Description: self.c.Tr.OpenFilteringMenu,
|
||||||
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.LcOpenDiffingMenu,
|
Description: self.c.Tr.OpenDiffingMenu,
|
||||||
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.LcOpenDiffingMenu,
|
Description: self.c.Tr.OpenDiffingMenu,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@ -180,7 +180,7 @@ func (self *MergeAndRebaseHelper) workingTreeStateNoun() string {
|
|||||||
// PromptToContinueRebase asks the user if they want to continue the rebase/merge that's in progress
|
// PromptToContinueRebase asks the user if they want to continue the rebase/merge that's in progress
|
||||||
func (self *MergeAndRebaseHelper) PromptToContinueRebase() error {
|
func (self *MergeAndRebaseHelper) PromptToContinueRebase() error {
|
||||||
return self.c.Confirm(types.ConfirmOpts{
|
return self.c.Confirm(types.ConfirmOpts{
|
||||||
Title: "continue",
|
Title: self.c.Tr.Continue,
|
||||||
Prompt: self.c.Tr.ConflictsResolved,
|
Prompt: self.c.Tr.ConflictsResolved,
|
||||||
HandleConfirm: func() error {
|
HandleConfirm: func() error {
|
||||||
return self.genericMergeCommand(REBASE_OPTION_CONTINUE)
|
return self.genericMergeCommand(REBASE_OPTION_CONTINUE)
|
||||||
|
|||||||
@ -53,7 +53,7 @@ func (self *ModeHelper) Statuses() []ModeStatus {
|
|||||||
return self.withResetButton(
|
return self.withResetButton(
|
||||||
fmt.Sprintf(
|
fmt.Sprintf(
|
||||||
"%s %s",
|
"%s %s",
|
||||||
self.c.Tr.LcShowingGitDiff,
|
self.c.Tr.ShowingGitDiff,
|
||||||
"git diff "+strings.Join(self.diffHelper.DiffArgs(), " "),
|
"git diff "+strings.Join(self.diffHelper.DiffArgs(), " "),
|
||||||
),
|
),
|
||||||
style.FgMagenta,
|
style.FgMagenta,
|
||||||
@ -64,7 +64,7 @@ func (self *ModeHelper) Statuses() []ModeStatus {
|
|||||||
{
|
{
|
||||||
IsActive: self.c.Git().Patch.PatchBuilder.Active,
|
IsActive: self.c.Git().Patch.PatchBuilder.Active,
|
||||||
Description: func() string {
|
Description: func() string {
|
||||||
return self.withResetButton(self.c.Tr.LcBuildingPatch, style.FgYellow.SetBold())
|
return self.withResetButton(self.c.Tr.BuildingPatch, style.FgYellow.SetBold())
|
||||||
},
|
},
|
||||||
Reset: self.patchBuildingHelper.Reset,
|
Reset: self.patchBuildingHelper.Reset,
|
||||||
},
|
},
|
||||||
@ -74,7 +74,7 @@ func (self *ModeHelper) Statuses() []ModeStatus {
|
|||||||
return self.withResetButton(
|
return self.withResetButton(
|
||||||
fmt.Sprintf(
|
fmt.Sprintf(
|
||||||
"%s '%s'",
|
"%s '%s'",
|
||||||
self.c.Tr.LcFilteringBy,
|
self.c.Tr.FilteringBy,
|
||||||
self.c.Modes().Filtering.GetPath(),
|
self.c.Modes().Filtering.GetPath(),
|
||||||
),
|
),
|
||||||
style.FgRed,
|
style.FgRed,
|
||||||
@ -86,9 +86,9 @@ func (self *ModeHelper) Statuses() []ModeStatus {
|
|||||||
IsActive: self.c.Modes().CherryPicking.Active,
|
IsActive: self.c.Modes().CherryPicking.Active,
|
||||||
Description: func() string {
|
Description: func() string {
|
||||||
copiedCount := len(self.c.Modes().CherryPicking.CherryPickedCommits)
|
copiedCount := len(self.c.Modes().CherryPicking.CherryPickedCommits)
|
||||||
text := self.c.Tr.LcCommitsCopied
|
text := self.c.Tr.CommitsCopied
|
||||||
if copiedCount == 1 {
|
if copiedCount == 1 {
|
||||||
text = self.c.Tr.LcCommitCopied
|
text = self.c.Tr.CommitCopied
|
||||||
}
|
}
|
||||||
|
|
||||||
return self.withResetButton(
|
return self.withResetButton(
|
||||||
@ -109,7 +109,7 @@ func (self *ModeHelper) Statuses() []ModeStatus {
|
|||||||
Description: func() string {
|
Description: func() string {
|
||||||
workingTreeState := self.c.Git().Status.WorkingTreeState()
|
workingTreeState := self.c.Git().Status.WorkingTreeState()
|
||||||
return self.withResetButton(
|
return self.withResetButton(
|
||||||
presentation.FormatWorkingTreeState(workingTreeState), style.FgYellow,
|
presentation.FormatWorkingTreeStateTitle(self.c.Tr, workingTreeState), style.FgYellow,
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
Reset: self.mergeAndRebaseHelper.AbortMergeOrRebaseWithConfirm,
|
Reset: self.mergeAndRebaseHelper.AbortMergeOrRebaseWithConfirm,
|
||||||
@ -119,7 +119,7 @@ func (self *ModeHelper) Statuses() []ModeStatus {
|
|||||||
return self.c.Model().BisectInfo.Started()
|
return self.c.Model().BisectInfo.Started()
|
||||||
},
|
},
|
||||||
Description: func() string {
|
Description: func() string {
|
||||||
return self.withResetButton("bisecting", style.FgGreen)
|
return self.withResetButton(self.c.Tr.Bisect.Bisecting, style.FgGreen)
|
||||||
},
|
},
|
||||||
Reset: self.bisectHelper.Reset,
|
Reset: self.bisectHelper.Reset,
|
||||||
},
|
},
|
||||||
|
|||||||
@ -584,7 +584,7 @@ func (self *RefreshHelper) refreshStatus() {
|
|||||||
|
|
||||||
workingTreeState := self.c.Git().Status.WorkingTreeState()
|
workingTreeState := self.c.Git().Status.WorkingTreeState()
|
||||||
if workingTreeState != enums.REBASE_MODE_NONE {
|
if workingTreeState != enums.REBASE_MODE_NONE {
|
||||||
status += style.FgYellow.Sprintf("(%s) ", presentation.FormatWorkingTreeState(workingTreeState))
|
status += style.FgYellow.Sprintf("(%s) ", presentation.FormatWorkingTreeStateLower(self.c.Tr, workingTreeState))
|
||||||
}
|
}
|
||||||
|
|
||||||
name := presentation.GetBranchTextStyle(currentBranch.Name).Sprint(currentBranch.Name)
|
name := presentation.GetBranchTextStyle(currentBranch.Name).Sprint(currentBranch.Name)
|
||||||
|
|||||||
@ -121,18 +121,20 @@ func (self *RefsHelper) ResetToRef(ref string, strength string, envVars []string
|
|||||||
func (self *RefsHelper) CreateGitResetMenu(ref string) error {
|
func (self *RefsHelper) CreateGitResetMenu(ref string) error {
|
||||||
type strengthWithKey struct {
|
type strengthWithKey struct {
|
||||||
strength string
|
strength string
|
||||||
|
label string
|
||||||
key types.Key
|
key types.Key
|
||||||
}
|
}
|
||||||
strengths := []strengthWithKey{
|
strengths := []strengthWithKey{
|
||||||
{strength: "soft", key: 's'},
|
// not i18'ing because it's git terminology
|
||||||
{strength: "mixed", key: 'm'},
|
{strength: "soft", label: "Soft reset", key: 's'},
|
||||||
{strength: "hard", key: 'h'},
|
{strength: "mixed", label: "Mixed reset", key: 'm'},
|
||||||
|
{strength: "hard", label: "Hard reset", key: 'h'},
|
||||||
}
|
}
|
||||||
|
|
||||||
menuItems := slices.Map(strengths, func(row strengthWithKey) *types.MenuItem {
|
menuItems := slices.Map(strengths, func(row strengthWithKey) *types.MenuItem {
|
||||||
return &types.MenuItem{
|
return &types.MenuItem{
|
||||||
LabelColumns: []string{
|
LabelColumns: []string{
|
||||||
fmt.Sprintf("%s reset", row.strength),
|
row.label,
|
||||||
style.FgRed.Sprintf("reset --%s %s", row.strength, ref),
|
style.FgRed.Sprintf("reset --%s %s", row.strength, ref),
|
||||||
},
|
},
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
@ -144,7 +146,7 @@ func (self *RefsHelper) CreateGitResetMenu(ref string) error {
|
|||||||
})
|
})
|
||||||
|
|
||||||
return self.c.Menu(types.CreateMenuOptions{
|
return self.c.Menu(types.CreateMenuOptions{
|
||||||
Title: fmt.Sprintf("%s %s", self.c.Tr.LcResetTo, ref),
|
Title: fmt.Sprintf("%s %s", self.c.Tr.ResetTo, ref),
|
||||||
Items: menuItems,
|
Items: menuItems,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@ -88,7 +88,7 @@ func (self *ReposHelper) getCurrentBranch(path string) string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return self.c.Tr.LcBranchUnknown
|
return self.c.Tr.BranchUnknown
|
||||||
}
|
}
|
||||||
|
|
||||||
func (self *ReposHelper) CreateRecentReposMenu() error {
|
func (self *ReposHelper) CreateRecentReposMenu() error {
|
||||||
|
|||||||
@ -100,7 +100,7 @@ func (self *SuggestionsHelper) GetBranchNameSuggestionsFunc() func(string) []*ty
|
|||||||
// Notably, unlike other suggestion functions we're not showing all the options
|
// Notably, unlike other suggestion functions we're not showing all the options
|
||||||
// if nothing has been typed because there'll be too much to display efficiently
|
// if nothing has been typed because there'll be too much to display efficiently
|
||||||
func (self *SuggestionsHelper) GetFilePathSuggestionsFunc() func(string) []*types.Suggestion {
|
func (self *SuggestionsHelper) GetFilePathSuggestionsFunc() func(string) []*types.Suggestion {
|
||||||
_ = self.c.WithWaitingStatus(self.c.Tr.LcLoadingFileSuggestions, func() error {
|
_ = self.c.WithWaitingStatus(self.c.Tr.LoadingFileSuggestions, func() error {
|
||||||
trie := patricia.NewTrie()
|
trie := patricia.NewTrie()
|
||||||
// load every non-gitignored file in the repo
|
// load every non-gitignored file in the repo
|
||||||
ignore, err := gitignore.FromGit()
|
ignore, err := gitignore.FromGit()
|
||||||
|
|||||||
@ -23,13 +23,13 @@ func (self *TagsHelper) CreateTagMenu(ref string, onCreate func()) error {
|
|||||||
Title: self.c.Tr.TagMenuTitle,
|
Title: self.c.Tr.TagMenuTitle,
|
||||||
Items: []*types.MenuItem{
|
Items: []*types.MenuItem{
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcLightweightTag,
|
Label: self.c.Tr.LightweightTag,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.handleCreateLightweightTag(ref, onCreate)
|
return self.handleCreateLightweightTag(ref, onCreate)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Label: self.c.Tr.LcAnnotatedTag,
|
Label: self.c.Tr.AnnotatedTag,
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.handleCreateAnnotatedTag(ref, onCreate)
|
return self.handleCreateAnnotatedTag(ref, onCreate)
|
||||||
},
|
},
|
||||||
|
|||||||
@ -2,7 +2,6 @@ package helpers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/jesseduffield/lazycore/pkg/boxlayout"
|
"github.com/jesseduffield/lazycore/pkg/boxlayout"
|
||||||
"github.com/jesseduffield/lazygit/pkg/gui/constants"
|
|
||||||
"github.com/jesseduffield/lazygit/pkg/gui/context"
|
"github.com/jesseduffield/lazygit/pkg/gui/context"
|
||||||
"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"
|
||||||
@ -179,7 +178,7 @@ func (self *WindowArrangementHelper) infoSectionChildren(informationStr string,
|
|||||||
return []*boxlayout.Box{
|
return []*boxlayout.Box{
|
||||||
{
|
{
|
||||||
Window: "searchPrefix",
|
Window: "searchPrefix",
|
||||||
Size: runewidth.StringWidth(constants.SEARCH_PREFIX),
|
Size: runewidth.StringWidth(self.c.Tr.SearchPrefix),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Window: "search",
|
Window: "search",
|
||||||
|
|||||||
@ -154,7 +154,7 @@ func (self *WorkingTreeHelper) HandleCommitPress() error {
|
|||||||
prefixReplace := commitPrefixConfig.Replace
|
prefixReplace := commitPrefixConfig.Replace
|
||||||
rgx, err := regexp.Compile(prefixPattern)
|
rgx, err := regexp.Compile(prefixPattern)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return self.c.ErrorMsg(fmt.Sprintf("%s: %s", self.c.Tr.LcCommitPrefixPatternError, err.Error()))
|
return self.c.ErrorMsg(fmt.Sprintf("%s: %s", self.c.Tr.CommitPrefixPatternError, err.Error()))
|
||||||
}
|
}
|
||||||
prefix := rgx.ReplaceAllString(self.refHelper.GetCheckedOutRef().Name, prefixReplace)
|
prefix := rgx.ReplaceAllString(self.refHelper.GetCheckedOutRef().Name, prefixReplace)
|
||||||
message = prefix
|
message = prefix
|
||||||
|
|||||||
@ -145,20 +145,20 @@ func (self *ListController) GetKeybindings(opts types.KeybindingsOpts) []*types.
|
|||||||
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.PrevItem), Handler: self.HandlePrevLine},
|
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.PrevItem), Handler: self.HandlePrevLine},
|
||||||
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextItemAlt), Handler: self.HandleNextLine},
|
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextItemAlt), Handler: self.HandleNextLine},
|
||||||
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextItem), Handler: self.HandleNextLine},
|
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextItem), Handler: self.HandleNextLine},
|
||||||
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.PrevPage), Handler: self.HandlePrevPage, Description: self.c.Tr.LcPrevPage},
|
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.PrevPage), Handler: self.HandlePrevPage, Description: self.c.Tr.PrevPage},
|
||||||
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextPage), Handler: self.HandleNextPage, Description: self.c.Tr.LcNextPage},
|
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextPage), Handler: self.HandleNextPage, Description: self.c.Tr.NextPage},
|
||||||
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoTop), Handler: self.HandleGotoTop, Description: self.c.Tr.LcGotoTop},
|
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoTop), Handler: self.HandleGotoTop, Description: self.c.Tr.GotoTop},
|
||||||
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.ScrollLeft), Handler: self.HandleScrollLeft},
|
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.ScrollLeft), Handler: self.HandleScrollLeft},
|
||||||
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.ScrollRight), Handler: self.HandleScrollRight},
|
{Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.ScrollRight), Handler: self.HandleScrollRight},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.StartSearch),
|
Key: opts.GetKey(opts.Config.Universal.StartSearch),
|
||||||
Handler: func() error { self.c.OpenSearch(); return nil },
|
Handler: func() error { self.c.OpenSearch(); return nil },
|
||||||
Description: self.c.Tr.LcStartSearch,
|
Description: self.c.Tr.StartSearch,
|
||||||
Tag: "navigation",
|
Tag: "navigation",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.GotoBottom),
|
Key: opts.GetKey(opts.Config.Universal.GotoBottom),
|
||||||
Description: self.c.Tr.LcGotoBottom,
|
Description: self.c.Tr.GotoBottom,
|
||||||
Handler: self.HandleGotoBottom,
|
Handler: self.HandleGotoBottom,
|
||||||
Tag: "navigation",
|
Tag: "navigation",
|
||||||
},
|
},
|
||||||
|
|||||||
@ -45,75 +45,75 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.SquashDown),
|
Key: opts.GetKey(opts.Config.Commits.SquashDown),
|
||||||
Handler: self.checkSelected(self.squashDown),
|
Handler: self.checkSelected(self.squashDown),
|
||||||
Description: self.c.Tr.LcSquashDown,
|
Description: self.c.Tr.SquashDown,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.MarkCommitAsFixup),
|
Key: opts.GetKey(opts.Config.Commits.MarkCommitAsFixup),
|
||||||
Handler: self.checkSelected(self.fixup),
|
Handler: self.checkSelected(self.fixup),
|
||||||
Description: self.c.Tr.LcFixupCommit,
|
Description: self.c.Tr.FixupCommit,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.RenameCommit),
|
Key: opts.GetKey(opts.Config.Commits.RenameCommit),
|
||||||
Handler: self.checkSelected(self.reword),
|
Handler: self.checkSelected(self.reword),
|
||||||
Description: self.c.Tr.LcRewordCommit,
|
Description: self.c.Tr.RewordCommit,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.RenameCommitWithEditor),
|
Key: opts.GetKey(opts.Config.Commits.RenameCommitWithEditor),
|
||||||
Handler: self.checkSelected(self.rewordEditor),
|
Handler: self.checkSelected(self.rewordEditor),
|
||||||
Description: self.c.Tr.LcRenameCommitEditor,
|
Description: self.c.Tr.RenameCommitEditor,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Remove),
|
Key: opts.GetKey(opts.Config.Universal.Remove),
|
||||||
Handler: self.checkSelected(self.drop),
|
Handler: self.checkSelected(self.drop),
|
||||||
Description: self.c.Tr.LcDeleteCommit,
|
Description: self.c.Tr.DeleteCommit,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Edit),
|
Key: opts.GetKey(opts.Config.Universal.Edit),
|
||||||
Handler: self.checkSelected(self.edit),
|
Handler: self.checkSelected(self.edit),
|
||||||
Description: self.c.Tr.LcEditCommit,
|
Description: self.c.Tr.EditCommit,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.PickCommit),
|
Key: opts.GetKey(opts.Config.Commits.PickCommit),
|
||||||
Handler: self.checkSelected(self.pick),
|
Handler: self.checkSelected(self.pick),
|
||||||
Description: self.c.Tr.LcPickCommit,
|
Description: self.c.Tr.PickCommit,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.CreateFixupCommit),
|
Key: opts.GetKey(opts.Config.Commits.CreateFixupCommit),
|
||||||
Handler: self.checkSelected(self.createFixupCommit),
|
Handler: self.checkSelected(self.createFixupCommit),
|
||||||
Description: self.c.Tr.LcCreateFixupCommit,
|
Description: self.c.Tr.CreateFixupCommitDescription,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.SquashAboveCommits),
|
Key: opts.GetKey(opts.Config.Commits.SquashAboveCommits),
|
||||||
Handler: self.checkSelected(self.squashAllAboveFixupCommits),
|
Handler: self.checkSelected(self.squashAllAboveFixupCommits),
|
||||||
Description: self.c.Tr.LcSquashAboveCommits,
|
Description: self.c.Tr.SquashAboveCommits,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.MoveDownCommit),
|
Key: opts.GetKey(opts.Config.Commits.MoveDownCommit),
|
||||||
Handler: self.checkSelected(self.moveDown),
|
Handler: self.checkSelected(self.moveDown),
|
||||||
Description: self.c.Tr.LcMoveDownCommit,
|
Description: self.c.Tr.MoveDownCommit,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.MoveUpCommit),
|
Key: opts.GetKey(opts.Config.Commits.MoveUpCommit),
|
||||||
Handler: self.checkSelected(self.moveUp),
|
Handler: self.checkSelected(self.moveUp),
|
||||||
Description: self.c.Tr.LcMoveUpCommit,
|
Description: self.c.Tr.MoveUpCommit,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.PasteCommits),
|
Key: opts.GetKey(opts.Config.Commits.PasteCommits),
|
||||||
Handler: opts.Guards.OutsideFilterMode(self.paste),
|
Handler: opts.Guards.OutsideFilterMode(self.paste),
|
||||||
Description: self.c.Tr.LcPasteCommits,
|
Description: self.c.Tr.PasteCommits,
|
||||||
},
|
},
|
||||||
// overriding these navigation keybindings because we might need to load
|
// overriding these navigation keybindings because we might need to load
|
||||||
// more commits on demand
|
// more commits on demand
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.StartSearch),
|
Key: opts.GetKey(opts.Config.Universal.StartSearch),
|
||||||
Handler: self.openSearch,
|
Handler: self.openSearch,
|
||||||
Description: self.c.Tr.LcStartSearch,
|
Description: self.c.Tr.StartSearch,
|
||||||
Tag: "navigation",
|
Tag: "navigation",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.GotoBottom),
|
Key: opts.GetKey(opts.Config.Universal.GotoBottom),
|
||||||
Handler: self.gotoBottom,
|
Handler: self.gotoBottom,
|
||||||
Description: self.c.Tr.LcGotoBottom,
|
Description: self.c.Tr.GotoBottom,
|
||||||
Tag: "navigation",
|
Tag: "navigation",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -126,27 +126,28 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.AmendToCommit),
|
Key: opts.GetKey(opts.Config.Commits.AmendToCommit),
|
||||||
Handler: self.checkSelected(self.amendTo),
|
Handler: self.checkSelected(self.amendTo),
|
||||||
Description: self.c.Tr.LcAmendToCommit,
|
Description: self.c.Tr.AmendToCommit,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.ResetCommitAuthor),
|
Key: opts.GetKey(opts.Config.Commits.ResetCommitAuthor),
|
||||||
Handler: self.checkSelected(self.amendAttribute),
|
Handler: self.checkSelected(self.amendAttribute),
|
||||||
Description: self.c.Tr.LcResetCommitAuthor,
|
Description: self.c.Tr.SetResetCommitAuthor,
|
||||||
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.RevertCommit),
|
Key: opts.GetKey(opts.Config.Commits.RevertCommit),
|
||||||
Handler: self.checkSelected(self.revert),
|
Handler: self.checkSelected(self.revert),
|
||||||
Description: self.c.Tr.LcRevertCommit,
|
Description: self.c.Tr.RevertCommit,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.CreateTag),
|
Key: opts.GetKey(opts.Config.Commits.CreateTag),
|
||||||
Handler: self.checkSelected(self.createTag),
|
Handler: self.checkSelected(self.createTag),
|
||||||
Description: self.c.Tr.LcTagCommit,
|
Description: self.c.Tr.TagCommit,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.OpenLogMenu),
|
Key: opts.GetKey(opts.Config.Commits.OpenLogMenu),
|
||||||
Handler: self.handleOpenLogMenu,
|
Handler: self.handleOpenLogMenu,
|
||||||
Description: self.c.Tr.LcOpenLogMenu,
|
Description: self.c.Tr.OpenLogMenu,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
}...)
|
}...)
|
||||||
@ -401,11 +402,11 @@ func (self *LocalCommitsController) handleMidRebaseCommand(action todo.TodoComma
|
|||||||
// our input or we set a lazygit client as the EDITOR env variable and have it
|
// our input or we set a lazygit client as the EDITOR env variable and have it
|
||||||
// request us to edit the commit message when prompted.
|
// request us to edit the commit message when prompted.
|
||||||
if action == todo.Reword {
|
if action == todo.Reword {
|
||||||
return true, self.c.ErrorMsg(self.c.Tr.LcRewordNotSupported)
|
return true, self.c.ErrorMsg(self.c.Tr.RewordNotSupported)
|
||||||
}
|
}
|
||||||
|
|
||||||
if allowed := isChangeOfRebaseTodoAllowed(action); !allowed {
|
if allowed := isChangeOfRebaseTodoAllowed(action); !allowed {
|
||||||
return true, self.c.ErrorMsg(self.c.Tr.LcChangingThisActionIsNotAllowed)
|
return true, self.c.ErrorMsg(self.c.Tr.ChangingThisActionIsNotAllowed)
|
||||||
}
|
}
|
||||||
|
|
||||||
self.c.LogAction("Update rebase TODO")
|
self.c.LogAction("Update rebase TODO")
|
||||||
@ -537,13 +538,13 @@ func (self *LocalCommitsController) amendAttribute(commit *models.Commit) error
|
|||||||
Title: "Amend commit attribute",
|
Title: "Amend commit attribute",
|
||||||
Items: []*types.MenuItem{
|
Items: []*types.MenuItem{
|
||||||
{
|
{
|
||||||
Label: "reset author",
|
Label: self.c.Tr.ResetAuthor,
|
||||||
OnPress: self.resetAuthor,
|
OnPress: self.resetAuthor,
|
||||||
Key: 'a',
|
Key: 'a',
|
||||||
Tooltip: "Reset the commit's author to the currently configured user. This will also renew the author timestamp",
|
Tooltip: "Reset the commit's author to the currently configured user. This will also renew the author timestamp",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Label: "set author",
|
Label: self.c.Tr.SetAuthor,
|
||||||
OnPress: self.setAuthor,
|
OnPress: self.setAuthor,
|
||||||
Key: 'A',
|
Key: 'A',
|
||||||
Tooltip: "Set the author based on a prompt",
|
Tooltip: "Set the author based on a prompt",
|
||||||
@ -720,7 +721,7 @@ func (self *LocalCommitsController) handleOpenLogMenu() error {
|
|||||||
self.context().SetLimitCommits(false)
|
self.context().SetLimitCommits(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
return self.c.WithWaitingStatus(self.c.Tr.LcLoadingCommits, func() error {
|
return self.c.WithWaitingStatus(self.c.Tr.LoadingCommits, func() error {
|
||||||
return self.c.Refresh(
|
return self.c.Refresh(
|
||||||
types.RefreshOptions{Mode: types.SYNC, Scope: []types.RefreshableView{types.COMMITS}},
|
types.RefreshOptions{Mode: types.SYNC, Scope: []types.RefreshableView{types.COMMITS}},
|
||||||
)
|
)
|
||||||
@ -763,7 +764,7 @@ func (self *LocalCommitsController) handleOpenLogMenu() error {
|
|||||||
onPress := func(value string) func() error {
|
onPress := func(value string) func() error {
|
||||||
return func() error {
|
return func() error {
|
||||||
self.c.UserConfig.Git.Log.Order = value
|
self.c.UserConfig.Git.Log.Order = value
|
||||||
return self.c.WithWaitingStatus(self.c.Tr.LcLoadingCommits, func() error {
|
return self.c.WithWaitingStatus(self.c.Tr.LoadingCommits, func() error {
|
||||||
return self.c.Refresh(
|
return self.c.Refresh(
|
||||||
types.RefreshOptions{
|
types.RefreshOptions{
|
||||||
Mode: types.SYNC,
|
Mode: types.SYNC,
|
||||||
|
|||||||
@ -32,13 +32,13 @@ func (self *MenuController) GetKeybindings(opts types.KeybindingsOpts) []*types.
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Confirm),
|
Key: opts.GetKey(opts.Config.Universal.Confirm),
|
||||||
Handler: self.press,
|
Handler: self.press,
|
||||||
Description: self.c.Tr.LcExecute,
|
Description: self.c.Tr.Execute,
|
||||||
Display: true,
|
Display: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Return),
|
Key: opts.GetKey(opts.Config.Universal.Return),
|
||||||
Handler: self.close,
|
Handler: self.close,
|
||||||
Description: self.c.Tr.LcClose,
|
Description: self.c.Tr.Close,
|
||||||
Display: true,
|
Display: true,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,12 +30,12 @@ func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts)
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Edit),
|
Key: opts.GetKey(opts.Config.Universal.Edit),
|
||||||
Handler: self.HandleEditFile,
|
Handler: self.HandleEditFile,
|
||||||
Description: self.c.Tr.LcEditFile,
|
Description: self.c.Tr.EditFile,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.OpenFile),
|
Key: opts.GetKey(opts.Config.Universal.OpenFile),
|
||||||
Handler: self.HandleOpenFile,
|
Handler: self.HandleOpenFile,
|
||||||
Description: self.c.Tr.LcOpenFile,
|
Description: self.c.Tr.OpenFile,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.PrevBlock),
|
Key: opts.GetKey(opts.Config.Universal.PrevBlock),
|
||||||
@ -80,25 +80,25 @@ func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts)
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.ScrollLeft),
|
Key: opts.GetKey(opts.Config.Universal.ScrollLeft),
|
||||||
Handler: self.withRenderAndFocus(self.HandleScrollLeft),
|
Handler: self.withRenderAndFocus(self.HandleScrollLeft),
|
||||||
Description: self.c.Tr.LcScrollLeft,
|
Description: self.c.Tr.ScrollLeft,
|
||||||
Tag: "navigation",
|
Tag: "navigation",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.ScrollRight),
|
Key: opts.GetKey(opts.Config.Universal.ScrollRight),
|
||||||
Handler: self.withRenderAndFocus(self.HandleScrollRight),
|
Handler: self.withRenderAndFocus(self.HandleScrollRight),
|
||||||
Description: self.c.Tr.LcScrollRight,
|
Description: self.c.Tr.ScrollRight,
|
||||||
Tag: "navigation",
|
Tag: "navigation",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Undo),
|
Key: opts.GetKey(opts.Config.Universal.Undo),
|
||||||
Handler: self.withRenderAndFocus(self.HandleUndo),
|
Handler: self.withRenderAndFocus(self.HandleUndo),
|
||||||
Description: self.c.Tr.LcUndo,
|
Description: self.c.Tr.Undo,
|
||||||
Display: true,
|
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.LcOpenMergeTool,
|
Description: self.c.Tr.OpenMergeTool,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Select),
|
Key: opts.GetKey(opts.Config.Universal.Select),
|
||||||
|
|||||||
@ -37,7 +37,7 @@ func (self *OptionsMenuAction) Call() error {
|
|||||||
})
|
})
|
||||||
|
|
||||||
return self.c.Menu(types.CreateMenuOptions{
|
return self.c.Menu(types.CreateMenuOptions{
|
||||||
Title: self.c.Tr.MenuTitle,
|
Title: self.c.Tr.Keybindings,
|
||||||
Items: menuItems,
|
Items: menuItems,
|
||||||
HideCancel: true,
|
HideCancel: true,
|
||||||
})
|
})
|
||||||
|
|||||||
@ -27,12 +27,12 @@ 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.LcOpenFile,
|
Description: self.c.Tr.OpenFile,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Edit),
|
Key: opts.GetKey(opts.Config.Universal.Edit),
|
||||||
Handler: self.EditFile,
|
Handler: self.EditFile,
|
||||||
Description: self.c.Tr.LcEditFile,
|
Description: self.c.Tr.EditFile,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Select),
|
Key: opts.GetKey(opts.Config.Universal.Select),
|
||||||
|
|||||||
@ -93,24 +93,24 @@ func (self *PatchExplorerController) GetKeybindings(opts types.KeybindingsOpts)
|
|||||||
Tag: "navigation",
|
Tag: "navigation",
|
||||||
Key: opts.GetKey(opts.Config.Universal.PrevPage),
|
Key: opts.GetKey(opts.Config.Universal.PrevPage),
|
||||||
Handler: self.withRenderAndFocus(self.HandlePrevPage),
|
Handler: self.withRenderAndFocus(self.HandlePrevPage),
|
||||||
Description: self.c.Tr.LcPrevPage,
|
Description: self.c.Tr.PrevPage,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Tag: "navigation",
|
Tag: "navigation",
|
||||||
Key: opts.GetKey(opts.Config.Universal.NextPage),
|
Key: opts.GetKey(opts.Config.Universal.NextPage),
|
||||||
Handler: self.withRenderAndFocus(self.HandleNextPage),
|
Handler: self.withRenderAndFocus(self.HandleNextPage),
|
||||||
Description: self.c.Tr.LcNextPage,
|
Description: self.c.Tr.NextPage,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Tag: "navigation",
|
Tag: "navigation",
|
||||||
Key: opts.GetKey(opts.Config.Universal.GotoTop),
|
Key: opts.GetKey(opts.Config.Universal.GotoTop),
|
||||||
Handler: self.withRenderAndFocus(self.HandleGotoTop),
|
Handler: self.withRenderAndFocus(self.HandleGotoTop),
|
||||||
Description: self.c.Tr.LcGotoTop,
|
Description: self.c.Tr.GotoTop,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Tag: "navigation",
|
Tag: "navigation",
|
||||||
Key: opts.GetKey(opts.Config.Universal.GotoBottom),
|
Key: opts.GetKey(opts.Config.Universal.GotoBottom),
|
||||||
Description: self.c.Tr.LcGotoBottom,
|
Description: self.c.Tr.GotoBottom,
|
||||||
Handler: self.withRenderAndFocus(self.HandleGotoBottom),
|
Handler: self.withRenderAndFocus(self.HandleGotoBottom),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -127,12 +127,12 @@ func (self *PatchExplorerController) GetKeybindings(opts types.KeybindingsOpts)
|
|||||||
Tag: "navigation",
|
Tag: "navigation",
|
||||||
Key: opts.GetKey(opts.Config.Universal.StartSearch),
|
Key: opts.GetKey(opts.Config.Universal.StartSearch),
|
||||||
Handler: func() error { self.c.OpenSearch(); return nil },
|
Handler: func() error { self.c.OpenSearch(); return nil },
|
||||||
Description: self.c.Tr.LcStartSearch,
|
Description: self.c.Tr.StartSearch,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
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.LcCopySelectedTexToClipboard,
|
Description: self.c.Tr.CopySelectedTexToClipboard,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -32,32 +32,32 @@ func (self *RemoteBranchesController) GetKeybindings(opts types.KeybindingsOpts)
|
|||||||
Key: opts.GetKey(opts.Config.Universal.Select),
|
Key: opts.GetKey(opts.Config.Universal.Select),
|
||||||
// gonna use the exact same handler as the 'n' keybinding because everybody wants this to happen when they checkout a remote branch
|
// gonna use the exact same handler as the 'n' keybinding because everybody wants this to happen when they checkout a remote branch
|
||||||
Handler: self.checkSelected(self.newLocalBranch),
|
Handler: self.checkSelected(self.newLocalBranch),
|
||||||
Description: self.c.Tr.LcCheckout,
|
Description: self.c.Tr.Checkout,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.New),
|
Key: opts.GetKey(opts.Config.Universal.New),
|
||||||
Handler: self.checkSelected(self.newLocalBranch),
|
Handler: self.checkSelected(self.newLocalBranch),
|
||||||
Description: self.c.Tr.LcNewBranch,
|
Description: self.c.Tr.NewBranch,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch),
|
Key: opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch),
|
||||||
Handler: opts.Guards.OutsideFilterMode(self.checkSelected(self.merge)),
|
Handler: opts.Guards.OutsideFilterMode(self.checkSelected(self.merge)),
|
||||||
Description: self.c.Tr.LcMergeIntoCurrentBranch,
|
Description: self.c.Tr.MergeIntoCurrentBranch,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.RebaseBranch),
|
Key: opts.GetKey(opts.Config.Branches.RebaseBranch),
|
||||||
Handler: opts.Guards.OutsideFilterMode(self.checkSelected(self.rebase)),
|
Handler: opts.Guards.OutsideFilterMode(self.checkSelected(self.rebase)),
|
||||||
Description: self.c.Tr.LcRebaseBranch,
|
Description: self.c.Tr.RebaseBranch,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Remove),
|
Key: opts.GetKey(opts.Config.Universal.Remove),
|
||||||
Handler: self.checkSelected(self.delete),
|
Handler: self.checkSelected(self.delete),
|
||||||
Description: self.c.Tr.LcDeleteBranch,
|
Description: self.c.Tr.DeleteBranch,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.SetUpstream),
|
Key: opts.GetKey(opts.Config.Branches.SetUpstream),
|
||||||
Handler: self.checkSelected(self.setAsUpstream),
|
Handler: self.checkSelected(self.setAsUpstream),
|
||||||
Description: self.c.Tr.LcSetAsUpstream,
|
Description: self.c.Tr.SetAsUpstream,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Return),
|
Key: opts.GetKey(opts.Config.Universal.Return),
|
||||||
@ -67,7 +67,7 @@ func (self *RemoteBranchesController) GetKeybindings(opts types.KeybindingsOpts)
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.ViewResetOptions),
|
Key: opts.GetKey(opts.Config.Commits.ViewResetOptions),
|
||||||
Handler: self.checkSelected(self.createResetMenu),
|
Handler: self.checkSelected(self.createResetMenu),
|
||||||
Description: self.c.Tr.LcViewResetOptions,
|
Description: self.c.Tr.ViewResetOptions,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@ -40,22 +40,22 @@ func (self *RemotesController) GetKeybindings(opts types.KeybindingsOpts) []*typ
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.FetchRemote),
|
Key: opts.GetKey(opts.Config.Branches.FetchRemote),
|
||||||
Handler: self.checkSelected(self.fetch),
|
Handler: self.checkSelected(self.fetch),
|
||||||
Description: self.c.Tr.LcFetchRemote,
|
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.LcAddNewRemote,
|
Description: self.c.Tr.AddNewRemote,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Remove),
|
Key: opts.GetKey(opts.Config.Universal.Remove),
|
||||||
Handler: self.checkSelected(self.remove),
|
Handler: self.checkSelected(self.remove),
|
||||||
Description: self.c.Tr.LcRemoveRemote,
|
Description: self.c.Tr.RemoveRemote,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Edit),
|
Key: opts.GetKey(opts.Config.Universal.Edit),
|
||||||
Handler: self.checkSelected(self.edit),
|
Handler: self.checkSelected(self.edit),
|
||||||
Description: self.c.Tr.LcEditRemote,
|
Description: self.c.Tr.EditRemote,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -116,10 +116,10 @@ func (self *RemotesController) enter(remote *models.Remote) error {
|
|||||||
|
|
||||||
func (self *RemotesController) add() error {
|
func (self *RemotesController) add() error {
|
||||||
return self.c.Prompt(types.PromptOpts{
|
return self.c.Prompt(types.PromptOpts{
|
||||||
Title: self.c.Tr.LcNewRemoteName,
|
Title: self.c.Tr.NewRemoteName,
|
||||||
HandleConfirm: func(remoteName string) error {
|
HandleConfirm: func(remoteName string) error {
|
||||||
return self.c.Prompt(types.PromptOpts{
|
return self.c.Prompt(types.PromptOpts{
|
||||||
Title: self.c.Tr.LcNewRemoteUrl,
|
Title: self.c.Tr.NewRemoteUrl,
|
||||||
HandleConfirm: func(remoteUrl string) error {
|
HandleConfirm: func(remoteUrl string) error {
|
||||||
self.c.LogAction(self.c.Tr.Actions.AddRemote)
|
self.c.LogAction(self.c.Tr.Actions.AddRemote)
|
||||||
if err := self.c.Git().Remote.AddRemote(remoteName, remoteUrl); err != nil {
|
if err := self.c.Git().Remote.AddRemote(remoteName, remoteUrl); err != nil {
|
||||||
@ -134,8 +134,8 @@ func (self *RemotesController) add() error {
|
|||||||
|
|
||||||
func (self *RemotesController) remove(remote *models.Remote) error {
|
func (self *RemotesController) remove(remote *models.Remote) error {
|
||||||
return self.c.Confirm(types.ConfirmOpts{
|
return self.c.Confirm(types.ConfirmOpts{
|
||||||
Title: self.c.Tr.LcRemoveRemote,
|
Title: self.c.Tr.RemoveRemote,
|
||||||
Prompt: self.c.Tr.LcRemoveRemotePrompt + " '" + remote.Name + "'?",
|
Prompt: self.c.Tr.RemoveRemotePrompt + " '" + remote.Name + "'?",
|
||||||
HandleConfirm: func() error {
|
HandleConfirm: func() error {
|
||||||
self.c.LogAction(self.c.Tr.Actions.RemoveRemote)
|
self.c.LogAction(self.c.Tr.Actions.RemoveRemote)
|
||||||
if err := self.c.Git().Remote.RemoveRemote(remote.Name); err != nil {
|
if err := self.c.Git().Remote.RemoveRemote(remote.Name); err != nil {
|
||||||
@ -149,7 +149,7 @@ func (self *RemotesController) remove(remote *models.Remote) error {
|
|||||||
|
|
||||||
func (self *RemotesController) edit(remote *models.Remote) error {
|
func (self *RemotesController) edit(remote *models.Remote) error {
|
||||||
editNameMessage := utils.ResolvePlaceholderString(
|
editNameMessage := utils.ResolvePlaceholderString(
|
||||||
self.c.Tr.LcEditRemoteName,
|
self.c.Tr.EditRemoteName,
|
||||||
map[string]string{
|
map[string]string{
|
||||||
"remoteName": remote.Name,
|
"remoteName": remote.Name,
|
||||||
},
|
},
|
||||||
@ -167,7 +167,7 @@ func (self *RemotesController) edit(remote *models.Remote) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
editUrlMessage := utils.ResolvePlaceholderString(
|
editUrlMessage := utils.ResolvePlaceholderString(
|
||||||
self.c.Tr.LcEditRemoteUrl,
|
self.c.Tr.EditRemoteUrl,
|
||||||
map[string]string{
|
map[string]string{
|
||||||
"remoteName": updatedRemoteName,
|
"remoteName": updatedRemoteName,
|
||||||
},
|
},
|
||||||
|
|||||||
@ -42,12 +42,12 @@ func (self *StagingController) GetKeybindings(opts types.KeybindingsOpts) []*typ
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.OpenFile),
|
Key: opts.GetKey(opts.Config.Universal.OpenFile),
|
||||||
Handler: self.OpenFile,
|
Handler: self.OpenFile,
|
||||||
Description: self.c.Tr.LcOpenFile,
|
Description: self.c.Tr.OpenFile,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Edit),
|
Key: opts.GetKey(opts.Config.Universal.Edit),
|
||||||
Handler: self.EditFile,
|
Handler: self.EditFile,
|
||||||
Description: self.c.Tr.LcEditFile,
|
Description: self.c.Tr.EditFile,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Return),
|
Key: opts.GetKey(opts.Config.Universal.Return),
|
||||||
@ -82,7 +82,7 @@ func (self *StagingController) GetKeybindings(opts types.KeybindingsOpts) []*typ
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.CommitChangesWithoutHook),
|
Key: opts.GetKey(opts.Config.Files.CommitChangesWithoutHook),
|
||||||
Handler: self.c.Helpers().WorkingTree.HandleWIPCommitPress,
|
Handler: self.c.Helpers().WorkingTree.HandleWIPCommitPress,
|
||||||
Description: self.c.Tr.LcCommitChangesWithoutHook,
|
Description: self.c.Tr.CommitChangesWithoutHook,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Files.CommitChangesWithEditor),
|
Key: opts.GetKey(opts.Config.Files.CommitChangesWithEditor),
|
||||||
|
|||||||
@ -28,27 +28,27 @@ func (self *StashController) GetKeybindings(opts types.KeybindingsOpts) []*types
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Select),
|
Key: opts.GetKey(opts.Config.Universal.Select),
|
||||||
Handler: self.checkSelected(self.handleStashApply),
|
Handler: self.checkSelected(self.handleStashApply),
|
||||||
Description: self.c.Tr.LcApply,
|
Description: self.c.Tr.Apply,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Stash.PopStash),
|
Key: opts.GetKey(opts.Config.Stash.PopStash),
|
||||||
Handler: self.checkSelected(self.handleStashPop),
|
Handler: self.checkSelected(self.handleStashPop),
|
||||||
Description: self.c.Tr.LcPop,
|
Description: self.c.Tr.Pop,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Remove),
|
Key: opts.GetKey(opts.Config.Universal.Remove),
|
||||||
Handler: self.checkSelected(self.handleStashDrop),
|
Handler: self.checkSelected(self.handleStashDrop),
|
||||||
Description: self.c.Tr.LcDrop,
|
Description: self.c.Tr.Drop,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.New),
|
Key: opts.GetKey(opts.Config.Universal.New),
|
||||||
Handler: self.checkSelected(self.handleNewBranchOffStashEntry),
|
Handler: self.checkSelected(self.handleNewBranchOffStashEntry),
|
||||||
Description: self.c.Tr.LcNewBranch,
|
Description: self.c.Tr.NewBranch,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Stash.RenameStash),
|
Key: opts.GetKey(opts.Config.Stash.RenameStash),
|
||||||
Handler: self.checkSelected(self.handleRenameStashEntry),
|
Handler: self.checkSelected(self.handleRenameStashEntry),
|
||||||
Description: self.c.Tr.LcRenameStash,
|
Description: self.c.Tr.RenameStash,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -45,7 +45,7 @@ func (self *StatusController) GetKeybindings(opts types.KeybindingsOpts) []*type
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Status.CheckForUpdate),
|
Key: opts.GetKey(opts.Config.Status.CheckForUpdate),
|
||||||
Handler: self.handleCheckForUpdate,
|
Handler: self.handleCheckForUpdate,
|
||||||
Description: self.c.Tr.LcCheckForUpdate,
|
Description: self.c.Tr.CheckForUpdate,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Status.RecentRepos),
|
Key: opts.GetKey(opts.Config.Status.RecentRepos),
|
||||||
@ -55,7 +55,7 @@ func (self *StatusController) GetKeybindings(opts types.KeybindingsOpts) []*type
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Status.AllBranchesLogGraph),
|
Key: opts.GetKey(opts.Config.Status.AllBranchesLogGraph),
|
||||||
Handler: self.showAllBranchLogs,
|
Handler: self.showAllBranchLogs,
|
||||||
Description: self.c.Tr.LcAllBranchesLogGraph,
|
Description: self.c.Tr.AllBranchesLogGraph,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -112,7 +112,7 @@ func (self *StatusController) onClick() error {
|
|||||||
workingTreeState := self.c.Git().Status.WorkingTreeState()
|
workingTreeState := self.c.Git().Status.WorkingTreeState()
|
||||||
switch workingTreeState {
|
switch workingTreeState {
|
||||||
case enums.REBASE_MODE_REBASING, enums.REBASE_MODE_MERGING:
|
case enums.REBASE_MODE_REBASING, enums.REBASE_MODE_MERGING:
|
||||||
workingTreeStatus := fmt.Sprintf("(%s)", presentation.FormatWorkingTreeState(workingTreeState))
|
workingTreeStatus := fmt.Sprintf("(%s)", presentation.FormatWorkingTreeStateLower(self.c.Tr, workingTreeState))
|
||||||
if cursorInSubstring(cx, upstreamStatus+" ", workingTreeStatus) {
|
if cursorInSubstring(cx, upstreamStatus+" ", workingTreeStatus) {
|
||||||
return self.c.Helpers().MergeAndRebase.CreateRebaseOptionsMenu()
|
return self.c.Helpers().MergeAndRebase.CreateRebaseOptionsMenu()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -32,37 +32,37 @@ func (self *SubmodulesController) GetKeybindings(opts types.KeybindingsOpts) []*
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.GoInto),
|
Key: opts.GetKey(opts.Config.Universal.GoInto),
|
||||||
Handler: self.checkSelected(self.enter),
|
Handler: self.checkSelected(self.enter),
|
||||||
Description: self.c.Tr.LcEnterSubmodule,
|
Description: self.c.Tr.EnterSubmodule,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Remove),
|
Key: opts.GetKey(opts.Config.Universal.Remove),
|
||||||
Handler: self.checkSelected(self.remove),
|
Handler: self.checkSelected(self.remove),
|
||||||
Description: self.c.Tr.LcRemoveSubmodule,
|
Description: self.c.Tr.RemoveSubmodule,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Submodules.Update),
|
Key: opts.GetKey(opts.Config.Submodules.Update),
|
||||||
Handler: self.checkSelected(self.update),
|
Handler: self.checkSelected(self.update),
|
||||||
Description: self.c.Tr.LcSubmoduleUpdate,
|
Description: self.c.Tr.SubmoduleUpdate,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.New),
|
Key: opts.GetKey(opts.Config.Universal.New),
|
||||||
Handler: self.add,
|
Handler: self.add,
|
||||||
Description: self.c.Tr.LcAddSubmodule,
|
Description: self.c.Tr.AddSubmodule,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Edit),
|
Key: opts.GetKey(opts.Config.Universal.Edit),
|
||||||
Handler: self.checkSelected(self.editURL),
|
Handler: self.checkSelected(self.editURL),
|
||||||
Description: self.c.Tr.LcEditSubmoduleUrl,
|
Description: self.c.Tr.EditSubmoduleUrl,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Submodules.Init),
|
Key: opts.GetKey(opts.Config.Submodules.Init),
|
||||||
Handler: self.checkSelected(self.init),
|
Handler: self.checkSelected(self.init),
|
||||||
Description: self.c.Tr.LcInitSubmodule,
|
Description: self.c.Tr.InitSubmodule,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Submodules.BulkMenu),
|
Key: opts.GetKey(opts.Config.Submodules.BulkMenu),
|
||||||
Handler: self.openBulkActionsMenu,
|
Handler: self.openBulkActionsMenu,
|
||||||
Description: self.c.Tr.LcViewBulkSubmoduleOptions,
|
Description: self.c.Tr.ViewBulkSubmoduleOptions,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -118,19 +118,19 @@ func (self *SubmodulesController) enter(submodule *models.SubmoduleConfig) error
|
|||||||
|
|
||||||
func (self *SubmodulesController) add() error {
|
func (self *SubmodulesController) add() error {
|
||||||
return self.c.Prompt(types.PromptOpts{
|
return self.c.Prompt(types.PromptOpts{
|
||||||
Title: self.c.Tr.LcNewSubmoduleUrl,
|
Title: self.c.Tr.NewSubmoduleUrl,
|
||||||
HandleConfirm: func(submoduleUrl string) error {
|
HandleConfirm: func(submoduleUrl string) error {
|
||||||
nameSuggestion := filepath.Base(strings.TrimSuffix(submoduleUrl, filepath.Ext(submoduleUrl)))
|
nameSuggestion := filepath.Base(strings.TrimSuffix(submoduleUrl, filepath.Ext(submoduleUrl)))
|
||||||
|
|
||||||
return self.c.Prompt(types.PromptOpts{
|
return self.c.Prompt(types.PromptOpts{
|
||||||
Title: self.c.Tr.LcNewSubmoduleName,
|
Title: self.c.Tr.NewSubmoduleName,
|
||||||
InitialContent: nameSuggestion,
|
InitialContent: nameSuggestion,
|
||||||
HandleConfirm: func(submoduleName string) error {
|
HandleConfirm: func(submoduleName string) error {
|
||||||
return self.c.Prompt(types.PromptOpts{
|
return self.c.Prompt(types.PromptOpts{
|
||||||
Title: self.c.Tr.LcNewSubmodulePath,
|
Title: self.c.Tr.NewSubmodulePath,
|
||||||
InitialContent: submoduleName,
|
InitialContent: submoduleName,
|
||||||
HandleConfirm: func(submodulePath string) error {
|
HandleConfirm: func(submodulePath string) error {
|
||||||
return self.c.WithWaitingStatus(self.c.Tr.LcAddingSubmoduleStatus, func() error {
|
return self.c.WithWaitingStatus(self.c.Tr.AddingSubmoduleStatus, func() error {
|
||||||
self.c.LogAction(self.c.Tr.Actions.AddSubmodule)
|
self.c.LogAction(self.c.Tr.Actions.AddSubmodule)
|
||||||
err := self.c.Git().Submodule.Add(submoduleName, submodulePath, submoduleUrl)
|
err := self.c.Git().Submodule.Add(submoduleName, submodulePath, submoduleUrl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -149,10 +149,10 @@ func (self *SubmodulesController) add() error {
|
|||||||
|
|
||||||
func (self *SubmodulesController) editURL(submodule *models.SubmoduleConfig) error {
|
func (self *SubmodulesController) editURL(submodule *models.SubmoduleConfig) error {
|
||||||
return self.c.Prompt(types.PromptOpts{
|
return self.c.Prompt(types.PromptOpts{
|
||||||
Title: fmt.Sprintf(self.c.Tr.LcUpdateSubmoduleUrl, submodule.Name),
|
Title: fmt.Sprintf(self.c.Tr.UpdateSubmoduleUrl, submodule.Name),
|
||||||
InitialContent: submodule.Url,
|
InitialContent: submodule.Url,
|
||||||
HandleConfirm: func(newUrl string) error {
|
HandleConfirm: func(newUrl string) error {
|
||||||
return self.c.WithWaitingStatus(self.c.Tr.LcUpdatingSubmoduleUrlStatus, func() error {
|
return self.c.WithWaitingStatus(self.c.Tr.UpdatingSubmoduleUrlStatus, func() error {
|
||||||
self.c.LogAction(self.c.Tr.Actions.UpdateSubmoduleUrl)
|
self.c.LogAction(self.c.Tr.Actions.UpdateSubmoduleUrl)
|
||||||
err := self.c.Git().Submodule.UpdateUrl(submodule.Name, submodule.Path, newUrl)
|
err := self.c.Git().Submodule.UpdateUrl(submodule.Name, submodule.Path, newUrl)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -166,7 +166,7 @@ func (self *SubmodulesController) editURL(submodule *models.SubmoduleConfig) err
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (self *SubmodulesController) init(submodule *models.SubmoduleConfig) error {
|
func (self *SubmodulesController) init(submodule *models.SubmoduleConfig) error {
|
||||||
return self.c.WithWaitingStatus(self.c.Tr.LcInitializingSubmoduleStatus, func() error {
|
return self.c.WithWaitingStatus(self.c.Tr.InitializingSubmoduleStatus, func() error {
|
||||||
self.c.LogAction(self.c.Tr.Actions.InitialiseSubmodule)
|
self.c.LogAction(self.c.Tr.Actions.InitialiseSubmodule)
|
||||||
err := self.c.Git().Submodule.Init(submodule.Path)
|
err := self.c.Git().Submodule.Init(submodule.Path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -179,12 +179,12 @@ func (self *SubmodulesController) init(submodule *models.SubmoduleConfig) error
|
|||||||
|
|
||||||
func (self *SubmodulesController) openBulkActionsMenu() error {
|
func (self *SubmodulesController) openBulkActionsMenu() error {
|
||||||
return self.c.Menu(types.CreateMenuOptions{
|
return self.c.Menu(types.CreateMenuOptions{
|
||||||
Title: self.c.Tr.LcBulkSubmoduleOptions,
|
Title: self.c.Tr.BulkSubmoduleOptions,
|
||||||
Items: []*types.MenuItem{
|
Items: []*types.MenuItem{
|
||||||
{
|
{
|
||||||
LabelColumns: []string{self.c.Tr.LcBulkInitSubmodules, style.FgGreen.Sprint(self.c.Git().Submodule.BulkInitCmdObj().ToString())},
|
LabelColumns: []string{self.c.Tr.BulkInitSubmodules, style.FgGreen.Sprint(self.c.Git().Submodule.BulkInitCmdObj().ToString())},
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.c.WithWaitingStatus(self.c.Tr.LcRunningCommand, func() error {
|
return self.c.WithWaitingStatus(self.c.Tr.RunningCommand, func() error {
|
||||||
self.c.LogAction(self.c.Tr.Actions.BulkInitialiseSubmodules)
|
self.c.LogAction(self.c.Tr.Actions.BulkInitialiseSubmodules)
|
||||||
err := self.c.Git().Submodule.BulkInitCmdObj().Run()
|
err := self.c.Git().Submodule.BulkInitCmdObj().Run()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -197,9 +197,9 @@ func (self *SubmodulesController) openBulkActionsMenu() error {
|
|||||||
Key: 'i',
|
Key: 'i',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
LabelColumns: []string{self.c.Tr.LcBulkUpdateSubmodules, style.FgYellow.Sprint(self.c.Git().Submodule.BulkUpdateCmdObj().ToString())},
|
LabelColumns: []string{self.c.Tr.BulkUpdateSubmodules, style.FgYellow.Sprint(self.c.Git().Submodule.BulkUpdateCmdObj().ToString())},
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.c.WithWaitingStatus(self.c.Tr.LcRunningCommand, func() error {
|
return self.c.WithWaitingStatus(self.c.Tr.RunningCommand, func() error {
|
||||||
self.c.LogAction(self.c.Tr.Actions.BulkUpdateSubmodules)
|
self.c.LogAction(self.c.Tr.Actions.BulkUpdateSubmodules)
|
||||||
if err := self.c.Git().Submodule.BulkUpdateCmdObj().Run(); err != nil {
|
if err := self.c.Git().Submodule.BulkUpdateCmdObj().Run(); err != nil {
|
||||||
return self.c.Error(err)
|
return self.c.Error(err)
|
||||||
@ -211,9 +211,9 @@ func (self *SubmodulesController) openBulkActionsMenu() error {
|
|||||||
Key: 'u',
|
Key: 'u',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
LabelColumns: []string{self.c.Tr.LcBulkDeinitSubmodules, style.FgRed.Sprint(self.c.Git().Submodule.BulkDeinitCmdObj().ToString())},
|
LabelColumns: []string{self.c.Tr.BulkDeinitSubmodules, style.FgRed.Sprint(self.c.Git().Submodule.BulkDeinitCmdObj().ToString())},
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return self.c.WithWaitingStatus(self.c.Tr.LcRunningCommand, func() error {
|
return self.c.WithWaitingStatus(self.c.Tr.RunningCommand, func() error {
|
||||||
self.c.LogAction(self.c.Tr.Actions.BulkDeinitialiseSubmodules)
|
self.c.LogAction(self.c.Tr.Actions.BulkDeinitialiseSubmodules)
|
||||||
if err := self.c.Git().Submodule.BulkDeinitCmdObj().Run(); err != nil {
|
if err := self.c.Git().Submodule.BulkDeinitCmdObj().Run(); err != nil {
|
||||||
return self.c.Error(err)
|
return self.c.Error(err)
|
||||||
@ -229,7 +229,7 @@ func (self *SubmodulesController) openBulkActionsMenu() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (self *SubmodulesController) update(submodule *models.SubmoduleConfig) error {
|
func (self *SubmodulesController) update(submodule *models.SubmoduleConfig) error {
|
||||||
return self.c.WithWaitingStatus(self.c.Tr.LcUpdatingSubmoduleStatus, func() error {
|
return self.c.WithWaitingStatus(self.c.Tr.UpdatingSubmoduleStatus, func() error {
|
||||||
self.c.LogAction(self.c.Tr.Actions.UpdateSubmodule)
|
self.c.LogAction(self.c.Tr.Actions.UpdateSubmodule)
|
||||||
err := self.c.Git().Submodule.Update(submodule.Path)
|
err := self.c.Git().Submodule.Update(submodule.Path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@ -40,7 +40,7 @@ func (self *SwitchToDiffFilesController) GetKeybindings(opts types.KeybindingsOp
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.GoInto),
|
Key: opts.GetKey(opts.Config.Universal.GoInto),
|
||||||
Handler: self.checkSelected(self.enter),
|
Handler: self.checkSelected(self.enter),
|
||||||
Description: self.c.Tr.LcViewItemFiles,
|
Description: self.c.Tr.ViewItemFiles,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -39,7 +39,7 @@ func (self *SwitchToSubCommitsController) GetKeybindings(opts types.KeybindingsO
|
|||||||
{
|
{
|
||||||
Handler: self.viewCommits,
|
Handler: self.viewCommits,
|
||||||
Key: opts.GetKey(opts.Config.Universal.GoInto),
|
Key: opts.GetKey(opts.Config.Universal.GoInto),
|
||||||
Description: self.c.Tr.LcViewCommits,
|
Description: self.c.Tr.ViewCommits,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -30,12 +30,12 @@ func (self *SyncController) GetKeybindings(opts types.KeybindingsOpts) []*types.
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Push),
|
Key: opts.GetKey(opts.Config.Universal.Push),
|
||||||
Handler: opts.Guards.NoPopupPanel(self.HandlePush),
|
Handler: opts.Guards.NoPopupPanel(self.HandlePush),
|
||||||
Description: self.c.Tr.LcPush,
|
Description: self.c.Tr.Push,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
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),
|
||||||
Description: self.c.Tr.LcPull,
|
Description: self.c.Tr.Pull,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -28,27 +28,27 @@ func (self *TagsController) GetKeybindings(opts types.KeybindingsOpts) []*types.
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Select),
|
Key: opts.GetKey(opts.Config.Universal.Select),
|
||||||
Handler: self.withSelectedTag(self.checkout),
|
Handler: self.withSelectedTag(self.checkout),
|
||||||
Description: self.c.Tr.LcCheckout,
|
Description: self.c.Tr.Checkout,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Remove),
|
Key: opts.GetKey(opts.Config.Universal.Remove),
|
||||||
Handler: self.withSelectedTag(self.delete),
|
Handler: self.withSelectedTag(self.delete),
|
||||||
Description: self.c.Tr.LcDeleteTag,
|
Description: self.c.Tr.DeleteTag,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Branches.PushTag),
|
Key: opts.GetKey(opts.Config.Branches.PushTag),
|
||||||
Handler: self.withSelectedTag(self.push),
|
Handler: self.withSelectedTag(self.push),
|
||||||
Description: self.c.Tr.LcPushTag,
|
Description: self.c.Tr.PushTag,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.New),
|
Key: opts.GetKey(opts.Config.Universal.New),
|
||||||
Handler: self.create,
|
Handler: self.create,
|
||||||
Description: self.c.Tr.LcCreateTag,
|
Description: self.c.Tr.CreateTag,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Commits.ViewResetOptions),
|
Key: opts.GetKey(opts.Config.Commits.ViewResetOptions),
|
||||||
Handler: self.withSelectedTag(self.createResetMenu),
|
Handler: self.withSelectedTag(self.createResetMenu),
|
||||||
Description: self.c.Tr.LcViewResetOptions,
|
Description: self.c.Tr.ViewResetOptions,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@ -54,13 +54,13 @@ func (self *UndoController) GetKeybindings(opts types.KeybindingsOpts) []*types.
|
|||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Undo),
|
Key: opts.GetKey(opts.Config.Universal.Undo),
|
||||||
Handler: self.reflogUndo,
|
Handler: self.reflogUndo,
|
||||||
Description: self.c.Tr.LcUndoReflog,
|
Description: self.c.Tr.UndoReflog,
|
||||||
Tooltip: self.c.Tr.UndoTooltip,
|
Tooltip: self.c.Tr.UndoTooltip,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Key: opts.GetKey(opts.Config.Universal.Redo),
|
Key: opts.GetKey(opts.Config.Universal.Redo),
|
||||||
Handler: self.reflogRedo,
|
Handler: self.reflogRedo,
|
||||||
Description: self.c.Tr.LcRedoReflog,
|
Description: self.c.Tr.RedoReflog,
|
||||||
Tooltip: self.c.Tr.RedoTooltip,
|
Tooltip: self.c.Tr.RedoTooltip,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -77,7 +77,7 @@ func (self *UndoController) reflogUndo() error {
|
|||||||
undoingStatus := self.c.Tr.UndoingStatus
|
undoingStatus := self.c.Tr.UndoingStatus
|
||||||
|
|
||||||
if self.c.Git().Status.WorkingTreeState() == enums.REBASE_MODE_REBASING {
|
if self.c.Git().Status.WorkingTreeState() == enums.REBASE_MODE_REBASING {
|
||||||
return self.c.ErrorMsg(self.c.Tr.LcCantUndoWhileRebasing)
|
return self.c.ErrorMsg(self.c.Tr.CantUndoWhileRebasing)
|
||||||
}
|
}
|
||||||
|
|
||||||
return self.parseReflogForActions(func(counter int, action reflogAction) (bool, error) {
|
return self.parseReflogForActions(func(counter int, action reflogAction) (bool, error) {
|
||||||
@ -125,7 +125,7 @@ func (self *UndoController) reflogRedo() error {
|
|||||||
redoingStatus := self.c.Tr.RedoingStatus
|
redoingStatus := self.c.Tr.RedoingStatus
|
||||||
|
|
||||||
if self.c.Git().Status.WorkingTreeState() == enums.REBASE_MODE_REBASING {
|
if self.c.Git().Status.WorkingTreeState() == enums.REBASE_MODE_REBASING {
|
||||||
return self.c.ErrorMsg(self.c.Tr.LcCantRedoWhileRebasing)
|
return self.c.ErrorMsg(self.c.Tr.CantRedoWhileRebasing)
|
||||||
}
|
}
|
||||||
|
|
||||||
return self.parseReflogForActions(func(counter int, action reflogAction) (bool, error) {
|
return self.parseReflogForActions(func(counter int, action reflogAction) (bool, error) {
|
||||||
|
|||||||
@ -14,13 +14,13 @@ func (self *FilesController) createResetMenu() error {
|
|||||||
|
|
||||||
nukeStr := "git reset --hard HEAD && git clean -fd"
|
nukeStr := "git reset --hard HEAD && git clean -fd"
|
||||||
if len(self.c.Model().Submodules) > 0 {
|
if len(self.c.Model().Submodules) > 0 {
|
||||||
nukeStr = fmt.Sprintf("%s (%s)", nukeStr, self.c.Tr.LcAndResetSubmodules)
|
nukeStr = fmt.Sprintf("%s (%s)", nukeStr, self.c.Tr.AndResetSubmodules)
|
||||||
}
|
}
|
||||||
|
|
||||||
menuItems := []*types.MenuItem{
|
menuItems := []*types.MenuItem{
|
||||||
{
|
{
|
||||||
LabelColumns: []string{
|
LabelColumns: []string{
|
||||||
self.c.Tr.LcDiscardAllChangesToAllFiles,
|
self.c.Tr.DiscardAllChangesToAllFiles,
|
||||||
red.Sprint(nukeStr),
|
red.Sprint(nukeStr),
|
||||||
},
|
},
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
@ -36,7 +36,7 @@ func (self *FilesController) createResetMenu() error {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
LabelColumns: []string{
|
LabelColumns: []string{
|
||||||
self.c.Tr.LcDiscardAnyUnstagedChanges,
|
self.c.Tr.DiscardAnyUnstagedChanges,
|
||||||
red.Sprint("git checkout -- ."),
|
red.Sprint("git checkout -- ."),
|
||||||
},
|
},
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
@ -51,7 +51,7 @@ func (self *FilesController) createResetMenu() error {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
LabelColumns: []string{
|
LabelColumns: []string{
|
||||||
self.c.Tr.LcDiscardUntrackedFiles,
|
self.c.Tr.DiscardUntrackedFiles,
|
||||||
red.Sprint("git clean -fd"),
|
red.Sprint("git clean -fd"),
|
||||||
},
|
},
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
@ -66,7 +66,7 @@ func (self *FilesController) createResetMenu() error {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
LabelColumns: []string{
|
LabelColumns: []string{
|
||||||
self.c.Tr.LcDiscardStagedChanges,
|
self.c.Tr.DiscardStagedChanges,
|
||||||
red.Sprint("stash staged and drop stash"),
|
red.Sprint("stash staged and drop stash"),
|
||||||
},
|
},
|
||||||
Tooltip: self.c.Tr.DiscardStagedChangesDescription,
|
Tooltip: self.c.Tr.DiscardStagedChangesDescription,
|
||||||
@ -88,7 +88,7 @@ func (self *FilesController) createResetMenu() error {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
LabelColumns: []string{
|
LabelColumns: []string{
|
||||||
self.c.Tr.LcSoftReset,
|
self.c.Tr.SoftReset,
|
||||||
red.Sprint("git reset --soft HEAD"),
|
red.Sprint("git reset --soft HEAD"),
|
||||||
},
|
},
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
@ -118,7 +118,7 @@ func (self *FilesController) createResetMenu() error {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
LabelColumns: []string{
|
LabelColumns: []string{
|
||||||
self.c.Tr.LcHardReset,
|
self.c.Tr.HardReset,
|
||||||
red.Sprint("git reset --hard HEAD"),
|
red.Sprint("git reset --hard HEAD"),
|
||||||
},
|
},
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
|
|||||||
@ -133,7 +133,7 @@ func (gui *Gui) handleCopySelectedSideContextItemToClipboard() error {
|
|||||||
|
|
||||||
truncatedItemId := utils.TruncateWithEllipsis(strings.Replace(itemId, "\n", " ", -1), 50)
|
truncatedItemId := utils.TruncateWithEllipsis(strings.Replace(itemId, "\n", " ", -1), 50)
|
||||||
|
|
||||||
gui.c.Toast(fmt.Sprintf("'%s' %s", truncatedItemId, gui.c.Tr.LcCopiedToClipboard))
|
gui.c.Toast(fmt.Sprintf("'%s' %s", truncatedItemId, gui.c.Tr.CopiedToClipboard))
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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.LcScrollUpMainPanel,
|
Description: self.c.Tr.ScrollUpMainPanel,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
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.LcScrollDownMainPanel,
|
Description: self.c.Tr.ScrollDownMainPanel,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ViewName: "",
|
ViewName: "",
|
||||||
@ -126,43 +126,43 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi
|
|||||||
ViewName: "files",
|
ViewName: "files",
|
||||||
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
||||||
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
||||||
Description: self.c.Tr.LcCopyFileNameToClipboard,
|
Description: self.c.Tr.CopyFileNameToClipboard,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ViewName: "localBranches",
|
ViewName: "localBranches",
|
||||||
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
||||||
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
||||||
Description: self.c.Tr.LcCopyBranchNameToClipboard,
|
Description: self.c.Tr.CopyBranchNameToClipboard,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ViewName: "remoteBranches",
|
ViewName: "remoteBranches",
|
||||||
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
||||||
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
||||||
Description: self.c.Tr.LcCopyBranchNameToClipboard,
|
Description: self.c.Tr.CopyBranchNameToClipboard,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ViewName: "commits",
|
ViewName: "commits",
|
||||||
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
||||||
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
||||||
Description: self.c.Tr.LcCopyCommitShaToClipboard,
|
Description: self.c.Tr.CopyCommitShaToClipboard,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ViewName: "commits",
|
ViewName: "commits",
|
||||||
Key: opts.GetKey(opts.Config.Commits.ResetCherryPick),
|
Key: opts.GetKey(opts.Config.Commits.ResetCherryPick),
|
||||||
Handler: self.helpers.CherryPick.Reset,
|
Handler: self.helpers.CherryPick.Reset,
|
||||||
Description: self.c.Tr.LcResetCherryPick,
|
Description: self.c.Tr.ResetCherryPick,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ViewName: "reflogCommits",
|
ViewName: "reflogCommits",
|
||||||
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
||||||
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
||||||
Description: self.c.Tr.LcCopyCommitShaToClipboard,
|
Description: self.c.Tr.CopyCommitShaToClipboard,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ViewName: "subCommits",
|
ViewName: "subCommits",
|
||||||
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
||||||
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
||||||
Description: self.c.Tr.LcCopyCommitShaToClipboard,
|
Description: self.c.Tr.CopyCommitShaToClipboard,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ViewName: "information",
|
ViewName: "information",
|
||||||
@ -174,13 +174,13 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi
|
|||||||
ViewName: "commitFiles",
|
ViewName: "commitFiles",
|
||||||
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
||||||
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
||||||
Description: self.c.Tr.LcCopyCommitFileNameToClipboard,
|
Description: self.c.Tr.CopyCommitFileNameToClipboard,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
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.LcOpenExtrasMenu,
|
Description: self.c.Tr.OpenExtrasMenu,
|
||||||
OpensMenu: true,
|
OpensMenu: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -255,7 +255,7 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi
|
|||||||
ViewName: "submodules",
|
ViewName: "submodules",
|
||||||
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
Key: opts.GetKey(opts.Config.Universal.CopyToClipboard),
|
||||||
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
Handler: self.handleCopySelectedSideContextItemToClipboard,
|
||||||
Description: self.c.Tr.LcCopySubmoduleNameToClipboard,
|
Description: self.c.Tr.CopySubmoduleNameToClipboard,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ViewName: "extras",
|
ViewName: "extras",
|
||||||
@ -321,14 +321,14 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi
|
|||||||
ViewName: "",
|
ViewName: "",
|
||||||
Key: opts.GetKey(opts.Config.Universal.NextTab),
|
Key: opts.GetKey(opts.Config.Universal.NextTab),
|
||||||
Handler: self.handleNextTab,
|
Handler: self.handleNextTab,
|
||||||
Description: self.c.Tr.LcNextTab,
|
Description: self.c.Tr.NextTab,
|
||||||
Tag: "navigation",
|
Tag: "navigation",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
ViewName: "",
|
ViewName: "",
|
||||||
Key: opts.GetKey(opts.Config.Universal.PrevTab),
|
Key: opts.GetKey(opts.Config.Universal.PrevTab),
|
||||||
Handler: self.handlePrevTab,
|
Handler: self.handlePrevTab,
|
||||||
Description: self.c.Tr.LcPrevTab,
|
Description: self.c.Tr.PrevTab,
|
||||||
Tag: "navigation",
|
Tag: "navigation",
|
||||||
},
|
},
|
||||||
}...)
|
}...)
|
||||||
|
|||||||
@ -12,7 +12,7 @@ func (gui *Gui) createMenu(opts types.CreateMenuOptions) error {
|
|||||||
if !opts.HideCancel {
|
if !opts.HideCancel {
|
||||||
// this is mutative but I'm okay with that for now
|
// this is mutative but I'm okay with that for now
|
||||||
opts.Items = append(opts.Items, &types.MenuItem{
|
opts.Items = append(opts.Items, &types.MenuItem{
|
||||||
LabelColumns: []string{gui.c.Tr.LcCancel},
|
LabelColumns: []string{gui.c.Tr.Cancel},
|
||||||
OnPress: func() error {
|
OnPress: func() error {
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
|
|||||||
@ -58,27 +58,27 @@ func (self *OptionsMapMgr) globalOptions() []bindingInfo {
|
|||||||
return []bindingInfo{
|
return []bindingInfo{
|
||||||
{
|
{
|
||||||
key: fmt.Sprintf("%s/%s", keybindings.Label(keybindingConfig.Universal.ScrollUpMain), keybindings.Label(keybindingConfig.Universal.ScrollDownMain)),
|
key: fmt.Sprintf("%s/%s", keybindings.Label(keybindingConfig.Universal.ScrollUpMain), keybindings.Label(keybindingConfig.Universal.ScrollDownMain)),
|
||||||
description: self.c.Tr.LcScroll,
|
description: self.c.Tr.Scroll,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: keybindings.Label(keybindingConfig.Universal.Return),
|
key: keybindings.Label(keybindingConfig.Universal.Return),
|
||||||
description: self.c.Tr.LcCancel,
|
description: self.c.Tr.Cancel,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: keybindings.Label(keybindingConfig.Universal.Quit),
|
key: keybindings.Label(keybindingConfig.Universal.Quit),
|
||||||
description: self.c.Tr.LcQuit,
|
description: self.c.Tr.Quit,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: keybindings.Label(keybindingConfig.Universal.OptionMenuAlt1),
|
key: keybindings.Label(keybindingConfig.Universal.OptionMenuAlt1),
|
||||||
description: self.c.Tr.LcMenu,
|
description: self.c.Tr.Keybindings,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: fmt.Sprintf("%s-%s", keybindings.Label(keybindingConfig.Universal.JumpToBlock[0]), keybindings.Label(keybindingConfig.Universal.JumpToBlock[len(keybindingConfig.Universal.JumpToBlock)-1])),
|
key: fmt.Sprintf("%s-%s", keybindings.Label(keybindingConfig.Universal.JumpToBlock[0]), keybindings.Label(keybindingConfig.Universal.JumpToBlock[len(keybindingConfig.Universal.JumpToBlock)-1])),
|
||||||
description: self.c.Tr.LcJump,
|
description: self.c.Tr.Jump,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: fmt.Sprintf("%s/%s", keybindings.Label(keybindingConfig.Universal.ScrollLeft), keybindings.Label(keybindingConfig.Universal.ScrollRight)),
|
key: fmt.Sprintf("%s/%s", keybindings.Label(keybindingConfig.Universal.ScrollLeft), keybindings.Label(keybindingConfig.Universal.ScrollRight)),
|
||||||
description: self.c.Tr.LcScrollLeftRight,
|
description: self.c.Tr.ScrollLeftRight,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,14 +1,30 @@
|
|||||||
package presentation
|
package presentation
|
||||||
|
|
||||||
import "github.com/jesseduffield/lazygit/pkg/commands/types/enums"
|
import (
|
||||||
|
"github.com/jesseduffield/lazygit/pkg/commands/types/enums"
|
||||||
|
"github.com/jesseduffield/lazygit/pkg/i18n"
|
||||||
|
)
|
||||||
|
|
||||||
func FormatWorkingTreeState(rebaseMode enums.RebaseMode) string {
|
func FormatWorkingTreeStateTitle(tr *i18n.TranslationSet, rebaseMode enums.RebaseMode) string {
|
||||||
switch rebaseMode {
|
switch rebaseMode {
|
||||||
case enums.REBASE_MODE_REBASING:
|
case enums.REBASE_MODE_REBASING:
|
||||||
return "rebasing"
|
return tr.RebasingStatus
|
||||||
case enums.REBASE_MODE_MERGING:
|
case enums.REBASE_MODE_MERGING:
|
||||||
return "merging"
|
return tr.MergingStatus
|
||||||
default:
|
default:
|
||||||
|
// should never actually display this
|
||||||
|
return "none"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func FormatWorkingTreeStateLower(tr *i18n.TranslationSet, rebaseMode enums.RebaseMode) string {
|
||||||
|
switch rebaseMode {
|
||||||
|
case enums.REBASE_MODE_REBASING:
|
||||||
|
return tr.LowercaseRebasingStatus
|
||||||
|
case enums.REBASE_MODE_MERGING:
|
||||||
|
return tr.LowercaseMergingStatus
|
||||||
|
default:
|
||||||
|
// should never actually display this
|
||||||
return "none"
|
return "none"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -51,9 +51,9 @@ func (gui *Gui) onSelectItemWrapper(innerFunc func(int) error) func(int, int, in
|
|||||||
gui.c.SetViewContent(
|
gui.c.SetViewContent(
|
||||||
gui.Views.Search,
|
gui.Views.Search,
|
||||||
fmt.Sprintf(
|
fmt.Sprintf(
|
||||||
"no matches for '%s' %s",
|
gui.Tr.NoMatchesFor,
|
||||||
gui.State.Searching.searchString,
|
gui.State.Searching.searchString,
|
||||||
theme.OptionsFgColor.Sprintf("%s: exit search mode", keybindings.Label(keybindingConfig.Universal.Return)),
|
theme.OptionsFgColor.Sprintf(gui.Tr.ExitSearchMode, keybindings.Label(keybindingConfig.Universal.Return)),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
return nil
|
return nil
|
||||||
@ -61,12 +61,12 @@ func (gui *Gui) onSelectItemWrapper(innerFunc func(int) error) func(int, int, in
|
|||||||
gui.c.SetViewContent(
|
gui.c.SetViewContent(
|
||||||
gui.Views.Search,
|
gui.Views.Search,
|
||||||
fmt.Sprintf(
|
fmt.Sprintf(
|
||||||
"matches for '%s' (%d of %d) %s",
|
gui.Tr.MatchesFor,
|
||||||
gui.State.Searching.searchString,
|
gui.State.Searching.searchString,
|
||||||
index+1,
|
index+1,
|
||||||
total,
|
total,
|
||||||
theme.OptionsFgColor.Sprintf(
|
theme.OptionsFgColor.Sprintf(
|
||||||
"%s: next match, %s: previous match, %s: exit search mode",
|
gui.Tr.SearchKeybindings,
|
||||||
keybindings.Label(keybindingConfig.Universal.NextMatch),
|
keybindings.Label(keybindingConfig.Universal.NextMatch),
|
||||||
keybindings.Label(keybindingConfig.Universal.PrevMatch),
|
keybindings.Label(keybindingConfig.Universal.PrevMatch),
|
||||||
keybindings.Label(keybindingConfig.Universal.Return),
|
keybindings.Label(keybindingConfig.Universal.Return),
|
||||||
|
|||||||
@ -194,7 +194,7 @@ func (self *HandlerCreator) finalHandler(customCommand config.CustomCommand, ses
|
|||||||
|
|
||||||
loadingText := customCommand.LoadingText
|
loadingText := customCommand.LoadingText
|
||||||
if loadingText == "" {
|
if loadingText == "" {
|
||||||
loadingText = self.c.Tr.LcRunningCustomCommandStatus
|
loadingText = self.c.Tr.RunningCustomCommandStatus
|
||||||
}
|
}
|
||||||
|
|
||||||
return self.c.WithWaitingStatus(loadingText, func() error {
|
return self.c.WithWaitingStatus(loadingText, func() error {
|
||||||
|
|||||||
@ -3,7 +3,6 @@ package gui
|
|||||||
import (
|
import (
|
||||||
"github.com/jesseduffield/generics/slices"
|
"github.com/jesseduffield/generics/slices"
|
||||||
"github.com/jesseduffield/gocui"
|
"github.com/jesseduffield/gocui"
|
||||||
"github.com/jesseduffield/lazygit/pkg/gui/constants"
|
|
||||||
"github.com/jesseduffield/lazygit/pkg/theme"
|
"github.com/jesseduffield/lazygit/pkg/theme"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -94,7 +93,7 @@ func (gui *Gui) createAllViews() error {
|
|||||||
gui.Views.SearchPrefix.BgColor = gocui.ColorDefault
|
gui.Views.SearchPrefix.BgColor = gocui.ColorDefault
|
||||||
gui.Views.SearchPrefix.FgColor = gocui.ColorGreen
|
gui.Views.SearchPrefix.FgColor = gocui.ColorGreen
|
||||||
gui.Views.SearchPrefix.Frame = false
|
gui.Views.SearchPrefix.Frame = false
|
||||||
gui.c.SetViewContent(gui.Views.SearchPrefix, constants.SEARCH_PREFIX)
|
gui.c.SetViewContent(gui.Views.SearchPrefix, gui.Tr.SearchPrefix)
|
||||||
|
|
||||||
gui.Views.Stash.Title = gui.c.Tr.StashTitle
|
gui.Views.Stash.Title = gui.c.Tr.StashTitle
|
||||||
|
|
||||||
|
|||||||
@ -59,24 +59,23 @@ func chineseTranslationSet() TranslationSet {
|
|||||||
NoCommitToAmend: "没有需要提交的修补。",
|
NoCommitToAmend: "没有需要提交的修补。",
|
||||||
CommitChangesWithEditor: "提交更改（使用编辑器编辑提交信息）",
|
CommitChangesWithEditor: "提交更改（使用编辑器编辑提交信息）",
|
||||||
StatusTitle: "状态",
|
StatusTitle: "状态",
|
||||||
LcNavigate: "导航",
|
Menu: "菜单",
|
||||||
LcMenu: "菜单",
|
Execute: "执行",
|
||||||
LcExecute: "执行",
|
ToggleStaged: "切换暂存状态",
|
||||||
LcToggleStaged: "切换暂存状态",
|
ToggleStagedAll: "切换所有文件的暂存状态",
|
||||||
LcToggleStagedAll: "切换所有文件的暂存状态",
|
ToggleTreeView: "切换文件树视图",
|
||||||
LcToggleTreeView: "切换文件树视图",
|
OpenMergeTool: "打开外部合并工具 (git mergetool)",
|
||||||
LcOpenMergeTool: "打开外部合并工具 (git mergetool)",
|
Refresh: "刷新",
|
||||||
LcRefresh: "刷新",
|
Push: "推送",
|
||||||
LcPush: "推送",
|
Pull: "拉取",
|
||||||
LcPull: "拉取",
|
Scroll: "滚动",
|
||||||
LcScroll: "滚动",
|
|
||||||
MergeConflictsTitle: "合并冲突",
|
MergeConflictsTitle: "合并冲突",
|
||||||
LcCheckout: "检出",
|
Checkout: "检出",
|
||||||
NoChangedFiles: "没有更改过文件",
|
NoChangedFiles: "没有更改过文件",
|
||||||
PullWait: "正在拉取…",
|
PullWait: "正在拉取…",
|
||||||
PushWait: "正在推送…",
|
PushWait: "正在推送…",
|
||||||
FetchWait: "正在抓取…",
|
FetchWait: "正在抓取…",
|
||||||
LcSoftReset: "软重置",
|
SoftReset: "软重置",
|
||||||
AlreadyCheckedOutBranch: "您已经检出至此分支",
|
AlreadyCheckedOutBranch: "您已经检出至此分支",
|
||||||
SureForceCheckout: "您确定要强制检出吗？您将丢失所有本地更改",
|
SureForceCheckout: "您确定要强制检出吗？您将丢失所有本地更改",
|
||||||
ForceCheckoutBranch: "强制检出分支",
|
ForceCheckoutBranch: "强制检出分支",
|
||||||
@ -86,45 +85,44 @@ func chineseTranslationSet() TranslationSet {
|
|||||||
DeleteBranch: "删除分支",
|
DeleteBranch: "删除分支",
|
||||||
DeleteBranchMessage: "您确定要删除分支 {{.selectedBranchName}} 吗？",
|
DeleteBranchMessage: "您确定要删除分支 {{.selectedBranchName}} 吗？",
|
||||||
ForceDeleteBranchMessage: "{{.selectedBranchName}} 还没有被完全合并。您确定要删除它吗？",
|
ForceDeleteBranchMessage: "{{.selectedBranchName}} 还没有被完全合并。您确定要删除它吗？",
|
||||||
LcRebaseBranch: "将已检出的分支变基到该分支",
|
RebaseBranch: "将已检出的分支变基到该分支",
|
||||||
CantRebaseOntoSelf: "您不能将分支变基到其自身",
|
CantRebaseOntoSelf: "您不能将分支变基到其自身",
|
||||||
CantMergeBranchIntoItself: "您不能将分支合并到其自身",
|
CantMergeBranchIntoItself: "您不能将分支合并到其自身",
|
||||||
LcForceCheckout: "强制检出",
|
ForceCheckout: "强制检出",
|
||||||
LcCheckoutByName: "按名称检出",
|
CheckoutByName: "按名称检出",
|
||||||
LcNewBranch: "新分支",
|
NewBranch: "新分支",
|
||||||
LcDeleteBranch: "删除分支",
|
|
||||||
NoBranchesThisRepo: "此仓库中没有分支",
|
NoBranchesThisRepo: "此仓库中没有分支",
|
||||||
CommitWithoutMessageErr: "您必须编写提交消息才能进行提交",
|
CommitWithoutMessageErr: "您必须编写提交消息才能进行提交",
|
||||||
LcCloseCancel: "关闭",
|
CloseCancel: "关闭",
|
||||||
LcConfirm: "确认",
|
Confirm: "确认",
|
||||||
LcClose: "关闭",
|
Close: "关闭",
|
||||||
LcQuit: "退出",
|
Quit: "退出",
|
||||||
LcSquashDown: "向下压缩",
|
SquashDown: "向下压缩",
|
||||||
LcFixupCommit: "修正提交（fixup）",
|
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: "压缩",
|
||||||
LcPickCommit: "选择提交（变基过程中）",
|
PickCommit: "选择提交（变基过程中）",
|
||||||
LcRevertCommit: "还原提交",
|
RevertCommit: "还原提交",
|
||||||
LcRewordCommit: "改写提交",
|
RewordCommit: "改写提交",
|
||||||
LcDeleteCommit: "删除提交",
|
DeleteCommit: "删除提交",
|
||||||
LcMoveDownCommit: "下移提交",
|
MoveDownCommit: "下移提交",
|
||||||
LcMoveUpCommit: "上移提交",
|
MoveUpCommit: "上移提交",
|
||||||
LcEditCommit: "编辑提交",
|
EditCommit: "编辑提交",
|
||||||
LcAmendToCommit: "用已暂存的更改来修补提交",
|
AmendToCommit: "用已暂存的更改来修补提交",
|
||||||
LcRenameCommitEditor: "使用编辑器重命名提交",
|
RenameCommitEditor: "使用编辑器重命名提交",
|
||||||
Error: "错误",
|
Error: "错误",
|
||||||
LcPickHunk: "选中区块",
|
PickHunk: "选中区块",
|
||||||
LcPickAllHunks: "选中所有区块",
|
PickAllHunks: "选中所有区块",
|
||||||
LcUndo: "撤销",
|
Undo: "撤销",
|
||||||
LcUndoReflog: "（通过 reflog）撤销「实验功能」",
|
UndoReflog: "（通过 reflog）撤销「实验功能」",
|
||||||
LcRedoReflog: "（通过 reflog）重做「实验功能」",
|
RedoReflog: "（通过 reflog）重做「实验功能」",
|
||||||
LcPop: "应用并删除",
|
Pop: "应用并删除",
|
||||||
LcDrop: "删除",
|
Drop: "删除",
|
||||||
LcApply: "应用",
|
Apply: "应用",
|
||||||
NoStashEntries: "没有贮藏条目",
|
NoStashEntries: "没有贮藏条目",
|
||||||
StashDrop: "删除贮藏",
|
StashDrop: "删除贮藏",
|
||||||
SureDropStashEntry: "您确定要删除此贮藏条目吗？",
|
SureDropStashEntry: "您确定要删除此贮藏条目吗？",
|
||||||
@ -134,7 +132,7 @@ func chineseTranslationSet() TranslationSet {
|
|||||||
SureApplyStashEntry: "您确定要应用此贮藏条目？",
|
SureApplyStashEntry: "您确定要应用此贮藏条目？",
|
||||||
NoTrackedStagedFilesStash: "没有可以贮藏的已跟踪/暂存文件",
|
NoTrackedStagedFilesStash: "没有可以贮藏的已跟踪/暂存文件",
|
||||||
StashChanges: "贮藏更改",
|
StashChanges: "贮藏更改",
|
||||||
LcRenameStash: "rename stash",
|
RenameStash: "Rename stash",
|
||||||
RenameStashPrompt: "Rename stash: {{.stashName}}",
|
RenameStashPrompt: "Rename stash: {{.stashName}}",
|
||||||
OpenConfig: "打开配置文件",
|
OpenConfig: "打开配置文件",
|
||||||
EditConfig: "编辑配置文件",
|
EditConfig: "编辑配置文件",
|
||||||
@ -142,7 +140,7 @@ func chineseTranslationSet() TranslationSet {
|
|||||||
ForcePushPrompt: "您的分支已与远程分支不同。按‘esc’取消，或‘enter’强制推送.",
|
ForcePushPrompt: "您的分支已与远程分支不同。按‘esc’取消，或‘enter’强制推送.",
|
||||||
ForcePushDisabled: "您的分支已与远程分支不同, 并且您已经禁用了强行推送",
|
ForcePushDisabled: "您的分支已与远程分支不同, 并且您已经禁用了强行推送",
|
||||||
UpdatesRejectedAndForcePushDisabled: "更新被拒绝，您已禁用强制推送",
|
UpdatesRejectedAndForcePushDisabled: "更新被拒绝，您已禁用强制推送",
|
||||||
LcCheckForUpdate: "检查更新",
|
CheckForUpdate: "检查更新",
|
||||||
CheckingForUpdates: "正在检查更新…",
|
CheckingForUpdates: "正在检查更新…",
|
||||||
OnLatestVersionErr: "已是最新版本",
|
OnLatestVersionErr: "已是最新版本",
|
||||||
MajorVersionErr: "新版本 ({{.newVersion}}) 与当前版本 ({{.currentVersion}}) 相比，具有非向后兼容的更改",
|
MajorVersionErr: "新版本 ({{.newVersion}}) 与当前版本 ({{.currentVersion}}) 相比，具有非向后兼容的更改",
|
||||||
@ -151,19 +149,19 @@ func chineseTranslationSet() TranslationSet {
|
|||||||
MergeToolPrompt: "确定要打开 `git mergetool` 吗?",
|
MergeToolPrompt: "确定要打开 `git mergetool` 吗?",
|
||||||
IntroPopupMessage: chineseIntroPopupMessage,
|
IntroPopupMessage: chineseIntroPopupMessage,
|
||||||
GitconfigParseErr: `由于存在未加引号的'\'字符，因此 Gogit 无法解析您的 gitconfig 文件。删除它们应该可以解决问题。`,
|
GitconfigParseErr: `由于存在未加引号的'\'字符，因此 Gogit 无法解析您的 gitconfig 文件。删除它们应该可以解决问题。`,
|
||||||
LcEditFile: `编辑文件`,
|
EditFile: `编辑文件`,
|
||||||
LcOpenFile: `打开文件`,
|
OpenFile: `打开文件`,
|
||||||
LcIgnoreFile: `添加到 .gitignore`,
|
IgnoreFile: `添加到 .gitignore`,
|
||||||
LcRefreshFiles: `刷新文件`,
|
RefreshFiles: `刷新文件`,
|
||||||
LcMergeIntoCurrentBranch: `合并到当前检出的分支`,
|
MergeIntoCurrentBranch: `合并到当前检出的分支`,
|
||||||
ConfirmQuit: `您确定要退出吗？`,
|
ConfirmQuit: `您确定要退出吗？`,
|
||||||
SwitchRepo: `切换到最近的仓库`,
|
SwitchRepo: `切换到最近的仓库`,
|
||||||
LcAllBranchesLogGraph: `显示所有分支的日志`,
|
AllBranchesLogGraph: `显示所有分支的日志`,
|
||||||
UnsupportedGitService: `不支持的 git 服务`,
|
UnsupportedGitService: `不支持的 git 服务`,
|
||||||
LcCreatePullRequest: `创建抓取请求`,
|
CreatePullRequest: `创建抓取请求`,
|
||||||
LcCopyPullRequestURL: `将抓取请求 URL 复制到剪贴板`,
|
CopyPullRequestURL: `将抓取请求 URL 复制到剪贴板`,
|
||||||
NoBranchOnRemote: `该分支在远程上不存在. 您需要先将其推送到远程.`,
|
NoBranchOnRemote: `该分支在远程上不存在. 您需要先将其推送到远程.`,
|
||||||
LcFetch: `抓取`,
|
Fetch: `抓取`,
|
||||||
NoAutomaticGitFetchTitle: `无法自动进行 "git fetch"`,
|
NoAutomaticGitFetchTitle: `无法自动进行 "git fetch"`,
|
||||||
NoAutomaticGitFetchBody: `Lazygit 不能在私人仓库中使用 "git fetch"; 请在文件面板中使用 'f' 手动运行 "git fetch"`,
|
NoAutomaticGitFetchBody: `Lazygit 不能在私人仓库中使用 "git fetch"; 请在文件面板中使用 'f' 手动运行 "git fetch"`,
|
||||||
FileEnter: `暂存单个 块/行 用于文件, 或 折叠/展开 目录`,
|
FileEnter: `暂存单个 块/行 用于文件, 或 折叠/展开 目录`,
|
||||||
@ -179,8 +177,6 @@ func chineseTranslationSet() TranslationSet {
|
|||||||
Fetching: "抓取并快进 {{.from}} -> {{.to}} ...",
|
Fetching: "抓取并快进 {{.from}} -> {{.to}} ...",
|
||||||
FoundConflicts: "冲突！需要中止操作请按‘esc’, 否则按‘enter’",
|
FoundConflicts: "冲突！需要中止操作请按‘esc’, 否则按‘enter’",
|
||||||
FoundConflictsTitle: "自动合并失败",
|
FoundConflictsTitle: "自动合并失败",
|
||||||
PickHunk: "选中区块",
|
|
||||||
PickAllHunks: "选中所有区块",
|
|
||||||
ViewMergeRebaseOptions: "查看 合并/变基 选项",
|
ViewMergeRebaseOptions: "查看 合并/变基 选项",
|
||||||
NotMergingOrRebasing: "您目前既不进行变基也不进行合并",
|
NotMergingOrRebasing: "您目前既不进行变基也不进行合并",
|
||||||
RecentRepos: "最近的仓库",
|
RecentRepos: "最近的仓库",
|
||||||
@ -206,10 +202,10 @@ func chineseTranslationSet() TranslationSet {
|
|||||||
ErrorOccurred: "发生错误！请在以下位置创建 issue",
|
ErrorOccurred: "发生错误！请在以下位置创建 issue",
|
||||||
NoRoom: "空间不足",
|
NoRoom: "空间不足",
|
||||||
YouAreHere: "您在这里",
|
YouAreHere: "您在这里",
|
||||||
LcRewordNotSupported: "当前不支持交互式重新基准化时的重新措词提交",
|
RewordNotSupported: "当前不支持交互式重新基准化时的重新措词提交",
|
||||||
LcCherryPickCopy: "复制提交（拣选）",
|
CherryPickCopy: "复制提交（拣选）",
|
||||||
LcCherryPickCopyRange: "复制提交范围（拣选）",
|
CherryPickCopyRange: "复制提交范围（拣选）",
|
||||||
LcPasteCommits: "粘贴提交（拣选）",
|
PasteCommits: "粘贴提交（拣选）",
|
||||||
SureCherryPick: "您确定要将选中的提交进行拣选到这个分支吗？",
|
SureCherryPick: "您确定要将选中的提交进行拣选到这个分支吗？",
|
||||||
CherryPick: "拣选 (Cherry-Pick)",
|
CherryPick: "拣选 (Cherry-Pick)",
|
||||||
Donate: "捐助",
|
Donate: "捐助",
|
||||||
@ -224,8 +220,8 @@ func chineseTranslationSet() TranslationSet {
|
|||||||
SelectNextHunk: "选择底部块",
|
SelectNextHunk: "选择底部块",
|
||||||
ScrollDown: "向下滚动",
|
ScrollDown: "向下滚动",
|
||||||
ScrollUp: "向上滚动",
|
ScrollUp: "向上滚动",
|
||||||
LcScrollUpMainPanel: "向上滚动主面板",
|
ScrollUpMainPanel: "向上滚动主面板",
|
||||||
LcScrollDownMainPanel: "向下滚动主面板",
|
ScrollDownMainPanel: "向下滚动主面板",
|
||||||
AmendCommitTitle: "修改提交",
|
AmendCommitTitle: "修改提交",
|
||||||
AmendCommitPrompt: "您确定要使用暂存文件来修改此提交吗？",
|
AmendCommitPrompt: "您确定要使用暂存文件来修改此提交吗？",
|
||||||
DeleteCommitTitle: "删除提交",
|
DeleteCommitTitle: "删除提交",
|
||||||
@ -242,10 +238,10 @@ func chineseTranslationSet() TranslationSet {
|
|||||||
CheckingOutStatus: "长子检出",
|
CheckingOutStatus: "长子检出",
|
||||||
CommittingStatus: "正在提交",
|
CommittingStatus: "正在提交",
|
||||||
CommitFiles: "提交文件",
|
CommitFiles: "提交文件",
|
||||||
LcViewItemFiles: "查看提交的文件",
|
ViewItemFiles: "查看提交的文件",
|
||||||
CommitFilesTitle: "提交文件",
|
CommitFilesTitle: "提交文件",
|
||||||
LcCheckoutCommitFile: "检出文件",
|
CheckoutCommitFile: "检出文件",
|
||||||
LcDiscardOldFileChange: "放弃对此文件的提交更改",
|
DiscardOldFileChange: "放弃对此文件的提交更改",
|
||||||
DiscardFileChangesTitle: "放弃文件更改",
|
DiscardFileChangesTitle: "放弃文件更改",
|
||||||
DiscardFileChangesPrompt: "您确定要舍弃此提交对该文件的更改吗？如果此文件是在此提交中创建的，它将被删除",
|
DiscardFileChangesPrompt: "您确定要舍弃此提交对该文件的更改吗？如果此文件是在此提交中创建的，它将被删除",
|
||||||
DisabledForGPG: "该功能不适用于使用 GPG 的用户",
|
DisabledForGPG: "该功能不适用于使用 GPG 的用户",
|
||||||
@ -253,170 +249,168 @@ func chineseTranslationSet() TranslationSet {
|
|||||||
AutoStashTitle: "自动存储？",
|
AutoStashTitle: "自动存储？",
|
||||||
AutoStashPrompt: "您必须隐藏并弹出更改以使更改生效。自动执行？(enter/esc)",
|
AutoStashPrompt: "您必须隐藏并弹出更改以使更改生效。自动执行？(enter/esc)",
|
||||||
StashPrefix: "自动隐藏更改 ",
|
StashPrefix: "自动隐藏更改 ",
|
||||||
LcViewDiscardOptions: "查看'放弃更改'选项",
|
ViewDiscardOptions: "查看'放弃更改'选项",
|
||||||
LcCancel: "取消",
|
Cancel: "取消",
|
||||||
LcDiscardAllChanges: "放弃所有更改",
|
DiscardAllChanges: "放弃所有更改",
|
||||||
LcDiscardUnstagedChanges: "放弃未暂存的变更",
|
DiscardUnstagedChanges: "放弃未暂存的变更",
|
||||||
LcDiscardAllChangesToAllFiles: "清空工作区",
|
DiscardAllChangesToAllFiles: "清空工作区",
|
||||||
LcDiscardAnyUnstagedChanges: "丢弃未暂存的变更",
|
DiscardAnyUnstagedChanges: "丢弃未暂存的变更",
|
||||||
LcDiscardUntrackedFiles: "丢弃未跟踪的文件",
|
DiscardUntrackedFiles: "丢弃未跟踪的文件",
|
||||||
LcHardReset: "硬重置",
|
HardReset: "硬重置",
|
||||||
LcViewResetOptions: `查看重置选项`,
|
ViewResetOptions: `查看重置选项`,
|
||||||
LcCreateFixupCommit: `为此提交创建修正`,
|
CreateFixupCommit: `为此提交创建修正`,
|
||||||
LcSquashAboveCommits: `压缩在所选提交之上的所有“fixup!”提交（自动压缩）`,
|
|
||||||
SquashAboveCommits: `压缩在所选提交之上的所有“fixup!”提交（自动压缩）`,
|
SquashAboveCommits: `压缩在所选提交之上的所有“fixup!”提交（自动压缩）`,
|
||||||
SureSquashAboveCommits: `您确定要压缩在 {{.commit}} 之上的所有“fixup!”提交吗?`,
|
SureSquashAboveCommits: `您确定要压缩在 {{.commit}} 之上的所有“fixup!”提交吗?`,
|
||||||
CreateFixupCommit: `创建修正提交`,
|
CreateFixupCommitDescription: `创建修正提交`,
|
||||||
SureCreateFixupCommit: `您确定要对 {{.commit}} 创建修正提交吗？`,
|
SureCreateFixupCommit: `您确定要对 {{.commit}} 创建修正提交吗？`,
|
||||||
LcExecuteCustomCommand: "执行自定义命令",
|
ExecuteCustomCommand: "执行自定义命令",
|
||||||
CustomCommand: "自定义命令：",
|
CustomCommand: "自定义命令：",
|
||||||
LcCommitChangesWithoutHook: "提交更改而无需预先提交钩子",
|
CommitChangesWithoutHook: "提交更改而无需预先提交钩子",
|
||||||
SkipHookPrefixNotConfigured: "您尚未配置用于跳过钩子的提交消息前缀。请在您的配置中设置 `git.skipHookPrefix ='WIP'`",
|
SkipHookPrefixNotConfigured: "您尚未配置用于跳过钩子的提交消息前缀。请在您的配置中设置 `git.skipHookPrefix ='WIP'`",
|
||||||
LcResetTo: `重置为`,
|
ResetTo: `重置为`,
|
||||||
PressEnterToReturn: "按下 Enter 键返回 lazygit",
|
PressEnterToReturn: "按下 Enter 键返回 lazygit",
|
||||||
LcViewStashOptions: "查看贮藏选项",
|
ViewStashOptions: "查看贮藏选项",
|
||||||
LcStashAllChanges: "将所有更改加入贮藏",
|
StashAllChanges: "将所有更改加入贮藏",
|
||||||
LcStashAllChangesKeepIndex: "将已暂存的更改加入贮藏",
|
StashAllChangesKeepIndex: "将已暂存的更改加入贮藏",
|
||||||
LcStashOptions: "贮藏选项",
|
StashOptions: "贮藏选项",
|
||||||
NotARepository: "错误：必须在 git 仓库中运行",
|
NotARepository: "错误：必须在 git 仓库中运行",
|
||||||
LcJump: "跳到面板",
|
Jump: "跳到面板",
|
||||||
LcScrollLeftRight: "左右滚动",
|
ScrollLeftRight: "左右滚动",
|
||||||
LcScrollLeft: "向左滚动",
|
ScrollLeft: "向左滚动",
|
||||||
LcScrollRight: "向右滚动",
|
ScrollRight: "向右滚动",
|
||||||
DiscardPatch: "丢弃补丁",
|
DiscardPatch: "丢弃补丁",
|
||||||
DiscardPatchConfirm: "您一次只能通过一个提交或贮藏条目构建补丁。需要放弃当前补丁吗？",
|
DiscardPatchConfirm: "您一次只能通过一个提交或贮藏条目构建补丁。需要放弃当前补丁吗？",
|
||||||
CantPatchWhileRebasingError: "处于合并或变基状态时，您无法构建修补程序或运行修补程序命令",
|
CantPatchWhileRebasingError: "处于合并或变基状态时，您无法构建修补程序或运行修补程序命令",
|
||||||
LcToggleAddToPatch: "补丁中包含的切换文件",
|
ToggleAddToPatch: "补丁中包含的切换文件",
|
||||||
ViewPatchOptions: "查看自定义补丁选项",
|
ViewPatchOptions: "查看自定义补丁选项",
|
||||||
PatchOptionsTitle: "补丁选项",
|
PatchOptionsTitle: "补丁选项",
|
||||||
NoPatchError: "尚未创建补丁。你可以在提交中的文件上按下“空格”或使用“回车”添加其中的特定行以开始构建补丁",
|
NoPatchError: "尚未创建补丁。你可以在提交中的文件上按下“空格”或使用“回车”添加其中的特定行以开始构建补丁",
|
||||||
LcEnterFile: "输入文件以将所选行添加到补丁中（或切换目录折叠）",
|
EnterFile: "输入文件以将所选行添加到补丁中（或切换目录折叠）",
|
||||||
ExitCustomPatchBuilder: `退出逐行模式`,
|
ExitCustomPatchBuilder: `退出逐行模式`,
|
||||||
EnterUpstream: `以这种格式输入上游：'<远程仓库> <分支名称>'`,
|
EnterUpstream: `以这种格式输入上游：'<远程仓库> <分支名称>'`,
|
||||||
InvalidUpstream: "上游格式无效，格式应当为：'<remote> <branchname>'",
|
InvalidUpstream: "上游格式无效，格式应当为：'<remote> <branchname>'",
|
||||||
ReturnToRemotesList: `返回远程仓库列表`,
|
ReturnToRemotesList: `返回远程仓库列表`,
|
||||||
LcAddNewRemote: `添加新的远程仓库`,
|
AddNewRemote: `添加新的远程仓库`,
|
||||||
LcNewRemoteName: `新远程仓库名称:`,
|
NewRemoteName: `新远程仓库名称:`,
|
||||||
LcNewRemoteUrl: `新远程仓库 URL:`,
|
NewRemoteUrl: `新远程仓库 URL:`,
|
||||||
LcEditRemoteName: `输入远程仓库 {{.remoteName}} 的新名称：`,
|
EditRemoteName: `输入远程仓库 {{.remoteName}} 的新名称：`,
|
||||||
LcEditRemoteUrl: `输入远程仓库 {{.remoteName}} 的新 URL：`,
|
EditRemoteUrl: `输入远程仓库 {{.remoteName}} 的新 URL：`,
|
||||||
LcRemoveRemote: `删除远程`,
|
RemoveRemote: `删除远程`,
|
||||||
LcRemoveRemotePrompt: "您确定要删除远程仓库吗？",
|
RemoveRemotePrompt: "您确定要删除远程仓库吗？",
|
||||||
DeleteRemoteBranch: "删除远程分支",
|
DeleteRemoteBranch: "删除远程分支",
|
||||||
DeleteRemoteBranchMessage: "您确定要删除远程分支吗？",
|
DeleteRemoteBranchMessage: "您确定要删除远程分支吗？",
|
||||||
LcSetUpstream: "设置为检出分支的上游",
|
SetUpstream: "设置为检出分支的上游",
|
||||||
LcSetAsUpstream: "设置为检出分支的上游",
|
SetAsUpstream: "设置为检出分支的上游",
|
||||||
SetUpstreamTitle: "设置上游分支",
|
SetUpstreamTitle: "设置上游分支",
|
||||||
SetUpstreamMessage: "您确定要将 {{.checkedOut}} 的上游分支设置为 {{.selected}} 吗？",
|
SetUpstreamMessage: "您确定要将 {{.checkedOut}} 的上游分支设置为 {{.selected}} 吗？",
|
||||||
LcEditRemote: "编辑远程仓库",
|
EditRemote: "编辑远程仓库",
|
||||||
LcTagCommit: "标签提交",
|
TagCommit: "标签提交",
|
||||||
TagMenuTitle: "创建标签",
|
TagMenuTitle: "创建标签",
|
||||||
TagNameTitle: "标签名称：",
|
TagNameTitle: "标签名称：",
|
||||||
TagMessageTitle: "标签消息：",
|
TagMessageTitle: "标签消息：",
|
||||||
LcAnnotatedTag: "附注标签",
|
AnnotatedTag: "附注标签",
|
||||||
LcLightweightTag: "轻量标签",
|
LightweightTag: "轻量标签",
|
||||||
LcDeleteTag: "删除标签",
|
DeleteTag: "删除标签",
|
||||||
DeleteTagTitle: "删除标签",
|
DeleteTagTitle: "删除标签",
|
||||||
DeleteTagPrompt: "您确定要删除标签 {{.tagName}} 吗？",
|
DeleteTagPrompt: "您确定要删除标签 {{.tagName}} 吗？",
|
||||||
PushTagTitle: "将 {{.tagName}} 推送到远程仓库：",
|
PushTagTitle: "将 {{.tagName}} 推送到远程仓库：",
|
||||||
LcPushTag: "推送标签",
|
PushTag: "推送标签",
|
||||||
LcCreateTag: "创建标签",
|
CreateTag: "创建标签",
|
||||||
CreateTagTitle: "标签名称：",
|
CreateTagTitle: "标签名称：",
|
||||||
LcFetchRemote: "抓取远程仓库",
|
FetchRemote: "抓取远程仓库",
|
||||||
FetchingRemoteStatus: "抓取远程仓库中",
|
FetchingRemoteStatus: "抓取远程仓库中",
|
||||||
LcCheckoutCommit: "检出提交",
|
CheckoutCommit: "检出提交",
|
||||||
SureCheckoutThisCommit: "您确定要检出此提交吗?",
|
SureCheckoutThisCommit: "您确定要检出此提交吗?",
|
||||||
LcGitFlowOptions: "显示 git-flow 选项",
|
GitFlowOptions: "显示 git-flow 选项",
|
||||||
NotAGitFlowBranch: "这似乎不是 git flow 分支",
|
NotAGitFlowBranch: "这似乎不是 git flow 分支",
|
||||||
NewGitFlowBranchPrompt: "新的 {{.branchType}} 名称：",
|
NewGitFlowBranchPrompt: "新的 {{.branchType}} 名称：",
|
||||||
IgnoreTracked: "忽略跟踪文件",
|
IgnoreTracked: "忽略跟踪文件",
|
||||||
IgnoreTrackedPrompt: "您确定要忽略已跟踪的文件吗？",
|
IgnoreTrackedPrompt: "您确定要忽略已跟踪的文件吗？",
|
||||||
LcViewResetToUpstreamOptions: "查看上游重置选项",
|
ViewResetToUpstreamOptions: "查看上游重置选项",
|
||||||
LcNextScreenMode: "下一屏模式（正常/半屏/全屏）",
|
NextScreenMode: "下一屏模式（正常/半屏/全屏）",
|
||||||
LcPrevScreenMode: "上一屏模式",
|
PrevScreenMode: "上一屏模式",
|
||||||
LcStartSearch: "开始搜索",
|
StartSearch: "开始搜索",
|
||||||
Panel: "面板",
|
Panel: "面板",
|
||||||
Keybindings: "按键绑定",
|
Keybindings: "按键绑定",
|
||||||
LcRenameBranch: "重命名分支",
|
RenameBranch: "重命名分支",
|
||||||
NewBranchNamePrompt: "输入分支的新名称",
|
NewBranchNamePrompt: "输入分支的新名称",
|
||||||
RenameBranchWarning: "该分支正在跟踪远程仓库。此操作将仅会重命名本地分支名称，而不会重命名远程分支的名称。确定继续？",
|
RenameBranchWarning: "该分支正在跟踪远程仓库。此操作将仅会重命名本地分支名称，而不会重命名远程分支的名称。确定继续？",
|
||||||
LcOpenMenu: "打开菜单",
|
OpenMenu: "打开菜单",
|
||||||
LcResetCherryPick: "重置已拣选（复制）的提交",
|
ResetCherryPick: "重置已拣选（复制）的提交",
|
||||||
LcNextTab: "下一个标签",
|
NextTab: "下一个标签",
|
||||||
LcPrevTab: "上一个标签",
|
PrevTab: "上一个标签",
|
||||||
LcCantUndoWhileRebasing: "进行基础调整时无法撤消",
|
CantUndoWhileRebasing: "进行基础调整时无法撤消",
|
||||||
LcCantRedoWhileRebasing: "变基时无法重做",
|
CantRedoWhileRebasing: "变基时无法重做",
|
||||||
MustStashWarning: "将补丁拉出到索引中需要存储和取消存储所做的更改。如果出现问题，您将可以从存储中访问文件。继续？",
|
MustStashWarning: "将补丁拉出到索引中需要存储和取消存储所做的更改。如果出现问题，您将可以从存储中访问文件。继续？",
|
||||||
MustStashTitle: "必须保存进度",
|
MustStashTitle: "必须保存进度",
|
||||||
ConfirmationTitle: "确认面板",
|
ConfirmationTitle: "确认面板",
|
||||||
LcPrevPage: "上一页",
|
PrevPage: "上一页",
|
||||||
LcNextPage: "下一页",
|
NextPage: "下一页",
|
||||||
LcGotoTop: "滚动到顶部",
|
GotoTop: "滚动到顶部",
|
||||||
LcGotoBottom: "滚动到底部",
|
GotoBottom: "滚动到底部",
|
||||||
LcFilteringBy: "过滤依据",
|
FilteringBy: "过滤依据",
|
||||||
ResetInParentheses: "（重置）",
|
ResetInParentheses: "（重置）",
|
||||||
LcOpenFilteringMenu: "查看按路径过滤选项",
|
OpenFilteringMenu: "查看按路径过滤选项",
|
||||||
LcFilterBy: "过滤",
|
FilterBy: "过滤",
|
||||||
LcExitFilterMode: "停止按路径过滤",
|
ExitFilterMode: "停止按路径过滤",
|
||||||
LcFilterPathOption: "输入要过滤的路径",
|
FilterPathOption: "输入要过滤的路径",
|
||||||
EnterFileName: "输入路径：",
|
EnterFileName: "输入路径：",
|
||||||
FilteringMenuTitle: "正在过滤",
|
FilteringMenuTitle: "正在过滤",
|
||||||
MustExitFilterModeTitle: "命令不可用",
|
MustExitFilterModeTitle: "命令不可用",
|
||||||
MustExitFilterModePrompt: "命令在过滤模式下不可用。退出过滤模式？",
|
MustExitFilterModePrompt: "命令在过滤模式下不可用。退出过滤模式？",
|
||||||
LcDiff: "差异",
|
Diff: "差异",
|
||||||
LcEnterRefToDiff: "输入 ref 以 diff",
|
EnterRefToDiff: "输入 ref 以 diff",
|
||||||
LcEnteRefName: "输入 ref：",
|
EnteRefName: "输入 ref：",
|
||||||
LcExitDiffMode: "退出差异模式",
|
ExitDiffMode: "退出差异模式",
|
||||||
DiffingMenuTitle: "正在 diff",
|
DiffingMenuTitle: "正在 diff",
|
||||||
LcSwapDiff: "反向 diff",
|
SwapDiff: "反向 diff",
|
||||||
LcOpenDiffingMenu: "打开 diff 菜单",
|
OpenDiffingMenu: "打开 diff 菜单",
|
||||||
// 实际视图 (actual view) 是附加视图 (extras view)，未来,我打算为附加视图提供更多选项卡，但现在，上面的文本只需要提及“命令日志”这个部分
|
// 实际视图 (actual view) 是附加视图 (extras view)，未来,我打算为附加视图提供更多选项卡，但现在，上面的文本只需要提及“命令日志”这个部分
|
||||||
LcOpenExtrasMenu: "打开命令日志菜单",
|
OpenExtrasMenu: "打开命令日志菜单",
|
||||||
LcShowingGitDiff: "显示输出：",
|
ShowingGitDiff: "显示输出：",
|
||||||
LcCopyCommitShaToClipboard: "将提交的 SHA 复制到剪贴板",
|
CopyCommitShaToClipboard: "将提交的 SHA 复制到剪贴板",
|
||||||
LcCopyCommitMessageToClipboard: "将提交消息复制到剪贴板",
|
CopyCommitMessageToClipboard: "将提交消息复制到剪贴板",
|
||||||
LcCopyBranchNameToClipboard: "将分支名称复制到剪贴板",
|
CopyBranchNameToClipboard: "将分支名称复制到剪贴板",
|
||||||
LcCopyFileNameToClipboard: "将文件名复制到剪贴板",
|
CopyFileNameToClipboard: "将文件名复制到剪贴板",
|
||||||
LcCopyCommitFileNameToClipboard: "将提交的文件名复制到剪贴板",
|
CopyCommitFileNameToClipboard: "将提交的文件名复制到剪贴板",
|
||||||
LcCopySelectedTexToClipboard: "将选中文本复制到剪贴板",
|
CopySelectedTexToClipboard: "将选中文本复制到剪贴板",
|
||||||
LcCommitPrefixPatternError: "提交前缀模式错误",
|
CommitPrefixPatternError: "提交前缀模式错误",
|
||||||
NoFilesStagedTitle: "没有暂存文件",
|
NoFilesStagedTitle: "没有暂存文件",
|
||||||
NoFilesStagedPrompt: "您尚未暂存任何文件。提交所有文件？",
|
NoFilesStagedPrompt: "您尚未暂存任何文件。提交所有文件？",
|
||||||
BranchNotFoundTitle: "找不到分支",
|
BranchNotFoundTitle: "找不到分支",
|
||||||
BranchNotFoundPrompt: "找不到分支。创建一个新分支命名为：",
|
BranchNotFoundPrompt: "找不到分支。创建一个新分支命名为：",
|
||||||
UnstageLinesTitle: "取消暂存选中的行",
|
UnstageLinesTitle: "取消暂存选中的行",
|
||||||
UnstageLinesPrompt: "您确定要删除所选的行（git reset）吗？这是不可逆的。\n要禁用此对话框，请将 'gui.skipUnstageLineWarning' 的配置键设置为 true",
|
UnstageLinesPrompt: "您确定要删除所选的行（git reset）吗？这是不可逆的。\n要禁用此对话框，请将 'gui.skipUnstageLineWarning' 的配置键设置为 true",
|
||||||
LcCreateNewBranchFromCommit: "从提交创建新分支",
|
CreateNewBranchFromCommit: "从提交创建新分支",
|
||||||
LcBuildingPatch: "正在构建补丁",
|
BuildingPatch: "正在构建补丁",
|
||||||
LcViewCommits: "查看提交",
|
ViewCommits: "查看提交",
|
||||||
MinGitVersionError: "Git 版本必须至少为 2.20（即从 2018 年开始的版本）。请更新 git。或者在 https://github.com/jesseduffield/lazygit/issues 上提出一个问题，以使 lazygit 更加向后兼容。",
|
MinGitVersionError: "Git 版本必须至少为 2.20（即从 2018 年开始的版本）。请更新 git。或者在 https://github.com/jesseduffield/lazygit/issues 上提出一个问题，以使 lazygit 更加向后兼容。",
|
||||||
LcRunningCustomCommandStatus: "正在运行自定义命令",
|
RunningCustomCommandStatus: "正在运行自定义命令",
|
||||||
LcSubmoduleStashAndReset: "存放未提交的子模块更改和更新",
|
SubmoduleStashAndReset: "存放未提交的子模块更改和更新",
|
||||||
LcAndResetSubmodules: "和重置子模块",
|
AndResetSubmodules: "和重置子模块",
|
||||||
LcEnterSubmodule: "输入子模块",
|
EnterSubmodule: "输入子模块",
|
||||||
LcCopySubmoduleNameToClipboard: "将子模块名称复制到剪贴板",
|
CopySubmoduleNameToClipboard: "将子模块名称复制到剪贴板",
|
||||||
RemoveSubmodule: "删除子模块",
|
RemoveSubmodule: "删除子模块",
|
||||||
LcRemoveSubmodule: "删除子模块",
|
|
||||||
RemoveSubmodulePrompt: "您确定要删除子模块 '%s' 及其对应的目录吗？这是不可逆的。",
|
RemoveSubmodulePrompt: "您确定要删除子模块 '%s' 及其对应的目录吗？这是不可逆的。",
|
||||||
LcResettingSubmoduleStatus: "正在重置子模块",
|
ResettingSubmoduleStatus: "正在重置子模块",
|
||||||
LcNewSubmoduleName: "新的子模块名称：",
|
NewSubmoduleName: "新的子模块名称：",
|
||||||
LcNewSubmoduleUrl: "新的子模块 URL：",
|
NewSubmoduleUrl: "新的子模块 URL：",
|
||||||
LcNewSubmodulePath: "新的子模块路径：",
|
NewSubmodulePath: "新的子模块路径：",
|
||||||
LcAddSubmodule: "添加新的子模块",
|
AddSubmodule: "添加新的子模块",
|
||||||
LcAddingSubmoduleStatus: "添加子模块",
|
AddingSubmoduleStatus: "添加子模块",
|
||||||
LcUpdateSubmoduleUrl: "更新子模块 '%s' 的 URL",
|
UpdateSubmoduleUrl: "更新子模块 '%s' 的 URL",
|
||||||
LcUpdatingSubmoduleUrlStatus: "更新 URL 中",
|
UpdatingSubmoduleUrlStatus: "更新 URL 中",
|
||||||
LcEditSubmoduleUrl: "更新子模块 URL",
|
EditSubmoduleUrl: "更新子模块 URL",
|
||||||
LcInitializingSubmoduleStatus: "正在初始化子模块",
|
InitializingSubmoduleStatus: "正在初始化子模块",
|
||||||
LcInitSubmodule: "初始化子模块",
|
InitSubmodule: "初始化子模块",
|
||||||
LcSubmoduleUpdate: "更新子模块",
|
SubmoduleUpdate: "更新子模块",
|
||||||
LcUpdatingSubmoduleStatus: "正在更新子模块",
|
UpdatingSubmoduleStatus: "正在更新子模块",
|
||||||
LcBulkInitSubmodules: "批量初始化子模块",
|
BulkInitSubmodules: "批量初始化子模块",
|
||||||
LcBulkUpdateSubmodules: "批量更新子模块",
|
BulkUpdateSubmodules: "批量更新子模块",
|
||||||
LcBulkDeinitSubmodules: "批量反初始化子模块",
|
BulkDeinitSubmodules: "批量反初始化子模块",
|
||||||
LcViewBulkSubmoduleOptions: "查看批量子模块选项",
|
ViewBulkSubmoduleOptions: "查看批量子模块选项",
|
||||||
LcBulkSubmoduleOptions: "批量子模块选项",
|
BulkSubmoduleOptions: "批量子模块选项",
|
||||||
LcRunningCommand: "运行命令",
|
RunningCommand: "运行命令",
|
||||||
SubCommitsTitle: "子提交",
|
SubCommitsTitle: "子提交",
|
||||||
SubmodulesTitle: "子模块",
|
SubmodulesTitle: "子模块",
|
||||||
NavigationTitle: "列表面板导航",
|
NavigationTitle: "列表面板导航",
|
||||||
@ -426,7 +420,7 @@ func chineseTranslationSet() TranslationSet {
|
|||||||
PushingTagStatus: "推送标签",
|
PushingTagStatus: "推送标签",
|
||||||
PullRequestURLCopiedToClipboard: "抓取请求网址已复制到剪贴板",
|
PullRequestURLCopiedToClipboard: "抓取请求网址已复制到剪贴板",
|
||||||
CommitMessageCopiedToClipboard: "提交消息复制到剪贴板",
|
CommitMessageCopiedToClipboard: "提交消息复制到剪贴板",
|
||||||
LcCopiedToClipboard: "复制到剪贴板",
|
CopiedToClipboard: "复制到剪贴板",
|
||||||
ErrCannotEditDirectory: "无法编辑目录：您只能编辑单个文件",
|
ErrCannotEditDirectory: "无法编辑目录：您只能编辑单个文件",
|
||||||
ErrStageDirWithInlineMergeConflicts: "无法 暂存/取消暂存 包含具有内联合并冲突的文件的目录。请先解决合并冲突",
|
ErrStageDirWithInlineMergeConflicts: "无法 暂存/取消暂存 包含具有内联合并冲突的文件的目录。请先解决合并冲突",
|
||||||
ErrRepositoryMovedOrDeleted: "找不到仓库。它可能已被移动或删除 ¯\\_(ツ)_/¯",
|
ErrRepositoryMovedOrDeleted: "找不到仓库。它可能已被移动或删除 ¯\\_(ツ)_/¯",
|
||||||
@ -439,28 +433,26 @@ func chineseTranslationSet() TranslationSet {
|
|||||||
ToggleWhitespaceInDiffView: "切换是否在差异视图中显示空白字符差异",
|
ToggleWhitespaceInDiffView: "切换是否在差异视图中显示空白字符差异",
|
||||||
IncreaseContextInDiffView: "扩大差异视图中显示的上下文范围",
|
IncreaseContextInDiffView: "扩大差异视图中显示的上下文范围",
|
||||||
DecreaseContextInDiffView: "缩小差异视图中显示的上下文范围",
|
DecreaseContextInDiffView: "缩小差异视图中显示的上下文范围",
|
||||||
CreatePullRequest: "创建抓取请求",
|
|
||||||
CreatePullRequestOptions: "创建抓取请求选项",
|
CreatePullRequestOptions: "创建抓取请求选项",
|
||||||
LcCreatePullRequestOptions: "创建抓取请求选项",
|
DefaultBranch: "默认分支",
|
||||||
LcDefaultBranch: "默认分支",
|
SelectBranch: "选择分支",
|
||||||
LcSelectBranch: "选择分支",
|
|
||||||
SelectConfigFile: "选择配置文件",
|
SelectConfigFile: "选择配置文件",
|
||||||
NoConfigFileFoundErr: "找不到配置文件",
|
NoConfigFileFoundErr: "找不到配置文件",
|
||||||
LcLoadingFileSuggestions: "正在加载文件建议",
|
LoadingFileSuggestions: "正在加载文件建议",
|
||||||
LcLoadingCommits: "正在加载提交",
|
LoadingCommits: "正在加载提交",
|
||||||
MustSpecifyOriginError: "指定分支时，必须同时指定远程",
|
MustSpecifyOriginError: "指定分支时，必须同时指定远程",
|
||||||
GitOutput: "Git 输出：",
|
GitOutput: "Git 输出：",
|
||||||
GitCommandFailed: "Git 命令执行失败。查看命令日志了解详情 (使用 %s 打开)",
|
GitCommandFailed: "Git 命令执行失败。查看命令日志了解详情 (使用 %s 打开)",
|
||||||
AbortTitle: "放弃 %s",
|
AbortTitle: "放弃 %s",
|
||||||
AbortPrompt: "您确定要放弃当前 %s 吗？",
|
AbortPrompt: "您确定要放弃当前 %s 吗？",
|
||||||
LcOpenLogMenu: "打开日志菜单",
|
OpenLogMenu: "打开日志菜单",
|
||||||
LogMenuTitle: "提交日志选项",
|
LogMenuTitle: "提交日志选项",
|
||||||
ToggleShowGitGraphAll: "切换显示完整 git 分支图 (向 `git log` 命令传入 `--all` 选项)",
|
ToggleShowGitGraphAll: "切换显示完整 git 分支图 (向 `git log` 命令传入 `--all` 选项)",
|
||||||
ShowGitGraph: "显示 git 分支图",
|
ShowGitGraph: "显示 git 分支图",
|
||||||
SortCommits: "提交排序",
|
SortCommits: "提交排序",
|
||||||
CantChangeContextSizeError: "无法在补丁构建模式下更改上下文，因为我们在发布该功能时懒得支持它。 如果你真的想要这么做，请告诉我们！",
|
CantChangeContextSizeError: "无法在补丁构建模式下更改上下文，因为我们在发布该功能时懒得支持它。 如果你真的想要这么做，请告诉我们！",
|
||||||
LcOpenCommitInBrowser: "在浏览器中打开提交",
|
OpenCommitInBrowser: "在浏览器中打开提交",
|
||||||
LcViewBisectOptions: "查看二分查找选项",
|
ViewBisectOptions: "查看二分查找选项",
|
||||||
Actions: Actions{
|
Actions: Actions{
|
||||||
// TODO: combine this with the original keybinding descriptions (those are all in lowercase atm)
|
// TODO: combine this with the original keybinding descriptions (those are all in lowercase atm)
|
||||||
CheckoutCommit: "检出提交",
|
CheckoutCommit: "检出提交",
|
||||||
@ -498,7 +490,7 @@ func chineseTranslationSet() TranslationSet {
|
|||||||
UnstageFile: "取消暂存文件",
|
UnstageFile: "取消暂存文件",
|
||||||
UnstageAllFiles: "取消暂存所有文件",
|
UnstageAllFiles: "取消暂存所有文件",
|
||||||
StageAllFiles: "暂存所有文件",
|
StageAllFiles: "暂存所有文件",
|
||||||
LcIgnoreExcludeFile: "忽略文件",
|
IgnoreExcludeFile: "忽略文件",
|
||||||
Commit: "提交 (Commit)",
|
Commit: "提交 (Commit)",
|
||||||
EditFile: "编辑文件",
|
EditFile: "编辑文件",
|
||||||
Push: "推送 (Push)",
|
Push: "推送 (Push)",
|
||||||
@ -506,8 +498,8 @@ func chineseTranslationSet() TranslationSet {
|
|||||||
OpenFile: "打开文件",
|
OpenFile: "打开文件",
|
||||||
StashAllChanges: "贮藏所有更改",
|
StashAllChanges: "贮藏所有更改",
|
||||||
StashStagedChanges: "贮藏暂存的更改",
|
StashStagedChanges: "贮藏暂存的更改",
|
||||||
GitFlowFinish: "Git flow 结果",
|
GitFlowFinish: "git flow 结果",
|
||||||
GitFlowStart: "Git Flow 开始",
|
GitFlowStart: "git flow 开始",
|
||||||
CopyToClipboard: "复制到剪贴板",
|
CopyToClipboard: "复制到剪贴板",
|
||||||
CopySelectedTextToClipboard: "将选中文本复制到剪贴板",
|
CopySelectedTextToClipboard: "将选中文本复制到剪贴板",
|
||||||
RemovePatchFromCommit: "从提交中删除补丁",
|
RemovePatchFromCommit: "从提交中删除补丁",
|
||||||
|
|||||||
@ -8,8 +8,8 @@ func dutchTranslationSet() TranslationSet {
|
|||||||
BranchesTitle: "Branches",
|
BranchesTitle: "Branches",
|
||||||
CommitsTitle: "Commits",
|
CommitsTitle: "Commits",
|
||||||
StashTitle: "Stash",
|
StashTitle: "Stash",
|
||||||
UnstagedChanges: `Unstaged wijzigingen`,
|
UnstagedChanges: "Unstaged wijzigingen",
|
||||||
StagedChanges: `Staged wijzigingen`,
|
StagedChanges: "Staged wijzigingen",
|
||||||
MainTitle: "Hoofd",
|
MainTitle: "Hoofd",
|
||||||
StagingTitle: "Staging",
|
StagingTitle: "Staging",
|
||||||
NormalTitle: "Normaal",
|
NormalTitle: "Normaal",
|
||||||
@ -18,31 +18,30 @@ 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",
|
CommitChanges: "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.",
|
||||||
NoCommitToAmend: "Er is geen commits om te wijzigen.",
|
NoCommitToAmend: "Er is geen commits om te wijzigen.",
|
||||||
CommitChangesWithEditor: "commit veranderingen met de git editor",
|
CommitChangesWithEditor: "Commit veranderingen met de git editor",
|
||||||
StatusTitle: "Status",
|
StatusTitle: "Status",
|
||||||
LcNavigate: "navigeer",
|
Menu: "Menu",
|
||||||
LcMenu: "menu",
|
Execute: "Uitvoeren",
|
||||||
LcExecute: "uitvoeren",
|
ToggleStaged: "Toggle staged",
|
||||||
LcToggleStaged: "toggle staged",
|
ToggleStagedAll: "Toggle staged alle",
|
||||||
LcToggleStagedAll: "toggle staged alle",
|
Refresh: "Verversen",
|
||||||
LcRefresh: "verversen",
|
Push: "Push",
|
||||||
LcPush: "push",
|
Pull: "Pull",
|
||||||
LcPull: "pull",
|
Scroll: "Scroll",
|
||||||
LcScroll: "scroll",
|
|
||||||
FilterStagedFiles: "Show only staged files",
|
FilterStagedFiles: "Show only staged files",
|
||||||
FilterUnstagedFiles: "Show only unstaged files",
|
FilterUnstagedFiles: "Show only unstaged files",
|
||||||
ResetCommitFilterState: "Reset commit file state filter",
|
ResetCommitFilterState: "Reset commit file state filter",
|
||||||
MergeConflictsTitle: "Merge Conflicten",
|
MergeConflictsTitle: "Merge conflicten",
|
||||||
LcCheckout: "uitchecken",
|
Checkout: "Uitchecken",
|
||||||
PullWait: "Pullen...",
|
PullWait: "Pullen...",
|
||||||
PushWait: "Pushen...",
|
PushWait: "Pushen...",
|
||||||
FetchWait: "Fetchen...",
|
FetchWait: "Fetchen...",
|
||||||
LcSoftReset: "zacht reset",
|
SoftReset: "Zacht reset",
|
||||||
AlreadyCheckedOutBranch: "Je hebt deze branch al uitgecheckt",
|
AlreadyCheckedOutBranch: "Je hebt deze branch al uitgecheckt",
|
||||||
SureForceCheckout: "Weet je zeker dat je het uitchecken wil forceren? Al je lokale verandering zullen worden verwijdert",
|
SureForceCheckout: "Weet je zeker dat je het uitchecken wil forceren? Al je lokale verandering zullen worden verwijdert",
|
||||||
ForceCheckoutBranch: "Forceer uitchecken op deze branch",
|
ForceCheckoutBranch: "Forceer uitchecken op deze branch",
|
||||||
@ -52,45 +51,44 @@ func dutchTranslationSet() TranslationSet {
|
|||||||
DeleteBranch: "Verwijder branch",
|
DeleteBranch: "Verwijder branch",
|
||||||
DeleteBranchMessage: "Weet je zeker dat je branch '{{.selectedBranchName}}' wilt verwijderen?",
|
DeleteBranchMessage: "Weet je zeker dat je branch '{{.selectedBranchName}}' wilt verwijderen?",
|
||||||
ForceDeleteBranchMessage: "Weet je zeker dat je branch '{{.selectedBranchName}}' geforceerd wil verwijderen?",
|
ForceDeleteBranchMessage: "Weet je zeker dat je branch '{{.selectedBranchName}}' geforceerd wil verwijderen?",
|
||||||
LcRebaseBranch: "rebase branch",
|
RebaseBranch: "Rebase branch",
|
||||||
CantRebaseOntoSelf: "Je kan niet een branch rebasen op zichzelf",
|
CantRebaseOntoSelf: "Je kan niet een branch rebasen op zichzelf",
|
||||||
CantMergeBranchIntoItself: "Je kan niet een branch in zichzelf mergen",
|
CantMergeBranchIntoItself: "Je kan niet een branch in zichzelf mergen",
|
||||||
LcForceCheckout: "forceer checkout",
|
ForceCheckout: "Forceer checkout",
|
||||||
LcCheckoutByName: "uitchecken bij naam",
|
CheckoutByName: "Uitchecken bij naam",
|
||||||
LcNewBranch: "nieuwe branch",
|
NewBranch: "Nieuwe branch",
|
||||||
LcDeleteBranch: "verwijder branch",
|
|
||||||
NoBranchesThisRepo: "Geen branches voor deze repo",
|
NoBranchesThisRepo: "Geen branches voor deze repo",
|
||||||
CommitWithoutMessageErr: "Je kan geen commit maken zonder commit bericht",
|
CommitWithoutMessageErr: "Je kan geen commit maken zonder commit bericht",
|
||||||
LcCloseCancel: "sluiten",
|
CloseCancel: "Sluiten",
|
||||||
LcConfirm: "bevestig",
|
Confirm: "Bevestig",
|
||||||
LcClose: "sluiten",
|
Close: "Sluiten",
|
||||||
LcQuit: "quit",
|
Quit: "Quit",
|
||||||
LcSquashDown: "squash beneden",
|
SquashDown: "Squash beneden",
|
||||||
LcFixupCommit: "Fixup commit",
|
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",
|
||||||
LcPickCommit: "kies commit (wanneer midden in rebase)",
|
PickCommit: "Kies commit (wanneer midden in rebase)",
|
||||||
LcRevertCommit: "commit ongedaan maken",
|
RevertCommit: "Commit ongedaan maken",
|
||||||
LcRewordCommit: "hernoem commit",
|
RewordCommit: "Hernoem commit",
|
||||||
LcDeleteCommit: "verwijder commit",
|
DeleteCommit: "Verwijder commit",
|
||||||
LcMoveDownCommit: "verplaats commit 1 naar beneden",
|
MoveDownCommit: "Verplaats commit 1 naar beneden",
|
||||||
LcMoveUpCommit: "verplaats commit 1 naar boven",
|
MoveUpCommit: "Verplaats commit 1 naar boven",
|
||||||
LcEditCommit: "wijzig commit",
|
EditCommit: "Wijzig commit",
|
||||||
LcAmendToCommit: "wijzig commit met staged veranderingen",
|
AmendToCommit: "Wijzig commit met staged veranderingen",
|
||||||
LcRenameCommitEditor: "hernoem commit met editor",
|
RenameCommitEditor: "Hernoem commit met editor",
|
||||||
NoCommitsThisBranch: "Geen commits in deze branch",
|
NoCommitsThisBranch: "Geen commits in deze branch",
|
||||||
Error: "Foutmelding",
|
Error: "Foutmelding",
|
||||||
LcPickHunk: "kies stuk",
|
PickHunk: "Kies stuk",
|
||||||
LcPickAllHunks: "kies beide stukken",
|
PickAllHunks: "Kies beide stukken",
|
||||||
LcUndo: "ongedaan maken",
|
Undo: "Ongedaan maken",
|
||||||
LcUndoReflog: "ongedaan maken (via reflog) (experimenteel)",
|
UndoReflog: "Ongedaan maken (via reflog) (experimenteel)",
|
||||||
LcRedoReflog: "redo (via reflog) (experimenteel)",
|
RedoReflog: "Redo (via reflog) (experimenteel)",
|
||||||
LcPop: "pop",
|
Pop: "Pop",
|
||||||
LcDrop: "laten vallen",
|
Drop: "Laten vallen",
|
||||||
LcApply: "toepassen",
|
Apply: "Toepassen",
|
||||||
NoStashEntries: "Geen stash items",
|
NoStashEntries: "Geen stash items",
|
||||||
StashDrop: "Stash laten vallen",
|
StashDrop: "Stash laten vallen",
|
||||||
SureDropStashEntry: "Weet je het zeker dat je deze stash entry wil laten vallen?",
|
SureDropStashEntry: "Weet je het zeker dat je deze stash entry wil laten vallen?",
|
||||||
@ -100,70 +98,68 @@ func dutchTranslationSet() TranslationSet {
|
|||||||
SureApplyStashEntry: "Weet je zeker dat je deze stash entry wil toepassen?",
|
SureApplyStashEntry: "Weet je zeker dat je deze stash entry wil toepassen?",
|
||||||
NoTrackedStagedFilesStash: "Je hebt geen tracked/staged bestanden om te laten stashen",
|
NoTrackedStagedFilesStash: "Je hebt geen tracked/staged bestanden om te laten stashen",
|
||||||
StashChanges: "Stash veranderingen",
|
StashChanges: "Stash veranderingen",
|
||||||
LcRenameStash: "rename stash",
|
RenameStash: "Rename stash",
|
||||||
RenameStashPrompt: "Rename stash: {{.stashName}}",
|
RenameStashPrompt: "Rename stash: {{.stashName}}",
|
||||||
NoChangedFiles: "Geen veranderde bestanden",
|
NoChangedFiles: "Geen veranderde bestanden",
|
||||||
OpenConfig: "open config bestand",
|
OpenConfig: "Open config bestand",
|
||||||
EditConfig: "verander config bestand",
|
EditConfig: "Verander config bestand",
|
||||||
ForcePush: "Forceer push",
|
ForcePush: "Forceer push",
|
||||||
ForcePushPrompt: "Jouw branch is afgeweken van de remote branch. Druk 'esc' om te annuleren, of 'enter' om geforceert te pushen.",
|
ForcePushPrompt: "Jouw branch is afgeweken van de remote branch. Druk 'esc' om te annuleren, of 'enter' om geforceert te pushen.",
|
||||||
ForcePushDisabled: "Your branch has diverged from the remote branch and you've disabled force pushing",
|
ForcePushDisabled: "Your branch has diverged from the remote branch and you've disabled force pushing",
|
||||||
UpdatesRejectedAndForcePushDisabled: "Updates were rejected and you have disabled force pushing",
|
UpdatesRejectedAndForcePushDisabled: "Updates were rejected and you have disabled force pushing",
|
||||||
LcCheckForUpdate: "check voor updates",
|
CheckForUpdate: "Check voor updates",
|
||||||
CheckingForUpdates: "zoeken naar updates...",
|
CheckingForUpdates: "Zoeken naar updates...",
|
||||||
OnLatestVersionErr: "Je hebt al de laatste versie",
|
OnLatestVersionErr: "Je hebt al de laatste versie",
|
||||||
MajorVersionErr: "Nieuwe versie ({{.newVersion}}) is niet backwards compatibele vergeleken met de huidige versie ({{.currentVersion}})",
|
MajorVersionErr: "Nieuwe versie ({{.newVersion}}) is niet backwards compatibele vergeleken met de huidige versie ({{.currentVersion}})",
|
||||||
CouldNotFindBinaryErr: "Kon geen binary vinden op {{.url}}",
|
CouldNotFindBinaryErr: "Kon geen binary vinden op {{.url}}",
|
||||||
IntroPopupMessage: "Bedankt voor het gebruik maken van lazygit! 2 dingen die je moet weten:\n\n1) Als je meer van lazygit zijn features wilt leren bekijk dan deze video:\n https://youtu.be/CPLdltN7wgE\n\n2) Als je git gebruikt, ben je een programmeur! Met jouw hulp kunnen we lazygit verbeteren, dus overweeg om een donateur te worden en mee te doen aan het plezier op\n https://github.com/jesseduffield/lazygit",
|
IntroPopupMessage: "Bedankt voor het gebruik maken van lazygit! 2 dingen die je moet weten:\n\n1) Als je meer van lazygit zijn features wilt leren bekijk dan deze video:\n https://youtu.be/CPLdltN7wgE\n\n2) Als je git gebruikt, ben je een programmeur! Met jouw hulp kunnen we lazygit verbeteren, dus overweeg om een donateur te worden en mee te doen aan het plezier op\n https://github.com/jesseduffield/lazygit",
|
||||||
GitconfigParseErr: `Gogit kon je gitconfig bestand niet goed parsen door de aanwezigheid van losstaande '\' tekens. Het weghalen van deze tekens zou het probleem moeten oplossen. `,
|
GitconfigParseErr: `Gogit kon je gitconfig bestand niet goed parsen door de aanwezigheid van losstaande '\' tekens. Het weghalen van deze tekens zou het probleem moeten oplossen. `,
|
||||||
LcEditFile: `verander bestand`,
|
EditFile: `Verander bestand`,
|
||||||
LcOpenFile: `open bestand`,
|
OpenFile: `Open bestand`,
|
||||||
LcIgnoreFile: `voeg toe aan .gitignore`,
|
IgnoreFile: `Voeg toe aan .gitignore`,
|
||||||
LcRefreshFiles: `refresh bestanden`,
|
RefreshFiles: `Refresh bestanden`,
|
||||||
LcMergeIntoCurrentBranch: `merge in met huidige checked out branch`,
|
MergeIntoCurrentBranch: `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",
|
||||||
LcAllBranchesLogGraph: `alle logs van de branch laten zien`,
|
AllBranchesLogGraph: `Alle logs van de branch laten zien`,
|
||||||
UnsupportedGitService: `Niet-ondersteunde git-service`,
|
UnsupportedGitService: `Niet-ondersteunde git-service`,
|
||||||
LcCreatePullRequest: `maak een pull-request`,
|
CreatePullRequest: `Maak een pull-request`,
|
||||||
LcCopyPullRequestURL: `kopieer de URL van het pull-verzoek naar het klembord`,
|
CopyPullRequestURL: `Kopieer de URL van het pull-verzoek naar het klembord`,
|
||||||
NoBranchOnRemote: `Deze branch bestaat niet op de remote. U moet het eerst naar de remote pushen.`,
|
NoBranchOnRemote: `Deze branch bestaat niet op de remote. U moet het eerst naar de remote pushen.`,
|
||||||
LcFetch: `fetch`,
|
Fetch: `Fetch`,
|
||||||
NoAutomaticGitFetchTitle: `Geen automatische git fetch`,
|
NoAutomaticGitFetchTitle: `Geen automatische git fetch`,
|
||||||
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`,
|
StageSelection: `Toggle lijnen staged / unstaged`,
|
||||||
ResetSelection: `verwijdert change (git reset)`,
|
ResetSelection: `Verwijdert change (git reset)`,
|
||||||
ToggleDragSelect: `toggle drag selecteer`,
|
ToggleDragSelect: `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`,
|
ToggleStagingPanel: `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`,
|
||||||
Fetching: "fetching en fast-forwarding {{.from}} -> {{.to}} ...",
|
Fetching: "Fetching en fast-forwarding {{.from}} -> {{.to}} ...",
|
||||||
FoundConflicts: "Conflicten!, Om af te breken druk 'esc', anders druk op 'enter'",
|
FoundConflicts: "Conflicten!, Om af te breken druk 'esc', anders druk op 'enter'",
|
||||||
FoundConflictsTitle: "Auto-merge mislukt",
|
FoundConflictsTitle: "Auto-merge mislukt",
|
||||||
PickHunk: "kies hunk",
|
ViewMergeRebaseOptions: "Bekijk merge/rebase opties",
|
||||||
PickAllHunks: "kies bijde hunks",
|
|
||||||
ViewMergeRebaseOptions: "bekijk merge/rebase opties",
|
|
||||||
NotMergingOrRebasing: "Je bent momenteel niet aan het rebasen of mergen",
|
NotMergingOrRebasing: "Je bent momenteel niet aan het rebasen of mergen",
|
||||||
RecentRepos: "recente repositories",
|
RecentRepos: "Recente repositories",
|
||||||
MergeOptionsTitle: "Merge Opties",
|
MergeOptionsTitle: "Merge opties",
|
||||||
RebaseOptionsTitle: "Rebase Opties",
|
RebaseOptionsTitle: "Rebase opties",
|
||||||
CommitMessageTitle: "Commit Bericht",
|
CommitMessageTitle: "Commit bericht",
|
||||||
LocalBranchesTitle: "Branches",
|
LocalBranchesTitle: "Branches",
|
||||||
SearchTitle: "Zoek",
|
SearchTitle: "Zoek",
|
||||||
TagsTitle: "Tags",
|
TagsTitle: "Tags",
|
||||||
MenuTitle: "Menu",
|
MenuTitle: "Menu",
|
||||||
RemotesTitle: "Remotes",
|
RemotesTitle: "Remotes",
|
||||||
RemoteBranchesTitle: "Remote Branches",
|
RemoteBranchesTitle: "Remote branches",
|
||||||
PatchBuildingTitle: "Patch Bouwen",
|
PatchBuildingTitle: "Patch bouwen",
|
||||||
InformationTitle: "Informatie",
|
InformationTitle: "Informatie",
|
||||||
SecondaryTitle: "Secondary",
|
SecondaryTitle: "Secondary",
|
||||||
ReflogCommitsTitle: "Reflog",
|
ReflogCommitsTitle: "Reflog",
|
||||||
GlobalTitle: "Globale Sneltoetsen",
|
GlobalTitle: "Globale sneltoetsen",
|
||||||
ConflictsResolved: "alle merge conflicten zijn opgelost. Wilt je verder gaan?",
|
ConflictsResolved: "Alle merge conflicten zijn opgelost. Wilt je verder gaan?",
|
||||||
MergingTitle: "Mergen",
|
MergingTitle: "Mergen",
|
||||||
ConfirmMerge: "Weet je zeker dat je '{{.selectedBranch}}' in '{{.checkedOutBranch}}' wil mergen?",
|
ConfirmMerge: "Weet je zeker dat je '{{.selectedBranch}}' in '{{.checkedOutBranch}}' wil mergen?",
|
||||||
FwdNoUpstream: "Kan niet de branch vooruitspoelen zonder upstream",
|
FwdNoUpstream: "Kan niet de branch vooruitspoelen zonder upstream",
|
||||||
@ -171,185 +167,183 @@ func dutchTranslationSet() TranslationSet {
|
|||||||
ErrorOccurred: "Er is iets fout gegaan! Zou je hier een issue aan willen maken",
|
ErrorOccurred: "Er is iets fout gegaan! Zou je hier een issue aan willen maken",
|
||||||
NoRoom: "Niet genoeg ruimte",
|
NoRoom: "Niet genoeg ruimte",
|
||||||
YouAreHere: "JE BENT HIER",
|
YouAreHere: "JE BENT HIER",
|
||||||
LcRewordNotSupported: "herformatteren van commits in interactief rebasen is nog niet ondersteund",
|
RewordNotSupported: "Herformatteren van commits in interactief rebasen is nog niet ondersteund",
|
||||||
LcCherryPickCopy: "kopieer commit (cherry-pick)",
|
CherryPickCopy: "Kopieer commit (cherry-pick)",
|
||||||
LcCherryPickCopyRange: "kopieer commit reeks (cherry-pick)",
|
CherryPickCopyRange: "Kopieer commit reeks (cherry-pick)",
|
||||||
LcPasteCommits: "plak commits (cherry-pick)",
|
PasteCommits: "Plak commits (cherry-pick)",
|
||||||
SureCherryPick: "Weet je zeker dat je de gekopieerde commits naar deze branch wil cherry-picken?",
|
SureCherryPick: "Weet je zeker dat je de gekopieerde commits naar deze branch wil cherry-picken?",
|
||||||
CherryPick: "Cherry-Pick",
|
CherryPick: "Cherry-Pick",
|
||||||
Donate: "Doneer",
|
Donate: "Doneer",
|
||||||
PrevLine: "selecteer de vorige lijn",
|
PrevLine: "Selecteer de vorige lijn",
|
||||||
NextLine: "selecteer de volgende lijn",
|
NextLine: "Selecteer de volgende lijn",
|
||||||
PrevHunk: "selecteer de vorige hunk",
|
PrevHunk: "Selecteer de vorige hunk",
|
||||||
NextHunk: "selecteer de volgende hunk",
|
NextHunk: "Selecteer de volgende hunk",
|
||||||
PrevConflict: "selecteer voorgaand conflict",
|
PrevConflict: "Selecteer voorgaand conflict",
|
||||||
NextConflict: "selecteer volgende conflict",
|
NextConflict: "Selecteer volgende conflict",
|
||||||
SelectPrevHunk: "selecteer bovenste hunk",
|
SelectPrevHunk: "Selecteer bovenste hunk",
|
||||||
SelectNextHunk: "selecteer onderste hunk",
|
SelectNextHunk: "Selecteer onderste hunk",
|
||||||
ScrollDown: "scroll omlaag",
|
ScrollDown: "Scroll omlaag",
|
||||||
ScrollUp: "scroll omhoog",
|
ScrollUp: "Scroll omhoog",
|
||||||
LcScrollUpMainPanel: "scroll naar beneden vanaf hoofdpaneel",
|
ScrollUpMainPanel: "Scroll naar beneden vanaf hoofdpaneel",
|
||||||
LcScrollDownMainPanel: "scroll naar beneden vanaf hoofdpaneel",
|
ScrollDownMainPanel: "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?",
|
||||||
DeleteCommitTitle: "Verwijder Commit",
|
DeleteCommitTitle: "Verwijder commit",
|
||||||
DeleteCommitPrompt: "Weet je zeker dat je deze commit wil verwijderen?",
|
DeleteCommitPrompt: "Weet je zeker dat je deze commit wil verwijderen?",
|
||||||
SquashingStatus: "squashen",
|
SquashingStatus: "Squashen",
|
||||||
FixingStatus: "fixing up",
|
FixingStatus: "Fixing up",
|
||||||
DeletingStatus: "verwijderen",
|
DeletingStatus: "Verwijderen",
|
||||||
MovingStatus: "verplaatsen",
|
MovingStatus: "Verplaatsen",
|
||||||
RebasingStatus: "rebasen",
|
RebasingStatus: "Rebasen",
|
||||||
AmendingStatus: "wijzigen",
|
AmendingStatus: "Wijzigen",
|
||||||
CherryPickingStatus: "cherry-picken",
|
CherryPickingStatus: "Cherry-picken",
|
||||||
UndoingStatus: "ongedaan maken",
|
UndoingStatus: "Ongedaan maken",
|
||||||
RedoingStatus: "redoing",
|
RedoingStatus: "Redoing",
|
||||||
CheckingOutStatus: "uitchecken",
|
CheckingOutStatus: "Uitchecken",
|
||||||
CommitFiles: "Commit bestanden",
|
CommitFiles: "Commit bestanden",
|
||||||
LcViewItemFiles: "bekijk gecommite bestanden",
|
ViewItemFiles: "Bekijk gecommite bestanden",
|
||||||
CommitFilesTitle: "Commit bestanden",
|
CommitFilesTitle: "Commit bestanden",
|
||||||
LcCheckoutCommitFile: "bestand uitchecken",
|
CheckoutCommitFile: "Bestand uitchecken",
|
||||||
LcDiscardOldFileChange: "uitsluit deze commit zijn veranderingen aan dit bestand",
|
DiscardOldFileChange: "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",
|
||||||
CreateRepo: "Niet in een git repository. Creëer een nieuwe git repository? (y/n): ",
|
CreateRepo: "Niet in een git repository. Creëer een nieuwe git repository? (y/n): ",
|
||||||
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 ",
|
||||||
LcViewDiscardOptions: "bekijk 'veranderingen ongedaan maken' opties",
|
ViewDiscardOptions: "Bekijk 'veranderingen ongedaan maken' opties",
|
||||||
LcCancel: "annuleren",
|
Cancel: "Annuleren",
|
||||||
LcDiscardAllChanges: "negeer alle wijzigingen",
|
DiscardAllChanges: "Negeer alle wijzigingen",
|
||||||
LcDiscardUnstagedChanges: "negeer unstaged wijzigingen",
|
DiscardUnstagedChanges: "Negeer unstaged wijzigingen",
|
||||||
LcDiscardAllChangesToAllFiles: "verwijder werkende tree",
|
DiscardAllChangesToAllFiles: "Verwijder werkende tree",
|
||||||
LcDiscardAnyUnstagedChanges: "gooi unstaged wijzigingen weg",
|
DiscardAnyUnstagedChanges: "Gooi unstaged wijzigingen weg",
|
||||||
LcDiscardUntrackedFiles: "negeer niet-gevonden bestanden",
|
DiscardUntrackedFiles: "Negeer niet-gevonden bestanden",
|
||||||
LcViewResetOptions: `bekijk reset opties`,
|
ViewResetOptions: `Bekijk reset opties`,
|
||||||
LcHardReset: "harde reset",
|
HardReset: "Harde reset",
|
||||||
LcCreateFixupCommit: `creëer fixup commit voor deze commit`,
|
CreateFixupCommit: `Creëer fixup commit voor deze commit`,
|
||||||
LcSquashAboveCommits: `squash bovenstaande commits`,
|
|
||||||
SquashAboveCommits: `Squash bovenstaande commits`,
|
SquashAboveCommits: `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}}?`,
|
||||||
CreateFixupCommit: `Creëer fixup commit`,
|
CreateFixupCommitDescription: `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}}?`,
|
||||||
LcExecuteCustomCommand: "voer aangepaste commando uit",
|
ExecuteCustomCommand: "Voer aangepaste commando uit",
|
||||||
CustomCommand: "Aangepaste commando:",
|
CustomCommand: "Aangepaste commando:",
|
||||||
LcCommitChangesWithoutHook: "commit veranderingen zonder pre-commit hook",
|
CommitChangesWithoutHook: "Commit veranderingen zonder pre-commit hook",
|
||||||
SkipHookPrefixNotConfigured: "Je hebt nog niet een commit bericht voorvoegsel ingesteld voor het overslaan van hooks. Set `git.skipHookPrefix = 'WIP'` in je config",
|
SkipHookPrefixNotConfigured: "Je hebt nog niet een commit bericht voorvoegsel ingesteld voor het overslaan van hooks. Set `git.skipHookPrefix = 'WIP'` in je config",
|
||||||
LcResetTo: `reset naar`,
|
ResetTo: `Reset naar`,
|
||||||
PressEnterToReturn: "Press om terug te gaan naar lazygit",
|
PressEnterToReturn: "Press om terug te gaan naar lazygit",
|
||||||
LcViewStashOptions: "bekijk stash opties",
|
ViewStashOptions: "Bekijk stash opties",
|
||||||
LcStashAllChanges: "stash-bestanden",
|
StashAllChanges: "Stash-bestanden",
|
||||||
LcStashAllChangesKeepIndex: "stash staged wijzigingen",
|
StashAllChangesKeepIndex: "Stash staged wijzigingen",
|
||||||
LcStashOptions: "Stash opties",
|
StashOptions: "Stash opties",
|
||||||
NotARepository: "Fout: moet in een git repository uitgevoerd worden",
|
NotARepository: "Fout: moet in een git repository uitgevoerd worden",
|
||||||
LcJump: "ga naar paneel",
|
Jump: "Ga naar paneel",
|
||||||
DiscardPatch: "Patch weg gooien",
|
DiscardPatch: "Patch weg gooien",
|
||||||
DiscardPatchConfirm: "Je kan alleen maar een patch bouwen van 1 commit. Huidige patch weggooien?",
|
DiscardPatchConfirm: "Je kan alleen maar een patch bouwen van 1 commit. Huidige patch weggooien?",
|
||||||
CantPatchWhileRebasingError: "Je kan geen patch bouwen of patch commando uitvoeren wanneer je in een merging of rebasing state zit",
|
CantPatchWhileRebasingError: "Je kan geen patch bouwen of patch commando uitvoeren wanneer je in een merging of rebasing state zit",
|
||||||
LcToggleAddToPatch: "toggle bestand inbegrepen in patch",
|
ToggleAddToPatch: "Toggle bestand inbegrepen in patch",
|
||||||
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",
|
||||||
LcEnterFile: "enter bestand om geselecteerde regels toe te voegen aan de patch",
|
EnterFile: "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`,
|
||||||
LcAddNewRemote: `voeg een nieuwe remote toe`,
|
AddNewRemote: `Voeg een nieuwe remote toe`,
|
||||||
LcNewRemoteName: `Nieuwe remote name:`,
|
NewRemoteName: `Nieuwe remote name:`,
|
||||||
LcNewRemoteUrl: `Nieuwe remote url:`,
|
NewRemoteUrl: `Nieuwe remote url:`,
|
||||||
LcEditRemoteName: `Enter updated remote naam voor {{.remoteName}}:`,
|
EditRemoteName: `Enter updated remote naam voor {{.remoteName}}:`,
|
||||||
LcEditRemoteUrl: `Enter updated remote url voor {{.remoteName}}:`,
|
EditRemoteUrl: `Enter updated remote url voor {{.remoteName}}:`,
|
||||||
LcRemoveRemote: `verwijder remote`,
|
RemoveRemote: `Verwijder remote`,
|
||||||
LcRemoveRemotePrompt: "Weet je zeker dat je deze remote wilt verwijderen",
|
RemoveRemotePrompt: "Weet je zeker dat je deze remote wilt verwijderen",
|
||||||
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",
|
||||||
LcSetUpstream: "stel in als upstream van uitgecheckte branch",
|
SetUpstream: "Stel in als upstream van uitgecheckte branch",
|
||||||
LcSetAsUpstream: "stel in als upstream van uitgecheckte branch",
|
SetAsUpstream: "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",
|
||||||
LcEditRemote: "wijzig remote",
|
EditRemote: "Wijzig remote",
|
||||||
LcTagCommit: "tag commit",
|
TagCommit: "Tag commit",
|
||||||
TagNameTitle: "Tag naam:",
|
TagNameTitle: "Tag naam:",
|
||||||
LcDeleteTag: "verwijder tag",
|
DeleteTag: "Verwijder tag",
|
||||||
DeleteTagTitle: "Verwijder tag",
|
DeleteTagTitle: "Verwijder tag",
|
||||||
DeleteTagPrompt: "Weet je zeker dat je '{{.tagName}}' wil verwijderen?",
|
DeleteTagPrompt: "Weet je zeker dat je '{{.tagName}}' wil verwijderen?",
|
||||||
PushTagTitle: "remote om tag '{{.tagName}}' te pushen naar:",
|
PushTagTitle: "Remote om tag '{{.tagName}}' te pushen naar:",
|
||||||
LcPushTag: "push tag",
|
PushTag: "Push tag",
|
||||||
LcCreateTag: "creëer tag",
|
CreateTag: "Creëer tag",
|
||||||
CreateTagTitle: "Tag naam:",
|
CreateTagTitle: "Tag naam:",
|
||||||
LcFetchRemote: "fetch remote",
|
FetchRemote: "Fetch remote",
|
||||||
FetchingRemoteStatus: "remote fetchen",
|
FetchingRemoteStatus: "Remote fetchen",
|
||||||
LcCheckoutCommit: "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?",
|
||||||
LcGitFlowOptions: "laat git-flow opties zien",
|
GitFlowOptions: "Laat git-flow opties zien",
|
||||||
NotAGitFlowBranch: "Dit lijkt geen git flow branch te zijn",
|
NotAGitFlowBranch: "Dit lijkt geen git flow branch te zijn",
|
||||||
NewGitFlowBranchPrompt: "nieuwe '{{.branchType}}' naam:",
|
NewGitFlowBranchPrompt: "Nieuwe '{{.branchType}}' naam:",
|
||||||
IgnoreTracked: "Negeer tracked bestand",
|
IgnoreTracked: "Negeer tracked bestand",
|
||||||
IgnoreTrackedPrompt: "weet je zeker dat je een getracked bestand wil negeren?",
|
IgnoreTrackedPrompt: "Weet je zeker dat je een getracked bestand wil negeren?",
|
||||||
LcViewResetToUpstreamOptions: "bekijk upstream reset opties",
|
ViewResetToUpstreamOptions: "Bekijk upstream reset opties",
|
||||||
LcNextScreenMode: "volgende scherm modus (normaal/half/groot)",
|
NextScreenMode: "Volgende scherm modus (normaal/half/groot)",
|
||||||
LcPrevScreenMode: "vorige scherm modus",
|
PrevScreenMode: "Vorige scherm modus",
|
||||||
LcStartSearch: "start met zoeken",
|
StartSearch: "Start met zoeken",
|
||||||
Panel: "Paneel",
|
Panel: "Paneel",
|
||||||
Keybindings: "Sneltoetsen",
|
Keybindings: "Sneltoetsen",
|
||||||
LcRenameBranch: "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?",
|
||||||
LcOpenMenu: "open menu",
|
OpenMenu: "Open menu",
|
||||||
LcResetCherryPick: "reset cherry-picked (gekopieerde) commits selectie",
|
ResetCherryPick: "Reset cherry-picked (gekopieerde) commits selectie",
|
||||||
LcNextTab: "volgende tabblad",
|
NextTab: "Volgende tabblad",
|
||||||
LcPrevTab: "vorige tabblad",
|
PrevTab: "Vorige tabblad",
|
||||||
LcCantUndoWhileRebasing: "Kan niet ongedaan maken terwijl je aan het rebasen bent",
|
CantUndoWhileRebasing: "Kan niet ongedaan maken terwijl je aan het rebasen bent",
|
||||||
LcCantRedoWhileRebasing: "Kan niet opnieuw doen (redo) terwijl je aan het rebasen bent",
|
CantRedoWhileRebasing: "Kan niet opnieuw doen (redo) terwijl je aan het rebasen bent",
|
||||||
MustStashWarning: "Een patch in de index stoppen vereist stashen en onstashen van je wijzigingen. Als er iets verkeert gaat kan je je bestanden terug vinden in de stash. Verder gaan?",
|
MustStashWarning: "Een patch in de index stoppen vereist stashen en onstashen van je wijzigingen. Als er iets verkeert gaat kan je je bestanden terug vinden in de stash. Verder gaan?",
|
||||||
MustStashTitle: "Moet stashen",
|
MustStashTitle: "Moet stashen",
|
||||||
ConfirmationTitle: "Bevestigingspaneel",
|
ConfirmationTitle: "Bevestigingspaneel",
|
||||||
LcPrevPage: "vorige pagina",
|
PrevPage: "Vorige pagina",
|
||||||
LcNextPage: "volgende pagina",
|
NextPage: "Volgende pagina",
|
||||||
LcGotoTop: "scroll naar boven",
|
GotoTop: "Scroll naar boven",
|
||||||
LcGotoBottom: "scroll naar beneden",
|
GotoBottom: "Scroll naar beneden",
|
||||||
LcFilteringBy: "filteren bij",
|
FilteringBy: "Filteren bij",
|
||||||
ResetInParentheses: "(reset)",
|
ResetInParentheses: "(reset)",
|
||||||
LcOpenFilteringMenu: "bekijk scoping opties",
|
OpenFilteringMenu: "Bekijk scoping opties",
|
||||||
LcFilterBy: "filter bij",
|
FilterBy: "Filter bij",
|
||||||
LcExitFilterMode: "stop met filteren bij pad",
|
ExitFilterMode: "Stop met filteren bij pad",
|
||||||
LcFilterPathOption: "vulin pad om op te filteren",
|
FilterPathOption: "Vulin pad om op te filteren",
|
||||||
EnterFileName: "Vulin path:",
|
EnterFileName: "Vulin path:",
|
||||||
FilteringMenuTitle: "Filteren",
|
FilteringMenuTitle: "Filteren",
|
||||||
MustExitFilterModeTitle: "Command niet beschikbaar",
|
MustExitFilterModeTitle: "Command niet beschikbaar",
|
||||||
MustExitFilterModePrompt: "Command niet beschikbaar in filter modus. Sluit filter modus?",
|
MustExitFilterModePrompt: "Command niet beschikbaar in filter modus. Sluit filter modus?",
|
||||||
LcDiff: "diff",
|
Diff: "Diff",
|
||||||
LcEnterRefToDiff: "vul in ref naar diff",
|
EnterRefToDiff: "Vul in ref naar diff",
|
||||||
LcEnteRefName: "vul in ref:",
|
EnteRefName: "Vul in ref:",
|
||||||
LcExitDiffMode: "sluit diff mode",
|
ExitDiffMode: "Sluit diff mode",
|
||||||
DiffingMenuTitle: "Diffen",
|
DiffingMenuTitle: "Diffen",
|
||||||
LcSwapDiff: "keer diff richting om",
|
SwapDiff: "Keer diff richting om",
|
||||||
LcOpenDiffingMenu: "open diff menu",
|
OpenDiffingMenu: "Open diff menu",
|
||||||
LcShowingGitDiff: "laat output zien voor:",
|
ShowingGitDiff: "Laat output zien voor:",
|
||||||
LcCopyCommitShaToClipboard: "kopieer commit SHA naar klembord",
|
CopyCommitShaToClipboard: "Kopieer commit SHA naar klembord",
|
||||||
LcCopyCommitMessageToClipboard: "kopieer commit bericht naar klembord",
|
CopyCommitMessageToClipboard: "Kopieer commit bericht naar klembord",
|
||||||
LcCopyBranchNameToClipboard: "kopieer branch name naar klembord",
|
CopyBranchNameToClipboard: "Kopieer branch name naar klembord",
|
||||||
LcCopyFileNameToClipboard: "kopieer de bestandsnaam naar het klembord",
|
CopyFileNameToClipboard: "Kopieer de bestandsnaam naar het klembord",
|
||||||
LcCopyCommitFileNameToClipboard: "kopieer de vastgelegde bestandsnaam naar het klembord",
|
CopyCommitFileNameToClipboard: "Kopieer de vastgelegde bestandsnaam naar het klembord",
|
||||||
LcCommitPrefixPatternError: "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?",
|
||||||
BranchNotFoundTitle: "Branch niet gevonden",
|
BranchNotFoundTitle: "Branch niet gevonden",
|
||||||
BranchNotFoundPrompt: "Branch niet gevonden. Creëer een nieuwe branch genaamd",
|
BranchNotFoundPrompt: "Branch niet gevonden. Creëer een nieuwe branch genaamd",
|
||||||
PullRequestURLCopiedToClipboard: "Pull-aanvraag-URL gekopieerd naar klembord",
|
PullRequestURLCopiedToClipboard: "Pull-aanvraag-URL gekopieerd naar klembord",
|
||||||
CommitMessageCopiedToClipboard: "Commit message gekopieerd naar klembord",
|
CommitMessageCopiedToClipboard: "Commit message gekopieerd naar klembord",
|
||||||
LcCopiedToClipboard: "gekopieerd naar klembord",
|
CopiedToClipboard: "Gekopieerd naar klembord",
|
||||||
NavigationTitle: "Lijstpaneel Navigatie",
|
NavigationTitle: "Lijstpaneel navigatie",
|
||||||
LcViewCommits: "bekijk commits",
|
ViewCommits: "Bekijk commits",
|
||||||
LcToggleTreeView: "toggle bestandsboom weergave",
|
ToggleTreeView: "Toggle bestandsboom weergave",
|
||||||
LcCreateNewBranchFromCommit: "creëer nieuwe branch van commit",
|
CreateNewBranchFromCommit: "Creëer nieuwe branch van commit",
|
||||||
LcCopySubmoduleNameToClipboard: "kopieer submodule naam naar klembord",
|
CopySubmoduleNameToClipboard: "Kopieer submodule naam naar klembord",
|
||||||
LcEnterSubmodule: "enter submodule",
|
EnterSubmodule: "Enter submodule",
|
||||||
LcAddSubmodule: "voeg nieuwe submodule toe",
|
AddSubmodule: "Voeg nieuwe submodule toe",
|
||||||
LcInitSubmodule: "initialiseer submodule",
|
InitSubmodule: "Initialiseer submodule",
|
||||||
LcViewBulkSubmoduleOptions: "bekijk bulk submodule opties",
|
ViewBulkSubmoduleOptions: "Bekijk bulk submodule opties",
|
||||||
CreatePullRequestOptions: "Bekijk opties voor pull-aanvraag",
|
CreatePullRequestOptions: "Bekijk opties voor pull-aanvraag",
|
||||||
LcCreatePullRequestOptions: "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?",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
1016
pkg/i18n/english.go
1016
pkg/i18n/english.go
File diff suppressed because it is too large
Load Diff
@ -43,23 +43,22 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
AmendLastCommit: "最新のコミットにamend",
|
AmendLastCommit: "最新のコミットにamend",
|
||||||
AmendLastCommitTitle: "最新のコミットにamend",
|
AmendLastCommitTitle: "最新のコミットにamend",
|
||||||
SureToAmend: "最新のコミットに変更をamendします。よろしいですか? コミットメッセージはコミットパネルから変更できます。",
|
SureToAmend: "最新のコミットに変更をamendします。よろしいですか? コミットメッセージはコミットパネルから変更できます。",
|
||||||
NoCommitToAmend: "amend可能なコミットが存在しません。",
|
NoCommitToAmend: "Amend可能なコミットが存在しません。",
|
||||||
CommitChangesWithEditor: "gitエディタを使用して変更をコミット",
|
CommitChangesWithEditor: "gitエディタを使用して変更をコミット",
|
||||||
StatusTitle: "ステータス",
|
StatusTitle: "ステータス",
|
||||||
LcNavigate: "移動",
|
Menu: "メニュー",
|
||||||
LcMenu: "メニュー",
|
Execute: "実行",
|
||||||
LcExecute: "実行",
|
ToggleStaged: "ステージ/アンステージ",
|
||||||
LcToggleStaged: "ステージ/アンステージ",
|
ToggleStagedAll: "すべての変更をステージ/アンステージ",
|
||||||
LcToggleStagedAll: "すべての変更をステージ/アンステージ",
|
ToggleTreeView: "ファイルツリーの表示を切り替え",
|
||||||
LcToggleTreeView: "ファイルツリーの表示を切り替え",
|
OpenMergeTool: "Git mergetoolを開く",
|
||||||
LcOpenMergeTool: "git mergetoolを開く",
|
Refresh: "リフレッシュ",
|
||||||
LcRefresh: "リフレッシュ",
|
Push: "Push",
|
||||||
LcPush: "push",
|
Pull: "Pull",
|
||||||
LcPull: "pull",
|
Scroll: "スクロール",
|
||||||
LcScroll: "スクロール",
|
|
||||||
MergeConflictsTitle: "マージコンフリクト",
|
MergeConflictsTitle: "マージコンフリクト",
|
||||||
LcCheckout: "チェックアウト",
|
Checkout: "チェックアウト",
|
||||||
LcFileFilter: "ファイルをフィルタ (ステージ/アンステージ)",
|
FileFilter: "ファイルをフィルタ (ステージ/アンステージ)",
|
||||||
FilterStagedFiles: "ステージされたファイルのみを表示",
|
FilterStagedFiles: "ステージされたファイルのみを表示",
|
||||||
FilterUnstagedFiles: "ステージされていないファイルのみを表示",
|
FilterUnstagedFiles: "ステージされていないファイルのみを表示",
|
||||||
ResetCommitFilterState: "フィルタをリセット",
|
ResetCommitFilterState: "フィルタをリセット",
|
||||||
@ -67,7 +66,7 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
PullWait: "Pull中...",
|
PullWait: "Pull中...",
|
||||||
PushWait: "Push中...",
|
PushWait: "Push中...",
|
||||||
FetchWait: "Fetch中...",
|
FetchWait: "Fetch中...",
|
||||||
LcSoftReset: "softリセット",
|
SoftReset: "Softリセット",
|
||||||
AlreadyCheckedOutBranch: "ブランチはすでにチェックアウトされています。",
|
AlreadyCheckedOutBranch: "ブランチはすでにチェックアウトされています。",
|
||||||
// SureForceCheckout: "Are you sure you want force checkout? You will lose all local changes",
|
// SureForceCheckout: "Are you sure you want force checkout? You will lose all local changes",
|
||||||
// ForceCheckoutBranch: "Force Checkout Branch",
|
// ForceCheckoutBranch: "Force Checkout Branch",
|
||||||
@ -77,45 +76,44 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
DeleteBranch: "ブランチを削除",
|
DeleteBranch: "ブランチを削除",
|
||||||
DeleteBranchMessage: "ブランチ '{{.selectedBranchName}}' を削除します。よろしいですか?",
|
DeleteBranchMessage: "ブランチ '{{.selectedBranchName}}' を削除します。よろしいですか?",
|
||||||
ForceDeleteBranchMessage: "'{{.selectedBranchName}}' はマージされていません。本当に削除しますか?",
|
ForceDeleteBranchMessage: "'{{.selectedBranchName}}' はマージされていません。本当に削除しますか?",
|
||||||
// LcRebaseBranch: "rebase checked-out branch onto this branch",
|
// LcRebaseBranch: "Rebase checked-out branch onto this branch",
|
||||||
CantRebaseOntoSelf: "ブランチを自分自身にリベースすることはできません。",
|
CantRebaseOntoSelf: "ブランチを自分自身にリベースすることはできません。",
|
||||||
CantMergeBranchIntoItself: "ブランチを自分自身にマージすることはできません。",
|
CantMergeBranchIntoItself: "ブランチを自分自身にマージすることはできません。",
|
||||||
// LcForceCheckout: "force checkout",
|
// LcForceCheckout: "Force checkout",
|
||||||
// LcCheckoutByName: "checkout by name",
|
// LcCheckoutByName: "Checkout by name",
|
||||||
LcNewBranch: "新しいブランチを作成",
|
NewBranch: "新しいブランチを作成",
|
||||||
LcDeleteBranch: "ブランチを削除",
|
|
||||||
NoBranchesThisRepo: "リポジトリにブランチが存在しません",
|
NoBranchesThisRepo: "リポジトリにブランチが存在しません",
|
||||||
CommitWithoutMessageErr: "コミットメッセージを入力してください",
|
CommitWithoutMessageErr: "コミットメッセージを入力してください",
|
||||||
LcCloseCancel: "閉じる/キャンセル",
|
CloseCancel: "閉じる/キャンセル",
|
||||||
LcConfirm: "確認",
|
Confirm: "確認",
|
||||||
LcClose: "閉じる",
|
Close: "閉じる",
|
||||||
LcQuit: "終了",
|
Quit: "終了",
|
||||||
// LcSquashDown: "squash down",
|
// 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",
|
||||||
// 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",
|
||||||
// LcPickCommit: "pick commit (when mid-rebase)",
|
// LcPickCommit: "Pick commit (when mid-rebase)",
|
||||||
LcRevertCommit: "コミットをrevert",
|
RevertCommit: "コミットをrevert",
|
||||||
LcRewordCommit: "コミットメッセージを変更",
|
RewordCommit: "コミットメッセージを変更",
|
||||||
LcDeleteCommit: "コミットを削除",
|
DeleteCommit: "コミットを削除",
|
||||||
LcMoveDownCommit: "コミットを1つ下に移動",
|
MoveDownCommit: "コミットを1つ下に移動",
|
||||||
LcMoveUpCommit: "コミットを1つ上に移動",
|
MoveUpCommit: "コミットを1つ上に移動",
|
||||||
LcEditCommit: "コミットを編集",
|
EditCommit: "コミットを編集",
|
||||||
LcAmendToCommit: "ステージされた変更でamendコミット",
|
AmendToCommit: "ステージされた変更でamendコミット",
|
||||||
LcRenameCommitEditor: "エディタでコミットメッセージを編集",
|
RenameCommitEditor: "エディタでコミットメッセージを編集",
|
||||||
Error: "エラー",
|
Error: "エラー",
|
||||||
// LcPickHunk: "pick hunk",
|
// LcPickHunk: "Pick hunk",
|
||||||
// LcPickAllHunks: "pick all hunks",
|
// LcPickAllHunks: "Pick all hunks",
|
||||||
LcUndo: "アンドゥ",
|
Undo: "アンドゥ",
|
||||||
LcUndoReflog: "アンドゥ (via reflog) (experimental)",
|
UndoReflog: "アンドゥ (via reflog) (experimental)",
|
||||||
LcRedoReflog: "リドゥ (via reflog) (experimental)",
|
RedoReflog: "リドゥ (via reflog) (experimental)",
|
||||||
LcPop: "pop",
|
Pop: "Pop",
|
||||||
LcDrop: "drop",
|
Drop: "Drop",
|
||||||
LcApply: "適用",
|
Apply: "適用",
|
||||||
NoStashEntries: "Stashが存在しません",
|
NoStashEntries: "Stashが存在しません",
|
||||||
StashDrop: "Stashを削除",
|
StashDrop: "Stashを削除",
|
||||||
SureDropStashEntry: "Stashを削除します。よろしいですか?",
|
SureDropStashEntry: "Stashを削除します。よろしいですか?",
|
||||||
@ -125,7 +123,7 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
SureApplyStashEntry: "Stashを適用します。よろしいですか?",
|
SureApplyStashEntry: "Stashを適用します。よろしいですか?",
|
||||||
// NoTrackedStagedFilesStash: "You have no tracked/staged files to stash",
|
// NoTrackedStagedFilesStash: "You have no tracked/staged files to stash",
|
||||||
StashChanges: "変更をStash",
|
StashChanges: "変更をStash",
|
||||||
LcRenameStash: "Stashを変更",
|
RenameStash: "Stashを変更",
|
||||||
RenameStashPrompt: "Stash名を変更: {{.stashName}}",
|
RenameStashPrompt: "Stash名を変更: {{.stashName}}",
|
||||||
OpenConfig: "設定ファイルを開く",
|
OpenConfig: "設定ファイルを開く",
|
||||||
EditConfig: "設定ファイルを編集",
|
EditConfig: "設定ファイルを編集",
|
||||||
@ -133,7 +131,7 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
ForcePushPrompt: "ブランチがリモートブランチから分岐しています。'esc'でキャンセル, または'enter'でforce pushします。",
|
ForcePushPrompt: "ブランチがリモートブランチから分岐しています。'esc'でキャンセル, または'enter'でforce pushします。",
|
||||||
ForcePushDisabled: "ブランチがリモートブランチから分岐しています。force pushは無効化されています。",
|
ForcePushDisabled: "ブランチがリモートブランチから分岐しています。force pushは無効化されています。",
|
||||||
// UpdatesRejectedAndForcePushDisabled: "Updates were rejected and you have disabled force pushing",
|
// UpdatesRejectedAndForcePushDisabled: "Updates were rejected and you have disabled force pushing",
|
||||||
LcCheckForUpdate: "更新を確認",
|
CheckForUpdate: "更新を確認",
|
||||||
CheckingForUpdates: "更新を確認中...",
|
CheckingForUpdates: "更新を確認中...",
|
||||||
UpdateAvailableTitle: "最新リリース!",
|
UpdateAvailableTitle: "最新リリース!",
|
||||||
UpdateAvailable: "バージョン {{.newVersion}} をインストールしますか?",
|
UpdateAvailable: "バージョン {{.newVersion}} をインストールしますか?",
|
||||||
@ -151,19 +149,19 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
MergeToolPrompt: "`git mergetool`を開きます。よろしいですか?",
|
MergeToolPrompt: "`git mergetool`を開きます。よろしいですか?",
|
||||||
IntroPopupMessage: japaneseIntroPopupMessage,
|
IntroPopupMessage: japaneseIntroPopupMessage,
|
||||||
// GitconfigParseErr: `Gogit failed to parse your gitconfig file due to the presence of unquoted '\' characters. Removing these should fix the issue.`,
|
// GitconfigParseErr: `Gogit failed to parse your gitconfig file due to the presence of unquoted '\' characters. Removing these should fix the issue.`,
|
||||||
LcEditFile: `ファイルを編集`,
|
EditFile: `ファイルを編集`,
|
||||||
LcOpenFile: `ファイルを開く`,
|
OpenFile: `ファイルを開く`,
|
||||||
LcIgnoreFile: `.gitignoreに追加`,
|
IgnoreFile: `.gitignoreに追加`,
|
||||||
LcRefreshFiles: `ファイルをリフレッシュ`,
|
RefreshFiles: `ファイルをリフレッシュ`,
|
||||||
LcMergeIntoCurrentBranch: `現在のブランチにマージ`,
|
MergeIntoCurrentBranch: `現在のブランチにマージ`,
|
||||||
ConfirmQuit: `終了します。よろしいですか?`,
|
ConfirmQuit: `終了します。よろしいですか?`,
|
||||||
SwitchRepo: `最近使用したリポジトリに切り替え`,
|
SwitchRepo: `最近使用したリポジトリに切り替え`,
|
||||||
LcAllBranchesLogGraph: `すべてのブランチログを表示`,
|
AllBranchesLogGraph: `すべてのブランチログを表示`,
|
||||||
UnsupportedGitService: `サポートされていないGitサービスです。`,
|
UnsupportedGitService: `サポートされていないGitサービスです。`,
|
||||||
LcCreatePullRequest: `Pull Requestを作成`,
|
CreatePullRequest: `Pull Requestを作成`,
|
||||||
LcCopyPullRequestURL: `Pull RequestのURLをクリップボードにコピー`,
|
CopyPullRequestURL: `Pull RequestのURLをクリップボードにコピー`,
|
||||||
NoBranchOnRemote: `ブランチがリモートに存在しません。リモートにpushしてください。`,
|
NoBranchOnRemote: `ブランチがリモートに存在しません。リモートにpushしてください。`,
|
||||||
LcFetch: `fetch`,
|
Fetch: `Fetch`,
|
||||||
// NoAutomaticGitFetchTitle: `No automatic git fetch`,
|
// NoAutomaticGitFetchTitle: `No automatic git fetch`,
|
||||||
// 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`,
|
||||||
@ -171,17 +169,17 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
StageSelection: `選択行をステージ/アンステージ`,
|
StageSelection: `選択行をステージ/アンステージ`,
|
||||||
ResetSelection: `変更を削除 (git reset)`,
|
ResetSelection: `変更を削除 (git reset)`,
|
||||||
ToggleDragSelect: `範囲選択を切り替え`,
|
ToggleDragSelect: `範囲選択を切り替え`,
|
||||||
ToggleSelectHunk: `hunk選択を切り替え`,
|
ToggleSelectHunk: `Hunk選択を切り替え`,
|
||||||
ToggleSelectionForPatch: `行をパッチに追加/削除`,
|
ToggleSelectionForPatch: `行をパッチに追加/削除`,
|
||||||
ToggleStagingPanel: `パネルを切り替え`,
|
ToggleStagingPanel: `パネルを切り替え`,
|
||||||
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}} ...",
|
||||||
// FoundConflicts: "Conflicts! To abort press 'esc', otherwise press 'enter'",
|
// FoundConflicts: "Conflicts! To abort press 'esc', otherwise press 'enter'",
|
||||||
// FoundConflictsTitle: "Auto-merge failed",
|
// FoundConflictsTitle: "Auto-merge failed",
|
||||||
// PickHunk: "pick hunk",
|
// PickHunk: "Pick hunk",
|
||||||
// PickAllHunks: "pick all hunks",
|
// PickAllHunks: "Pick all hunks",
|
||||||
// ViewMergeRebaseOptions: "view merge/rebase options",
|
// ViewMergeRebaseOptions: "View merge/rebase options",
|
||||||
// NotMergingOrRebasing: "You are currently neither rebasing nor merging",
|
// NotMergingOrRebasing: "You are currently neither rebasing nor merging",
|
||||||
RecentRepos: "最近使用したリポジトリ",
|
RecentRepos: "最近使用したリポジトリ",
|
||||||
// MergeOptionsTitle: "Merge Options",
|
// MergeOptionsTitle: "Merge Options",
|
||||||
@ -198,7 +196,7 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
SecondaryTitle: "Secondary",
|
SecondaryTitle: "Secondary",
|
||||||
ReflogCommitsTitle: "参照ログ",
|
ReflogCommitsTitle: "参照ログ",
|
||||||
GlobalTitle: "グローバルキーバインド",
|
GlobalTitle: "グローバルキーバインド",
|
||||||
// ConflictsResolved: "all merge conflicts resolved. Continue?",
|
// ConflictsResolved: "All merge conflicts resolved. Continue?",
|
||||||
// RebasingTitle: "Rebasing",
|
// RebasingTitle: "Rebasing",
|
||||||
// ConfirmRebase: "Are you sure you want to rebase '{{.checkedOutBranch}}' onto '{{.selectedBranch}}'?",
|
// ConfirmRebase: "Are you sure you want to rebase '{{.checkedOutBranch}}' onto '{{.selectedBranch}}'?",
|
||||||
// ConfirmMerge: "Are you sure you want to merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'?",
|
// ConfirmMerge: "Are you sure you want to merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'?",
|
||||||
@ -208,10 +206,10 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
ErrorOccurred: "エラーが発生しました! issueを作成してください: ",
|
ErrorOccurred: "エラーが発生しました! issueを作成してください: ",
|
||||||
// NoRoom: "Not enough room",
|
// NoRoom: "Not enough room",
|
||||||
YouAreHere: "現在位置",
|
YouAreHere: "現在位置",
|
||||||
// LcRewordNotSupported: "rewording commits while interactively rebasing is not currently supported",
|
// LcRewordNotSupported: "Rewording commits while interactively rebasing is not currently supported",
|
||||||
LcCherryPickCopy: "コミットをコピー (cherry-pick)",
|
CherryPickCopy: "コミットをコピー (cherry-pick)",
|
||||||
LcCherryPickCopyRange: "コミットを範囲コピー (cherry-pick)",
|
CherryPickCopyRange: "コミットを範囲コピー (cherry-pick)",
|
||||||
LcPasteCommits: "コミットを貼り付け (cherry-pick)",
|
PasteCommits: "コミットを貼り付け (cherry-pick)",
|
||||||
// SureCherryPick: "Are you sure you want to cherry-pick the copied commits onto this branch?",
|
// SureCherryPick: "Are you sure you want to cherry-pick the copied commits onto this branch?",
|
||||||
CherryPick: "Cherry-Pick",
|
CherryPick: "Cherry-Pick",
|
||||||
Donate: "支援",
|
Donate: "支援",
|
||||||
@ -226,31 +224,31 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
SelectNextHunk: "次のhunkを選択",
|
SelectNextHunk: "次のhunkを選択",
|
||||||
ScrollDown: "下にスクロール",
|
ScrollDown: "下にスクロール",
|
||||||
ScrollUp: "上にスクロール",
|
ScrollUp: "上にスクロール",
|
||||||
LcScrollUpMainPanel: "メインパネルを上にスクロール",
|
ScrollUpMainPanel: "メインパネルを上にスクロール",
|
||||||
LcScrollDownMainPanel: "メインパネルを下にスクロール",
|
ScrollDownMainPanel: "メインパネルを下にスクロール",
|
||||||
AmendCommitTitle: "amendコミット",
|
AmendCommitTitle: "Amendコミット",
|
||||||
AmendCommitPrompt: "ステージされたファイルで現在のコミットをamendします。よろしいですか?",
|
AmendCommitPrompt: "ステージされたファイルで現在のコミットをamendします。よろしいですか?",
|
||||||
DeleteCommitTitle: "コミットを削除",
|
DeleteCommitTitle: "コミットを削除",
|
||||||
DeleteCommitPrompt: "選択されたコミットを削除します。よろしいですか?",
|
DeleteCommitPrompt: "選択されたコミットを削除します。よろしいですか?",
|
||||||
// SquashingStatus: "squashing",
|
// SquashingStatus: "Squashing",
|
||||||
// FixingStatus: "fixing up",
|
// FixingStatus: "Fixing up",
|
||||||
// DeletingStatus: "deleting",
|
// DeletingStatus: "Deleting",
|
||||||
// MovingStatus: "moving",
|
// MovingStatus: "Moving",
|
||||||
// RebasingStatus: "rebasing",
|
// RebasingStatus: "Rebasing",
|
||||||
// AmendingStatus: "amending",
|
// AmendingStatus: "Amending",
|
||||||
// CherryPickingStatus: "cherry-picking",
|
// CherryPickingStatus: "Cherry-picking",
|
||||||
// UndoingStatus: "undoing",
|
// UndoingStatus: "Undoing",
|
||||||
// RedoingStatus: "redoing",
|
// RedoingStatus: "Redoing",
|
||||||
// CheckingOutStatus: "checking out",
|
// CheckingOutStatus: "Checking out",
|
||||||
// CommittingStatus: "committing",
|
// CommittingStatus: "Committing",
|
||||||
CommitFiles: "Commit files",
|
CommitFiles: "Commit files",
|
||||||
SubCommitsDynamicTitle: "コミット (%s)",
|
SubCommitsDynamicTitle: "コミット (%s)",
|
||||||
CommitFilesDynamicTitle: "Diff files (%s)",
|
CommitFilesDynamicTitle: "Diff files (%s)",
|
||||||
RemoteBranchesDynamicTitle: "リモートブランチ (%s)",
|
RemoteBranchesDynamicTitle: "リモートブランチ (%s)",
|
||||||
// LcViewItemFiles: "view selected item's files",
|
// LcViewItemFiles: "View selected item's files",
|
||||||
CommitFilesTitle: "コミットファイル",
|
CommitFilesTitle: "コミットファイル",
|
||||||
// LcCheckoutCommitFile: "checkout file",
|
// LcCheckoutCommitFile: "Checkout file",
|
||||||
// LcDiscardOldFileChange: "discard this commit's changes to this file",
|
// LcDiscardOldFileChange: "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",
|
||||||
@ -258,139 +256,139 @@ func japaneseTranslationSet() 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 ",
|
||||||
// LcViewDiscardOptions: "view 'discard changes' options",
|
// LcViewDiscardOptions: "View 'discard changes' options",
|
||||||
LcCancel: "キャンセル",
|
Cancel: "キャンセル",
|
||||||
LcDiscardAllChanges: "すべての変更を破棄",
|
DiscardAllChanges: "すべての変更を破棄",
|
||||||
// LcDiscardUnstagedChanges: "discard unstaged changes",
|
// LcDiscardUnstagedChanges: "Discard unstaged changes",
|
||||||
// LcDiscardAllChangesToAllFiles: "nuke working tree",
|
// LcDiscardAllChangesToAllFiles: "Nuke working tree",
|
||||||
// LcDiscardAnyUnstagedChanges: "discard unstaged changes",
|
// LcDiscardAnyUnstagedChanges: "Discard unstaged changes",
|
||||||
// LcDiscardUntrackedFiles: "discard untracked files",
|
// LcDiscardUntrackedFiles: "Discard untracked files",
|
||||||
LcHardReset: "hardリセット",
|
HardReset: "hardリセット",
|
||||||
// LcViewResetOptions: `view reset options`,
|
// LcViewResetOptions: `view reset options`,
|
||||||
LcCreateFixupCommit: `このコミットに対するfixupコミットを作成`,
|
CreateFixupCommitDescription: `このコミットに対する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します。よろしいですか?`,
|
||||||
CreateFixupCommit: `fixupコミットを作成`,
|
CreateFixupCommit: `Fixupコミットを作成`,
|
||||||
SureCreateFixupCommit: `{{.commit}} に対する fixup! コミットを作成します。よろしいですか?`,
|
SureCreateFixupCommit: `{{.commit}} に対する fixup! コミットを作成します。よろしいですか?`,
|
||||||
LcExecuteCustomCommand: "カスタムコマンドを実行",
|
ExecuteCustomCommand: "カスタムコマンドを実行",
|
||||||
CustomCommand: "カスタムコマンド:",
|
CustomCommand: "カスタムコマンド:",
|
||||||
LcCommitChangesWithoutHook: "pre-commitフックを実行せずに変更をコミット",
|
CommitChangesWithoutHook: "pre-commitフックを実行せずに変更をコミット",
|
||||||
// SkipHookPrefixNotConfigured: "You have not configured a commit message prefix for skipping hooks. Set `git.skipHookPrefix = 'WIP'` in your config",
|
// SkipHookPrefixNotConfigured: "You have not configured a commit message prefix for skipping hooks. Set `git.skipHookPrefix = 'WIP'` in your config",
|
||||||
// LcResetTo: `reset to`,
|
// LcResetTo: `reset to`,
|
||||||
PressEnterToReturn: "Enterを入力してください",
|
PressEnterToReturn: "Enterを入力してください",
|
||||||
// LcViewStashOptions: "view stash options",
|
// LcViewStashOptions: "View stash options",
|
||||||
LcStashAllChanges: "変更をstash",
|
StashAllChanges: "変更をstash",
|
||||||
// LcStashStagedChanges: "stash staged changes",
|
// LcStashStagedChanges: "Stash staged changes",
|
||||||
// LcStashOptions: "Stash options",
|
// LcStashOptions: "Stash options",
|
||||||
// NotARepository: "Error: must be run inside a git repository",
|
// NotARepository: "Error: must be run inside a git repository",
|
||||||
LcJump: "パネルに移動",
|
Jump: "パネルに移動",
|
||||||
LcScrollLeftRight: "左右にスクロール",
|
ScrollLeftRight: "左右にスクロール",
|
||||||
LcScrollLeft: "左スクロール",
|
ScrollLeft: "左スクロール",
|
||||||
LcScrollRight: "右スクロール",
|
ScrollRight: "右スクロール",
|
||||||
DiscardPatch: "パッチを破棄",
|
DiscardPatch: "パッチを破棄",
|
||||||
// DiscardPatchConfirm: "You can only build a patch from one commit/stash-entry at a time. Discard current patch?",
|
// DiscardPatchConfirm: "You can only build a patch from one commit/stash-entry at a time. Discard current patch?",
|
||||||
// CantPatchWhileRebasingError: "You cannot build a patch or run patch commands while in a merging or rebasing state",
|
// CantPatchWhileRebasingError: "You cannot build a patch or run patch commands while in a merging or rebasing state",
|
||||||
// LcToggleAddToPatch: "toggle file included in patch",
|
// LcToggleAddToPatch: "Toggle file included in patch",
|
||||||
// LcToggleAllInPatch: "toggle all files included in patch",
|
// LcToggleAllInPatch: "Toggle all files included in patch",
|
||||||
// LcUpdatingPatch: "updating patch",
|
// LcUpdatingPatch: "Updating patch",
|
||||||
// ViewPatchOptions: "view custom patch options",
|
// ViewPatchOptions: "View custom patch options",
|
||||||
// PatchOptionsTitle: "Patch Options",
|
// PatchOptionsTitle: "Patch Options",
|
||||||
// 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",
|
||||||
// LcEnterFile: "enter file to add selected lines to the patch (or toggle directory collapsed)",
|
// LcEnterFile: "Enter file to add selected lines to the patch (or toggle directory collapsed)",
|
||||||
// ExitCustomPatchBuilder: ``,
|
// ExitCustomPatchBuilder: ``,
|
||||||
EnterUpstream: `'<remote> <branchname>' の形式でupstreamを入力`,
|
EnterUpstream: `'<remote> <branchname>' の形式でupstreamを入力`,
|
||||||
InvalidUpstream: "upstreamの形式が正しくありません。'<remote> <branchname>' の形式で入力してください。",
|
InvalidUpstream: "Upstreamの形式が正しくありません。'<remote> <branchname>' の形式で入力してください。",
|
||||||
ReturnToRemotesList: `リモート一覧に戻る`,
|
ReturnToRemotesList: `リモート一覧に戻る`,
|
||||||
LcAddNewRemote: `リモートを新規追加`,
|
AddNewRemote: `リモートを新規追加`,
|
||||||
LcNewRemoteName: `新規リモート名:`,
|
NewRemoteName: `新規リモート名:`,
|
||||||
LcNewRemoteUrl: `新規リモートURL:`,
|
NewRemoteUrl: `新規リモートURL:`,
|
||||||
LcEditRemoteName: `{{.remoteName}} の新しいリモート名を入力:`,
|
EditRemoteName: `{{.remoteName}} の新しいリモート名を入力:`,
|
||||||
LcEditRemoteUrl: `{{.remoteName}} の新しいリモートURLを入力:`,
|
EditRemoteUrl: `{{.remoteName}} の新しいリモートURLを入力:`,
|
||||||
LcRemoveRemote: `リモートを削除`,
|
RemoveRemote: `リモートを削除`,
|
||||||
LcRemoveRemotePrompt: "リモートを削除します。よろしいですか?",
|
RemoveRemotePrompt: "リモートを削除します。よろしいですか?",
|
||||||
DeleteRemoteBranch: "リモートブランチを削除",
|
DeleteRemoteBranch: "リモートブランチを削除",
|
||||||
DeleteRemoteBranchMessage: "リモートブランチを削除します。よろしいですか",
|
DeleteRemoteBranchMessage: "リモートブランチを削除します。よろしいですか",
|
||||||
// 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}}'",
|
||||||
LcEditRemote: "リモートを編集",
|
EditRemote: "リモートを編集",
|
||||||
LcTagCommit: "タグを作成",
|
TagCommit: "タグを作成",
|
||||||
TagMenuTitle: "タグを作成",
|
TagMenuTitle: "タグを作成",
|
||||||
TagNameTitle: "タグ名:",
|
TagNameTitle: "タグ名:",
|
||||||
TagMessageTitle: "タグメッセージ: ",
|
TagMessageTitle: "タグメッセージ: ",
|
||||||
LcAnnotatedTag: "注釈付きタグ",
|
AnnotatedTag: "注釈付きタグ",
|
||||||
LcLightweightTag: "軽量タグ",
|
LightweightTag: "軽量タグ",
|
||||||
LcDeleteTag: "タグを削除",
|
DeleteTag: "タグを削除",
|
||||||
DeleteTagTitle: "タグを削除",
|
DeleteTagTitle: "タグを削除",
|
||||||
DeleteTagPrompt: "タグ '{{.tagName}}' を削除します。よろしいですか?",
|
DeleteTagPrompt: "タグ '{{.tagName}}' を削除します。よろしいですか?",
|
||||||
PushTagTitle: "リモートにタグ '{{.tagName}}' をpush",
|
PushTagTitle: "リモートにタグ '{{.tagName}}' をpush",
|
||||||
LcPushTag: "タグをpush",
|
PushTag: "タグをpush",
|
||||||
LcCreateTag: "タグを作成",
|
CreateTag: "タグを作成",
|
||||||
CreateTagTitle: "タグ名:",
|
CreateTagTitle: "タグ名:",
|
||||||
LcFetchRemote: "リモートをfetch",
|
FetchRemote: "リモートをfetch",
|
||||||
FetchingRemoteStatus: "リモートをfetch",
|
FetchingRemoteStatus: "リモートをfetch",
|
||||||
LcCheckoutCommit: "コミットをチェックアウト",
|
CheckoutCommit: "コミットをチェックアウト",
|
||||||
SureCheckoutThisCommit: "選択されたコミットをチェックアウトします。よろしいですか?",
|
SureCheckoutThisCommit: "選択されたコミットをチェックアウトします。よろしいですか?",
|
||||||
// LcGitFlowOptions: "show git-flow options",
|
// LcGitFlowOptions: "Show git-flow options",
|
||||||
// NotAGitFlowBranch: "This does not seem to be a git flow branch",
|
// NotAGitFlowBranch: "This does not seem to be a git flow branch",
|
||||||
// NewGitFlowBranchPrompt: "new {{.branchType}} name:",
|
// NewGitFlowBranchPrompt: "New {{.branchType}} name:",
|
||||||
// IgnoreTracked: "Ignore tracked file",
|
// IgnoreTracked: "Ignore tracked file",
|
||||||
// IgnoreTrackedPrompt: "Are you sure you want to ignore a tracked file?",
|
// IgnoreTrackedPrompt: "Are you sure you want to ignore a tracked file?",
|
||||||
// LcViewResetToUpstreamOptions: "view upstream reset options",
|
// LcViewResetToUpstreamOptions: "View upstream reset options",
|
||||||
LcNextScreenMode: "次のスクリーンモード (normal/half/fullscreen)",
|
NextScreenMode: "次のスクリーンモード (normal/half/fullscreen)",
|
||||||
LcPrevScreenMode: "前のスクリーンモード",
|
PrevScreenMode: "前のスクリーンモード",
|
||||||
LcStartSearch: "検索を開始",
|
StartSearch: "検索を開始",
|
||||||
Panel: "パネル",
|
Panel: "パネル",
|
||||||
Keybindings: "キーバインド",
|
Keybindings: "キーバインド",
|
||||||
LcRenameBranch: "ブランチ名を変更",
|
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?",
|
||||||
LcOpenMenu: "メニューを開く",
|
OpenMenu: "メニューを開く",
|
||||||
// LcResetCherryPick: "reset cherry-picked (copied) commits selection",
|
// LcResetCherryPick: "Reset cherry-picked (copied) commits selection",
|
||||||
LcNextTab: "次のタブ",
|
NextTab: "次のタブ",
|
||||||
LcPrevTab: "前のタブ",
|
PrevTab: "前のタブ",
|
||||||
LcCantUndoWhileRebasing: "リベース中はアンドゥできません。",
|
CantUndoWhileRebasing: "リベース中はアンドゥできません。",
|
||||||
LcCantRedoWhileRebasing: "リベース中はリドゥできません。",
|
CantRedoWhileRebasing: "リベース中はリドゥできません。",
|
||||||
// MustStashWarning: "Pulling a patch out into the index requires stashing and unstashing your changes. If something goes wrong, you'll be able to access your files from the stash. Continue?",
|
// MustStashWarning: "Pulling a patch out into the index requires stashing and unstashing your changes. If something goes wrong, you'll be able to access your files from the stash. Continue?",
|
||||||
// MustStashTitle: "Must stash",
|
// MustStashTitle: "Must stash",
|
||||||
ConfirmationTitle: "確認パネル",
|
ConfirmationTitle: "確認パネル",
|
||||||
LcPrevPage: "前のページ",
|
PrevPage: "前のページ",
|
||||||
LcNextPage: "次のページ",
|
NextPage: "次のページ",
|
||||||
LcGotoTop: "最上部までスクロール",
|
GotoTop: "最上部までスクロール",
|
||||||
LcGotoBottom: "最下部までスクロール",
|
GotoBottom: "最下部までスクロール",
|
||||||
// LcFilteringBy: "filtering by",
|
// LcFilteringBy: "Filtering by",
|
||||||
// ResetInParentheses: "(reset)",
|
// ResetInParentheses: "(reset)",
|
||||||
// LcOpenFilteringMenu: "view filter-by-path options",
|
// LcOpenFilteringMenu: "View filter-by-path options",
|
||||||
// LcFilterBy: "filter by",
|
// LcFilterBy: "Filter by",
|
||||||
// LcExitFilterMode: "stop filtering by path",
|
// LcExitFilterMode: "Stop filtering by path",
|
||||||
// LcFilterPathOption: "enter path to filter by",
|
// LcFilterPathOption: "Enter path to filter by",
|
||||||
// EnterFileName: "Enter path:",
|
// EnterFileName: "Enter path:",
|
||||||
// FilteringMenuTitle: "Filtering",
|
// FilteringMenuTitle: "Filtering",
|
||||||
// MustExitFilterModeTitle: "Command not available",
|
// MustExitFilterModeTitle: "Command not available",
|
||||||
// MustExitFilterModePrompt: "Command not available in filtered mode. Exit filtered mode?",
|
// MustExitFilterModePrompt: "Command not available in filtered mode. Exit filtered mode?",
|
||||||
LcDiff: "差分",
|
Diff: "差分",
|
||||||
// LcEnterRefToDiff: "enter ref to diff",
|
// LcEnterRefToDiff: "Enter ref to diff",
|
||||||
LcEnteRefName: "参照を入力:",
|
EnteRefName: "参照を入力:",
|
||||||
LcExitDiffMode: "差分モードを終了",
|
ExitDiffMode: "差分モードを終了",
|
||||||
DiffingMenuTitle: "差分",
|
DiffingMenuTitle: "差分",
|
||||||
// LcSwapDiff: "reverse diff direction",
|
// LcSwapDiff: "Reverse diff direction",
|
||||||
LcOpenDiffingMenu: "差分メニューを開く",
|
OpenDiffingMenu: "差分メニューを開く",
|
||||||
// // 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
|
||||||
LcOpenExtrasMenu: "コマンドログメニューを開く",
|
OpenExtrasMenu: "コマンドログメニューを開く",
|
||||||
// LcShowingGitDiff: "showing output for:",
|
// LcShowingGitDiff: "Showing output for:",
|
||||||
LcCommitDiff: "コミットの差分",
|
CommitDiff: "コミットの差分",
|
||||||
LcCopyCommitShaToClipboard: "コミットのSHAをクリップボードにコピー",
|
CopyCommitShaToClipboard: "コミットのSHAをクリップボードにコピー",
|
||||||
LcCommitSha: "コミットのSHA",
|
CommitSha: "コミットのSHA",
|
||||||
LcCommitURL: "コミットのURL",
|
CommitURL: "コミットのURL",
|
||||||
LcCopyCommitMessageToClipboard: "コミットメッセージをクリップボードにコピー",
|
CopyCommitMessageToClipboard: "コミットメッセージをクリップボードにコピー",
|
||||||
LcCommitMessage: "コミットメッセージ",
|
CommitMessage: "コミットメッセージ",
|
||||||
LcCommitAuthor: "コミットの作成者名",
|
CommitAuthor: "コミットの作成者名",
|
||||||
LcCopyCommitAttributeToClipboard: "コミットの情報をコピー",
|
CopyCommitAttributeToClipboard: "コミットの情報をコピー",
|
||||||
LcCopyBranchNameToClipboard: "ブランチ名をクリップボードにコピー",
|
CopyBranchNameToClipboard: "ブランチ名をクリップボードにコピー",
|
||||||
LcCopyFileNameToClipboard: "ファイル名をクリップボードにコピー",
|
CopyFileNameToClipboard: "ファイル名をクリップボードにコピー",
|
||||||
LcCopyCommitFileNameToClipboard: "コミットされたファイル名をクリップボードにコピー",
|
CopyCommitFileNameToClipboard: "コミットされたファイル名をクリップボードにコピー",
|
||||||
LcCopySelectedTexToClipboard: "選択されたテキストをクリップボードにコピー",
|
CopySelectedTexToClipboard: "選択されたテキストをクリップボードにコピー",
|
||||||
// LcCommitPrefixPatternError: "Error in commitPrefix pattern",
|
// LcCommitPrefixPatternError: "Error in commitPrefix pattern",
|
||||||
NoFilesStagedTitle: "ファイルがステージされていません",
|
NoFilesStagedTitle: "ファイルがステージされていません",
|
||||||
NoFilesStagedPrompt: "ファイルがステージされていません。すべての変更をコミットしますか?",
|
NoFilesStagedPrompt: "ファイルがステージされていません。すべての変更をコミットしますか?",
|
||||||
@ -398,51 +396,50 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
BranchNotFoundPrompt: "ブランチが見つかりませんでした。新しくブランチを作成します ",
|
BranchNotFoundPrompt: "ブランチが見つかりませんでした。新しくブランチを作成します ",
|
||||||
UnstageLinesTitle: "選択行をアンステージ",
|
UnstageLinesTitle: "選択行をアンステージ",
|
||||||
UnstageLinesPrompt: "選択された行を削除 (git reset) します。よろしいですか? この操作は取り消せません。\nこの警告を無効化するには設定ファイルの 'gui.skipUnstageLineWarning' を true に設定してください。",
|
UnstageLinesPrompt: "選択された行を削除 (git reset) します。よろしいですか? この操作は取り消せません。\nこの警告を無効化するには設定ファイルの 'gui.skipUnstageLineWarning' を true に設定してください。",
|
||||||
LcCreateNewBranchFromCommit: "コミットにブランチを作成",
|
CreateNewBranchFromCommit: "コミットにブランチを作成",
|
||||||
LcBuildingPatch: "パッチを構築",
|
BuildingPatch: "パッチを構築",
|
||||||
LcViewCommits: "コミットを閲覧",
|
ViewCommits: "コミットを閲覧",
|
||||||
MinGitVersionError: "lazygitの実行にはGit 2.20以降のバージョンが必要です。Gitを更新してください。もしくは、lazygitの後方互換性を改善するために https://github.com/jesseduffield/lazygit/issues にissueを作成してください。",
|
MinGitVersionError: "Lazygitの実行にはGit 2.20以降のバージョンが必要です。Gitを更新してください。もしくは、lazygitの後方互換性を改善するために https://github.com/jesseduffield/lazygit/issues にissueを作成してください。",
|
||||||
LcRunningCustomCommandStatus: "カスタムコマンドを実行",
|
RunningCustomCommandStatus: "カスタムコマンドを実行",
|
||||||
// LcSubmoduleStashAndReset: "stash uncommitted submodule changes and update",
|
// LcSubmoduleStashAndReset: "Stash uncommitted submodule changes and update",
|
||||||
// LcAndResetSubmodules: "and reset submodules",
|
// LcAndResetSubmodules: "And reset submodules",
|
||||||
LcEnterSubmodule: "サブモジュールを開く",
|
EnterSubmodule: "サブモジュールを開く",
|
||||||
LcCopySubmoduleNameToClipboard: "サブモジュール名をクリップボードにコピー",
|
CopySubmoduleNameToClipboard: "サブモジュール名をクリップボードにコピー",
|
||||||
RemoveSubmodule: "サブモジュールを削除",
|
RemoveSubmodule: "サブモジュールを削除",
|
||||||
LcRemoveSubmodule: "サブモジュールを削除",
|
|
||||||
RemoveSubmodulePrompt: "サブモジュール '%s' とそのディレクトリを削除します。よろしいですか? この操作は取り消せません。",
|
RemoveSubmodulePrompt: "サブモジュール '%s' とそのディレクトリを削除します。よろしいですか? この操作は取り消せません。",
|
||||||
LcResettingSubmoduleStatus: "サブモジュールをリセット",
|
ResettingSubmoduleStatus: "サブモジュールをリセット",
|
||||||
LcNewSubmoduleName: "新規サブモジュール名:",
|
NewSubmoduleName: "新規サブモジュール名:",
|
||||||
LcNewSubmoduleUrl: "新規サブモジュールのURL:",
|
NewSubmoduleUrl: "新規サブモジュールのURL:",
|
||||||
LcNewSubmodulePath: "新規サブモジュールのパス:",
|
NewSubmodulePath: "新規サブモジュールのパス:",
|
||||||
LcAddSubmodule: "サブモジュールを新規追加",
|
AddSubmodule: "サブモジュールを新規追加",
|
||||||
LcAddingSubmoduleStatus: "サブモジュールを新規追加",
|
AddingSubmoduleStatus: "サブモジュールを新規追加",
|
||||||
LcUpdateSubmoduleUrl: "サブモジュール '%s' のURLを更新",
|
UpdateSubmoduleUrl: "サブモジュール '%s' のURLを更新",
|
||||||
LcUpdatingSubmoduleUrlStatus: "URLを更新",
|
UpdatingSubmoduleUrlStatus: "URLを更新",
|
||||||
LcEditSubmoduleUrl: "サブモジュールのURLを更新",
|
EditSubmoduleUrl: "サブモジュールのURLを更新",
|
||||||
LcInitializingSubmoduleStatus: "サブモジュールを初期化",
|
InitializingSubmoduleStatus: "サブモジュールを初期化",
|
||||||
LcInitSubmodule: "サブモジュールを初期化",
|
InitSubmodule: "サブモジュールを初期化",
|
||||||
LcSubmoduleUpdate: "サブモジュールを更新",
|
SubmoduleUpdate: "サブモジュールを更新",
|
||||||
LcUpdatingSubmoduleStatus: "サブモジュールを更新",
|
UpdatingSubmoduleStatus: "サブモジュールを更新",
|
||||||
LcBulkInitSubmodules: "サブモジュールを一括初期化",
|
BulkInitSubmodules: "サブモジュールを一括初期化",
|
||||||
LcBulkUpdateSubmodules: "サブモジュールを一括更新",
|
BulkUpdateSubmodules: "サブモジュールを一括更新",
|
||||||
// LcBulkDeinitSubmodules: "bulk deinit submodules",
|
// LcBulkDeinitSubmodules: "Bulk deinit submodules",
|
||||||
// LcViewBulkSubmoduleOptions: "view bulk submodule options",
|
// LcViewBulkSubmoduleOptions: "View bulk submodule options",
|
||||||
// LcBulkSubmoduleOptions: "bulk submodule options",
|
// LcBulkSubmoduleOptions: "Bulk submodule options",
|
||||||
// LcRunningCommand: "running command",
|
// LcRunningCommand: "Running command",
|
||||||
// SubCommitsTitle: "Sub-commits",
|
// SubCommitsTitle: "Sub-commits",
|
||||||
SubmodulesTitle: "サブモジュール",
|
SubmodulesTitle: "サブモジュール",
|
||||||
NavigationTitle: "一覧パネルの操作",
|
NavigationTitle: "一覧パネルの操作",
|
||||||
// SuggestionsCheatsheetTitle: "Suggestions",
|
// SuggestionsCheatsheetTitle: "Suggestions",
|
||||||
// SuggestionsTitle: "Suggestions (press %s to focus)",
|
// SuggestionsTitle: "Suggestions (press %s to focus)",
|
||||||
ExtrasTitle: "コマンドログ",
|
ExtrasTitle: "コマンドログ",
|
||||||
// PushingTagStatus: "pushing tag",
|
// PushingTagStatus: "Pushing tag",
|
||||||
PullRequestURLCopiedToClipboard: "pull requestのURLがクリップボードにコピーされました",
|
PullRequestURLCopiedToClipboard: "Pull requestのURLがクリップボードにコピーされました",
|
||||||
CommitDiffCopiedToClipboard: "コミットの差分がクリップボードにコピーされました",
|
CommitDiffCopiedToClipboard: "コミットの差分がクリップボードにコピーされました",
|
||||||
CommitSHACopiedToClipboard: "コミットのSHAがクリップボードにコピーされました",
|
CommitSHACopiedToClipboard: "コミットのSHAがクリップボードにコピーされました",
|
||||||
CommitURLCopiedToClipboard: "コミットのURLがクリップボードにコピーされました",
|
CommitURLCopiedToClipboard: "コミットのURLがクリップボードにコピーされました",
|
||||||
CommitMessageCopiedToClipboard: "コミットメッセージがクリップボードにコピーされました",
|
CommitMessageCopiedToClipboard: "コミットメッセージがクリップボードにコピーされました",
|
||||||
CommitAuthorCopiedToClipboard: "コミットの作成者名がクリップボードにコピーされました",
|
CommitAuthorCopiedToClipboard: "コミットの作成者名がクリップボードにコピーされました",
|
||||||
LcCopiedToClipboard: "クリップボードにコピーされました",
|
CopiedToClipboard: "クリップボードにコピーされました",
|
||||||
ErrCannotEditDirectory: "ディレクトリは編集できません。",
|
ErrCannotEditDirectory: "ディレクトリは編集できません。",
|
||||||
ErrStageDirWithInlineMergeConflicts: "マージコンフリクトの発生したファイルを含むディレクトリはステージ/アンステージできません。マージコンフリクトを解決してください。",
|
ErrStageDirWithInlineMergeConflicts: "マージコンフリクトの発生したファイルを含むディレクトリはステージ/アンステージできません。マージコンフリクトを解決してください。",
|
||||||
ErrRepositoryMovedOrDeleted: "リポジトリが見つかりません。すでに削除されたか、移動された可能性があります ¯\\_(ツ)_/¯",
|
ErrRepositoryMovedOrDeleted: "リポジトリが見つかりません。すでに削除されたか、移動された可能性があります ¯\\_(ツ)_/¯",
|
||||||
@ -455,28 +452,27 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
ToggleWhitespaceInDiffView: "空白文字の差分の表示有無を切り替え",
|
ToggleWhitespaceInDiffView: "空白文字の差分の表示有無を切り替え",
|
||||||
// IncreaseContextInDiffView: "Increase the size of the context shown around changes in the diff view",
|
// IncreaseContextInDiffView: "Increase the size of the context shown around changes in the diff view",
|
||||||
// DecreaseContextInDiffView: "Decrease the size of the context shown around changes in the diff view",
|
// DecreaseContextInDiffView: "Decrease the size of the context shown around changes in the diff view",
|
||||||
CreatePullRequest: "pull requestを作成",
|
|
||||||
// CreatePullRequestOptions: "Create pull request options",
|
// CreatePullRequestOptions: "Create pull request options",
|
||||||
// LcCreatePullRequestOptions: "create pull request options",
|
// LcCreatePullRequestOptions: "Create pull request options",
|
||||||
LcDefaultBranch: "デフォルトブランチ",
|
DefaultBranch: "デフォルトブランチ",
|
||||||
LcSelectBranch: "ブランチを選択",
|
SelectBranch: "ブランチを選択",
|
||||||
SelectConfigFile: "設定ファイルを選択",
|
SelectConfigFile: "設定ファイルを選択",
|
||||||
NoConfigFileFoundErr: "設定ファイルが見つかりませんでした。",
|
NoConfigFileFoundErr: "設定ファイルが見つかりませんでした。",
|
||||||
// LcLoadingFileSuggestions: "loading file suggestions",
|
// LcLoadingFileSuggestions: "Loading file suggestions",
|
||||||
// LcLoadingCommits: "loading commits",
|
// LcLoadingCommits: "Loading commits",
|
||||||
// MustSpecifyOriginError: "Must specify a remote if specifying a branch",
|
// MustSpecifyOriginError: "Must specify a remote if specifying a branch",
|
||||||
// GitOutput: "Git output:",
|
// GitOutput: "Git output:",
|
||||||
// GitCommandFailed: "Git command failed. Check command log for details (open with %s)",
|
// GitCommandFailed: "Git command failed. Check command log for details (open with %s)",
|
||||||
AbortTitle: "%sを中止",
|
AbortTitle: "%sを中止",
|
||||||
AbortPrompt: "実施中の%sを中止します。よろしいですか?",
|
AbortPrompt: "実施中の%sを中止します。よろしいですか?",
|
||||||
LcOpenLogMenu: "ログメニューを開く",
|
OpenLogMenu: "ログメニューを開く",
|
||||||
LogMenuTitle: "コミットログオプション",
|
LogMenuTitle: "コミットログオプション",
|
||||||
// ToggleShowGitGraphAll: "toggle show whole git graph (pass the `--all` flag to `git log`)",
|
// ToggleShowGitGraphAll: "Toggle show whole git graph (pass the `--all` flag to `git log`)",
|
||||||
ShowGitGraph: "コミットグラフの表示",
|
ShowGitGraph: "コミットグラフの表示",
|
||||||
SortCommits: "コミットの表示順",
|
SortCommits: "コミットの表示順",
|
||||||
// CantChangeContextSizeError: "Cannot change context while in patch building mode because we were too lazy to support it when releasing the feature. If you really want it, please let us know!",
|
// CantChangeContextSizeError: "Cannot change context while in patch building mode because we were too lazy to support it when releasing the feature. If you really want it, please let us know!",
|
||||||
LcOpenCommitInBrowser: "ブラウザでコミットを開く",
|
OpenCommitInBrowser: "ブラウザでコミットを開く",
|
||||||
// LcViewBisectOptions: "view bisect options",
|
// LcViewBisectOptions: "View bisect options",
|
||||||
// ConfirmRevertCommit: "Are you sure you want to revert {{.selectedCommit}}?",
|
// ConfirmRevertCommit: "Are you sure you want to revert {{.selectedCommit}}?",
|
||||||
RewordInEditorTitle: "コミットメッセージをエディタで編集",
|
RewordInEditorTitle: "コミットメッセージをエディタで編集",
|
||||||
// RewordInEditorPrompt: "Are you sure you want to reword this commit in your editor?",
|
// RewordInEditorPrompt: "Are you sure you want to reword this commit in your editor?",
|
||||||
@ -498,11 +494,11 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
CheckoutFile: "ファイルをチェックアウトs",
|
CheckoutFile: "ファイルをチェックアウトs",
|
||||||
// DiscardOldFileChange: "Discard old file change",
|
// DiscardOldFileChange: "Discard old file change",
|
||||||
// SquashCommitDown: "Squash commit down",
|
// SquashCommitDown: "Squash commit down",
|
||||||
FixupCommit: "fixupコミット",
|
FixupCommit: "Fixupコミット",
|
||||||
RewordCommit: "コミットメッセージを変更",
|
RewordCommit: "コミットメッセージを変更",
|
||||||
DropCommit: "コミットを削除",
|
DropCommit: "コミットを削除",
|
||||||
EditCommit: "コミットを編集",
|
EditCommit: "コミットを編集",
|
||||||
AmendCommit: "amendコミット",
|
AmendCommit: "Amendコミット",
|
||||||
RevertCommit: "コミットをrevert",
|
RevertCommit: "コミットをrevert",
|
||||||
CreateFixupCommit: "fixupコミットを作成",
|
CreateFixupCommit: "fixupコミットを作成",
|
||||||
// SquashAllAboveFixupCommits: "Squash all above fixup commits",
|
// SquashAllAboveFixupCommits: "Squash all above fixup commits",
|
||||||
@ -526,7 +522,7 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
UnstageFile: "ファイルをアンステージ",
|
UnstageFile: "ファイルをアンステージ",
|
||||||
UnstageAllFiles: "すべてのファイルをアンステージ",
|
UnstageAllFiles: "すべてのファイルをアンステージ",
|
||||||
StageAllFiles: "すべてのファイルをステージ",
|
StageAllFiles: "すべてのファイルをステージ",
|
||||||
LcIgnoreExcludeFile: "ファイルをignore",
|
IgnoreExcludeFile: "ファイルをignore",
|
||||||
Commit: "コミット",
|
Commit: "コミット",
|
||||||
EditFile: "ファイルを編集",
|
EditFile: "ファイルを編集",
|
||||||
Push: "Push",
|
Push: "Push",
|
||||||
@ -543,7 +539,7 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
MovePatchIntoIndex: "パッチをindexに移動",
|
MovePatchIntoIndex: "パッチをindexに移動",
|
||||||
MovePatchIntoNewCommit: "パッチを次のコミットに移動",
|
MovePatchIntoNewCommit: "パッチを次のコミットに移動",
|
||||||
DeleteRemoteBranch: "リモートブランチを削除",
|
DeleteRemoteBranch: "リモートブランチを削除",
|
||||||
SetBranchUpstream: "upstreamブランチを設定",
|
SetBranchUpstream: "Upstreamブランチを設定",
|
||||||
AddRemote: "リモートを追加",
|
AddRemote: "リモートを追加",
|
||||||
RemoveRemote: "リモートを削除",
|
RemoveRemote: "リモートを削除",
|
||||||
UpdateRemote: "リモートを更新",
|
UpdateRemote: "リモートを更新",
|
||||||
@ -570,22 +566,22 @@ func japaneseTranslationSet() TranslationSet {
|
|||||||
FastForwardBranch: "ブランチをfast forward",
|
FastForwardBranch: "ブランチをfast forward",
|
||||||
Undo: "アンドゥ",
|
Undo: "アンドゥ",
|
||||||
Redo: "リドゥ",
|
Redo: "リドゥ",
|
||||||
CopyPullRequestURL: "pull requestのURLをコピー",
|
CopyPullRequestURL: "Pull requestのURLをコピー",
|
||||||
OpenMergeTool: "マージツールを開く",
|
OpenMergeTool: "マージツールを開く",
|
||||||
OpenCommitInBrowser: "コミットをブラウザで開く",
|
OpenCommitInBrowser: "コミットをブラウザで開く",
|
||||||
OpenPullRequest: "pull requestをブラウザで開く",
|
OpenPullRequest: "Pull requestをブラウザで開く",
|
||||||
StartBisect: "bisectを開始",
|
StartBisect: "Bisectを開始",
|
||||||
ResetBisect: "bisectをリセット",
|
ResetBisect: "Bisectをリセット",
|
||||||
BisectSkip: "bisectをスキップ",
|
BisectSkip: "Bisectをスキップ",
|
||||||
BisectMark: "bisectをマーク",
|
BisectMark: "Bisectをマーク",
|
||||||
},
|
},
|
||||||
Bisect: Bisect{
|
Bisect: Bisect{
|
||||||
// Mark: "mark %s as %s",
|
// Mark: "Mark %s as %s",
|
||||||
// MarkStart: "mark %s as %s (start bisect)",
|
// MarkStart: "Mark %s as %s (start bisect)",
|
||||||
Skip: "%s をスキップする",
|
Skip: "%s をスキップする",
|
||||||
ResetTitle: "'git bisect' をリセット",
|
ResetTitle: "'git bisect' をリセット",
|
||||||
ResetPrompt: "'git bisect' をリセットします。よろしいですか?",
|
ResetPrompt: "'git bisect' をリセットします。よろしいですか?",
|
||||||
ResetOption: "bisectをリセット",
|
ResetOption: "Bisectをリセット",
|
||||||
BisectMenuTitle: "bisect",
|
BisectMenuTitle: "bisect",
|
||||||
CompleteTitle: "Bisect完了",
|
CompleteTitle: "Bisect完了",
|
||||||
// CompletePrompt: "Bisect complete! The following commit introduced the change:\n\n%s\n\nDo you want to reset 'git bisect' now?",
|
// CompletePrompt: "Bisect complete! The following commit introduced the change:\n\n%s\n\nDo you want to reset 'git bisect' now?",
|
||||||
|
|||||||
@ -42,23 +42,22 @@ func koreanTranslationSet() TranslationSet {
|
|||||||
AmendLastCommit: "마지맛 커밋 수정",
|
AmendLastCommit: "마지맛 커밋 수정",
|
||||||
AmendLastCommitTitle: "마지막 커밋 수정",
|
AmendLastCommitTitle: "마지막 커밋 수정",
|
||||||
SureToAmend: "마지막 커밋을 수정하시겠습니까? 그런 다음 커밋 패널에서 커밋 메시지를 변경할 수 있습니다.",
|
SureToAmend: "마지막 커밋을 수정하시겠습니까? 그런 다음 커밋 패널에서 커밋 메시지를 변경할 수 있습니다.",
|
||||||
NoCommitToAmend: "amend 가능한 커밋이 없습니다.",
|
NoCommitToAmend: "Amend 가능한 커밋이 없습니다.",
|
||||||
CommitChangesWithEditor: "Git 편집기를 사용하여 변경 내용을 커밋합니다.",
|
CommitChangesWithEditor: "Git 편집기를 사용하여 변경 내용을 커밋합니다.",
|
||||||
StatusTitle: "상태",
|
StatusTitle: "상태",
|
||||||
LcNavigate: "이동",
|
Menu: "메뉴",
|
||||||
LcMenu: "메뉴",
|
Execute: "실행",
|
||||||
LcExecute: "실행",
|
ToggleStaged: "Staged 전환",
|
||||||
LcToggleStaged: "Staged 전환",
|
ToggleStagedAll: "모든 변경을 Staged/unstaged으로 전환",
|
||||||
LcToggleStagedAll: "모든 변경을 Staged/unstaged으로 전환",
|
ToggleTreeView: "파일 트리뷰로 전환",
|
||||||
LcToggleTreeView: "파일 트리뷰로 전환",
|
OpenMergeTool: "Git mergetool를 열기",
|
||||||
LcOpenMergeTool: "git mergetool를 열기",
|
Refresh: "새로고침",
|
||||||
LcRefresh: "새로고침",
|
Push: "푸시",
|
||||||
LcPush: "푸시",
|
Pull: "업데이트",
|
||||||
LcPull: "업데이트",
|
Scroll: "스크롤",
|
||||||
LcScroll: "스크롤",
|
|
||||||
MergeConflictsTitle: "병합 충돌 내용",
|
MergeConflictsTitle: "병합 충돌 내용",
|
||||||
LcCheckout: "체크아웃",
|
Checkout: "체크아웃",
|
||||||
LcFileFilter: "파일을 필터하기 (Staged/unstaged)",
|
FileFilter: "파일을 필터하기 (Staged/unstaged)",
|
||||||
FilterStagedFiles: "Staged된 파일만 표시",
|
FilterStagedFiles: "Staged된 파일만 표시",
|
||||||
FilterUnstagedFiles: "Stage되지 않은 파일만 표시",
|
FilterUnstagedFiles: "Stage되지 않은 파일만 표시",
|
||||||
ResetCommitFilterState: "필터 리셋",
|
ResetCommitFilterState: "필터 리셋",
|
||||||
@ -66,57 +65,56 @@ func koreanTranslationSet() TranslationSet {
|
|||||||
PullWait: "업데이트 중...",
|
PullWait: "업데이트 중...",
|
||||||
PushWait: "푸시 중...",
|
PushWait: "푸시 중...",
|
||||||
FetchWait: "패치 중...",
|
FetchWait: "패치 중...",
|
||||||
LcSoftReset: "소프트 리셋",
|
SoftReset: "소프트 리셋",
|
||||||
AlreadyCheckedOutBranch: "브랜치가 이미 체크아웃 되었습니다",
|
AlreadyCheckedOutBranch: "브랜치가 이미 체크아웃 되었습니다",
|
||||||
SureForceCheckout: "강제로 체크아웃하시겠습니까? 모든 로컬 변경 사항을 잃게 됩니다.",
|
SureForceCheckout: "강제로 체크아웃하시겠습니까? 모든 로컬 변경 사항을 잃게 됩니다.",
|
||||||
ForceCheckoutBranch: "브랜치 강제 체크아웃",
|
ForceCheckoutBranch: "브랜치 강제 체크아웃",
|
||||||
BranchName: "브랜치 이름",
|
BranchName: "브랜치 이름",
|
||||||
NewBranchNameBranchOff: "새 브랜치 이름 (Branch is off of '{{.branchName}}')",
|
NewBranchNameBranchOff: "새 브랜치 이름 (branch is off of '{{.branchName}}')",
|
||||||
CantDeleteCheckOutBranch: "체크아웃하는 브랜치는 삭제할 수 없습니다!",
|
CantDeleteCheckOutBranch: "체크아웃하는 브랜치는 삭제할 수 없습니다!",
|
||||||
DeleteBranch: "브랜치 삭제",
|
DeleteBranch: "브랜치 삭제",
|
||||||
DeleteBranchMessage: "정말로 브랜치 '{{.selectedBranchName}}' 를 삭제하시겠습니까?",
|
DeleteBranchMessage: "정말로 브랜치 '{{.selectedBranchName}}' 를 삭제하시겠습니까?",
|
||||||
ForceDeleteBranchMessage: "'{{.selectedBranchName}}'는 완전히 병합되지 않았습니다. 정말 삭제하시겠습니까?",
|
ForceDeleteBranchMessage: "'{{.selectedBranchName}}'는 완전히 병합되지 않았습니다. 정말 삭제하시겠습니까?",
|
||||||
LcRebaseBranch: "체크아웃된 브랜치를 이 브랜치에 리베이스",
|
RebaseBranch: "체크아웃된 브랜치를 이 브랜치에 리베이스",
|
||||||
CantRebaseOntoSelf: "브랜치를 자기 자신에게 리베이스할 수는 없습니다.",
|
CantRebaseOntoSelf: "브랜치를 자기 자신에게 리베이스할 수는 없습니다.",
|
||||||
CantMergeBranchIntoItself: "브랜치를 자기 자신에게 병합할 수는 없습니다.",
|
CantMergeBranchIntoItself: "브랜치를 자기 자신에게 병합할 수는 없습니다.",
|
||||||
LcForceCheckout: "강제 체크아웃",
|
ForceCheckout: "강제 체크아웃",
|
||||||
LcCheckoutByName: "이름으로 체크아웃",
|
CheckoutByName: "이름으로 체크아웃",
|
||||||
LcNewBranch: "새 브랜치 생성",
|
NewBranch: "새 브랜치 생성",
|
||||||
LcDeleteBranch: "브랜치 삭제",
|
|
||||||
NoBranchesThisRepo: "저장소에 브랜치가 존재하지 않습니다.",
|
NoBranchesThisRepo: "저장소에 브랜치가 존재하지 않습니다.",
|
||||||
CommitWithoutMessageErr: "커밋 메시지를 입력하세요.",
|
CommitWithoutMessageErr: "커밋 메시지를 입력하세요.",
|
||||||
LcCloseCancel: "닫기/취소",
|
CloseCancel: "닫기/취소",
|
||||||
LcConfirm: "확인",
|
Confirm: "확인",
|
||||||
LcClose: "닫기",
|
Close: "닫기",
|
||||||
LcQuit: "종료",
|
Quit: "종료",
|
||||||
LcSquashDown: "squash down",
|
SquashDown: "Squash down",
|
||||||
LcFixupCommit: "fixup commit",
|
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",
|
||||||
LcPickCommit: "pick commit (when mid-rebase)",
|
PickCommit: "Pick commit (when mid-rebase)",
|
||||||
LcRevertCommit: "커밋 되돌리기",
|
RevertCommit: "커밋 되돌리기",
|
||||||
LcRewordCommit: "커밋메시지 변경",
|
RewordCommit: "커밋메시지 변경",
|
||||||
LcDeleteCommit: "커밋 삭제",
|
DeleteCommit: "커밋 삭제",
|
||||||
LcMoveDownCommit: "커밋을 1개 아래로 이동",
|
MoveDownCommit: "커밋을 1개 아래로 이동",
|
||||||
LcMoveUpCommit: "커밋을 1개 위로 이동",
|
MoveUpCommit: "커밋을 1개 위로 이동",
|
||||||
LcEditCommit: "커밋을 편집",
|
EditCommit: "커밋을 편집",
|
||||||
LcAmendToCommit: "amend commit with staged changes",
|
AmendToCommit: "Amend commit with staged changes",
|
||||||
LcResetCommitAuthor: "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?",
|
||||||
LcRenameCommitEditor: "에디터에서 커밋메시지 수정",
|
RenameCommitEditor: "에디터에서 커밋메시지 수정",
|
||||||
Error: "오류",
|
Error: "오류",
|
||||||
LcPickHunk: "pick hunk",
|
PickHunk: "Pick hunk",
|
||||||
LcPickAllHunks: "pick all hunks",
|
PickAllHunks: "Pick all hunks",
|
||||||
LcUndo: "되돌리기",
|
Undo: "되돌리기",
|
||||||
LcUndoReflog: "되돌리기 (reflog) (실험적)",
|
UndoReflog: "되돌리기 (reflog) (실험적)",
|
||||||
LcRedoReflog: "다시 실행 (reflog) (실험적)",
|
RedoReflog: "다시 실행 (reflog) (실험적)",
|
||||||
LcPop: "pop",
|
Pop: "Pop",
|
||||||
LcDrop: "drop",
|
Drop: "Drop",
|
||||||
LcApply: "적용",
|
Apply: "적용",
|
||||||
NoStashEntries: "Stash가 존재하지 않습니다.",
|
NoStashEntries: "Stash가 존재하지 않습니다.",
|
||||||
StashDrop: "Stash를 삭제",
|
StashDrop: "Stash를 삭제",
|
||||||
SureDropStashEntry: "정말로 Stash를 삭제하시겠습니까?",
|
SureDropStashEntry: "정말로 Stash를 삭제하시겠습니까?",
|
||||||
@ -126,7 +124,7 @@ func koreanTranslationSet() TranslationSet {
|
|||||||
SureApplyStashEntry: "정말로 Stash를 적용하시겠습니까?",
|
SureApplyStashEntry: "정말로 Stash를 적용하시겠습니까?",
|
||||||
NoTrackedStagedFilesStash: "You have no tracked/staged files to stash",
|
NoTrackedStagedFilesStash: "You have no tracked/staged files to stash",
|
||||||
StashChanges: "변경을 Stash",
|
StashChanges: "변경을 Stash",
|
||||||
LcRenameStash: "rename stash",
|
RenameStash: "Rename stash",
|
||||||
RenameStashPrompt: "Rename stash: {{.stashName}}",
|
RenameStashPrompt: "Rename stash: {{.stashName}}",
|
||||||
OpenConfig: "설정 파일 열기",
|
OpenConfig: "설정 파일 열기",
|
||||||
EditConfig: "설정 파일 수정",
|
EditConfig: "설정 파일 수정",
|
||||||
@ -134,7 +132,7 @@ func koreanTranslationSet() TranslationSet {
|
|||||||
ForcePushPrompt: "브랜치가 원격 브랜치에서 분기하고 있습니다. 'esc'를 눌러 취소하거나, 'enter'를 눌러 강제로 푸시하세요.",
|
ForcePushPrompt: "브랜치가 원격 브랜치에서 분기하고 있습니다. 'esc'를 눌러 취소하거나, 'enter'를 눌러 강제로 푸시하세요.",
|
||||||
ForcePushDisabled: "브랜치가 원격 브랜치에서 분기하고 있습니다. force push가 비활성화 되었습니다.",
|
ForcePushDisabled: "브랜치가 원격 브랜치에서 분기하고 있습니다. force push가 비활성화 되었습니다.",
|
||||||
UpdatesRejectedAndForcePushDisabled: "업데이트가 거부되었으며 강제 푸시를 비활성화했습니다.",
|
UpdatesRejectedAndForcePushDisabled: "업데이트가 거부되었으며 강제 푸시를 비활성화했습니다.",
|
||||||
LcCheckForUpdate: "업데이트 확인",
|
CheckForUpdate: "업데이트 확인",
|
||||||
CheckingForUpdates: "업데이트 확인 중...",
|
CheckingForUpdates: "업데이트 확인 중...",
|
||||||
UpdateAvailableTitle: "새로운 업데이트 사용가능!",
|
UpdateAvailableTitle: "새로운 업데이트 사용가능!",
|
||||||
UpdateAvailable: "버전 {{.newVersion}} 을(를) 설치하시겠습니까?",
|
UpdateAvailable: "버전 {{.newVersion}} 을(를) 설치하시겠습니까?",
|
||||||
@ -152,41 +150,39 @@ func koreanTranslationSet() TranslationSet {
|
|||||||
MergeToolPrompt: "정말로 `git mergetool`을 여시겠습니까?",
|
MergeToolPrompt: "정말로 `git mergetool`을 여시겠습니까?",
|
||||||
IntroPopupMessage: koreanIntroPopupMessage,
|
IntroPopupMessage: koreanIntroPopupMessage,
|
||||||
GitconfigParseErr: `따옴표로 묶이지 않은 '\' 문자가 있어서 Gogit이 gitconfig 파일을 분석하지 못했습니다. 이를 제거하면 문제가 해결됩니다.`,
|
GitconfigParseErr: `따옴표로 묶이지 않은 '\' 문자가 있어서 Gogit이 gitconfig 파일을 분석하지 못했습니다. 이를 제거하면 문제가 해결됩니다.`,
|
||||||
LcEditFile: `파일 편집`,
|
EditFile: `파일 편집`,
|
||||||
LcOpenFile: `파일 닫기`,
|
OpenFile: `파일 닫기`,
|
||||||
LcIgnoreFile: `.gitignore에 추가`,
|
IgnoreFile: `.gitignore에 추가`,
|
||||||
LcRefreshFiles: `파일 새로고침`,
|
RefreshFiles: `파일 새로고침`,
|
||||||
LcMergeIntoCurrentBranch: `현재 브랜치에 병합`,
|
MergeIntoCurrentBranch: `현재 브랜치에 병합`,
|
||||||
ConfirmQuit: `정말로 종료하시겠습니까?`,
|
ConfirmQuit: `정말로 종료하시겠습니까?`,
|
||||||
SwitchRepo: `최근에 사용한 저장소로 전환`,
|
SwitchRepo: `최근에 사용한 저장소로 전환`,
|
||||||
LcAllBranchesLogGraph: `모든 브랜치 로그 표시`,
|
AllBranchesLogGraph: `모든 브랜치 로그 표시`,
|
||||||
UnsupportedGitService: `지원되지 않는 Git 서비스입니다.`,
|
UnsupportedGitService: `지원되지 않는 Git 서비스입니다.`,
|
||||||
LcCreatePullRequest: `풀 리퀘스트 생성`,
|
CreatePullRequest: `풀 리퀘스트 생성`,
|
||||||
LcCopyPullRequestURL: `풀 리퀘스트 URL을 클립보드에 복사`,
|
CopyPullRequestURL: `풀 리퀘스트 URL을 클립보드에 복사`,
|
||||||
NoBranchOnRemote: `브랜치가 원격에 없습니다. 원격에 먼저 푸시해야합니다.`,
|
NoBranchOnRemote: `브랜치가 원격에 없습니다. 원격에 먼저 푸시해야합니다.`,
|
||||||
LcFetch: `fetch`,
|
Fetch: `Fetch`,
|
||||||
NoAutomaticGitFetchTitle: `자동 git 업데이트) 없음`,
|
NoAutomaticGitFetchTitle: `자동 git 업데이트) 없음`,
|
||||||
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`,
|
StageSelection: `선택한 행을 staged / unstaged`,
|
||||||
ResetSelection: `변경을 삭제 (git reset)`,
|
ResetSelection: `변경을 삭제 (git reset)`,
|
||||||
ToggleDragSelect: `드래그 선택 전환`,
|
ToggleDragSelect: `드래그 선택 전환`,
|
||||||
ToggleSelectHunk: `toggle select hunk`,
|
ToggleSelectHunk: `Toggle select hunk`,
|
||||||
ToggleSelectionForPatch: `line(s)을 패치에 추가/삭제`,
|
ToggleSelectionForPatch: `Line(s)을 패치에 추가/삭제`,
|
||||||
ToggleStagingPanel: `패널 전환`,
|
ToggleStagingPanel: `패널 전환`,
|
||||||
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}} ...",
|
||||||
FoundConflicts: "Conflicts! To abort press 'esc', otherwise press 'enter'",
|
FoundConflicts: "Conflicts! To abort press 'esc', otherwise press 'enter'",
|
||||||
FoundConflictsTitle: "Auto-merge failed",
|
FoundConflictsTitle: "Auto-merge failed",
|
||||||
PickHunk: "pick hunk",
|
ViewMergeRebaseOptions: "View merge/rebase options",
|
||||||
PickAllHunks: "pick all hunks",
|
|
||||||
ViewMergeRebaseOptions: "view merge/rebase options",
|
|
||||||
NotMergingOrRebasing: "You are currently neither rebasing nor merging",
|
NotMergingOrRebasing: "You are currently neither rebasing nor merging",
|
||||||
RecentRepos: "최근에 사용한 저장소",
|
RecentRepos: "최근에 사용한 저장소",
|
||||||
MergeOptionsTitle: "Merge Options",
|
MergeOptionsTitle: "Merge options",
|
||||||
RebaseOptionsTitle: "Rebase Options",
|
RebaseOptionsTitle: "Rebase options",
|
||||||
CommitMessageTitle: "커밋메시지",
|
CommitMessageTitle: "커밋메시지",
|
||||||
LocalBranchesTitle: "브랜치",
|
LocalBranchesTitle: "브랜치",
|
||||||
SearchTitle: "검색",
|
SearchTitle: "검색",
|
||||||
@ -207,10 +203,10 @@ func koreanTranslationSet() TranslationSet {
|
|||||||
ErrorOccurred: "오류가 발생했습니다! issue를 작성해 주세요: ",
|
ErrorOccurred: "오류가 발생했습니다! issue를 작성해 주세요: ",
|
||||||
NoRoom: "Not enough room",
|
NoRoom: "Not enough room",
|
||||||
YouAreHere: "현재 위치",
|
YouAreHere: "현재 위치",
|
||||||
LcRewordNotSupported: "rewording commits while interactively rebasing is not currently supported",
|
RewordNotSupported: "Rewording commits while interactively rebasing is not currently supported",
|
||||||
LcCherryPickCopy: "커밋을 복사 (cherry-pick)",
|
CherryPickCopy: "커밋을 복사 (cherry-pick)",
|
||||||
LcCherryPickCopyRange: "커밋을 범위로 복사 (cherry-pick)",
|
CherryPickCopyRange: "커밋을 범위로 복사 (cherry-pick)",
|
||||||
LcPasteCommits: "커밋을 붙여넣기 (cherry-pick)",
|
PasteCommits: "커밋을 붙여넣기 (cherry-pick)",
|
||||||
SureCherryPick: "정말로 복사한 커밋을 이 브랜치에 체리픽하시겠습니까?",
|
SureCherryPick: "정말로 복사한 커밋을 이 브랜치에 체리픽하시겠습니까?",
|
||||||
CherryPick: "체리픽",
|
CherryPick: "체리픽",
|
||||||
Donate: "후원",
|
Donate: "후원",
|
||||||
@ -225,31 +221,31 @@ func koreanTranslationSet() TranslationSet {
|
|||||||
SelectNextHunk: "다음 hunk를 선택",
|
SelectNextHunk: "다음 hunk를 선택",
|
||||||
ScrollDown: "아래로 스크롤",
|
ScrollDown: "아래로 스크롤",
|
||||||
ScrollUp: "위로 스크롤",
|
ScrollUp: "위로 스크롤",
|
||||||
LcScrollUpMainPanel: "메인 패널을 위로 스크롤",
|
ScrollUpMainPanel: "메인 패널을 위로 스크롤",
|
||||||
LcScrollDownMainPanel: "메인 패널을 아래로로 스크롤",
|
ScrollDownMainPanel: "메인 패널을 아래로로 스크롤",
|
||||||
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?",
|
||||||
DeleteCommitTitle: "커밋 삭제",
|
DeleteCommitTitle: "커밋 삭제",
|
||||||
DeleteCommitPrompt: "정말로 선택한 커밋을 삭제하시겠습니까?",
|
DeleteCommitPrompt: "정말로 선택한 커밋을 삭제하시겠습니까?",
|
||||||
SquashingStatus: "squashing",
|
SquashingStatus: "Squashing",
|
||||||
FixingStatus: "fixing up",
|
FixingStatus: "Fixing up",
|
||||||
DeletingStatus: "deleting",
|
DeletingStatus: "Deleting",
|
||||||
MovingStatus: "moving",
|
MovingStatus: "Moving",
|
||||||
RebasingStatus: "rebasing",
|
RebasingStatus: "Rebasing",
|
||||||
AmendingStatus: "amending",
|
AmendingStatus: "Amending",
|
||||||
CherryPickingStatus: "cherry-picking",
|
CherryPickingStatus: "Cherry-picking",
|
||||||
UndoingStatus: "undoing",
|
UndoingStatus: "Undoing",
|
||||||
RedoingStatus: "redoing",
|
RedoingStatus: "Redoing",
|
||||||
CheckingOutStatus: "checking out",
|
CheckingOutStatus: "Checking out",
|
||||||
CommittingStatus: "committing",
|
CommittingStatus: "Committing",
|
||||||
CommitFiles: "Commit files",
|
CommitFiles: "Commit files",
|
||||||
SubCommitsDynamicTitle: "커밋 (%s)",
|
SubCommitsDynamicTitle: "커밋 (%s)",
|
||||||
CommitFilesDynamicTitle: "Diff files (%s)",
|
CommitFilesDynamicTitle: "Diff files (%s)",
|
||||||
RemoteBranchesDynamicTitle: "원격브랜치 (%s)",
|
RemoteBranchesDynamicTitle: "원격브랜치 (%s)",
|
||||||
LcViewItemFiles: "view selected item's files",
|
ViewItemFiles: "View selected item's files",
|
||||||
CommitFilesTitle: "커밋 파일",
|
CommitFilesTitle: "커밋 파일",
|
||||||
LcCheckoutCommitFile: "checkout file",
|
CheckoutCommitFile: "Checkout file",
|
||||||
LcDiscardOldFileChange: "discard this commit's changes to this file",
|
DiscardOldFileChange: "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",
|
||||||
@ -257,191 +253,189 @@ 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 ",
|
||||||
LcViewDiscardOptions: "view 'discard changes' options",
|
ViewDiscardOptions: "View 'discard changes' options",
|
||||||
LcCancel: "취소",
|
Cancel: "취소",
|
||||||
LcDiscardAllChanges: "모든 변경사항 버리기",
|
DiscardAllChanges: "모든 변경사항 버리기",
|
||||||
LcDiscardUnstagedChanges: "discard unstaged changes",
|
DiscardUnstagedChanges: "Discard unstaged changes",
|
||||||
LcDiscardAllChangesToAllFiles: "nuke working tree",
|
DiscardAllChangesToAllFiles: "Nuke working tree",
|
||||||
LcDiscardAnyUnstagedChanges: "discard unstaged changes",
|
DiscardAnyUnstagedChanges: "Discard unstaged changes",
|
||||||
LcDiscardUntrackedFiles: "discard untracked files",
|
DiscardUntrackedFiles: "Discard untracked files",
|
||||||
LcHardReset: "hard reset",
|
HardReset: "Hard reset",
|
||||||
LcViewResetOptions: `view reset options`,
|
ViewResetOptions: `View reset options`,
|
||||||
LcCreateFixupCommit: `create fixup commit for this commit`,
|
CreateFixupCommitDescription: `Create fixup commit for this commit`,
|
||||||
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: `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}}?`,
|
||||||
LcExecuteCustomCommand: "execute custom command",
|
ExecuteCustomCommand: "Execute custom command",
|
||||||
CustomCommand: "Custom Command:",
|
CustomCommand: "Custom command:",
|
||||||
LcCommitChangesWithoutHook: "commit changes without pre-commit hook",
|
CommitChangesWithoutHook: "Commit changes without pre-commit hook",
|
||||||
SkipHookPrefixNotConfigured: "You have not configured a commit message prefix for skipping hooks. Set `git.skipHookPrefix = 'WIP'` in your config",
|
SkipHookPrefixNotConfigured: "You have not configured a commit message prefix for skipping hooks. Set `git.skipHookPrefix = 'WIP'` in your config",
|
||||||
LcResetTo: `reset to`,
|
ResetTo: `Reset to`,
|
||||||
PressEnterToReturn: "엔터를 눌러 lazygit으로 돌아갑니다.",
|
PressEnterToReturn: "엔터를 눌러 lazygit으로 돌아갑니다.",
|
||||||
LcViewStashOptions: "Stash 옵션 보기",
|
ViewStashOptions: "Stash 옵션 보기",
|
||||||
LcStashAllChanges: "변경사항을 Stash",
|
StashAllChanges: "변경사항을 Stash",
|
||||||
LcStashStagedChanges: "stash staged changes",
|
StashStagedChanges: "Stash staged changes",
|
||||||
LcStashOptions: "Stash 옵션",
|
StashOptions: "Stash 옵션",
|
||||||
NotARepository: "Error: must be run inside a git repository",
|
NotARepository: "Error: must be run inside a git repository",
|
||||||
LcJump: "패널로 이동",
|
Jump: "패널로 이동",
|
||||||
LcScrollLeftRight: "좌우로 스크롤",
|
ScrollLeftRight: "좌우로 스크롤",
|
||||||
LcScrollLeft: "우 스크롤",
|
ScrollLeft: "우 스크롤",
|
||||||
LcScrollRight: "좌 스크롤",
|
ScrollRight: "좌 스크롤",
|
||||||
DiscardPatch: "patch 버리기",
|
DiscardPatch: "Patch 버리기",
|
||||||
DiscardPatchConfirm: "You can only build a patch from one commit/stash-entry at a time. Discard current patch?",
|
DiscardPatchConfirm: "You can only build a patch from one commit/stash-entry at a time. Discard current patch?",
|
||||||
CantPatchWhileRebasingError: "You cannot build a patch or run patch commands while in a merging or rebasing state",
|
CantPatchWhileRebasingError: "You cannot build a patch or run patch commands while in a merging or rebasing state",
|
||||||
LcToggleAddToPatch: "toggle file included in patch",
|
ToggleAddToPatch: "Toggle file included in patch",
|
||||||
LcToggleAllInPatch: "toggle all files included in patch",
|
ToggleAllInPatch: "Toggle all files included in patch",
|
||||||
LcUpdatingPatch: "updating patch",
|
UpdatingPatch: "Updating patch",
|
||||||
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",
|
||||||
LcEnterFile: "enter file to add selected lines to the patch (or toggle directory collapsed)",
|
EnterFile: "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: `원격목록으로 돌아가기`,
|
||||||
LcAddNewRemote: `새로운 Remote 추가`,
|
AddNewRemote: `새로운 Remote 추가`,
|
||||||
LcNewRemoteName: `새로운 Remote 이름:`,
|
NewRemoteName: `새로운 Remote 이름:`,
|
||||||
LcNewRemoteUrl: `새로운 Remote URL:`,
|
NewRemoteUrl: `새로운 Remote URL:`,
|
||||||
LcEditRemoteName: `{{.remoteName}} 의 새로운 Remote 이름 입력:`,
|
EditRemoteName: `{{.remoteName}} 의 새로운 Remote 이름 입력:`,
|
||||||
LcEditRemoteUrl: `{{.remoteName}} 의 새로운 Remote URL 입력:`,
|
EditRemoteUrl: `{{.remoteName}} 의 새로운 Remote URL 입력:`,
|
||||||
LcRemoveRemote: `Remote를 삭제`,
|
RemoveRemote: `Remote를 삭제`,
|
||||||
LcRemoveRemotePrompt: "정말로 Remote를 삭제하시겠습니까?",
|
RemoveRemotePrompt: "정말로 Remote를 삭제하시겠습니까?",
|
||||||
DeleteRemoteBranch: "원격 브랜치를 삭제",
|
DeleteRemoteBranch: "원격 브랜치를 삭제",
|
||||||
DeleteRemoteBranchMessage: "정말로 원격 브랜치를 삭제하시겠습니까?",
|
DeleteRemoteBranchMessage: "정말로 원격 브랜치를 삭제하시겠습니까?",
|
||||||
LcSetUpstream: "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}}'",
|
||||||
LcEditRemote: "Remote를 수정",
|
EditRemote: "Remote를 수정",
|
||||||
LcTagCommit: "tag commit",
|
TagCommit: "Tag commit",
|
||||||
TagMenuTitle: "태그 작성",
|
TagMenuTitle: "태그 작성",
|
||||||
TagNameTitle: "태그 이름:",
|
TagNameTitle: "태그 이름:",
|
||||||
TagMessageTitle: "태그 메시지: ",
|
TagMessageTitle: "태그 메시지: ",
|
||||||
LcAnnotatedTag: "annotated tag",
|
AnnotatedTag: "Annotated tag",
|
||||||
LcLightweightTag: "lightweight tag",
|
LightweightTag: "Lightweight tag",
|
||||||
LcDeleteTag: "태그 삭제",
|
DeleteTag: "태그 삭제",
|
||||||
DeleteTagTitle: "태그 삭제",
|
DeleteTagTitle: "태그 삭제",
|
||||||
DeleteTagPrompt: "정말로 태그 '{{.tagName}}' 를 삭제하시겠습니까?",
|
DeleteTagPrompt: "정말로 태그 '{{.tagName}}' 를 삭제하시겠습니까?",
|
||||||
PushTagTitle: "원격에 태그 '{{.tagName}}' 를 푸시",
|
PushTagTitle: "원격에 태그 '{{.tagName}}' 를 푸시",
|
||||||
LcPushTag: "태그를 push",
|
PushTag: "태그를 push",
|
||||||
LcCreateTag: "태그를 생성",
|
CreateTag: "태그를 생성",
|
||||||
CreateTagTitle: "태그 이름:",
|
CreateTagTitle: "태그 이름:",
|
||||||
LcFetchRemote: "원격을 업데이트",
|
FetchRemote: "원격을 업데이트",
|
||||||
FetchingRemoteStatus: "원격을 업데이트 중",
|
FetchingRemoteStatus: "원격을 업데이트 중",
|
||||||
LcCheckoutCommit: "커밋을 체크아웃",
|
CheckoutCommit: "커밋을 체크아웃",
|
||||||
SureCheckoutThisCommit: "정말로 선택한 커밋을 체크아웃 하시겠습니까?",
|
SureCheckoutThisCommit: "정말로 선택한 커밋을 체크아웃 하시겠습니까?",
|
||||||
LcGitFlowOptions: "git-flow 옵션 보기",
|
GitFlowOptions: "Git-flow 옵션 보기",
|
||||||
NotAGitFlowBranch: "This does not seem to be a git flow branch",
|
NotAGitFlowBranch: "This does not seem to be a git flow branch",
|
||||||
NewGitFlowBranchPrompt: "new {{.branchType}} name:",
|
NewGitFlowBranchPrompt: "New {{.branchType}} name:",
|
||||||
IgnoreTracked: "Ignore tracked file",
|
IgnoreTracked: "Ignore tracked file",
|
||||||
IgnoreTrackedPrompt: "Are you sure you want to ignore a tracked file?",
|
IgnoreTrackedPrompt: "Are you sure you want to ignore a tracked file?",
|
||||||
LcViewResetToUpstreamOptions: "view upstream reset options",
|
ViewResetToUpstreamOptions: "View upstream reset options",
|
||||||
LcNextScreenMode: "다음 스크린 모드 (normal/half/fullscreen)",
|
NextScreenMode: "다음 스크린 모드 (normal/half/fullscreen)",
|
||||||
LcPrevScreenMode: "이전 스크린 모드",
|
PrevScreenMode: "이전 스크린 모드",
|
||||||
LcStartSearch: "검색 시작",
|
StartSearch: "검색 시작",
|
||||||
Panel: "패널",
|
Panel: "패널",
|
||||||
Keybindings: "키 바인딩",
|
Keybindings: "키 바인딩",
|
||||||
LcRenameBranch: "브랜치 이름 변경",
|
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?",
|
||||||
LcOpenMenu: "매뉴 열기",
|
OpenMenu: "매뉴 열기",
|
||||||
LcResetCherryPick: "reset cherry-picked (copied) commits selection",
|
ResetCherryPick: "Reset cherry-picked (copied) commits selection",
|
||||||
LcNextTab: "이전 탭",
|
NextTab: "이전 탭",
|
||||||
LcPrevTab: "다음 탭",
|
PrevTab: "다음 탭",
|
||||||
LcCantUndoWhileRebasing: "리베이스중에는 되돌릴 수 없습니다.",
|
CantUndoWhileRebasing: "리베이스중에는 되돌릴 수 없습니다.",
|
||||||
LcCantRedoWhileRebasing: "리베이스중에는 다시 실행할 수 없습니다.",
|
CantRedoWhileRebasing: "리베이스중에는 다시 실행할 수 없습니다.",
|
||||||
MustStashWarning: "Pulling a patch out into the index requires stashing and unstashing your changes. If something goes wrong, you'll be able to access your files from the stash. Continue?",
|
MustStashWarning: "Pulling a patch out into the index requires stashing and unstashing your changes. If something goes wrong, you'll be able to access your files from the stash. Continue?",
|
||||||
MustStashTitle: "Must stash",
|
MustStashTitle: "Must stash",
|
||||||
ConfirmationTitle: "확인 패널",
|
ConfirmationTitle: "확인 패널",
|
||||||
LcPrevPage: "이전 페이지",
|
PrevPage: "이전 페이지",
|
||||||
LcNextPage: "다음 페이지",
|
NextPage: "다음 페이지",
|
||||||
LcGotoTop: "맨 위로 스크롤 ",
|
GotoTop: "맨 위로 스크롤 ",
|
||||||
LcGotoBottom: "맨 아래로 스크롤 ",
|
GotoBottom: "맨 아래로 스크롤 ",
|
||||||
LcFilteringBy: "filtering by",
|
FilteringBy: "Filtering by",
|
||||||
ResetInParentheses: "(reset)",
|
ResetInParentheses: "(reset)",
|
||||||
LcOpenFilteringMenu: "view filter-by-path options",
|
OpenFilteringMenu: "View filter-by-path options",
|
||||||
LcFilterBy: "filter by",
|
FilterBy: "Filter by",
|
||||||
LcExitFilterMode: "stop filtering by path",
|
ExitFilterMode: "Stop filtering by path",
|
||||||
LcFilterPathOption: "enter path to filter by",
|
FilterPathOption: "Enter path to filter by",
|
||||||
EnterFileName: "Enter path:",
|
EnterFileName: "Enter path:",
|
||||||
FilteringMenuTitle: "Filtering",
|
FilteringMenuTitle: "Filtering",
|
||||||
MustExitFilterModeTitle: "Command not available",
|
MustExitFilterModeTitle: "Command not available",
|
||||||
MustExitFilterModePrompt: "Command not available in filtered mode. Exit filtered mode?",
|
MustExitFilterModePrompt: "Command not available in filtered mode. Exit filtered mode?",
|
||||||
LcDiff: "Diff",
|
Diff: "Diff",
|
||||||
LcEnterRefToDiff: "enter ref to diff",
|
EnterRefToDiff: "Enter ref to diff",
|
||||||
LcEnteRefName: "ref 입력:",
|
EnteRefName: "Ref 입력:",
|
||||||
LcExitDiffMode: "Diff 모드 종료",
|
ExitDiffMode: "Diff 모드 종료",
|
||||||
DiffingMenuTitle: "Diff",
|
DiffingMenuTitle: "Diff",
|
||||||
LcSwapDiff: "reverse diff direction",
|
SwapDiff: "Reverse diff direction",
|
||||||
LcOpenDiffingMenu: "Diff 메뉴 열기",
|
OpenDiffingMenu: "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
|
||||||
LcOpenExtrasMenu: "명령어 로그 메뉴 열기",
|
OpenExtrasMenu: "명령어 로그 메뉴 열기",
|
||||||
LcShowingGitDiff: "showing output for:",
|
ShowingGitDiff: "Showing output for:",
|
||||||
LcCommitDiff: "커밋의 iff",
|
CommitDiff: "커밋의 iff",
|
||||||
LcCopyCommitShaToClipboard: "커밋 SHA를 클립보드에 복사",
|
CopyCommitShaToClipboard: "커밋 SHA를 클립보드에 복사",
|
||||||
LcCommitSha: "커밋 SHA",
|
CommitSha: "커밋 SHA",
|
||||||
LcCommitURL: "커밋 URL",
|
CommitURL: "커밋 URL",
|
||||||
LcCopyCommitMessageToClipboard: "커밋 메시지를 클립보드에 복사",
|
CopyCommitMessageToClipboard: "커밋 메시지를 클립보드에 복사",
|
||||||
LcCommitMessage: "커밋 메시지",
|
CommitMessage: "커밋 메시지",
|
||||||
LcCommitAuthor: "커밋 작성자",
|
CommitAuthor: "커밋 작성자",
|
||||||
LcCopyCommitAttributeToClipboard: "커밋 attribute 복사",
|
CopyCommitAttributeToClipboard: "커밋 attribute 복사",
|
||||||
LcCopyBranchNameToClipboard: "브랜치명을 클립보드에 복사",
|
CopyBranchNameToClipboard: "브랜치명을 클립보드에 복사",
|
||||||
LcCopyFileNameToClipboard: "파일명을 클립보드에 복사",
|
CopyFileNameToClipboard: "파일명을 클립보드에 복사",
|
||||||
LcCopyCommitFileNameToClipboard: "커밋한 파일명을 클립보드에 복사",
|
CopyCommitFileNameToClipboard: "커밋한 파일명을 클립보드에 복사",
|
||||||
LcCopySelectedTexToClipboard: "선택한 텍스트를 클립보드에 복사",
|
CopySelectedTexToClipboard: "선택한 텍스트를 클립보드에 복사",
|
||||||
LcCommitPrefixPatternError: "Error in commitPrefix pattern",
|
CommitPrefixPatternError: "Error in commitPrefix pattern",
|
||||||
NoFilesStagedTitle: "파일이 Staged 되지 않았습니다.",
|
NoFilesStagedTitle: "파일이 Staged 되지 않았습니다.",
|
||||||
NoFilesStagedPrompt: "파일이 Staged 되지 않았습니다. 모든 파일을 커밋하시겠습니까?",
|
NoFilesStagedPrompt: "파일이 Staged 되지 않았습니다. 모든 파일을 커밋하시겠습니까?",
|
||||||
BranchNotFoundTitle: "브랜치를 찾을 수 없습니다.",
|
BranchNotFoundTitle: "브랜치를 찾을 수 없습니다.",
|
||||||
BranchNotFoundPrompt: "브랜치를 찾을 수 없습니다. 새로운 브랜치를 생성합니다.",
|
BranchNotFoundPrompt: "브랜치를 찾을 수 없습니다. 새로운 브랜치를 생성합니다.",
|
||||||
UnstageLinesTitle: "선택한 라인을 unstaged",
|
UnstageLinesTitle: "선택한 라인을 unstaged",
|
||||||
UnstageLinesPrompt: "정말로 선택한 라인을 삭제 (git reset) 하시겠습니까? 이 조작은 취소할 수 없습니다.\n이 경고를 비활성화 하려면 설정 파일의 'gui.skipUnstageLineWarning' 를 true로 설정하세요.",
|
UnstageLinesPrompt: "정말로 선택한 라인을 삭제 (git reset) 하시겠습니까? 이 조작은 취소할 수 없습니다.\n이 경고를 비활성화 하려면 설정 파일의 'gui.skipUnstageLineWarning' 를 true로 설정하세요.",
|
||||||
LcCreateNewBranchFromCommit: "커밋에서 새 브랜치를 만듭니다.",
|
CreateNewBranchFromCommit: "커밋에서 새 브랜치를 만듭니다.",
|
||||||
LcBuildingPatch: "building patch",
|
BuildingPatch: "Building patch",
|
||||||
LcViewCommits: "커밋 보기",
|
ViewCommits: "커밋 보기",
|
||||||
MinGitVersionError: "lazygit 실행을 위해서는 Git 2.20 이후의 버전(2018년 이후의)이 필요합니다. Git를 업데이트 해주세요. 아니면 lazygit이 이전 버전과 더 잘 호환되도록 https://github.com/jesseduffield/lazygit/issues 에 issue를 작성해 주세요.",
|
MinGitVersionError: "Lazygit 실행을 위해서는 Git 2.20 이후의 버전(2018년 이후의)이 필요합니다. Git를 업데이트 해주세요. 아니면 lazygit이 이전 버전과 더 잘 호환되도록 https://github.com/jesseduffield/lazygit/issues 에 issue를 작성해 주세요.",
|
||||||
LcRunningCustomCommandStatus: "커스텀 명령어 실행",
|
RunningCustomCommandStatus: "커스텀 명령어 실행",
|
||||||
LcSubmoduleStashAndReset: "stash uncommitted submodule changes and update",
|
SubmoduleStashAndReset: "Stash uncommitted submodule changes and update",
|
||||||
LcAndResetSubmodules: "and reset submodules",
|
AndResetSubmodules: "And reset submodules",
|
||||||
LcEnterSubmodule: "서브모듈 열기",
|
EnterSubmodule: "서브모듈 열기",
|
||||||
LcCopySubmoduleNameToClipboard: "서브모듈 이름을 클립보드에 복사",
|
CopySubmoduleNameToClipboard: "서브모듈 이름을 클립보드에 복사",
|
||||||
RemoveSubmodule: "서브모듈 삭제",
|
RemoveSubmodule: "서브모듈 삭제",
|
||||||
LcRemoveSubmodule: "서브모듈 삭제",
|
|
||||||
RemoveSubmodulePrompt: "정말로 서브모듈 '%s'및 해당 디렉토리를 제거하시겠습니까? 이것은 되돌릴 수 없습니다.",
|
RemoveSubmodulePrompt: "정말로 서브모듈 '%s'및 해당 디렉토리를 제거하시겠습니까? 이것은 되돌릴 수 없습니다.",
|
||||||
LcResettingSubmoduleStatus: "서브모듈를 리셋",
|
ResettingSubmoduleStatus: "서브모듈를 리셋",
|
||||||
LcNewSubmoduleName: "새로운 서브모듈이름 :",
|
NewSubmoduleName: "새로운 서브모듈이름 :",
|
||||||
LcNewSubmoduleUrl: "새로운 서브모듈의 URL:",
|
NewSubmoduleUrl: "새로운 서브모듈의 URL:",
|
||||||
LcNewSubmodulePath: "새로운 서브모듈의 경로",
|
NewSubmodulePath: "새로운 서브모듈의 경로",
|
||||||
LcAddSubmodule: "새로운 서브모듈 추가",
|
AddSubmodule: "새로운 서브모듈 추가",
|
||||||
LcAddingSubmoduleStatus: "새로운 서브모듈 추가",
|
AddingSubmoduleStatus: "새로운 서브모듈 추가",
|
||||||
LcUpdateSubmoduleUrl: "서브모듈 '%s' 의 URL을 업데이트",
|
UpdateSubmoduleUrl: "서브모듈 '%s' 의 URL을 업데이트",
|
||||||
LcUpdatingSubmoduleUrlStatus: "updating URL",
|
UpdatingSubmoduleUrlStatus: "Updating URL",
|
||||||
LcEditSubmoduleUrl: "서브모듈의 URL을 수정",
|
EditSubmoduleUrl: "서브모듈의 URL을 수정",
|
||||||
LcInitializingSubmoduleStatus: "서브모듈 초기화",
|
InitializingSubmoduleStatus: "서브모듈 초기화",
|
||||||
LcInitSubmodule: "서브모듈 초기화",
|
InitSubmodule: "서브모듈 초기화",
|
||||||
LcSubmoduleUpdate: "서브모듈 업데이트",
|
SubmoduleUpdate: "서브모듈 업데이트",
|
||||||
LcUpdatingSubmoduleStatus: "서브모듈 업데이트",
|
UpdatingSubmoduleStatus: "서브모듈 업데이트",
|
||||||
LcBulkInitSubmodules: "서브모듈 일괄 초기화",
|
BulkInitSubmodules: "서브모듈 일괄 초기화",
|
||||||
LcBulkUpdateSubmodules: "서브모듈 일괄 업데이트",
|
BulkUpdateSubmodules: "서브모듈 일괄 업데이트",
|
||||||
LcBulkDeinitSubmodules: "bulk deinit submodules",
|
BulkDeinitSubmodules: "Bulk deinit submodules",
|
||||||
LcViewBulkSubmoduleOptions: "view bulk submodule options",
|
ViewBulkSubmoduleOptions: "View bulk submodule options",
|
||||||
LcBulkSubmoduleOptions: "bulk submodule options",
|
BulkSubmoduleOptions: "Bulk submodule options",
|
||||||
LcRunningCommand: "running command",
|
RunningCommand: "Running command",
|
||||||
SubCommitsTitle: "Sub-commits",
|
SubCommitsTitle: "Sub-commits",
|
||||||
SubmodulesTitle: "서브모듈",
|
SubmodulesTitle: "서브모듈",
|
||||||
NavigationTitle: "List Panel Navigation",
|
NavigationTitle: "List panel navigation",
|
||||||
SuggestionsCheatsheetTitle: "추천",
|
SuggestionsCheatsheetTitle: "추천",
|
||||||
SuggestionsTitle: "추천 (press %s to focus)",
|
SuggestionsTitle: "추천 (press %s to focus)",
|
||||||
ExtrasTitle: "명령어 로그",
|
ExtrasTitle: "명령어 로그",
|
||||||
PushingTagStatus: "pushing tag",
|
PushingTagStatus: "Pushing tag",
|
||||||
PullRequestURLCopiedToClipboard: "풀 리퀘스트의 URL을 클립보드에 복사했습니다.",
|
PullRequestURLCopiedToClipboard: "풀 리퀘스트의 URL을 클립보드에 복사했습니다.",
|
||||||
CommitDiffCopiedToClipboard: "커밋의 Diff를 클립보드에 복사했습니다.",
|
CommitDiffCopiedToClipboard: "커밋의 Diff를 클립보드에 복사했습니다.",
|
||||||
CommitSHACopiedToClipboard: "커밋의 SHA를 클립보드에 복사했습니다.",
|
CommitSHACopiedToClipboard: "커밋의 SHA를 클립보드에 복사했습니다.",
|
||||||
CommitURLCopiedToClipboard: "커밋의 URL를 클립보드에 복사했습니다.",
|
CommitURLCopiedToClipboard: "커밋의 URL를 클립보드에 복사했습니다.",
|
||||||
CommitMessageCopiedToClipboard: "커밋 메시지를 클립보드에 복사했습니다.",
|
CommitMessageCopiedToClipboard: "커밋 메시지를 클립보드에 복사했습니다.",
|
||||||
CommitAuthorCopiedToClipboard: "커밋 작성자를 클립보드에 복사했습니다.",
|
CommitAuthorCopiedToClipboard: "커밋 작성자를 클립보드에 복사했습니다.",
|
||||||
LcCopiedToClipboard: "클립보드에 복사했습니다.",
|
CopiedToClipboard: "클립보드에 복사했습니다.",
|
||||||
ErrCannotEditDirectory: "디렉토리는 편집할 수 없습니다.",
|
ErrCannotEditDirectory: "디렉토리는 편집할 수 없습니다.",
|
||||||
ErrStageDirWithInlineMergeConflicts: "병합 충돌이 발생한 파일을 포함하는 디렉토리는 Staged/untaged할 수 없습니다. 병합 충돌을 먼저 해결하세요.",
|
ErrStageDirWithInlineMergeConflicts: "병합 충돌이 발생한 파일을 포함하는 디렉토리는 Staged/untaged할 수 없습니다. 병합 충돌을 먼저 해결하세요.",
|
||||||
ErrRepositoryMovedOrDeleted: "저장소를 찾을 수 없습니다. 이미 삭제되었거나 이동되었을 가능성이 있습니다. ¯\\_(ツ)_/¯",
|
ErrRepositoryMovedOrDeleted: "저장소를 찾을 수 없습니다. 이미 삭제되었거나 이동되었을 가능성이 있습니다. ¯\\_(ツ)_/¯",
|
||||||
@ -452,30 +446,28 @@ func koreanTranslationSet() TranslationSet {
|
|||||||
RandomTip: "랜덤 Tip",
|
RandomTip: "랜덤 Tip",
|
||||||
SelectParentCommitForMerge: "병합을 위한 상위 커밋 선택",
|
SelectParentCommitForMerge: "병합을 위한 상위 커밋 선택",
|
||||||
ToggleWhitespaceInDiffView: "공백문자를 Diff 뷰에서 표시 여부 전환",
|
ToggleWhitespaceInDiffView: "공백문자를 Diff 뷰에서 표시 여부 전환",
|
||||||
IncreaseContextInDiffView: "diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기",
|
IncreaseContextInDiffView: "Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기",
|
||||||
DecreaseContextInDiffView: "diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기",
|
DecreaseContextInDiffView: "Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기",
|
||||||
CreatePullRequest: "풀 리퀘스트 생성",
|
|
||||||
CreatePullRequestOptions: "풀 리퀘스트 생성 옵션",
|
CreatePullRequestOptions: "풀 리퀘스트 생성 옵션",
|
||||||
LcCreatePullRequestOptions: "풀 리퀘스트 생성 옵션",
|
DefaultBranch: "기본 브랜치",
|
||||||
LcDefaultBranch: "기본 브랜치",
|
SelectBranch: "브랜치를 선택",
|
||||||
LcSelectBranch: "브랜치를 선택",
|
|
||||||
SelectConfigFile: "설정파일 선택",
|
SelectConfigFile: "설정파일 선택",
|
||||||
NoConfigFileFoundErr: "설정 파일을 찾지 못했습니다.",
|
NoConfigFileFoundErr: "설정 파일을 찾지 못했습니다.",
|
||||||
LcLoadingFileSuggestions: "파일 제안 로딩 중",
|
LoadingFileSuggestions: "파일 제안 로딩 중",
|
||||||
LcLoadingCommits: "커밋 로딩",
|
LoadingCommits: "커밋 로딩",
|
||||||
MustSpecifyOriginError: "Must specify a remote if specifying a branch",
|
MustSpecifyOriginError: "Must specify a remote if specifying a branch",
|
||||||
GitOutput: "Git output:",
|
GitOutput: "Git output:",
|
||||||
GitCommandFailed: "Git command failed. Check command log for details (open with %s)",
|
GitCommandFailed: "Git command failed. Check command log for details (open with %s)",
|
||||||
AbortTitle: "%s 중지",
|
AbortTitle: "%s 중지",
|
||||||
AbortPrompt: "정말로 실행중인 %s 를 중지할까요?",
|
AbortPrompt: "정말로 실행중인 %s 를 중지할까요?",
|
||||||
LcOpenLogMenu: "로그 메뉴 열기",
|
OpenLogMenu: "로그 메뉴 열기",
|
||||||
LogMenuTitle: "커밋 로그 옵션",
|
LogMenuTitle: "커밋 로그 옵션",
|
||||||
ToggleShowGitGraphAll: "toggle show whole git graph (pass the `--all` flag to `git log`)",
|
ToggleShowGitGraphAll: "Toggle show whole git graph (pass the `--all` flag to `git log`)",
|
||||||
ShowGitGraph: "커밋 그래프 표시",
|
ShowGitGraph: "커밋 그래프 표시",
|
||||||
SortCommits: "커밋 정렬",
|
SortCommits: "커밋 정렬",
|
||||||
CantChangeContextSizeError: "Cannot change context while in patch building mode because we were too lazy to support it when releasing the feature. If you really want it, please let us know!",
|
CantChangeContextSizeError: "Cannot change context while in patch building mode because we were too lazy to support it when releasing the feature. If you really want it, please let us know!",
|
||||||
LcOpenCommitInBrowser: "브라우저에서 커밋 열기",
|
OpenCommitInBrowser: "브라우저에서 커밋 열기",
|
||||||
LcViewBisectOptions: "bisect 옵션 보기",
|
ViewBisectOptions: "Bisect 옵션 보기",
|
||||||
ConfirmRevertCommit: "Are you sure you want to revert {{.selectedCommit}}?",
|
ConfirmRevertCommit: "Are you sure you want to revert {{.selectedCommit}}?",
|
||||||
RewordInEditorTitle: "커밋 메시지를 에디터에서 수정",
|
RewordInEditorTitle: "커밋 메시지를 에디터에서 수정",
|
||||||
RewordInEditorPrompt: "Are you sure you want to reword this commit in your editor?",
|
RewordInEditorPrompt: "Are you sure you want to reword this commit in your editor?",
|
||||||
@ -492,7 +484,7 @@ func koreanTranslationSet() TranslationSet {
|
|||||||
Merge: "병합",
|
Merge: "병합",
|
||||||
RebaseBranch: "브랜치 리베이스",
|
RebaseBranch: "브랜치 리베이스",
|
||||||
RenameBranch: "브랜치 이름 변경",
|
RenameBranch: "브랜치 이름 변경",
|
||||||
SetUnsetUpstream: "Set/unset upstream",
|
SetUnsetUpstream: "Set/Unset upstream",
|
||||||
CreateBranch: "브랜치 생성",
|
CreateBranch: "브랜치 생성",
|
||||||
CherryPick: "(Cherry-pick) 커밋 붙여넣기",
|
CherryPick: "(Cherry-pick) 커밋 붙여넣기",
|
||||||
CheckoutFile: "체크아웃 파일",
|
CheckoutFile: "체크아웃 파일",
|
||||||
@ -505,7 +497,7 @@ func koreanTranslationSet() TranslationSet {
|
|||||||
AmendCommit: "커밋 Amend",
|
AmendCommit: "커밋 Amend",
|
||||||
ResetCommitAuthor: "커밋 작성자 Reset",
|
ResetCommitAuthor: "커밋 작성자 Reset",
|
||||||
RevertCommit: "커밋 Revert",
|
RevertCommit: "커밋 Revert",
|
||||||
CreateFixupCommit: "fixup 커밋 생성",
|
CreateFixupCommit: "Fixup 커밋 생성",
|
||||||
SquashAllAboveFixupCommits: "Squash all above fixup commits",
|
SquashAllAboveFixupCommits: "Squash all above fixup commits",
|
||||||
CreateLightweightTag: "Create lightweight tag",
|
CreateLightweightTag: "Create lightweight tag",
|
||||||
CreateAnnotatedTag: "Create annotated tag",
|
CreateAnnotatedTag: "Create annotated tag",
|
||||||
@ -527,7 +519,7 @@ func koreanTranslationSet() TranslationSet {
|
|||||||
UnstageFile: "Unstage file",
|
UnstageFile: "Unstage file",
|
||||||
UnstageAllFiles: "Unstage all files",
|
UnstageAllFiles: "Unstage all files",
|
||||||
StageAllFiles: "Stage all files",
|
StageAllFiles: "Stage all files",
|
||||||
LcIgnoreExcludeFile: "ignore file",
|
IgnoreExcludeFile: "Ignore file",
|
||||||
Commit: "커밋",
|
Commit: "커밋",
|
||||||
EditFile: "파일 수정",
|
EditFile: "파일 수정",
|
||||||
Push: "푸시",
|
Push: "푸시",
|
||||||
@ -537,8 +529,8 @@ func koreanTranslationSet() TranslationSet {
|
|||||||
StashAllChangesKeepIndex: "Stash all changes and keep index",
|
StashAllChangesKeepIndex: "Stash all changes and keep index",
|
||||||
StashStagedChanges: "Stash staged changes",
|
StashStagedChanges: "Stash staged changes",
|
||||||
StashUnstagedChanges: "Stash unstaged changes",
|
StashUnstagedChanges: "Stash unstaged changes",
|
||||||
GitFlowFinish: "Git flow finish",
|
GitFlowFinish: "git flow finish",
|
||||||
GitFlowStart: "Git Flow start",
|
GitFlowStart: "git flow start",
|
||||||
CopyToClipboard: "Copy to clipboard",
|
CopyToClipboard: "Copy to clipboard",
|
||||||
CopySelectedTextToClipboard: "Copy selected text to clipboard",
|
CopySelectedTextToClipboard: "Copy selected text to clipboard",
|
||||||
RemovePatchFromCommit: "Remove patch from commit",
|
RemovePatchFromCommit: "Remove patch from commit",
|
||||||
@ -565,9 +557,9 @@ func koreanTranslationSet() TranslationSet {
|
|||||||
DeleteTag: "태그 삭제",
|
DeleteTag: "태그 삭제",
|
||||||
PushTag: "태그 푸시g",
|
PushTag: "태그 푸시g",
|
||||||
NukeWorkingTree: "Nuke working tree",
|
NukeWorkingTree: "Nuke working tree",
|
||||||
DiscardUnstagedFileChanges: "unstaged 파일 변경사항 버리기",
|
DiscardUnstagedFileChanges: "Unstaged 파일 변경사항 버리기",
|
||||||
RemoveUntrackedFiles: "untracked 파일 삭제",
|
RemoveUntrackedFiles: "Untracked 파일 삭제",
|
||||||
RemoveStagedFiles: "staged 파일 삭제",
|
RemoveStagedFiles: "Staged 파일 삭제",
|
||||||
SoftReset: "Soft reset",
|
SoftReset: "Soft reset",
|
||||||
MixedReset: "Mixed reset",
|
MixedReset: "Mixed reset",
|
||||||
HardReset: "Hard reset",
|
HardReset: "Hard reset",
|
||||||
@ -584,13 +576,13 @@ func koreanTranslationSet() TranslationSet {
|
|||||||
BisectMark: "Bisect mark",
|
BisectMark: "Bisect mark",
|
||||||
},
|
},
|
||||||
Bisect: Bisect{
|
Bisect: Bisect{
|
||||||
Mark: "mark %s as %s",
|
Mark: "Mark %s as %s",
|
||||||
MarkStart: "mark %s as %s (start bisect)",
|
MarkStart: "Mark %s as %s (start bisect)",
|
||||||
Skip: "%s 를 스킵",
|
Skip: "%s 를 스킵",
|
||||||
ResetTitle: "'git bisect' 를 리셋",
|
ResetTitle: "'git bisect' 를 리셋",
|
||||||
ResetPrompt: "정말로 'git bisect' 를 리셋하시겠습니까?",
|
ResetPrompt: "정말로 'git bisect' 를 리셋하시겠습니까?",
|
||||||
ResetOption: "bisect를 리셋",
|
ResetOption: "Bisect를 리셋",
|
||||||
BisectMenuTitle: "bisect",
|
BisectMenuTitle: "Bisect",
|
||||||
CompleteTitle: "Bisect 완료",
|
CompleteTitle: "Bisect 완료",
|
||||||
CompletePrompt: "Bisect complete! The following commit introduced the change:\n\n%s\n\nDo you want to reset 'git bisect' now?",
|
CompletePrompt: "Bisect complete! The following commit introduced the change:\n\n%s\n\nDo you want to reset 'git bisect' now?",
|
||||||
CompletePromptIndeterminate: "Bisect complete! Some commits were skipped, so any of the following commits may have introduced the change:\n\n%s\n\nDo you want to reset 'git bisect' now?",
|
CompletePromptIndeterminate: "Bisect complete! Some commits were skipped, so any of the following commits may have introduced the change:\n\n%s\n\nDo you want to reset 'git bisect' now?",
|
||||||
|
|||||||
@ -17,23 +17,22 @@ func polishTranslationSet() TranslationSet {
|
|||||||
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",
|
CommitChanges: "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.",
|
||||||
NoCommitToAmend: "Brak commitów do zmiany.",
|
NoCommitToAmend: "Brak commitów do zmiany.",
|
||||||
CommitChangesWithEditor: "Zatwierdź zmiany używając edytora",
|
CommitChangesWithEditor: "Zatwierdź zmiany używając edytora",
|
||||||
StatusTitle: "Status",
|
StatusTitle: "Status",
|
||||||
GlobalTitle: "Globalne",
|
GlobalTitle: "Globalne",
|
||||||
LcNavigate: "nawiguj",
|
Menu: "Menu",
|
||||||
LcMenu: "menu",
|
Execute: "Wykonaj",
|
||||||
LcExecute: "wykonaj",
|
ToggleStaged: "Przełącz stan poczekalni",
|
||||||
LcToggleStaged: "przełącz stan poczekalni",
|
ToggleStagedAll: "Przełącz stan poczekalni wszystkich",
|
||||||
LcToggleStagedAll: "przełącz stan poczekalni wszystkich",
|
Refresh: "Odśwież",
|
||||||
LcRefresh: "odśwież",
|
Scroll: "Przewiń",
|
||||||
LcScroll: "przewiń",
|
|
||||||
FilterStagedFiles: "Pokaż tylko pliki w poczekalni",
|
FilterStagedFiles: "Pokaż tylko pliki w poczekalni",
|
||||||
FilterUnstagedFiles: "Pokaż tylko pliki poza poczekalnią",
|
FilterUnstagedFiles: "Pokaż tylko pliki poza poczekalnią",
|
||||||
ResetCommitFilterState: "Resetuj filtr commitów",
|
ResetCommitFilterState: "Resetuj filtr commitów",
|
||||||
LcCheckout: "przełącz",
|
Checkout: "Przełącz",
|
||||||
NoChangedFiles: "Brak zmienionych plików",
|
NoChangedFiles: "Brak zmienionych plików",
|
||||||
PullWait: "Pobieranie zmian...",
|
PullWait: "Pobieranie zmian...",
|
||||||
PushWait: "Wysyłanie zmian...",
|
PushWait: "Wysyłanie zmian...",
|
||||||
@ -47,69 +46,68 @@ func polishTranslationSet() TranslationSet {
|
|||||||
DeleteBranch: "Usuń gałąź",
|
DeleteBranch: "Usuń gałąź",
|
||||||
DeleteBranchMessage: "Jesteś pewien, że chcesz usunąć gałąź '{{.selectedBranchName}}' ?",
|
DeleteBranchMessage: "Jesteś pewien, że chcesz usunąć gałąź '{{.selectedBranchName}}' ?",
|
||||||
ForceDeleteBranchMessage: "Na pewno wymusić usunięcie gałęzi '{{.selectedBranchName}}'?",
|
ForceDeleteBranchMessage: "Na pewno wymusić usunięcie gałęzi '{{.selectedBranchName}}'?",
|
||||||
LcRebaseBranch: "zmiana bazy gałęzi",
|
RebaseBranch: "Zmiana bazy gałęzi",
|
||||||
CantRebaseOntoSelf: "Nie możesz zmienić bazy gałęzi na nią samą",
|
CantRebaseOntoSelf: "Nie możesz zmienić bazy gałęzi na nią samą",
|
||||||
CantMergeBranchIntoItself: "Nie możesz scalić gałęzi do samej siebie",
|
CantMergeBranchIntoItself: "Nie możesz scalić gałęzi do samej siebie",
|
||||||
LcForceCheckout: "wymuś przełączenie",
|
ForceCheckout: "Wymuś przełączenie",
|
||||||
LcCheckoutByName: "przełącz używając nazwy",
|
CheckoutByName: "Przełącz używając nazwy",
|
||||||
LcNewBranch: "nowa gałąź",
|
NewBranch: "Nowa gałąź",
|
||||||
LcDeleteBranch: "usuń gałąź",
|
|
||||||
NoBranchesThisRepo: "Brak gałęzi dla tego repozytorium",
|
NoBranchesThisRepo: "Brak gałęzi dla tego repozytorium",
|
||||||
CommitWithoutMessageErr: "Nie możesz commitować bez komunikatu",
|
CommitWithoutMessageErr: "Nie możesz commitować bez komunikatu",
|
||||||
LcCloseCancel: "zamknij",
|
CloseCancel: "Zamknij",
|
||||||
LcConfirm: "potwierdź",
|
Confirm: "Potwierdź",
|
||||||
LcClose: "zamknij",
|
Close: "Zamknij",
|
||||||
LcSquashDown: "ściśnij",
|
SquashDown: "Ściśnij",
|
||||||
LcFixupCommit: "napraw commit",
|
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",
|
||||||
LcRewordCommit: "zmień nazwę commita",
|
RewordCommit: "Zmień nazwę commita",
|
||||||
LcRenameCommitEditor: "zmień nazwę commita w edytorze",
|
RenameCommitEditor: "Zmień nazwę commita w edytorze",
|
||||||
Error: "Błąd",
|
Error: "Błąd",
|
||||||
LcPickHunk: "wybierz kawałek",
|
PickHunk: "Wybierz kawałek",
|
||||||
LcPickAllHunks: "wybierz oba kawałki",
|
PickAllHunks: "Wybierz oba kawałki",
|
||||||
LcUndo: "cofnij",
|
Undo: "Cofnij",
|
||||||
LcPop: "wyciągnij",
|
Pop: "Wyciągnij",
|
||||||
LcDrop: "porzuć",
|
Drop: "Porzuć",
|
||||||
LcApply: "zastosuj",
|
Apply: "Zastosuj",
|
||||||
NoStashEntries: "Brak pozycji w schowku",
|
NoStashEntries: "Brak pozycji w schowku",
|
||||||
StashDrop: "Porzuć schowek",
|
StashDrop: "Porzuć schowek",
|
||||||
SureDropStashEntry: "Jesteś pewny, że chcesz porzucić tę pozycję w schowku?",
|
SureDropStashEntry: "Jesteś pewny, że chcesz porzucić tę pozycję w schowku?",
|
||||||
NoTrackedStagedFilesStash: "Nie masz śledzonych/zatwierdzonych plików do przechowania",
|
NoTrackedStagedFilesStash: "Nie masz śledzonych/zatwierdzonych plików do przechowania",
|
||||||
StashChanges: "Przechowaj zmiany",
|
StashChanges: "Przechowaj zmiany",
|
||||||
LcRenameStash: "rename stash",
|
RenameStash: "Rename stash",
|
||||||
RenameStashPrompt: "Rename stash: {{.stashName}}",
|
RenameStashPrompt: "Rename stash: {{.stashName}}",
|
||||||
OpenConfig: "otwórz konfigurację",
|
OpenConfig: "Otwórz konfigurację",
|
||||||
EditConfig: "edytuj konfigurację",
|
EditConfig: "Edytuj konfigurację",
|
||||||
ForcePush: "Wymuś wysłanie",
|
ForcePush: "Wymuś wysłanie",
|
||||||
ForcePushPrompt: "Twoja gałąź rozeszła się z gałęzią zdalną. Wciśnij 'esc' aby anulować lub 'enter' aby wymusić wysłanie.",
|
ForcePushPrompt: "Twoja gałąź rozeszła się z gałęzią zdalną. Wciśnij 'esc' aby anulować lub 'enter' aby wymusić wysłanie.",
|
||||||
ForcePushDisabled: "Twoja gałąź rozeszła się z gałęzią zdalną i wyłączyłeś wymuszenie wysłania",
|
ForcePushDisabled: "Twoja gałąź rozeszła się z gałęzią zdalną i wyłączyłeś wymuszenie wysłania",
|
||||||
UpdatesRejectedAndForcePushDisabled: "Aktualizacje zostały odrzucone i wyłączyłeś wymuszenie wysłania",
|
UpdatesRejectedAndForcePushDisabled: "Aktualizacje zostały odrzucone i wyłączyłeś wymuszenie wysłania",
|
||||||
LcCheckForUpdate: "sprawdź aktualizacje",
|
CheckForUpdate: "Sprawdź aktualizacje",
|
||||||
CheckingForUpdates: "Sprawdzanie aktualizacji...",
|
CheckingForUpdates: "Sprawdzanie aktualizacji...",
|
||||||
OnLatestVersionErr: "Już posiadasz najnowszą wersję",
|
OnLatestVersionErr: "Już posiadasz najnowszą wersję",
|
||||||
MajorVersionErr: "Nowa wersja ({{.newVersion}}) posiada niekompatybilne zmiany w porównaniu do obecnej wersji ({{.currentVersion}})",
|
MajorVersionErr: "Nowa wersja ({{.newVersion}}) posiada niekompatybilne zmiany w porównaniu do obecnej wersji ({{.currentVersion}})",
|
||||||
CouldNotFindBinaryErr: "Nie można znaleźć pliku binarnego w {{.url}}",
|
CouldNotFindBinaryErr: "Nie można znaleźć pliku binarnego w {{.url}}",
|
||||||
LcEditFile: "edytuj plik",
|
EditFile: "Edytuj plik",
|
||||||
LcOpenFile: "otwórz plik",
|
OpenFile: "Otwórz plik",
|
||||||
LcIgnoreFile: "dodaj do .gitignore",
|
IgnoreFile: "Dodaj do .gitignore",
|
||||||
LcRefreshFiles: "odśwież pliki",
|
RefreshFiles: "Odśwież pliki",
|
||||||
LcMergeIntoCurrentBranch: "scal do obecnej gałęzi",
|
MergeIntoCurrentBranch: "Scal do obecnej gałęzi",
|
||||||
ConfirmQuit: "Na pewno chcesz wyjść z programu?",
|
ConfirmQuit: "Na pewno chcesz wyjść z programu?",
|
||||||
LcAllBranchesLogGraph: "pokaż wszystkie logi gałęzi",
|
AllBranchesLogGraph: "Pokaż wszystkie logi gałęzi",
|
||||||
UnsupportedGitService: "Nieobsługiwana usługa git",
|
UnsupportedGitService: "Nieobsługiwana usługa git",
|
||||||
LcCreatePullRequest: "utwórz żądanie pobrania",
|
CreatePullRequest: "Utwórz żądanie pobrania",
|
||||||
LcCopyPullRequestURL: "skopiuj adres URL żądania pobrania do schowka",
|
CopyPullRequestURL: "Skopiuj adres URL żądania pobrania do schowka",
|
||||||
NoBranchOnRemote: "Ta gałąź nie istnieje w zdalnym repo. Najpierw musisz ją wysłać.",
|
NoBranchOnRemote: "Ta gałąź nie istnieje w zdalnym repo. Najpierw musisz ją wysłać.",
|
||||||
LcFetch: "pobierz",
|
Fetch: "Pobierz",
|
||||||
NoAutomaticGitFetchTitle: `Brak automatycznego "git fetch"`,
|
NoAutomaticGitFetchTitle: `Brak automatycznego "git fetch"`,
|
||||||
NoAutomaticGitFetchBody: `Lazygit nie może użyć "git fetch" w prywatnym repo, użyj f w panelu gałęzi żeby uruchomić "git fetch" ręcznie`,
|
NoAutomaticGitFetchBody: `Lazygit nie może użyć "git fetch" w prywatnym repo, użyj f w panelu gałęzi żeby uruchomić "git fetch" ręcznie`,
|
||||||
FileEnter: "zatwierdź pojedyncze linie",
|
FileEnter: "Zatwierdź pojedyncze linie",
|
||||||
FileStagingRequirements: "Można tylko zatwierdzić pojedyncze linie dla śledzonych plików z niezatwierdzonymi zmianami",
|
FileStagingRequirements: "Można tylko zatwierdzić pojedyncze linie dla śledzonych plików z niezatwierdzonymi zmianami",
|
||||||
StagingTitle: "Poczekalnia",
|
StagingTitle: "Poczekalnia",
|
||||||
ReturnToFilesPanel: "wróć do panelu plików",
|
ReturnToFilesPanel: "Wróć do panelu plików",
|
||||||
MergingTitle: "Scalanie",
|
MergingTitle: "Scalanie",
|
||||||
ConfirmMerge: "Czy na pewno chcesz scalić '{{.selectedBranch}}' do '{{.checkedOutBranch}}'?",
|
ConfirmMerge: "Czy na pewno chcesz scalić '{{.selectedBranch}}' do '{{.checkedOutBranch}}'?",
|
||||||
FwdNoUpstream: "Nie można przewinąć gałęzi bez gałęzi nadrzędnej",
|
FwdNoUpstream: "Nie można przewinąć gałęzi bez gałęzi nadrzędnej",
|
||||||
@ -117,61 +115,59 @@ func polishTranslationSet() TranslationSet {
|
|||||||
ErrorOccurred: "Wystąpił błąd! Zgłoś problem na",
|
ErrorOccurred: "Wystąpił błąd! Zgłoś problem na",
|
||||||
MainTitle: "Główne",
|
MainTitle: "Główne",
|
||||||
NormalTitle: "Zwykłe",
|
NormalTitle: "Zwykłe",
|
||||||
LcSoftReset: "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",
|
||||||
LcPickCommit: "wybierz commit (podczas zmiany bazy)",
|
PickCommit: "Wybierz commit (podczas zmiany bazy)",
|
||||||
LcRevertCommit: "odwróć commit",
|
RevertCommit: "Odwróć commit",
|
||||||
LcDeleteCommit: "usuń commit",
|
DeleteCommit: "Usuń commit",
|
||||||
LcMoveDownCommit: "przenieś commit 1 w dół",
|
MoveDownCommit: "Przenieś commit 1 w dół",
|
||||||
LcMoveUpCommit: "przenieś commit 1 w górę",
|
MoveUpCommit: "Przenieś commit 1 w górę",
|
||||||
LcEditCommit: "edytuj commit",
|
EditCommit: "Edytuj commit",
|
||||||
LcAmendToCommit: "popraw commit zmianami z poczekalni",
|
AmendToCommit: "Popraw commit zmianami z poczekalni",
|
||||||
FoundConflicts: "Konflikty! Wciśnij 'esc' żeby przerwać, w przeciwnym razie wciśnij 'enter'",
|
FoundConflicts: "Konflikty! Wciśnij 'esc' żeby przerwać, w przeciwnym razie wciśnij 'enter'",
|
||||||
FoundConflictsTitle: "Automatyczne scalenie nie powiodło się",
|
FoundConflictsTitle: "Automatyczne scalenie nie powiodło się",
|
||||||
PickHunk: "wybierz kawałek",
|
ViewMergeRebaseOptions: "Widok scalenia/opcje zmiany bazy",
|
||||||
PickAllHunks: "wybierz wszystkie kawałki",
|
|
||||||
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",
|
||||||
RecentRepos: "ostatnie repozytoria",
|
RecentRepos: "Ostatnie repozytoria",
|
||||||
MergeOptionsTitle: "Opcje scalania",
|
MergeOptionsTitle: "Opcje scalania",
|
||||||
RebaseOptionsTitle: "Opcje zmiany bazy",
|
RebaseOptionsTitle: "Opcje zmiany bazy",
|
||||||
ConflictsResolved: "Wszystkie konflikty scalania rozwiązane. Kontynuować?",
|
ConflictsResolved: "Wszystkie konflikty scalania rozwiązane. Kontynuować?",
|
||||||
NoRoom: "Brak miejsca",
|
NoRoom: "Brak miejsca",
|
||||||
YouAreHere: "JESTEŚ TU",
|
YouAreHere: "JESTEŚ TU",
|
||||||
LcRewordNotSupported: "przeredagowanie commitów podczas interaktywnej zmiany bazy nie jest obecnie wspierane",
|
RewordNotSupported: "Przeredagowanie commitów podczas interaktywnej zmiany bazy nie jest obecnie wspierane",
|
||||||
LcCherryPickCopy: "kopiuj commit (przebieranie)",
|
CherryPickCopy: "Kopiuj commit (przebieranie)",
|
||||||
LcCherryPickCopyRange: "kopiuj zakres commitów (przebieranie)",
|
CherryPickCopyRange: "Kopiuj zakres commitów (przebieranie)",
|
||||||
LcPasteCommits: "wklej commity (przebieranie)",
|
PasteCommits: "Wklej commity (przebieranie)",
|
||||||
SureCherryPick: "Czy na pewno chcesz przebierać w skopiowanych commitach na tej gałęzi?",
|
SureCherryPick: "Czy na pewno chcesz przebierać w skopiowanych commitach na tej gałęzi?",
|
||||||
CherryPick: "Przebieranie",
|
CherryPick: "Przebieranie",
|
||||||
Donate: "Wesprzyj",
|
Donate: "Wesprzyj",
|
||||||
PrevLine: "poprzednia linia",
|
PrevLine: "Poprzednia linia",
|
||||||
NextLine: "następna linia",
|
NextLine: "Następna linia",
|
||||||
PrevHunk: "poprzedni kawałek",
|
PrevHunk: "Poprzedni kawałek",
|
||||||
NextHunk: "następny kawałek",
|
NextHunk: "Następny kawałek",
|
||||||
PrevConflict: "poprzedni konflikt",
|
PrevConflict: "Poprzedni konflikt",
|
||||||
NextConflict: "następny konflikt",
|
NextConflict: "Następny konflikt",
|
||||||
SelectPrevHunk: "wybierz poprzedni kawałek",
|
SelectPrevHunk: "Wybierz poprzedni kawałek",
|
||||||
SelectNextHunk: "wybierz następny kawałek",
|
SelectNextHunk: "Wybierz następny kawałek",
|
||||||
ScrollDown: "przewiń w dół",
|
ScrollDown: "Przewiń w dół",
|
||||||
ScrollUp: "przewiń w górę",
|
ScrollUp: "Przewiń w górę",
|
||||||
AmendCommitTitle: "Popraw commit",
|
AmendCommitTitle: "Popraw commit",
|
||||||
AmendCommitPrompt: "Czy na pewno chcesz poprawić ten commit plikami z poczekalni?",
|
AmendCommitPrompt: "Czy na pewno chcesz poprawić ten commit plikami z poczekalni?",
|
||||||
DeleteCommitTitle: "Usuń commit",
|
DeleteCommitTitle: "Usuń commit",
|
||||||
DeleteCommitPrompt: "Czy na pewno usunąć ten commit?",
|
DeleteCommitPrompt: "Czy na pewno usunąć ten commit?",
|
||||||
SquashingStatus: "spłaszczanie",
|
SquashingStatus: "Spłaszczanie",
|
||||||
FixingStatus: "naprawianie",
|
FixingStatus: "Naprawianie",
|
||||||
DeletingStatus: "usuwanie",
|
DeletingStatus: "Usuwanie",
|
||||||
MovingStatus: "przenoszenie",
|
MovingStatus: "Przenoszenie",
|
||||||
RebasingStatus: "zmiana bazy",
|
RebasingStatus: "Zmiana bazy",
|
||||||
AmendingStatus: "poprawianie",
|
AmendingStatus: "Poprawianie",
|
||||||
CherryPickingStatus: "przebieranie",
|
CherryPickingStatus: "Przebieranie",
|
||||||
CommitFiles: "Pliki commita",
|
CommitFiles: "Pliki commita",
|
||||||
LcViewItemFiles: "przeglądaj pliki commita",
|
ViewItemFiles: "Przeglądaj pliki commita",
|
||||||
CommitFilesTitle: "Pliki commita",
|
CommitFilesTitle: "Pliki commita",
|
||||||
LcCheckoutCommitFile: "plik wybierania",
|
CheckoutCommitFile: "Plik wybierania",
|
||||||
LcDiscardOldFileChange: "porzuć zmiany commita dla tego pliku",
|
DiscardOldFileChange: "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",
|
||||||
@ -179,48 +175,46 @@ 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 ",
|
||||||
LcViewDiscardOptions: "pokaż opcje porzucania zmian",
|
ViewDiscardOptions: "Pokaż opcje porzucania zmian",
|
||||||
LcCancel: "anuluj",
|
Cancel: "Anuluj",
|
||||||
LcDiscardAllChanges: "porzuć wszystkie zmiany",
|
DiscardAllChanges: "Porzuć wszystkie zmiany",
|
||||||
LcDiscardUnstagedChanges: "porzuć zmiany poza poczekalnią",
|
DiscardUnstagedChanges: "Porzuć zmiany poza poczekalnią",
|
||||||
LcDiscardAllChangesToAllFiles: "wytnij drzewo robocze",
|
DiscardAllChangesToAllFiles: "Wytnij drzewo robocze",
|
||||||
LcDiscardAnyUnstagedChanges: "porzuć zmiany poza poczekalnią",
|
DiscardAnyUnstagedChanges: "Porzuć zmiany poza poczekalnią",
|
||||||
LcDiscardUntrackedFiles: "porzuć pliki nieśledzone",
|
DiscardUntrackedFiles: "Porzuć pliki nieśledzone",
|
||||||
LcHardReset: "twardy reset",
|
HardReset: "Twardy reset",
|
||||||
LcViewResetOptions: "wyświetl opcje resetu",
|
ViewResetOptions: "Wyświetl opcje resetu",
|
||||||
LcCreateFixupCommit: "utwórz commit naprawczy dla tego commita",
|
CreateFixupCommitDescription: "Utwórz commit naprawczy dla tego commita",
|
||||||
LcSquashAboveCommits: `spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash)`,
|
SquashAboveCommits: `Spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash)`,
|
||||||
SquashAboveCommits: `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}}?`,
|
||||||
LcExecuteCustomCommand: "wykonaj własną komendę",
|
ExecuteCustomCommand: "Wykonaj własną komendę",
|
||||||
CustomCommand: "Własna komenda:",
|
CustomCommand: "Własna komenda:",
|
||||||
LcCommitChangesWithoutHook: "zatwierdź zmiany bez skryptu pre-commit",
|
CommitChangesWithoutHook: "Zatwierdź zmiany bez skryptu pre-commit",
|
||||||
SkipHookPrefixNotConfigured: "Nie masz skonfigurowanego prefixa komunikatu commita dla pomijania skryptów. Ustaw `git.skipHookPrefix = 'WIP'` w konfiguracji",
|
SkipHookPrefixNotConfigured: "Nie masz skonfigurowanego prefixa komunikatu commita dla pomijania skryptów. Ustaw `git.skipHookPrefix = 'WIP'` w konfiguracji",
|
||||||
LcResetTo: "zresetuj do",
|
ResetTo: "Zresetuj do",
|
||||||
PressEnterToReturn: "Wciśnij enter żeby wrócić do lazygit",
|
PressEnterToReturn: "Wciśnij enter żeby wrócić do lazygit",
|
||||||
LcViewStashOptions: "wyświetl opcje schowka",
|
ViewStashOptions: "Wyświetl opcje schowka",
|
||||||
LcStashAllChanges: "przechowaj zmiany",
|
StashAllChanges: "Przechowaj zmiany",
|
||||||
LcStashAllChangesKeepIndex: "przechowaj zmiany z poczekalni",
|
StashAllChangesKeepIndex: "Przechowaj zmiany z poczekalni",
|
||||||
LcStashOptions: "Opcje schowka",
|
StashOptions: "Opcje schowka",
|
||||||
NotARepository: "Błąd: nie jesteś w repozytorium",
|
NotARepository: "Błąd: nie jesteś w repozytorium",
|
||||||
LcJump: "przeskocz do panelu",
|
Jump: "Przeskocz do panelu",
|
||||||
ExitCustomPatchBuilder: `wyście z trybu "linia po linii"`,
|
ExitCustomPatchBuilder: `Wyście z trybu "linia po linii"`,
|
||||||
EnterUpstream: `Podaj gałąź nadrzędną jako '<remote> <branchname>'`,
|
EnterUpstream: `Podaj gałąź nadrzędną jako '<remote> <branchname>'`,
|
||||||
ReturnToRemotesList: `wróć do listy repozytoriów zdalnych`,
|
ReturnToRemotesList: `Wróć do listy repozytoriów zdalnych`,
|
||||||
IgnoreTracked: "Ignoruj plik śledzony",
|
IgnoreTracked: "Ignoruj plik śledzony",
|
||||||
IgnoreTrackedPrompt: "Na pewno ignorować plik śledzony?",
|
IgnoreTrackedPrompt: "Na pewno ignorować plik śledzony?",
|
||||||
LcCommitPrefixPatternError: "Błąd we wzorcu prefixu commita",
|
CommitPrefixPatternError: "Błąd we wzorcu prefixu commita",
|
||||||
NoFilesStagedTitle: "Brak plików w poczekalni",
|
NoFilesStagedTitle: "Brak plików w poczekalni",
|
||||||
NoFilesStagedPrompt: "Nie masz plików w poczekalni. Zatwierdzić wszystkie pliki?",
|
NoFilesStagedPrompt: "Nie masz plików w poczekalni. Zatwierdzić wszystkie pliki?",
|
||||||
BranchNotFoundTitle: "Nie znaleziono gałęzi",
|
BranchNotFoundTitle: "Nie znaleziono gałęzi",
|
||||||
BranchNotFoundPrompt: "Nie znaleziono gałęzi. Utwórz nową gałąź ",
|
BranchNotFoundPrompt: "Nie znaleziono gałęzi. Utwórz nową gałąź ",
|
||||||
PullRequestURLCopiedToClipboard: "URL żądania ściągnięcia skopiowany do schowka",
|
PullRequestURLCopiedToClipboard: "URL żądania ściągnięcia skopiowany do schowka",
|
||||||
CommitMessageCopiedToClipboard: "Komunikat commita skopiowany do schowka",
|
CommitMessageCopiedToClipboard: "Komunikat commita skopiowany do schowka",
|
||||||
LcCopiedToClipboard: "skopiowany do schowka",
|
CopiedToClipboard: "Skopiowany do schowka",
|
||||||
CreatePullRequestOptions: "Utwórz opcje żądania ściągnięcia",
|
CreatePullRequestOptions: "Utwórz opcje żądania ściągnięcia",
|
||||||
LcCreatePullRequestOptions: "utwórz opcje żądania ściągnięcia",
|
|
||||||
ConfirmRevertCommit: "Czy na pewno chcesz obrócić {{.selectedCommit}}?",
|
ConfirmRevertCommit: "Czy na pewno chcesz obrócić {{.selectedCommit}}?",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,7 +9,7 @@ func (self *Common) ContinueMerge() {
|
|||||||
self.t.GlobalPress(self.t.keys.Universal.CreateRebaseOptionsMenu)
|
self.t.GlobalPress(self.t.keys.Universal.CreateRebaseOptionsMenu)
|
||||||
|
|
||||||
self.t.ExpectPopup().Menu().
|
self.t.ExpectPopup().Menu().
|
||||||
Title(Equals("Rebase Options")).
|
Title(Equals("Rebase options")).
|
||||||
Select(Contains("continue")).
|
Select(Contains("continue")).
|
||||||
Confirm()
|
Confirm()
|
||||||
}
|
}
|
||||||
@ -27,8 +27,8 @@ func (self *Common) AcknowledgeConflicts() {
|
|||||||
|
|
||||||
func (self *Common) ContinueOnConflictsResolved() {
|
func (self *Common) ContinueOnConflictsResolved() {
|
||||||
self.t.ExpectPopup().Confirmation().
|
self.t.ExpectPopup().Confirmation().
|
||||||
Title(Equals("continue")).
|
Title(Equals("Continue")).
|
||||||
Content(Contains("all merge conflicts resolved. Continue?")).
|
Content(Contains("All merge conflicts resolved. Continue?")).
|
||||||
Confirm()
|
Confirm()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -42,5 +42,5 @@ func (self *Common) ConfirmDiscardLines() {
|
|||||||
func (self *Common) SelectPatchOption(matcher *Matcher) {
|
func (self *Common) SelectPatchOption(matcher *Matcher) {
|
||||||
self.t.GlobalPress(self.t.keys.Universal.CreatePatchOptionsMenu)
|
self.t.GlobalPress(self.t.keys.Universal.CreatePatchOptionsMenu)
|
||||||
|
|
||||||
self.t.ExpectPopup().Menu().Title(Equals("Patch Options")).Select(matcher).Confirm()
|
self.t.ExpectPopup().Menu().Title(Equals("Patch options")).Select(matcher).Confirm()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,14 +19,14 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
t.Views().Commits().
|
t.Views().Commits().
|
||||||
Press(keys.Commits.ViewBisectOptions)
|
Press(keys.Commits.ViewBisectOptions)
|
||||||
|
|
||||||
t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`mark .* as bad`)).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`Mark .* as bad`)).Confirm()
|
||||||
}
|
}
|
||||||
|
|
||||||
markCommitAsGood := func() {
|
markCommitAsGood := func() {
|
||||||
t.Views().Commits().
|
t.Views().Commits().
|
||||||
Press(keys.Commits.ViewBisectOptions)
|
Press(keys.Commits.ViewBisectOptions)
|
||||||
|
|
||||||
t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`mark .* as good`)).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`Mark .* as good`)).Confirm()
|
||||||
}
|
}
|
||||||
|
|
||||||
t.Views().Commits().
|
t.Views().Commits().
|
||||||
@ -36,7 +36,7 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Tap(func() {
|
Tap(func() {
|
||||||
markCommitAsBad()
|
markCommitAsBad()
|
||||||
|
|
||||||
t.Views().Information().Content(Contains("bisecting"))
|
t.Views().Information().Content(Contains("Bisecting"))
|
||||||
}).
|
}).
|
||||||
SelectedLine(Contains("<-- bad")).
|
SelectedLine(Contains("<-- bad")).
|
||||||
NavigateToLine(Contains("commit 02")).
|
NavigateToLine(Contains("commit 02")).
|
||||||
@ -54,6 +54,6 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
IsFocused().
|
IsFocused().
|
||||||
Content(Contains("commit 04"))
|
Content(Contains("commit 04"))
|
||||||
|
|
||||||
t.Views().Information().Content(DoesNotContain("bisecting"))
|
t.Views().Information().Content(DoesNotContain("Bisecting"))
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
@ -19,7 +19,7 @@ var FromOtherBranch = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
},
|
},
|
||||||
SetupConfig: func(cfg *config.AppConfig) {},
|
SetupConfig: func(cfg *config.AppConfig) {},
|
||||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||||
t.Views().Information().Content(Contains("bisecting"))
|
t.Views().Information().Content(Contains("Bisecting"))
|
||||||
|
|
||||||
t.Views().Commits().
|
t.Views().Commits().
|
||||||
Focus().
|
Focus().
|
||||||
@ -32,11 +32,11 @@ var FromOtherBranch = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
SelectNextItem().
|
SelectNextItem().
|
||||||
Press(keys.Commits.ViewBisectOptions).
|
Press(keys.Commits.ViewBisectOptions).
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`mark .* as good`)).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("Bisect")).Select(MatchesRegexp(`Mark .* as good`)).Confirm()
|
||||||
|
|
||||||
t.ExpectPopup().Alert().Title(Equals("Bisect complete")).Content(MatchesRegexp("(?s)commit 08.*Do you want to reset")).Confirm()
|
t.ExpectPopup().Alert().Title(Equals("Bisect complete")).Content(MatchesRegexp("(?s)commit 08.*Do you want to reset")).Confirm()
|
||||||
|
|
||||||
t.Views().Information().Content(DoesNotContain("bisecting"))
|
t.Views().Information().Content(DoesNotContain("Bisecting"))
|
||||||
}).
|
}).
|
||||||
// back in master branch which just had the one commit
|
// back in master branch which just had the one commit
|
||||||
Lines(
|
Lines(
|
||||||
|
|||||||
@ -28,7 +28,7 @@ var CreateTag = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
|
|
||||||
t.ExpectPopup().Menu().
|
t.ExpectPopup().Menu().
|
||||||
Title(Equals("Create tag")).
|
Title(Equals("Create tag")).
|
||||||
Select(Contains("lightweight")).
|
Select(Contains("Lightweight")).
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
t.ExpectPopup().Prompt().
|
t.ExpectPopup().Prompt().
|
||||||
|
|||||||
@ -32,7 +32,7 @@ var Delete = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Universal.Remove).
|
Press(keys.Universal.Remove).
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Confirmation().
|
t.ExpectPopup().Confirmation().
|
||||||
Title(Equals("Delete Branch")).
|
Title(Equals("Delete branch")).
|
||||||
Content(Contains("Are you sure you want to delete the branch 'branch-one'?")).
|
Content(Contains("Are you sure you want to delete the branch 'branch-one'?")).
|
||||||
Confirm()
|
Confirm()
|
||||||
}).
|
}).
|
||||||
|
|||||||
@ -25,7 +25,7 @@ var DetachedHead = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Universal.New)
|
Press(keys.Universal.New)
|
||||||
|
|
||||||
t.ExpectPopup().Prompt().
|
t.ExpectPopup().Prompt().
|
||||||
Title(MatchesRegexp(`^New Branch Name \(Branch is off of '[0-9a-f]+'\)$`)).
|
Title(MatchesRegexp(`^New branch name \(branch is off of '[0-9a-f]+'\)$`)).
|
||||||
Type("new-branch").
|
Type("new-branch").
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
|
|||||||
@ -32,7 +32,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
|
|
||||||
t.ExpectPopup().Menu().
|
t.ExpectPopup().Menu().
|
||||||
Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
|
Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
|
||||||
Select(Contains("simple rebase")).
|
Select(Contains("Simple rebase")).
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
t.Common().AcknowledgeConflicts()
|
t.Common().AcknowledgeConflicts()
|
||||||
@ -46,11 +46,11 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
IsFocused().
|
IsFocused().
|
||||||
PressPrimaryAction()
|
PressPrimaryAction()
|
||||||
|
|
||||||
t.Views().Information().Content(Contains("rebasing"))
|
t.Views().Information().Content(Contains("Rebasing"))
|
||||||
|
|
||||||
t.Common().ContinueOnConflictsResolved()
|
t.Common().ContinueOnConflictsResolved()
|
||||||
|
|
||||||
t.Views().Information().Content(DoesNotContain("rebasing"))
|
t.Views().Information().Content(DoesNotContain("Rebasing"))
|
||||||
|
|
||||||
t.Views().Commits().TopLines(
|
t.Views().Commits().TopLines(
|
||||||
Contains("second-change-branch unrelated change"),
|
Contains("second-change-branch unrelated change"),
|
||||||
|
|||||||
@ -38,10 +38,10 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
|
|
||||||
t.ExpectPopup().Menu().
|
t.ExpectPopup().Menu().
|
||||||
Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
|
Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")).
|
||||||
Select(Contains("simple rebase")).
|
Select(Contains("Simple rebase")).
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
t.Views().Information().Content(Contains("rebasing"))
|
t.Views().Information().Content(Contains("Rebasing"))
|
||||||
|
|
||||||
t.Common().AcknowledgeConflicts()
|
t.Common().AcknowledgeConflicts()
|
||||||
|
|
||||||
@ -77,7 +77,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
|
|
||||||
t.Common().ContinueOnConflictsResolved()
|
t.Common().ContinueOnConflictsResolved()
|
||||||
|
|
||||||
t.Views().Information().Content(DoesNotContain("rebasing"))
|
t.Views().Information().Content(DoesNotContain("Rebasing"))
|
||||||
|
|
||||||
t.Views().Commits().TopLines(
|
t.Views().Commits().TopLines(
|
||||||
Contains("to keep"),
|
Contains("to keep"),
|
||||||
|
|||||||
@ -41,7 +41,7 @@ var RebaseDoesNotAutosquash = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
|
|
||||||
t.ExpectPopup().Menu().
|
t.ExpectPopup().Menu().
|
||||||
Title(Equals("Rebase 'my-branch' onto 'master'")).
|
Title(Equals("Rebase 'my-branch' onto 'master'")).
|
||||||
Select(Contains("simple rebase")).
|
Select(Contains("Simple rebase")).
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
t.Views().Commits().Lines(
|
t.Views().Commits().Lines(
|
||||||
|
|||||||
@ -36,8 +36,8 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Commits.ViewResetOptions)
|
Press(keys.Commits.ViewResetOptions)
|
||||||
|
|
||||||
t.ExpectPopup().Menu().
|
t.ExpectPopup().Menu().
|
||||||
Title(Contains("reset to other-branch")).
|
Title(Contains("Reset to other-branch")).
|
||||||
Select(Contains("hard reset")).
|
Select(Contains("Hard reset")).
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
// assert that we now have the expected commits in the commit panel
|
// assert that we now have the expected commits in the commit panel
|
||||||
|
|||||||
@ -25,8 +25,8 @@ var ResetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Branches.SetUpstream).
|
Press(keys.Branches.SetUpstream).
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Menu().
|
t.ExpectPopup().Menu().
|
||||||
Title(Equals("Set/unset upstream")).
|
Title(Equals("Set/Unset upstream")).
|
||||||
Select(Contains("unset upstream of selected branch")).
|
Select(Contains("Unset upstream of selected branch")).
|
||||||
Confirm()
|
Confirm()
|
||||||
}).
|
}).
|
||||||
Lines(
|
Lines(
|
||||||
|
|||||||
@ -24,8 +24,8 @@ var SetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Branches.SetUpstream).
|
Press(keys.Branches.SetUpstream).
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Menu().
|
t.ExpectPopup().Menu().
|
||||||
Title(Equals("Set/unset upstream")).
|
Title(Equals("Set/Unset upstream")).
|
||||||
Select(Contains(" set upstream of selected branch")). // using leading space to disambiguate from the 'reset' option
|
Select(Contains(" Set upstream of selected branch")). // using leading space to disambiguate from the 'reset' option
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
t.ExpectPopup().Prompt().
|
t.ExpectPopup().Prompt().
|
||||||
|
|||||||
@ -61,7 +61,7 @@ var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Commits.PasteCommits).
|
Press(keys.Commits.PasteCommits).
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Alert().
|
t.ExpectPopup().Alert().
|
||||||
Title(Equals("Cherry-Pick")).
|
Title(Equals("Cherry-pick")).
|
||||||
Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")).
|
Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")).
|
||||||
Confirm()
|
Confirm()
|
||||||
}).
|
}).
|
||||||
|
|||||||
@ -48,7 +48,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Commits.PasteCommits)
|
Press(keys.Commits.PasteCommits)
|
||||||
|
|
||||||
t.ExpectPopup().Alert().
|
t.ExpectPopup().Alert().
|
||||||
Title(Equals("Cherry-Pick")).
|
Title(Equals("Cherry-pick")).
|
||||||
Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")).
|
Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")).
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
|
|||||||
@ -26,7 +26,7 @@ var Amend = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Commits.AmendToCommit)
|
Press(keys.Commits.AmendToCommit)
|
||||||
|
|
||||||
t.ExpectPopup().Confirmation().Title(
|
t.ExpectPopup().Confirmation().Title(
|
||||||
Equals("Amend Last Commit")).
|
Equals("Amend last commit")).
|
||||||
Content(Contains("Are you sure you want to amend last commit?")).
|
Content(Contains("Are you sure you want to amend last commit?")).
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
|
|||||||
@ -25,7 +25,7 @@ var CreateTag = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
|
|
||||||
t.ExpectPopup().Menu().
|
t.ExpectPopup().Menu().
|
||||||
Title(Equals("Create tag")).
|
Title(Equals("Create tag")).
|
||||||
Select(Contains("lightweight")).
|
Select(Contains("Lightweight")).
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
t.ExpectPopup().Prompt().
|
t.ExpectPopup().Prompt().
|
||||||
|
|||||||
@ -28,7 +28,7 @@ var NewBranch = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Universal.New).
|
Press(keys.Universal.New).
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
branchName := "my-branch-name"
|
branchName := "my-branch-name"
|
||||||
t.ExpectPopup().Prompt().Title(Contains("New Branch Name")).Type(branchName).Confirm()
|
t.ExpectPopup().Prompt().Title(Contains("New branch name")).Type(branchName).Confirm()
|
||||||
|
|
||||||
t.Git().CurrentBranchName(branchName)
|
t.Git().CurrentBranchName(branchName)
|
||||||
}).
|
}).
|
||||||
|
|||||||
@ -29,7 +29,7 @@ var ResetAuthor = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Menu().
|
t.ExpectPopup().Menu().
|
||||||
Title(Equals("Amend commit attribute")).
|
Title(Equals("Amend commit attribute")).
|
||||||
Select(Contains("reset author")).
|
Select(Contains("Reset author")).
|
||||||
Confirm()
|
Confirm()
|
||||||
}).
|
}).
|
||||||
Lines(
|
Lines(
|
||||||
|
|||||||
@ -26,7 +26,7 @@ var RevertMerge = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Lines(
|
Lines(
|
||||||
Contains("first change"),
|
Contains("first change"),
|
||||||
Contains("second-change-branch unrelated change"),
|
Contains("second-change-branch unrelated change"),
|
||||||
Contains("cancel"),
|
Contains("Cancel"),
|
||||||
).
|
).
|
||||||
Select(Contains("first change")).
|
Select(Contains("first change")).
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|||||||
@ -32,7 +32,7 @@ var SetAuthor = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Menu().
|
t.ExpectPopup().Menu().
|
||||||
Title(Equals("Amend commit attribute")).
|
Title(Equals("Amend commit attribute")).
|
||||||
Select(Contains(" set author")). // adding space at start to distinguish from 'reset author'
|
Select(Contains(" Set author")). // adding space at start to distinguish from 'reset author'
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
t.ExpectPopup().Prompt().
|
t.ExpectPopup().Prompt().
|
||||||
|
|||||||
@ -20,7 +20,7 @@ var BasicCmdAtRuntime = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Universal.ExecuteCustomCommand)
|
Press(keys.Universal.ExecuteCustomCommand)
|
||||||
|
|
||||||
t.ExpectPopup().Prompt().
|
t.ExpectPopup().Prompt().
|
||||||
Title(Equals("Custom Command:")).
|
Title(Equals("Custom command:")).
|
||||||
Type("touch file.txt").
|
Type("touch file.txt").
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@ var ComplexCmdAtRuntime = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Universal.ExecuteCustomCommand)
|
Press(keys.Universal.ExecuteCustomCommand)
|
||||||
|
|
||||||
t.ExpectPopup().Prompt().
|
t.ExpectPopup().Prompt().
|
||||||
Title(Equals("Custom Command:")).
|
Title(Equals("Custom command:")).
|
||||||
Type("sh -c \"touch file.txt\"").
|
Type("sh -c \"touch file.txt\"").
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
|
|||||||
@ -16,13 +16,13 @@ var OmitFromHistory = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||||
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
|
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
|
||||||
t.ExpectPopup().Prompt().
|
t.ExpectPopup().Prompt().
|
||||||
Title(Equals("Custom Command:")).
|
Title(Equals("Custom command:")).
|
||||||
Type("echo aubergine").
|
Type("echo aubergine").
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
|
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
|
||||||
t.ExpectPopup().Prompt().
|
t.ExpectPopup().Prompt().
|
||||||
Title(Equals("Custom Command:")).
|
Title(Equals("Custom command:")).
|
||||||
SuggestionLines(Contains("aubergine")).
|
SuggestionLines(Contains("aubergine")).
|
||||||
SuggestionLines(DoesNotContain("tangerine")).
|
SuggestionLines(DoesNotContain("tangerine")).
|
||||||
Type(" echo tangerine").
|
Type(" echo tangerine").
|
||||||
@ -30,7 +30,7 @@ var OmitFromHistory = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
|
|
||||||
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
|
t.GlobalPress(keys.Universal.ExecuteCustomCommand)
|
||||||
t.ExpectPopup().Prompt().
|
t.ExpectPopup().Prompt().
|
||||||
Title(Equals("Custom Command:")).
|
Title(Equals("Custom command:")).
|
||||||
SuggestionLines(Contains("aubergine")).
|
SuggestionLines(Contains("aubergine")).
|
||||||
SuggestionLines(DoesNotContain("tangerine")).
|
SuggestionLines(DoesNotContain("tangerine")).
|
||||||
Cancel()
|
Cancel()
|
||||||
|
|||||||
@ -30,16 +30,16 @@ var Diff = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
).
|
).
|
||||||
Press(keys.Universal.DiffingMenu)
|
Press(keys.Universal.DiffingMenu)
|
||||||
|
|
||||||
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains(`diff branch-a`)).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains(`Diff branch-a`)).Confirm()
|
||||||
|
|
||||||
t.Views().Branches().
|
t.Views().Branches().
|
||||||
IsFocused().
|
IsFocused().
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-a"))
|
t.Views().Information().Content(Contains("Showing output for: git diff branch-a branch-a"))
|
||||||
}).
|
}).
|
||||||
SelectNextItem().
|
SelectNextItem().
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b"))
|
t.Views().Information().Content(Contains("Showing output for: git diff branch-a branch-b"))
|
||||||
t.Views().Main().Content(Contains("+second line"))
|
t.Views().Main().Content(Contains("+second line"))
|
||||||
}).
|
}).
|
||||||
PressEnter()
|
PressEnter()
|
||||||
@ -66,8 +66,8 @@ var Diff = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
IsFocused().
|
IsFocused().
|
||||||
Press(keys.Universal.DiffingMenu)
|
Press(keys.Universal.DiffingMenu)
|
||||||
|
|
||||||
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("reverse diff direction")).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("Reverse diff direction")).Confirm()
|
||||||
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b -R"))
|
t.Views().Information().Content(Contains("Showing output for: git diff branch-a branch-b -R"))
|
||||||
t.Views().Main().Content(Contains("-second line"))
|
t.Views().Main().Content(Contains("-second line"))
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
@ -30,15 +30,15 @@ var DiffAndApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
).
|
).
|
||||||
Press(keys.Universal.DiffingMenu)
|
Press(keys.Universal.DiffingMenu)
|
||||||
|
|
||||||
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Equals("diff branch-a")).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Equals("Diff branch-a")).Confirm()
|
||||||
|
|
||||||
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-a"))
|
t.Views().Information().Content(Contains("Showing output for: git diff branch-a branch-a"))
|
||||||
|
|
||||||
t.Views().Branches().
|
t.Views().Branches().
|
||||||
IsFocused().
|
IsFocused().
|
||||||
SelectNextItem().
|
SelectNextItem().
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.Views().Information().Content(Contains("showing output for: git diff branch-a branch-b"))
|
t.Views().Information().Content(Contains("Showing output for: git diff branch-a branch-b"))
|
||||||
t.Views().Main().Content(Contains("+second line"))
|
t.Views().Main().Content(Contains("+second line"))
|
||||||
}).
|
}).
|
||||||
PressEnter()
|
PressEnter()
|
||||||
@ -60,14 +60,14 @@ var DiffAndApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
PressPrimaryAction(). // add the file to the patch
|
PressPrimaryAction(). // add the file to the patch
|
||||||
Press(keys.Universal.DiffingMenu).
|
Press(keys.Universal.DiffingMenu).
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("exit diff mode")).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("Exit diff mode")).Confirm()
|
||||||
|
|
||||||
t.Views().Information().Content(DoesNotContain("building patch"))
|
t.Views().Information().Content(DoesNotContain("Building patch"))
|
||||||
}).
|
}).
|
||||||
Press(keys.Universal.CreatePatchOptionsMenu)
|
Press(keys.Universal.CreatePatchOptionsMenu)
|
||||||
|
|
||||||
// adding the regex '$' here to distinguish the menu item from the 'apply patch in reverse' item
|
// adding the regex '$' here to distinguish the menu item from the 'Apply patch in reverse' item
|
||||||
t.ExpectPopup().Menu().Title(Equals("Patch Options")).Select(MatchesRegexp("apply patch$")).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("Patch options")).Select(MatchesRegexp("Apply patch$")).Confirm()
|
||||||
|
|
||||||
t.Views().Files().
|
t.Views().Files().
|
||||||
Focus().
|
Focus().
|
||||||
|
|||||||
@ -28,9 +28,9 @@ var DiffCommits = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
).
|
).
|
||||||
Press(keys.Universal.DiffingMenu).
|
Press(keys.Universal.DiffingMenu).
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(MatchesRegexp(`diff \w+`)).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(MatchesRegexp(`Diff \w+`)).Confirm()
|
||||||
|
|
||||||
t.Views().Information().Content(Contains("showing output for: git diff"))
|
t.Views().Information().Content(Contains("Showing output for: git diff"))
|
||||||
}).
|
}).
|
||||||
SelectNextItem().
|
SelectNextItem().
|
||||||
SelectNextItem().
|
SelectNextItem().
|
||||||
@ -40,7 +40,7 @@ var DiffCommits = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
}).
|
}).
|
||||||
Press(keys.Universal.DiffingMenu).
|
Press(keys.Universal.DiffingMenu).
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("reverse diff direction")).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("Diffing")).Select(Contains("Reverse diff direction")).Confirm()
|
||||||
|
|
||||||
t.Views().Main().Content(Contains("+second line\n+third line"))
|
t.Views().Main().Content(Contains("+second line\n+third line"))
|
||||||
}).
|
}).
|
||||||
|
|||||||
@ -85,7 +85,7 @@ var DiscardChanges = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
SelectedLine(Contains(file.status + " " + file.label)).
|
SelectedLine(Contains(file.status + " " + file.label)).
|
||||||
Press(keys.Universal.Remove)
|
Press(keys.Universal.Remove)
|
||||||
|
|
||||||
t.ExpectPopup().Menu().Title(Equals(file.menuTitle)).Select(Contains("discard all changes")).Confirm()
|
t.ExpectPopup().Menu().Title(Equals(file.menuTitle)).Select(Contains("Discard all changes")).Confirm()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -100,8 +100,8 @@ var DiscardChanges = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
})
|
})
|
||||||
|
|
||||||
t.ExpectPopup().Confirmation().
|
t.ExpectPopup().Confirmation().
|
||||||
Title(Equals("continue")).
|
Title(Equals("Continue")).
|
||||||
Content(Contains("all merge conflicts resolved. Continue?")).
|
Content(Contains("All merge conflicts resolved. Continue?")).
|
||||||
Cancel()
|
Cancel()
|
||||||
|
|
||||||
discardOneByOne([]statusFile{
|
discardOneByOne([]statusFile{
|
||||||
|
|||||||
@ -37,7 +37,7 @@ var DiscardStagedChanges = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
).
|
).
|
||||||
Press(keys.Files.ViewResetOptions)
|
Press(keys.Files.ViewResetOptions)
|
||||||
|
|
||||||
t.ExpectPopup().Menu().Title(Equals("")).Select(Contains("discard staged changes")).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("")).Select(Contains("Discard staged changes")).Confirm()
|
||||||
|
|
||||||
// staged file has been removed
|
// staged file has been removed
|
||||||
t.Views().Files().
|
t.Views().Files().
|
||||||
|
|||||||
@ -27,14 +27,14 @@ var Gitignore = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Files.IgnoreFile).
|
Press(keys.Files.IgnoreFile).
|
||||||
// ensure we can't exclude the .gitignore file
|
// ensure we can't exclude the .gitignore file
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .git/info/exclude")).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("Ignore or exclude file")).Select(Contains("Add to .git/info/exclude")).Confirm()
|
||||||
|
|
||||||
t.ExpectPopup().Alert().Title(Equals("Error")).Content(Equals("Cannot exclude .gitignore")).Confirm()
|
t.ExpectPopup().Alert().Title(Equals("Error")).Content(Equals("Cannot exclude .gitignore")).Confirm()
|
||||||
}).
|
}).
|
||||||
Press(keys.Files.IgnoreFile).
|
Press(keys.Files.IgnoreFile).
|
||||||
// ensure we can't ignore the .gitignore file
|
// ensure we can't ignore the .gitignore file
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .gitignore")).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("Ignore or exclude file")).Select(Contains("Add to .gitignore")).Confirm()
|
||||||
|
|
||||||
t.ExpectPopup().Alert().Title(Equals("Error")).Content(Equals("Cannot ignore .gitignore")).Confirm()
|
t.ExpectPopup().Alert().Title(Equals("Error")).Content(Equals("Cannot ignore .gitignore")).Confirm()
|
||||||
|
|
||||||
@ -45,7 +45,7 @@ var Gitignore = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Files.IgnoreFile).
|
Press(keys.Files.IgnoreFile).
|
||||||
// exclude a file
|
// exclude a file
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .git/info/exclude")).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("Ignore or exclude file")).Select(Contains("Add to .git/info/exclude")).Confirm()
|
||||||
|
|
||||||
t.FileSystem().FileContent(".gitignore", Equals(""))
|
t.FileSystem().FileContent(".gitignore", Equals(""))
|
||||||
t.FileSystem().FileContent(".git/info/exclude", Contains("toExclude"))
|
t.FileSystem().FileContent(".git/info/exclude", Contains("toExclude"))
|
||||||
@ -54,7 +54,7 @@ var Gitignore = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Files.IgnoreFile).
|
Press(keys.Files.IgnoreFile).
|
||||||
// ignore a file
|
// ignore a file
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Menu().Title(Equals("ignore or exclude file")).Select(Contains("add to .gitignore")).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("Ignore or exclude file")).Select(Contains("Add to .gitignore")).Confirm()
|
||||||
|
|
||||||
t.FileSystem().FileContent(".gitignore", Equals("toIgnore\n"))
|
t.FileSystem().FileContent(".gitignore", Equals("toIgnore\n"))
|
||||||
t.FileSystem().FileContent(".git/info/exclude", Contains("toExclude"))
|
t.FileSystem().FileContent(".git/info/exclude", Contains("toExclude"))
|
||||||
|
|||||||
@ -42,7 +42,7 @@ var RememberCommitMessageAfterFail = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
}).
|
}).
|
||||||
Press(keys.Universal.Remove). // remove file that triggers pre-commit hook to fail
|
Press(keys.Universal.Remove). // remove file that triggers pre-commit hook to fail
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Menu().Title(Equals("bad")).Select(Contains("discard all changes")).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("bad")).Select(Contains("Discard all changes")).Confirm()
|
||||||
}).
|
}).
|
||||||
Lines(
|
Lines(
|
||||||
Contains("one"),
|
Contains("one"),
|
||||||
|
|||||||
@ -23,7 +23,7 @@ var SelectFile = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Contains(`only otherFile`),
|
Contains(`only otherFile`),
|
||||||
Contains(`both files`),
|
Contains(`both files`),
|
||||||
).
|
).
|
||||||
SelectNextItem().
|
NavigateToLine(Contains(`only filterFile`)).
|
||||||
PressEnter()
|
PressEnter()
|
||||||
|
|
||||||
// when you click into the commit itself, you see all files from that commit
|
// when you click into the commit itself, you see all files from that commit
|
||||||
@ -34,7 +34,7 @@ var SelectFile = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
).
|
).
|
||||||
Press(keys.Universal.FilteringMenu)
|
Press(keys.Universal.FilteringMenu)
|
||||||
|
|
||||||
t.ExpectPopup().Menu().Title(Equals("Filtering")).Select(Contains("filter by 'filterFile'")).Confirm()
|
t.ExpectPopup().Menu().Title(Equals("Filtering")).Select(Contains("Filter by 'filterFile'")).Confirm()
|
||||||
|
|
||||||
postFilterTest(t)
|
postFilterTest(t)
|
||||||
},
|
},
|
||||||
|
|||||||
@ -19,7 +19,7 @@ func commonSetup(shell *Shell) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func postFilterTest(t *TestDriver) {
|
func postFilterTest(t *TestDriver) {
|
||||||
t.Views().Information().Content(Contains("filtering by 'filterFile'"))
|
t.Views().Information().Content(Contains("Filtering by 'filterFile'"))
|
||||||
|
|
||||||
t.Views().Commits().
|
t.Views().Commits().
|
||||||
IsFocused().
|
IsFocused().
|
||||||
|
|||||||
@ -21,7 +21,7 @@ var TypeFile = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
|
|
||||||
t.ExpectPopup().Menu().
|
t.ExpectPopup().Menu().
|
||||||
Title(Equals("Filtering")).
|
Title(Equals("Filtering")).
|
||||||
Select(Contains("enter path to filter by")).
|
Select(Contains("Enter path to filter by")).
|
||||||
Confirm()
|
Confirm()
|
||||||
|
|
||||||
t.ExpectPopup().Prompt().
|
t.ExpectPopup().Prompt().
|
||||||
|
|||||||
@ -40,7 +40,7 @@ var AdvancedInteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
|
|
||||||
t.ExpectPopup().Menu().
|
t.ExpectPopup().Menu().
|
||||||
Title(Equals(fmt.Sprintf("Rebase '%s' onto '%s'", TOP_BRANCH, BASE_BRANCH))).
|
Title(Equals(fmt.Sprintf("Rebase '%s' onto '%s'", TOP_BRANCH, BASE_BRANCH))).
|
||||||
Select(Contains("interactive rebase")).
|
Select(Contains("Interactive rebase")).
|
||||||
Confirm()
|
Confirm()
|
||||||
t.Views().Commits().
|
t.Views().Commits().
|
||||||
IsFocused().
|
IsFocused().
|
||||||
|
|||||||
@ -26,7 +26,7 @@ var AmendFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Commits.AmendToCommit).
|
Press(keys.Commits.AmendToCommit).
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Confirmation().
|
t.ExpectPopup().Confirmation().
|
||||||
Title(Equals("Amend Commit")).
|
Title(Equals("Amend commit")).
|
||||||
Content(Contains("Are you sure you want to amend this commit with your staged files?")).
|
Content(Contains("Are you sure you want to amend this commit with your staged files?")).
|
||||||
Confirm()
|
Confirm()
|
||||||
}).
|
}).
|
||||||
|
|||||||
@ -32,7 +32,7 @@ var AmendFixupCommit = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Press(keys.Commits.AmendToCommit).
|
Press(keys.Commits.AmendToCommit).
|
||||||
Tap(func() {
|
Tap(func() {
|
||||||
t.ExpectPopup().Confirmation().
|
t.ExpectPopup().Confirmation().
|
||||||
Title(Equals("Amend Commit")).
|
Title(Equals("Amend commit")).
|
||||||
Content(Contains("Are you sure you want to amend this commit with your staged files?")).
|
Content(Contains("Are you sure you want to amend this commit with your staged files?")).
|
||||||
Confirm()
|
Confirm()
|
||||||
}).
|
}).
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user