From d772c9f1d446f9566d0c46a1cb76dc63ef31cb21 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Thu, 25 May 2023 21:11:51 +1000 Subject: [PATCH] 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. --- CONTRIBUTING.md | 4 +- docs/keybindings/Keybindings_en.md | 432 +++---- docs/keybindings/Keybindings_ja.md | 108 +- docs/keybindings/Keybindings_ko.md | 114 +- docs/keybindings/Keybindings_nl.md | 420 +++---- docs/keybindings/Keybindings_pl.md | 414 +++---- docs/keybindings/Keybindings_zh.md | 18 +- pkg/cheatsheet/generate_test.go | 6 +- pkg/gui/constants/constants.go | 3 - .../controllers/basic_commits_controller.go | 28 +- pkg/gui/controllers/bisect_controller.go | 2 +- pkg/gui/controllers/branches_controller.go | 38 +- .../controllers/commit_message_controller.go | 4 +- .../controllers/commits_files_controller.go | 18 +- .../controllers/confirmation_controller.go | 4 +- .../custom_patch_options_menu_action.go | 16 +- pkg/gui/controllers/diffing_menu_action.go | 10 +- pkg/gui/controllers/files_controller.go | 50 +- .../controllers/files_remove_controller.go | 14 +- pkg/gui/controllers/filtering_menu_action.go | 6 +- pkg/gui/controllers/git_flow_controller.go | 2 +- pkg/gui/controllers/global_controller.go | 16 +- .../helpers/merge_and_rebase_helper.go | 2 +- pkg/gui/controllers/helpers/mode_helper.go | 14 +- pkg/gui/controllers/helpers/refresh_helper.go | 2 +- pkg/gui/controllers/helpers/refs_helper.go | 12 +- pkg/gui/controllers/helpers/repos_helper.go | 2 +- .../controllers/helpers/suggestions_helper.go | 2 +- pkg/gui/controllers/helpers/tags_helper.go | 4 +- .../helpers/window_arrangement_helper.go | 3 +- .../helpers/working_tree_helper.go | 2 +- pkg/gui/controllers/list_controller.go | 10 +- .../controllers/local_commits_controller.go | 51 +- pkg/gui/controllers/menu_controller.go | 4 +- .../controllers/merge_conflicts_controller.go | 12 +- pkg/gui/controllers/options_menu_action.go | 2 +- .../controllers/patch_building_controller.go | 4 +- .../controllers/patch_explorer_controller.go | 12 +- .../controllers/remote_branches_controller.go | 14 +- pkg/gui/controllers/remotes_controller.go | 20 +- pkg/gui/controllers/staging_controller.go | 6 +- pkg/gui/controllers/stash_controller.go | 10 +- pkg/gui/controllers/status_controller.go | 6 +- pkg/gui/controllers/submodules_controller.go | 44 +- .../switch_to_diff_files_controller.go | 2 +- .../switch_to_sub_commits_controller.go | 2 +- pkg/gui/controllers/sync_controller.go | 4 +- pkg/gui/controllers/tags_controller.go | 10 +- pkg/gui/controllers/undo_controller.go | 8 +- .../controllers/workspace_reset_controller.go | 14 +- pkg/gui/global_handlers.go | 2 +- pkg/gui/keybindings.go | 28 +- pkg/gui/menu_panel.go | 2 +- pkg/gui/options_map.go | 12 +- pkg/gui/presentation/working_tree.go | 24 +- pkg/gui/searching.go | 8 +- .../custom_commands/handler_creator.go | 2 +- pkg/gui/views.go | 3 +- pkg/i18n/chinese.go | 358 +++--- pkg/i18n/dutch.go | 406 ++++--- pkg/i18n/english.go | 1016 +++++++++-------- pkg/i18n/japanese.go | 508 ++++----- pkg/i18n/korean.go | 518 +++++---- pkg/i18n/polish.go | 200 ++-- pkg/integration/components/common.go | 8 +- pkg/integration/tests/bisect/basic.go | 8 +- .../tests/bisect/from_other_branch.go | 6 +- pkg/integration/tests/branch/create_tag.go | 2 +- pkg/integration/tests/branch/delete.go | 2 +- pkg/integration/tests/branch/detached_head.go | 2 +- pkg/integration/tests/branch/rebase.go | 6 +- .../tests/branch/rebase_and_drop.go | 6 +- .../branch/rebase_does_not_autosquash.go | 2 +- pkg/integration/tests/branch/reset.go | 4 +- .../tests/branch/reset_upstream.go | 4 +- pkg/integration/tests/branch/set_upstream.go | 4 +- .../tests/cherry_pick/cherry_pick.go | 2 +- .../cherry_pick/cherry_pick_conflicts.go | 2 +- pkg/integration/tests/commit/amend.go | 2 +- pkg/integration/tests/commit/create_tag.go | 2 +- pkg/integration/tests/commit/new_branch.go | 2 +- pkg/integration/tests/commit/reset_author.go | 2 +- pkg/integration/tests/commit/revert_merge.go | 2 +- pkg/integration/tests/commit/set_author.go | 2 +- .../custom_commands/basic_cmd_at_runtime.go | 2 +- .../custom_commands/complex_cmd_at_runtime.go | 2 +- .../custom_commands/omit_from_history.go | 6 +- pkg/integration/tests/diff/diff.go | 10 +- .../tests/diff/diff_and_apply_patch.go | 14 +- pkg/integration/tests/diff/diff_commits.go | 6 +- pkg/integration/tests/file/discard_changes.go | 6 +- .../tests/file/discard_staged_changes.go | 2 +- pkg/integration/tests/file/gitignore.go | 8 +- .../remember_commit_message_after_fail.go | 2 +- .../tests/filter_by_path/select_file.go | 4 +- .../tests/filter_by_path/shared.go | 2 +- .../tests/filter_by_path/type_file.go | 2 +- .../advanced_interactive_rebase.go | 2 +- .../interactive_rebase/amend_first_commit.go | 2 +- .../interactive_rebase/amend_fixup_commit.go | 2 +- .../amend_head_commit_during_rebase.go | 2 +- .../tests/interactive_rebase/amend_merge.go | 2 +- pkg/integration/tests/patch_building/apply.go | 4 +- .../tests/patch_building/apply_in_reverse.go | 4 +- .../apply_in_reverse_with_conflict.go | 4 +- .../patch_building/copy_patch_to_clipboard.go | 2 +- .../patch_building/move_to_earlier_commit.go | 4 +- .../move_to_earlier_commit_no_keep_empty.go | 4 +- .../tests/patch_building/move_to_index.go | 4 +- ...e_to_index_part_of_adjacent_added_lines.go | 4 +- .../patch_building/move_to_index_partial.go | 4 +- .../move_to_index_with_conflict.go | 4 +- .../patch_building/move_to_later_commit.go | 4 +- .../move_to_later_commit_partial_hunk.go | 4 +- .../patch_building/move_to_new_commit.go | 4 +- .../move_to_new_commit_partial_hunk.go | 4 +- .../patch_building/remove_from_commit.go | 4 +- .../tests/patch_building/reset_with_escape.go | 4 +- .../tests/patch_building/select_all_files.go | 2 +- .../patch_building/specific_selection.go | 6 +- .../tests/patch_building/start_new_patch.go | 4 +- pkg/integration/tests/reflog/checkout.go | 2 +- pkg/integration/tests/reflog/cherry_pick.go | 2 +- pkg/integration/tests/reflog/patch.go | 6 +- pkg/integration/tests/reflog/reset.go | 4 +- pkg/integration/tests/stash/apply_patch.go | 6 +- pkg/integration/tests/stash/create_branch.go | 2 +- pkg/integration/tests/stash/stash_all.go | 2 +- .../tests/stash/stash_and_keep_index.go | 2 +- .../stash/stash_including_untracked_files.go | 2 +- pkg/integration/tests/stash/stash_staged.go | 2 +- pkg/integration/tests/stash/stash_unstaged.go | 2 +- pkg/integration/tests/submodule/add.go | 6 +- pkg/integration/tests/submodule/reset.go | 2 +- pkg/integration/tests/sync/push_tag.go | 2 +- .../tests/sync/rename_branch_and_pull.go | 2 +- pkg/integration/tests/tag/crud_annotated.go | 2 +- pkg/integration/tests/tag/crud_lightweight.go | 2 +- pkg/integration/tests/tag/reset.go | 4 +- pkg/integration/tests/ui/double_popup.go | 2 +- .../tests/ui/switch_tab_from_menu.go | 4 +- .../tests/undo/undo_checkout_and_drop.go | 2 +- pkg/integration/tests/undo/undo_drop.go | 2 +- 143 files changed, 2691 insertions(+), 2683 deletions(-) delete mode 100644 pkg/gui/constants/constants.go diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bed0a124a..e5c1c7ede 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -99,7 +99,9 @@ go install mvdan.cc/gofumpt@latest && gofumpt -l -w . ## 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 diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md index 8e48afcba..7a6687d9f 100644 --- a/docs/keybindings/Keybindings_en.md +++ b/docs/keybindings/Keybindings_en.md @@ -4,317 +4,317 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ -## Global Keybindings +## Global keybindings 
-  <c-r>: switch to a recent repo
-  <pgup>: scroll up main panel (fn+up/shift+k)
-  <pgdown>: scroll down main panel (fn+down/shift+j)
-  @: open command log menu
+  <c-r>: Switch to a recent repo
+  <pgup>: Scroll up main panel (fn+up/shift+k)
+  <pgdown>: Scroll down main panel (fn+down/shift+j)
+  @: Open command log menu
   }: Increase the size of the context shown around changes in the diff view
   {: Decrease the size of the context shown around changes in the diff view
-  :: execute custom command
-  <c-p>: view custom patch options
-  m: view merge/rebase options
-  R: refresh
-  +: next screen mode (normal/half/fullscreen)
-  _: prev screen mode
-  ?: open menu
-  <c-s>: view filter-by-path options
-  W: open diff menu
-  <c-e>: open diff menu
+  :: Execute custom command
+  <c-p>: View custom patch options
+  m: View merge/rebase options
+  R: Refresh
+  +: Next screen mode (normal/half/fullscreen)
+  _: Prev screen mode
+  ?: Open menu
+  <c-s>: View filter-by-path options
+  W: Open diff menu
+  <c-e>: Open diff menu
   <c-w>: Toggle whether or not whitespace changes are shown in the diff view
-  z: undo (via reflog) (experimental)
-  <c-z>: redo (via reflog) (experimental)
-  P: push
-  p: pull
+  z: Undo
+  <c-z>: Redo
+  P: Push
+  p: Pull
-## List Panel Navigation +## List panel navigation 
-  ,: previous page
-  .: next page
-  <: scroll to top
-  /: start search
-  >: scroll to bottom
-  H: scroll left
-  L: scroll right
-  ]: next tab
-  [: previous tab
+  ,: Previous page
+  .: Next page
+  <: Scroll to top
+  /: Start search
+  >: Scroll to bottom
+  H: Scroll left
+  L: Scroll right
+  ]: Next tab
+  [: Previous tab
-## Commit Files +## Commit files 
-  <c-o>: copy the committed file name to the clipboard
-  c: checkout file
-  d: discard this commit's changes to this file
-  o: open file
-  e: edit file
-  <space>: toggle file included in patch
-  a: toggle all files included in patch
-  <enter>: enter file to add selected lines to the patch (or toggle directory collapsed)
-  `: toggle file tree view
+  <c-o>: Copy the committed file name to the clipboard
+  c: Checkout file
+  d: Discard this commit's changes to this file
+  o: Open file
+  e: Edit file
+  <space>: Toggle file included in patch
+  a: Toggle all files included in patch
+  <enter>: Enter file to add selected lines to the patch (or toggle directory collapsed)
+  `: Toggle file tree view
-## Commit Summary +## Commit summary 
-  <enter>: confirm
-  <esc>: close
+  <enter>: Confirm
+  <esc>: Close
## Commits 
-  <c-o>: copy commit SHA to clipboard
-  <c-r>: reset cherry-picked (copied) commits selection
-  b: view bisect options
-  s: squash down
-  f: fixup commit
-  r: reword commit
-  R: reword commit with editor
-  d: delete commit
-  e: edit commit
-  p: pick commit (when mid-rebase)
-  F: create fixup commit for this commit
-  S: squash all 'fixup!' commits above selected commit (autosquash)
-  <c-j>: move commit down one
-  <c-k>: move commit up one
-  v: paste commits (cherry-pick)
-  A: amend commit with staged changes
-  a: reset commit author
-  t: revert commit
-  T: tag commit
-  <c-l>: open log menu
-  <space>: checkout commit
-  y: copy commit attribute
-  o: open commit in browser
-  n: create new branch off of commit
-  g: view reset options
-  c: copy commit (cherry-pick)
-  C: copy commit range (cherry-pick)
-  <enter>: view selected item's files
+  <c-o>: Copy commit SHA to clipboard
+  <c-r>: Reset cherry-picked (copied) commits selection
+  b: View bisect options
+  s: Squash down
+  f: Fixup commit
+  r: Reword commit
+  R: Reword commit with editor
+  d: Delete commit
+  e: Edit commit
+  p: Pick commit (when mid-rebase)
+  F: Create fixup commit for this commit
+  S: Squash all 'fixup!' commits above selected commit (autosquash)
+  <c-j>: Move commit down one
+  <c-k>: Move commit up one
+  v: Paste commits (cherry-pick)
+  A: Amend commit with staged changes
+  a: Set/Reset commit author
+  t: Revert commit
+  T: Tag commit
+  <c-l>: Open log menu
+  <space>: Checkout commit
+  y: Copy commit attribute
+  o: Open commit in browser
+  n: Create new branch off of commit
+  g: View reset options
+  c: Copy commit (cherry-pick)
+  C: Copy commit range (cherry-pick)
+  <enter>: View selected item's files
-## Confirmation Panel +## Confirmation panel 
-  <enter>: confirm
-  <esc>: close/cancel
+  <enter>: Confirm
+  <esc>: Close/Cancel
## Files 
-  <c-o>: copy the file name to the clipboard
-  d: view 'discard changes' options
-  <space>: toggle staged
+  <c-o>: Copy the file name to the clipboard
+  d: View 'discard changes' options
+  <space>: Toggle staged
   <c-b>: Filter files (staged/unstaged)
-  c: commit changes
-  w: commit changes without pre-commit hook
-  A: amend last commit
-  C: commit changes using git editor
-  e: edit file
-  o: open file
-  i: ignore or exclude file
-  r: refresh files
-  s: stash all changes
-  S: view stash options
-  a: stage/unstage all
-  <enter>: stage individual hunks/lines for file, or collapse/expand for directory
-  g: view upstream reset options
-  D: view reset options
-  `: toggle file tree view
-  M: open external merge tool (git mergetool)
-  f: fetch
+  c: Commit changes
+  w: Commit changes without pre-commit hook
+  A: Amend last commit
+  C: Commit changes using git editor
+  e: Edit file
+  o: Open file
+  i: Ignore or exclude file
+  r: Refresh files
+  s: Stash all changes
+  S: View stash options
+  a: Stage/unstage all
+  <enter>: Stage individual hunks/lines for file, or collapse/expand for directory
+  g: View upstream reset options
+  D: View reset options
+  `: Toggle file tree view
+  M: Open external merge tool (git mergetool)
+  f: Fetch
-## Local Branches +## Local branches 
-  <c-o>: copy branch name to clipboard
-  i: show git-flow options
-  <space>: checkout
-  n: new branch
-  o: create pull request
-  O: create pull request options
-  <c-y>: copy pull request URL to clipboard
-  c: checkout by name
-  F: force checkout
-  d: delete branch
-  r: rebase checked-out branch onto this branch
-  M: merge into currently checked out branch
-  f: fast-forward this branch from its upstream
-  T: create tag
-  g: view reset options
-  R: rename branch
-  u: set/unset upstream
-  <enter>: view commits
+  <c-o>: Copy branch name to clipboard
+  i: Show git-flow options
+  <space>: Checkout
+  n: New branch
+  o: Create pull request
+  O: Create pull request options
+  <c-y>: Copy pull request URL to clipboard
+  c: Checkout by name
+  F: Force checkout
+  d: Delete branch
+  r: Rebase checked-out branch onto this branch
+  M: Merge into currently checked out branch
+  f: Fast-forward this branch from its upstream
+  T: Create tag
+  g: View reset options
+  R: Rename branch
+  u: Set/Unset upstream
+  <enter>: View commits
-## Main Panel (Merging) +## Main panel (merging) 
-  e: edit file
-  o: open file
-  <left>: select previous conflict
-  <right>: select next conflict
-  <up>: select previous hunk
-  <down>: select next hunk
-  z: undo
-  M: open external merge tool (git mergetool)
-  <space>: pick hunk
-  b: pick all hunks
-  <esc>: return to files panel
+  e: Edit file
+  o: Open file
+  <left>: Select previous conflict
+  <right>: Select next conflict
+  <up>: Select previous hunk
+  <down>: Select next hunk
+  z: Undo
+  M: Open external merge tool (git mergetool)
+  <space>: Pick hunk
+  b: Pick all hunks
+  <esc>: Return to files panel
-## Main Panel (Normal) +## Main panel (normal) 
-  mouse wheel down: scroll down (fn+up)
-  mouse wheel up: scroll up (fn+down)
+  mouse wheel down: Scroll down (fn+up)
+  mouse wheel up: Scroll up (fn+down)
-## Main Panel (Patch Building) +## Main panel (patch building) 
-  <left>: select previous hunk
-  <right>: select next hunk
-  v: toggle drag select
-  V: toggle drag select
-  a: toggle select hunk
-  <c-o>: copy the selected text to the clipboard
-  o: open file
-  e: edit file
-  <space>: add/remove line(s) to patch
-  <esc>: exit custom patch builder
+  <left>: Select previous hunk
+  <right>: Select next hunk
+  v: Toggle drag select
+  V: Toggle drag select
+  a: Toggle select hunk
+  <c-o>: Copy the selected text to the clipboard
+  o: Open file
+  e: Edit file
+  <space>: Add/Remove line(s) to patch
+  <esc>: Exit custom patch builder
-## Main Panel (Staging) +## Main panel (staging) 
-  <left>: select previous hunk
-  <right>: select next hunk
-  v: toggle drag select
-  V: toggle drag select
-  a: toggle select hunk
-  <c-o>: copy the selected text to the clipboard
-  o: open file
-  e: edit file
-  <esc>: return to files panel
-  <tab>: switch to other panel (staged/unstaged changes)
-  <space>: toggle line staged / unstaged
-  d: delete change (git reset)
-  E: edit hunk
-  c: commit changes
-  w: commit changes without pre-commit hook
-  C: commit changes using git editor
+  <left>: Select previous hunk
+  <right>: Select next hunk
+  v: Toggle drag select
+  V: Toggle drag select
+  a: Toggle select hunk
+  <c-o>: Copy the selected text to the clipboard
+  o: Open file
+  e: Edit file
+  <esc>: Return to files panel
+  <tab>: Switch to other panel (staged/unstaged changes)
+  <space>: Toggle line staged / unstaged
+  d: Delete change (git reset)
+  E: Edit hunk
+  c: Commit changes
+  w: Commit changes without pre-commit hook
+  C: Commit changes using git editor
## Menu 
-  <enter>: execute
-  <esc>: close
+  <enter>: Execute
+  <esc>: Close
## Reflog 
-  <c-o>: copy commit SHA to clipboard
-  <space>: checkout commit
-  y: copy commit attribute
-  o: open commit in browser
-  n: create new branch off of commit
-  g: view reset options
-  c: copy commit (cherry-pick)
-  C: copy commit range (cherry-pick)
-  <c-r>: reset cherry-picked (copied) commits selection
-  <enter>: view commits
+  <c-o>: Copy commit SHA to clipboard
+  <space>: Checkout commit
+  y: Copy commit attribute
+  o: Open commit in browser
+  n: Create new branch off of commit
+  g: View reset options
+  c: Copy commit (cherry-pick)
+  C: Copy commit range (cherry-pick)
+  <c-r>: Reset cherry-picked (copied) commits selection
+  <enter>: View commits
-## Remote Branches +## Remote branches 
-  <c-o>: copy branch name to clipboard
-  <space>: checkout
-  n: new branch
-  M: merge into currently checked out branch
-  r: rebase checked-out branch onto this branch
-  d: delete branch
-  u: set as upstream of checked-out branch
+  <c-o>: Copy branch name to clipboard
+  <space>: Checkout
+  n: New branch
+  M: Merge into currently checked out branch
+  r: Rebase checked-out branch onto this branch
+  d: Delete branch
+  u: Set as upstream of checked-out branch
   <esc>: Return to remotes list
-  g: view reset options
-  <enter>: view commits
+  g: View reset options
+  <enter>: View commits
## Remotes 
-  f: fetch remote
-  n: add new remote
-  d: remove remote
-  e: edit remote
+  f: Fetch remote
+  n: Add new remote
+  d: Remove remote
+  e: Edit remote
## Stash 
-  <space>: apply
-  g: pop
-  d: drop
-  n: new branch
-  r: rename stash
-  <enter>: view selected item's files
+  <space>: Apply
+  g: Pop
+  d: Drop
+  n: New branch
+  r: Rename stash
+  <enter>: View selected item's files
## Status 
-  o: open config file
-  e: edit config file
-  u: check for update
-  <enter>: switch to a recent repo
-  a: show all branch logs
+  o: Open config file
+  e: Edit config file
+  u: Check for update
+  <enter>: Switch to a recent repo
+  a: Show all branch logs
## Sub-commits 
-  <c-o>: copy commit SHA to clipboard
-  <space>: checkout commit
-  y: copy commit attribute
-  o: open commit in browser
-  n: create new branch off of commit
-  g: view reset options
-  c: copy commit (cherry-pick)
-  C: copy commit range (cherry-pick)
-  <c-r>: reset cherry-picked (copied) commits selection
-  <enter>: view selected item's files
+  <c-o>: Copy commit SHA to clipboard
+  <space>: Checkout commit
+  y: Copy commit attribute
+  o: Open commit in browser
+  n: Create new branch off of commit
+  g: View reset options
+  c: Copy commit (cherry-pick)
+  C: Copy commit range (cherry-pick)
+  <c-r>: Reset cherry-picked (copied) commits selection
+  <enter>: View selected item's files
## Submodules 
-  <c-o>: copy submodule name to clipboard
-  <enter>: enter submodule
-  d: remove submodule
-  u: update submodule
-  n: add new submodule
-  e: update submodule URL
-  i: initialize submodule
-  b: view bulk submodule options
+  <c-o>: Copy submodule name to clipboard
+  <enter>: Enter submodule
+  d: Remove submodule
+  u: Update submodule
+  n: Add new submodule
+  e: Update submodule URL
+  i: Initialize submodule
+  b: View bulk submodule options
## Tags 
-  <space>: checkout
-  d: delete tag
-  P: push tag
-  n: create tag
-  g: view reset options
-  <enter>: view commits
+  <space>: Checkout
+  d: Delete tag
+  P: Push tag
+  n: Create tag
+  g: View reset options
+  <enter>: View commits
diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md index 80430a69d..1fbef475a 100644 --- a/docs/keybindings/Keybindings_ja.md +++ b/docs/keybindings/Keybindings_ja.md @@ -14,20 +14,20 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ }: Increase the size of the context shown around changes in the diff view {: Decrease the size of the context shown around changes in the diff view :: カスタムコマンドを実行 - <c-p>: view custom patch options - m: view merge/rebase options + <c-p>: View custom patch options + m: View merge/rebase options R: リフレッシュ +: 次のスクリーンモード (normal/half/fullscreen) _: 前のスクリーンモード ?: メニューを開く - <c-s>: view filter-by-path options + <c-s>: View filter-by-path options W: 差分メニューを開く <c-e>: 差分メニューを開く <c-w>: 空白文字の差分の表示有無を切り替え z: アンドゥ (via reflog) (experimental) <c-z>: リドゥ (via reflog) (experimental) - P: push - p: pull + P: Push + p: Pull ## 一覧パネルの操作 @@ -48,11 +48,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ 
   <space>: 適用
-  g: pop
-  d: drop
+  g: Pop
+  d: Drop
   n: 新しいブランチを作成
   r: Stashを変更
-  <enter>: view selected item's files
+  <enter>: View selected item's files
## Sub-commits @@ -63,33 +63,33 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ y: コミットの情報をコピー o: ブラウザでコミットを開く n: コミットにブランチを作成 - g: view reset options + g: View reset options c: コミットをコピー (cherry-pick) C: コミットを範囲コピー (cherry-pick) - <c-r>: reset cherry-picked (copied) commits selection - <enter>: view selected item's files + <c-r>: Reset cherry-picked (copied) commits selection + <enter>: View selected item's files ## コミット 
   <c-o>: コミットのSHAをクリップボードにコピー
-  <c-r>: reset cherry-picked (copied) commits selection
-  b: view bisect options
-  s: squash down
-  f: fixup commit
+  <c-r>: Reset cherry-picked (copied) commits selection
+  b: View bisect options
+  s: Squash down
+  f: Fixup commit
   r: コミットメッセージを変更
   R: エディタでコミットメッセージを編集
   d: コミットを削除
   e: コミットを編集
-  p: pick commit (when mid-rebase)
+  p: Pick commit (when mid-rebase)
   F: このコミットに対するfixupコミットを作成
-  S: squash all 'fixup!' commits above selected commit (autosquash)
+  S: Squash all 'fixup!' commits above selected commit (autosquash)
   <c-j>: コミットを1つ下に移動
   <c-k>: コミットを1つ上に移動
   v: コミットを貼り付け (cherry-pick)
   A: ステージされた変更でamendコミット
-  a: reset commit author
+  a: Set/Reset commit author
   t: コミットをrevert
   T: タグを作成
   <c-l>: ログメニューを開く
@@ -97,23 +97,23 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_
   y: コミットの情報をコピー
   o: ブラウザでコミットを開く
   n: コミットにブランチを作成
-  g: view reset options
+  g: View reset options
   c: コミットをコピー (cherry-pick)
   C: コミットを範囲コピー (cherry-pick)
-  <enter>: view selected item's files
+  <enter>: View selected item's files
## コミットファイル 
   <c-o>: コミットされたファイル名をクリップボードにコピー
-  c: checkout file
-  d: discard this commit's changes to this file
+  c: Checkout file
+  d: Discard this commit's changes to this file
   o: ファイルを開く
   e: ファイルを編集
-  <space>: toggle file included in patch
-  a: toggle all files included in patch
-  <enter>: enter file to add selected lines to the patch (or toggle directory collapsed)
+  <space>: Toggle file included in patch
+  a: Toggle all files included in patch
+  <enter>: Enter file to add selected lines to the patch (or toggle directory collapsed)
   `: ファイルツリーの表示を切り替え
@@ -134,7 +134,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: サブモジュールを新規追加 e: サブモジュールのURLを更新 i: サブモジュールを初期化 - b: view bulk submodule options + b: View bulk submodule options ## ステータス @@ -154,7 +154,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ d: タグを削除 P: タグをpush n: タグを作成 - g: view reset options + g: View reset options <enter>: コミットを閲覧 @@ -162,7 +162,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ 
   <c-o>: ファイル名をクリップボードにコピー
-  d: view 'discard changes' options
+  d: View 'discard changes' options
   <space>: ステージ/アンステージ
   <c-b>: ファイルをフィルタ (ステージ/アンステージ)
   c: 変更をコミット
@@ -174,36 +174,36 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_
   i: ファイルをignore
   r: ファイルをリフレッシュ
   s: 変更をstash
-  S: view stash options
+  S: View stash options
   a: すべての変更をステージ/アンステージ
-  <enter>: stage individual hunks/lines for file, or collapse/expand for directory
-  g: view upstream reset options
-  D: view reset options
+  <enter>: Stage individual hunks/lines for file, or collapse/expand for directory
+  g: View upstream reset options
+  D: View reset options
   `: ファイルツリーの表示を切り替え
-  M: git mergetoolを開く
-  f: fetch
+  M: Git mergetoolを開く
+  f: Fetch
## ブランチ 
   <c-o>: ブランチ名をクリップボードにコピー
-  i: show git-flow options
+  i: Show git-flow options
   <space>: チェックアウト
   n: 新しいブランチを作成
   o: Pull Requestを作成
-  O: create pull request options
+  O: Create pull request options
   <c-y>: Pull RequestのURLをクリップボードにコピー
-  c: checkout by name
-  F: force checkout
+  c: Checkout by name
+  F: Force checkout
   d: ブランチを削除
-  r: rebase checked-out branch onto this branch
+  r: Rebase checked-out branch onto this branch
   M: 現在のブランチにマージ
-  f: fast-forward this branch from its upstream
+  f: Fast-forward this branch from its upstream
   T: タグを作成
-  g: view reset options
+  g: View reset options
   R: ブランチ名を変更
-  u: set/unset upstream
+  u: Set/Unset upstream
   <enter>: コミットを閲覧
@@ -217,9 +217,9 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <up>: 前のhunkを選択 <down>: 次のhunkを選択 z: アンドゥ - M: git mergetoolを開く - <space>: pick hunk - b: pick all hunks + M: Git mergetoolを開く + <space>: Pick hunk + b: Pick all hunks <esc>: ファイル一覧に戻る @@ -237,12 +237,12 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <right>: 次のhunkを選択 v: 範囲選択を切り替え V: 範囲選択を切り替え - a: hunk選択を切り替え + a: Hunk選択を切り替え <c-o>: 選択されたテキストをクリップボードにコピー o: ファイルを開く e: ファイルを編集 <space>: 行をパッチに追加/削除 - <esc>: exit custom patch builder + <esc>: Exit custom patch builder ## メインパネル (Staging) @@ -252,7 +252,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <right>: 次のhunkを選択 v: 範囲選択を切り替え V: 範囲選択を切り替え - a: hunk選択を切り替え + a: Hunk選択を切り替え <c-o>: 選択されたテキストをクリップボードにコピー o: ファイルを開く e: ファイルを編集 @@ -260,7 +260,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <tab>: パネルを切り替え <space>: 選択行をステージ/アンステージ d: 変更を削除 (git reset) - E: edit hunk + E: Edit hunk c: 変更をコミット w: pre-commitフックを実行せずに変更をコミット C: gitエディタを使用して変更をコミット @@ -289,11 +289,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <space>: チェックアウト n: 新しいブランチを作成 M: 現在のブランチにマージ - r: rebase checked-out branch onto this branch + r: Rebase checked-out branch onto this branch d: ブランチを削除 - u: set as upstream of checked-out branch + u: Set as upstream of checked-out branch <esc>: リモート一覧に戻る - g: view reset options + g: View reset options <enter>: コミットを閲覧 @@ -305,10 +305,10 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ y: コミットの情報をコピー o: ブラウザでコミットを開く n: コミットにブランチを作成 - g: view reset options + g: View reset options c: コミットをコピー (cherry-pick) C: コミットを範囲コピー (cherry-pick) - <c-r>: reset cherry-picked (copied) commits selection + <c-r>: Reset cherry-picked (copied) commits selection <enter>: コミットを閲覧 diff --git a/docs/keybindings/Keybindings_ko.md b/docs/keybindings/Keybindings_ko.md index ab76feb80..54c09e7e8 100644 --- a/docs/keybindings/Keybindings_ko.md +++ b/docs/keybindings/Keybindings_ko.md @@ -11,16 +11,16 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <pgup>: 메인 패널을 위로 스크롤 (fn+up/shift+k) <pgdown>: 메인 패널을 아래로로 스크롤 (fn+down/shift+j) @: 명령어 로그 메뉴 열기 - }: diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기 - {: diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기 - :: execute custom command + }: Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기 + {: Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기 + :: Execute custom command <c-p>: 커스텀 Patch 옵션 보기 - m: view merge/rebase options + m: View merge/rebase options R: 새로고침 +: 다음 스크린 모드 (normal/half/fullscreen) _: 이전 스크린 모드 ?: 매뉴 열기 - <c-s>: view filter-by-path options + <c-s>: View filter-by-path options W: Diff 메뉴 열기 <c-e>: Diff 메뉴 열기 <c-w>: 공백문자를 Diff 뷰에서 표시 여부 전환 @@ -30,7 +30,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ p: 업데이트 -## List Panel Navigation +## List panel navigation 
   ,: 이전 페이지
@@ -52,10 +52,10 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_
   y: 커밋 attribute 복사
   o: 브라우저에서 커밋 열기
   n: 커밋에서 새 브랜치를 만듭니다.
-  g: view reset options
+  g: View reset options
   c: 커밋을 복사 (cherry-pick)
   C: 커밋을 범위로 복사 (cherry-pick)
-  <c-r>: reset cherry-picked (copied) commits selection
+  <c-r>: Reset cherry-picked (copied) commits selection
   <enter>: 커밋 보기
@@ -63,11 +63,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ 
   <space>: 적용
-  g: pop
-  d: drop
+  g: Pop
+  d: Drop
   n: 새 브랜치 생성
-  r: rename stash
-  <enter>: view selected item's files
+  r: Rename stash
+  <enter>: View selected item's files
## Sub-commits @@ -78,11 +78,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ y: 커밋 attribute 복사 o: 브라우저에서 커밋 열기 n: 커밋에서 새 브랜치를 만듭니다. - g: view reset options + g: View reset options c: 커밋을 복사 (cherry-pick) C: 커밋을 범위로 복사 (cherry-pick) - <c-r>: reset cherry-picked (copied) commits selection - <enter>: view selected item's files + <c-r>: Reset cherry-picked (copied) commits selection + <enter>: View selected item's files ## 메뉴 @@ -102,9 +102,9 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <up>: 이전 hunk를 선택 <down>: 다음 hunk를 선택 z: 되돌리기 - M: git mergetool를 열기 - <space>: pick hunk - b: pick all hunks + M: Git mergetool를 열기 + <space>: Pick hunk + b: Pick all hunks <esc>: 파일 목록으로 돌아가기 @@ -122,12 +122,12 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <right>: 다음 hunk를 선택 v: 드래그 선택 전환 V: 드래그 선택 전환 - a: toggle select hunk + a: Toggle select hunk <c-o>: 선택한 텍스트를 클립보드에 복사 o: 파일 닫기 e: 파일 편집 - <space>: line(s)을 패치에 추가/삭제 - <esc>: exit custom patch builder + <space>: Line(s)을 패치에 추가/삭제 + <esc>: Exit custom patch builder ## 메인 패널 (Staging) @@ -137,7 +137,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <right>: 다음 hunk를 선택 v: 드래그 선택 전환 V: 드래그 선택 전환 - a: toggle select hunk + a: Toggle select hunk <c-o>: 선택한 텍스트를 클립보드에 복사 o: 파일 닫기 e: 파일 편집 @@ -145,9 +145,9 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <tab>: 패널 전환 <space>: 선택한 행을 staged / unstaged d: 변경을 삭제 (git reset) - E: edit hunk + E: Edit hunk c: 커밋 변경내용 - w: commit changes without pre-commit hook + w: Commit changes without pre-commit hook C: Git 편집기를 사용하여 변경 내용을 커밋합니다. @@ -155,7 +155,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ 
   <c-o>: 브랜치명을 클립보드에 복사
-  i: git-flow 옵션 보기
+  i: Git-flow 옵션 보기
   <space>: 체크아웃
   n: 새 브랜치 생성
   o: 풀 리퀘스트 생성
@@ -166,11 +166,11 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_
   d: 브랜치 삭제
   r: 체크아웃된 브랜치를 이 브랜치에 리베이스
   M: 현재 브랜치에 병합
-  f: fast-forward this branch from its upstream
+  f: Fast-forward this branch from its upstream
   T: 태그를 생성
-  g: view reset options
+  g: View reset options
   R: 브랜치 이름 변경
-  u: set/unset upstream
+  u: Set/Unset upstream
   <enter>: 커밋 보기
@@ -194,7 +194,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ n: 새로운 서브모듈 추가 e: 서브모듈의 URL을 수정 i: 서브모듈 초기화 - b: view bulk submodule options + b: View bulk submodule options ## 원격 @@ -215,9 +215,9 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ M: 현재 브랜치에 병합 r: 체크아웃된 브랜치를 이 브랜치에 리베이스 d: 브랜치 삭제 - u: set as upstream of checked-out branch + u: Set as upstream of checked-out branch <esc>: 원격목록으로 돌아가기 - g: view reset options + g: View reset options <enter>: 커밋 보기 @@ -225,46 +225,46 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ 
   <c-o>: 커밋 SHA를 클립보드에 복사
-  <c-r>: reset cherry-picked (copied) commits selection
-  b: bisect 옵션 보기
-  s: squash down
-  f: fixup commit
+  <c-r>: Reset cherry-picked (copied) commits selection
+  b: Bisect 옵션 보기
+  s: Squash down
+  f: Fixup commit
   r: 커밋메시지 변경
   R: 에디터에서 커밋메시지 수정
   d: 커밋 삭제
   e: 커밋을 편집
-  p: pick commit (when mid-rebase)
-  F: create fixup commit for this commit
-  S: squash all 'fixup!' commits above selected commit (autosquash)
+  p: Pick commit (when mid-rebase)
+  F: Create fixup commit for this commit
+  S: Squash all 'fixup!' commits above selected commit (autosquash)
   <c-j>: 커밋을 1개 아래로 이동
   <c-k>: 커밋을 1개 위로 이동
   v: 커밋을 붙여넣기 (cherry-pick)
-  A: amend commit with staged changes
-  a: reset commit author
+  A: Amend commit with staged changes
+  a: Set/Reset commit author
   t: 커밋 되돌리기
-  T: tag commit
+  T: Tag commit
   <c-l>: 로그 메뉴 열기
   <space>: 커밋을 체크아웃
   y: 커밋 attribute 복사
   o: 브라우저에서 커밋 열기
   n: 커밋에서 새 브랜치를 만듭니다.
-  g: view reset options
+  g: View reset options
   c: 커밋을 복사 (cherry-pick)
   C: 커밋을 범위로 복사 (cherry-pick)
-  <enter>: view selected item's files
+  <enter>: View selected item's files
## 커밋 파일 
   <c-o>: 커밋한 파일명을 클립보드에 복사
-  c: checkout file
-  d: discard this commit's changes to this file
+  c: Checkout file
+  d: Discard this commit's changes to this file
   o: 파일 닫기
   e: 파일 편집
-  <space>: toggle file included in patch
-  a: toggle all files included in patch
-  <enter>: enter file to add selected lines to the patch (or toggle directory collapsed)
+  <space>: Toggle file included in patch
+  a: Toggle all files included in patch
+  <enter>: Enter file to add selected lines to the patch (or toggle directory collapsed)
   `: 파일 트리뷰로 전환
@@ -282,7 +282,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ d: 태그 삭제 P: 태그를 push n: 태그를 생성 - g: view reset options + g: View reset options <enter>: 커밋 보기 @@ -290,26 +290,26 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ 
   <c-o>: 파일명을 클립보드에 복사
-  d: view 'discard changes' options
+  d: View 'discard changes' options
   <space>: Staged 전환
   <c-b>: 파일을 필터하기 (Staged/unstaged)
   c: 커밋 변경내용
-  w: commit changes without pre-commit hook
+  w: Commit changes without pre-commit hook
   A: 마지맛 커밋 수정
   C: Git 편집기를 사용하여 변경 내용을 커밋합니다.
   e: 파일 편집
   o: 파일 닫기
-  i: ignore file
+  i: Ignore file
   r: 파일 새로고침
   s: 변경사항을 Stash
   S: Stash 옵션 보기
   a: 모든 변경을 Staged/unstaged으로 전환
-  <enter>: stage individual hunks/lines for file, or collapse/expand for directory
-  g: view upstream reset options
-  D: view reset options
+  <enter>: Stage individual hunks/lines for file, or collapse/expand for directory
+  g: View upstream reset options
+  D: View reset options
   `: 파일 트리뷰로 전환
-  M: git mergetool를 열기
-  f: fetch
+  M: Git mergetool를 열기
+  f: Fetch
## 확인 패널 diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md index aa9847b79..223317778 100644 --- a/docs/keybindings/Keybindings_nl.md +++ b/docs/keybindings/Keybindings_nl.md @@ -4,317 +4,317 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ -## Globale Sneltoetsen +## Globale sneltoetsen 
-  <c-r>: wissel naar een recente repo
-  <pgup>: scroll naar beneden vanaf hoofdpaneel (fn+up/shift+k)
-  <pgdown>: scroll naar beneden vanaf hoofdpaneel (fn+down/shift+j)
-  @: open command log menu
+  <c-r>: Wissel naar een recente repo
+  <pgup>: Scroll naar beneden vanaf hoofdpaneel (fn+up/shift+k)
+  <pgdown>: Scroll naar beneden vanaf hoofdpaneel (fn+down/shift+j)
+  @: Open command log menu
   }: Increase the size of the context shown around changes in the diff view
   {: Decrease the size of the context shown around changes in the diff view
-  :: voer aangepaste commando uit
-  <c-p>: bekijk aangepaste patch opties
-  m: bekijk merge/rebase opties
-  R: verversen
-  +: volgende scherm modus (normaal/half/groot)
-  _: vorige scherm modus
-  ?: open menu
-  <c-s>: bekijk scoping opties
-  W: open diff menu
-  <c-e>: open diff menu
+  :: Voer aangepaste commando uit
+  <c-p>: Bekijk aangepaste patch opties
+  m: Bekijk merge/rebase opties
+  R: Verversen
+  +: Volgende scherm modus (normaal/half/groot)
+  _: Vorige scherm modus
+  ?: Open menu
+  <c-s>: Bekijk scoping opties
+  W: Open diff menu
+  <c-e>: Open diff menu
   <c-w>: Toggle whether or not whitespace changes are shown in the diff view
-  z: ongedaan maken (via reflog) (experimenteel)
-  <c-z>: redo (via reflog) (experimenteel)
-  P: push
-  p: pull
+  z: Ongedaan maken (via reflog) (experimenteel)
+  <c-z>: Redo (via reflog) (experimenteel)
+  P: Push
+  p: Pull
-## Lijstpaneel Navigatie +## Lijstpaneel navigatie 
-  ,: vorige pagina
-  .: volgende pagina
-  <: scroll naar boven
-  /: start met zoeken
-  >: scroll naar beneden
-  H: scroll left
-  L: scroll right
-  ]: volgende tabblad
-  [: vorige tabblad
+  ,: Vorige pagina
+  .: Volgende pagina
+  <: Scroll naar boven
+  /: Start met zoeken
+  >: Scroll naar beneden
+  H: Scroll left
+  L: Scroll right
+  ]: Volgende tabblad
+  [: Vorige tabblad
## Bestanden 
-  <c-o>: kopieer de bestandsnaam naar het klembord
-  d: bekijk 'veranderingen ongedaan maken' opties
-  <space>: toggle staged
+  <c-o>: Kopieer de bestandsnaam naar het klembord
+  d: Bekijk 'veranderingen ongedaan maken' opties
+  <space>: Toggle staged
   <c-b>: Filter files (staged/unstaged)
-  c: commit veranderingen
-  w: commit veranderingen zonder pre-commit hook
-  A: wijzig laatste commit
-  C: commit veranderingen met de git editor
-  e: verander bestand
-  o: open bestand
-  i: ignore or exclude file
-  r: refresh bestanden
-  s: stash-bestanden
-  S: bekijk stash opties
-  a: toggle staged alle
-  <enter>: stage individuele hunks/lijnen
-  g: bekijk upstream reset opties
-  D: bekijk reset opties
-  `: toggle bestandsboom weergave
-  M: open external merge tool (git mergetool)
-  f: fetch
+  c: Commit veranderingen
+  w: Commit veranderingen zonder pre-commit hook
+  A: Wijzig laatste commit
+  C: Commit veranderingen met de git editor
+  e: Verander bestand
+  o: Open bestand
+  i: Ignore or exclude file
+  r: Refresh bestanden
+  s: Stash-bestanden
+  S: Bekijk stash opties
+  a: Toggle staged alle
+  <enter>: Stage individuele hunks/lijnen
+  g: Bekijk upstream reset opties
+  D: Bekijk reset opties
+  `: Toggle bestandsboom weergave
+  M: Open external merge tool (git mergetool)
+  f: Fetch
## Bevestigingspaneel 
-  <enter>: bevestig
-  <esc>: sluiten
+  <enter>: Bevestig
+  <esc>: Sluiten
## Branches 
-  <c-o>: kopieer branch name naar klembord
-  i: laat git-flow opties zien
-  <space>: uitchecken
-  n: nieuwe branch
-  o: maak een pull-request
-  O: bekijk opties voor pull-aanvraag
-  <c-y>: kopieer de URL van het pull-verzoek naar het klembord
-  c: uitchecken bij naam
-  F: forceer checkout
-  d: verwijder branch
-  r: rebase branch
-  M: merge in met huidige checked out branch
-  f: fast-forward deze branch vanaf zijn upstream
-  T: creëer tag
-  g: bekijk reset opties
-  R: hernoem branch
-  u: set/unset upstream
-  <enter>: bekijk commits
+  <c-o>: Kopieer branch name naar klembord
+  i: Laat git-flow opties zien
+  <space>: Uitchecken
+  n: Nieuwe branch
+  o: Maak een pull-request
+  O: Bekijk opties voor pull-aanvraag
+  <c-y>: Kopieer de URL van het pull-verzoek naar het klembord
+  c: Uitchecken bij naam
+  F: Forceer checkout
+  d: Verwijder branch
+  r: Rebase branch
+  M: Merge in met huidige checked out branch
+  f: Fast-forward deze branch vanaf zijn upstream
+  T: Creëer tag
+  g: Bekijk reset opties
+  R: Hernoem branch
+  u: Set/Unset upstream
+  <enter>: Bekijk commits
-## Commit Bericht +## Commit bericht 
-  <enter>: bevestig
-  <esc>: sluiten
+  <enter>: Bevestig
+  <esc>: Sluiten
## Commit bestanden 
-  <c-o>: kopieer de vastgelegde bestandsnaam naar het klembord
-  c: bestand uitchecken
-  d: uitsluit deze commit zijn veranderingen aan dit bestand
-  o: open bestand
-  e: verander bestand
-  <space>: toggle bestand inbegrepen in patch
-  a: toggle all files included in patch
-  <enter>: enter bestand om geselecteerde regels toe te voegen aan de patch
-  `: toggle bestandsboom weergave
+  <c-o>: Kopieer de vastgelegde bestandsnaam naar het klembord
+  c: Bestand uitchecken
+  d: Uitsluit deze commit zijn veranderingen aan dit bestand
+  o: Open bestand
+  e: Verander bestand
+  <space>: Toggle bestand inbegrepen in patch
+  a: Toggle all files included in patch
+  <enter>: Enter bestand om geselecteerde regels toe te voegen aan de patch
+  `: Toggle bestandsboom weergave
## Commits 
-  <c-o>: kopieer commit SHA naar klembord
-  <c-r>: reset cherry-picked (gekopieerde) commits selectie
-  b: view bisect options
-  s: squash beneden
+  <c-o>: Kopieer commit SHA naar klembord
+  <c-r>: Reset cherry-picked (gekopieerde) commits selectie
+  b: View bisect options
+  s: Squash beneden
   f: Fixup commit
-  r: hernoem commit
-  R: hernoem commit met editor
-  d: verwijder commit
-  e: wijzig commit
-  p: kies commit (wanneer midden in rebase)
-  F: creëer fixup commit voor deze commit
-  S: squash bovenstaande commits
-  <c-j>: verplaats commit 1 naar beneden
-  <c-k>: verplaats commit 1 naar boven
-  v: plak commits (cherry-pick)
-  A: wijzig commit met staged veranderingen
-  a: reset commit author
-  t: commit ongedaan maken
-  T: tag commit
-  <c-l>: open log menu
-  <space>: checkout commit
-  y: copy commit attribute
-  o: open commit in browser
-  n: creëer nieuwe branch van commit
-  g: bekijk reset opties
-  c: kopieer commit (cherry-pick)
-  C: kopieer commit reeks (cherry-pick)
-  <enter>: bekijk gecommite bestanden
+  r: Hernoem commit
+  R: Hernoem commit met editor
+  d: Verwijder commit
+  e: Wijzig commit
+  p: Kies commit (wanneer midden in rebase)
+  F: Creëer fixup commit
+  S: Squash bovenstaande commits
+  <c-j>: Verplaats commit 1 naar beneden
+  <c-k>: Verplaats commit 1 naar boven
+  v: Plak commits (cherry-pick)
+  A: Wijzig commit met staged veranderingen
+  a: Set/Reset commit author
+  t: Commit ongedaan maken
+  T: Tag commit
+  <c-l>: Open log menu
+  <space>: Checkout commit
+  y: Copy commit attribute
+  o: Open commit in browser
+  n: Creëer nieuwe branch van commit
+  g: Bekijk reset opties
+  c: Kopieer commit (cherry-pick)
+  C: Kopieer commit reeks (cherry-pick)
+  <enter>: Bekijk gecommite bestanden
## Menu 
-  <enter>: uitvoeren
-  <esc>: sluiten
+  <enter>: Uitvoeren
+  <esc>: Sluiten
## Mergen 
-  e: verander bestand
-  o: open bestand
-  <left>: selecteer voorgaand conflict
-  <right>: selecteer volgende conflict
-  <up>: selecteer bovenste hunk
-  <down>: selecteer onderste hunk
-  z: ongedaan maken
-  M: open external merge tool (git mergetool)
-  <space>: kies hunk
-  b: kies bijde hunks
-  <esc>: ga terug naar het bestanden paneel
+  e: Verander bestand
+  o: Open bestand
+  <left>: Selecteer voorgaand conflict
+  <right>: Selecteer volgende conflict
+  <up>: Selecteer bovenste hunk
+  <down>: Selecteer onderste hunk
+  z: Ongedaan maken
+  M: Open external merge tool (git mergetool)
+  <space>: Kies stuk
+  b: Kies beide stukken
+  <esc>: Ga terug naar het bestanden paneel
## Normaal 
-  mouse wheel down: scroll omlaag (fn+up)
-  mouse wheel up: scroll omhoog (fn+down)
+  mouse wheel down: Scroll omlaag (fn+up)
+  mouse wheel up: Scroll omhoog (fn+down)
-## Patch Bouwen +## Patch bouwen 
-  <left>: selecteer de vorige hunk
-  <right>: selecteer de volgende hunk
-  v: toggle drag selecteer
-  V: toggle drag selecteer
-  a: toggle selecteer hunk
-  <c-o>: copy the selected text to the clipboard
-  o: open bestand
-  e: verander bestand
-  <space>: voeg toe/verwijder lijn(en) in patch
-  <esc>: sluit lijn-bij-lijn modus
+  <left>: Selecteer de vorige hunk
+  <right>: Selecteer de volgende hunk
+  v: Toggle drag selecteer
+  V: Toggle drag selecteer
+  a: Toggle selecteer hunk
+  <c-o>: Copy the selected text to the clipboard
+  o: Open bestand
+  e: Verander bestand
+  <space>: Voeg toe/verwijder lijn(en) in patch
+  <esc>: Sluit lijn-bij-lijn modus
## Reflog 
-  <c-o>: kopieer commit SHA naar klembord
-  <space>: checkout commit
-  y: copy commit attribute
-  o: open commit in browser
-  n: creëer nieuwe branch van commit
-  g: bekijk reset opties
-  c: kopieer commit (cherry-pick)
-  C: kopieer commit reeks (cherry-pick)
-  <c-r>: reset cherry-picked (gekopieerde) commits selectie
-  <enter>: bekijk commits
+  <c-o>: Kopieer commit SHA naar klembord
+  <space>: Checkout commit
+  y: Copy commit attribute
+  o: Open commit in browser
+  n: Creëer nieuwe branch van commit
+  g: Bekijk reset opties
+  c: Kopieer commit (cherry-pick)
+  C: Kopieer commit reeks (cherry-pick)
+  <c-r>: Reset cherry-picked (gekopieerde) commits selectie
+  <enter>: Bekijk commits
-## Remote Branches +## Remote branches 
-  <c-o>: kopieer branch name naar klembord
-  <space>: uitchecken
-  n: nieuwe branch
-  M: merge in met huidige checked out branch
-  r: rebase branch
-  d: verwijder branch
-  u: stel in als upstream van uitgecheckte branch
-  <esc>: ga terug naar remotes lijst
-  g: bekijk reset opties
-  <enter>: bekijk commits
+  <c-o>: Kopieer branch name naar klembord
+  <space>: Uitchecken
+  n: Nieuwe branch
+  M: Merge in met huidige checked out branch
+  r: Rebase branch
+  d: Verwijder branch
+  u: Stel in als upstream van uitgecheckte branch
+  <esc>: Ga terug naar remotes lijst
+  g: Bekijk reset opties
+  <enter>: Bekijk commits
## Remotes 
-  f: fetch remote
-  n: voeg een nieuwe remote toe
-  d: verwijder remote
-  e: wijzig remote
+  f: Fetch remote
+  n: Voeg een nieuwe remote toe
+  d: Verwijder remote
+  e: Wijzig remote
## Staging 
-  <left>: selecteer de vorige hunk
-  <right>: selecteer de volgende hunk
-  v: toggle drag selecteer
-  V: toggle drag selecteer
-  a: toggle selecteer hunk
-  <c-o>: copy the selected text to the clipboard
-  o: open bestand
-  e: verander bestand
-  <esc>: ga terug naar het bestanden paneel
-  <tab>: ga naar een ander paneel
-  <space>: toggle lijnen staged / unstaged
-  d: verwijdert change (git reset)
-  E: edit hunk
-  c: commit veranderingen
-  w: commit veranderingen zonder pre-commit hook
-  C: commit veranderingen met de git editor
+  <left>: Selecteer de vorige hunk
+  <right>: Selecteer de volgende hunk
+  v: Toggle drag selecteer
+  V: Toggle drag selecteer
+  a: Toggle selecteer hunk
+  <c-o>: Copy the selected text to the clipboard
+  o: Open bestand
+  e: Verander bestand
+  <esc>: Ga terug naar het bestanden paneel
+  <tab>: Ga naar een ander paneel
+  <space>: Toggle lijnen staged / unstaged
+  d: Verwijdert change (git reset)
+  E: Edit hunk
+  c: Commit veranderingen
+  w: Commit veranderingen zonder pre-commit hook
+  C: Commit veranderingen met de git editor
## Stash 
-  <space>: toepassen
-  g: pop
-  d: laten vallen
-  n: nieuwe branch
-  r: rename stash
-  <enter>: bekijk gecommite bestanden
+  <space>: Toepassen
+  g: Pop
+  d: Laten vallen
+  n: Nieuwe branch
+  r: Rename stash
+  <enter>: Bekijk gecommite bestanden
## Status 
-  o: open config bestand
-  e: verander config bestand
-  u: check voor updates
-  <enter>: wissel naar een recente repo
-  a: alle logs van de branch laten zien
+  o: Open config bestand
+  e: Verander config bestand
+  u: Check voor updates
+  <enter>: Wissel naar een recente repo
+  a: Alle logs van de branch laten zien
## Sub-commits 
-  <c-o>: kopieer commit SHA naar klembord
-  <space>: checkout commit
-  y: copy commit attribute
-  o: open commit in browser
-  n: creëer nieuwe branch van commit
-  g: bekijk reset opties
-  c: kopieer commit (cherry-pick)
-  C: kopieer commit reeks (cherry-pick)
-  <c-r>: reset cherry-picked (gekopieerde) commits selectie
-  <enter>: bekijk gecommite bestanden
+  <c-o>: Kopieer commit SHA naar klembord
+  <space>: Checkout commit
+  y: Copy commit attribute
+  o: Open commit in browser
+  n: Creëer nieuwe branch van commit
+  g: Bekijk reset opties
+  c: Kopieer commit (cherry-pick)
+  C: Kopieer commit reeks (cherry-pick)
+  <c-r>: Reset cherry-picked (gekopieerde) commits selectie
+  <enter>: Bekijk gecommite bestanden
## Submodules 
-  <c-o>: kopieer submodule naam naar klembord
-  <enter>: enter submodule
-  d: remove submodule
-  u: update submodule
-  n: voeg nieuwe submodule toe
-  e: update submodule URL
-  i: initialiseer submodule
-  b: bekijk bulk submodule opties
+  <c-o>: Kopieer submodule naam naar klembord
+  <enter>: Enter submodule
+  d: Remove submodule
+  u: Update submodule
+  n: Voeg nieuwe submodule toe
+  e: Update submodule URL
+  i: Initialiseer submodule
+  b: Bekijk bulk submodule opties
## Tags 
-  <space>: uitchecken
-  d: verwijder tag
-  P: push tag
-  n: creëer tag
-  g: bekijk reset opties
-  <enter>: bekijk commits
+  <space>: Uitchecken
+  d: Verwijder tag
+  P: Push tag
+  n: Creëer tag
+  g: Bekijk reset opties
+  <enter>: Bekijk commits
diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md index 5840dfcb0..2f1da2e62 100644 --- a/docs/keybindings/Keybindings_pl.md +++ b/docs/keybindings/Keybindings_pl.md @@ -7,314 +7,314 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ ## Globalne 
-  <c-r>: switch to a recent repo
-  <pgup>: scroll up main panel (fn+up/shift+k)
-  <pgdown>: scroll down main panel (fn+down/shift+j)
-  @: open command log menu
+  <c-r>: Switch to a recent repo
+  <pgup>: Scroll up main panel (fn+up/shift+k)
+  <pgdown>: Scroll down main panel (fn+down/shift+j)
+  @: Open command log menu
   }: Increase the size of the context shown around changes in the diff view
   {: Decrease the size of the context shown around changes in the diff view
-  :: wykonaj własną komendę
-  <c-p>: view custom patch options
-  m: widok scalenia/opcje zmiany bazy
-  R: odśwież
-  +: next screen mode (normal/half/fullscreen)
-  _: prev screen mode
-  ?: open menu
-  <c-s>: view filter-by-path options
-  W: open diff menu
-  <c-e>: open diff menu
+  :: Wykonaj własną komendę
+  <c-p>: View custom patch options
+  m: Widok scalenia/opcje zmiany bazy
+  R: Odśwież
+  +: Next screen mode (normal/half/fullscreen)
+  _: Prev screen mode
+  ?: Open menu
+  <c-s>: View filter-by-path options
+  W: Open diff menu
+  <c-e>: Open diff menu
   <c-w>: Toggle whether or not whitespace changes are shown in the diff view
-  z: undo (via reflog) (experimental)
-  <c-z>: redo (via reflog) (experimental)
-  P: push
-  p: pull
+  z: Undo
+  <c-z>: Redo
+  P: Push
+  p: Pull
-## List Panel Navigation +## List panel navigation 
-  ,: previous page
-  .: next page
-  <: scroll to top
-  /: start search
-  >: scroll to bottom
-  H: scroll left
-  L: scroll right
-  ]: next tab
-  [: previous tab
+  ,: Previous page
+  .: Next page
+  <: Scroll to top
+  /: Start search
+  >: Scroll to bottom
+  H: Scroll left
+  L: Scroll right
+  ]: Next tab
+  [: Previous tab
-## Commit Summary +## Commit summary 
-  <enter>: potwierdź
-  <esc>: zamknij
+  <enter>: Potwierdź
+  <esc>: Zamknij
## Commity 
-  <c-o>: copy commit SHA to clipboard
-  <c-r>: reset cherry-picked (copied) commits selection
-  b: view bisect options
-  s: ściśnij
-  f: napraw commit
-  r: zmień nazwę commita
-  R: zmień nazwę commita w edytorze
-  d: usuń commit
-  e: edytuj commit
-  p: wybierz commit (podczas zmiany bazy)
-  F: utwórz commit naprawczy dla tego commita
-  S: spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash)
-  <c-j>: przenieś commit 1 w dół
-  <c-k>: przenieś commit 1 w górę
-  v: wklej commity (przebieranie)
-  A: popraw commit zmianami z poczekalni
-  a: reset commit author
-  t: odwróć commit
-  T: tag commit
-  <c-l>: open log menu
-  <space>: checkout commit
-  y: copy commit attribute
-  o: open commit in browser
-  n: create new branch off of commit
-  g: wyświetl opcje resetu
-  c: kopiuj commit (przebieranie)
-  C: kopiuj zakres commitów (przebieranie)
-  <enter>: przeglądaj pliki commita
+  <c-o>: Copy commit SHA to clipboard
+  <c-r>: Reset cherry-picked (copied) commits selection
+  b: View bisect options
+  s: Ściśnij
+  f: Napraw commit
+  r: Zmień nazwę commita
+  R: Zmień nazwę commita w edytorze
+  d: Usuń commit
+  e: Edytuj commit
+  p: Wybierz commit (podczas zmiany bazy)
+  F: Utwórz commit naprawczy dla tego commita
+  S: Spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash)
+  <c-j>: Przenieś commit 1 w dół
+  <c-k>: Przenieś commit 1 w górę
+  v: Wklej commity (przebieranie)
+  A: Popraw commit zmianami z poczekalni
+  a: Set/Reset commit author
+  t: Odwróć commit
+  T: Tag commit
+  <c-l>: Open log menu
+  <space>: Checkout commit
+  y: Copy commit attribute
+  o: Open commit in browser
+  n: Create new branch off of commit
+  g: Wyświetl opcje resetu
+  c: Kopiuj commit (przebieranie)
+  C: Kopiuj zakres commitów (przebieranie)
+  <enter>: Przeglądaj pliki commita
-## Confirmation Panel +## Confirmation panel 
-  <enter>: potwierdź
-  <esc>: zamknij
+  <enter>: Potwierdź
+  <esc>: Zamknij
-## Local Branches +## Local branches 
-  <c-o>: copy branch name to clipboard
-  i: show git-flow options
-  <space>: przełącz
-  n: nowa gałąź
-  o: utwórz żądanie pobrania
-  O: utwórz opcje żądania ściągnięcia
-  <c-y>: skopiuj adres URL żądania pobrania do schowka
-  c: przełącz używając nazwy
-  F: wymuś przełączenie
-  d: usuń gałąź
-  r: zmiana bazy gałęzi
-  M: scal do obecnej gałęzi
-  f: fast-forward this branch from its upstream
-  T: create tag
-  g: wyświetl opcje resetu
-  R: rename branch
-  u: set/unset upstream
-  <enter>: view commits
+  <c-o>: Copy branch name to clipboard
+  i: Show git-flow options
+  <space>: Przełącz
+  n: Nowa gałąź
+  o: Utwórz żądanie pobrania
+  O: Utwórz opcje żądania ściągnięcia
+  <c-y>: Skopiuj adres URL żądania pobrania do schowka
+  c: Przełącz używając nazwy
+  F: Wymuś przełączenie
+  d: Usuń gałąź
+  r: Zmiana bazy gałęzi
+  M: Scal do obecnej gałęzi
+  f: Fast-forward this branch from its upstream
+  T: Create tag
+  g: Wyświetl opcje resetu
+  R: Rename branch
+  u: Set/Unset upstream
+  <enter>: View commits
-## Main Panel (Patch Building) +## Main panel (patch building) 
-  <left>: poprzedni kawałek
-  <right>: następny kawałek
-  v: toggle drag select
-  V: toggle drag select
-  a: toggle select hunk
-  <c-o>: copy the selected text to the clipboard
-  o: otwórz plik
-  e: edytuj plik
-  <space>: add/remove line(s) to patch
-  <esc>: wyście z trybu "linia po linii"
+  <left>: Poprzedni kawałek
+  <right>: Następny kawałek
+  v: Toggle drag select
+  V: Toggle drag select
+  a: Toggle select hunk
+  <c-o>: Copy the selected text to the clipboard
+  o: Otwórz plik
+  e: Edytuj plik
+  <space>: Add/Remove line(s) to patch
+  <esc>: Wyście z trybu "linia po linii"
## Menu 
-  <enter>: wykonaj
-  <esc>: zamknij
+  <enter>: Wykonaj
+  <esc>: Zamknij
## Pliki 
-  <c-o>: copy the file name to the clipboard
-  d: pokaż opcje porzucania zmian
-  <space>: przełącz stan poczekalni
+  <c-o>: Copy the file name to the clipboard
+  d: Pokaż opcje porzucania zmian
+  <space>: Przełącz stan poczekalni
   <c-b>: Filter files (staged/unstaged)
   c: Zatwierdź zmiany
-  w: zatwierdź zmiany bez skryptu pre-commit
+  w: Zatwierdź zmiany bez skryptu pre-commit
   A: Zmień ostatni commit
   C: Zatwierdź zmiany używając edytora
-  e: edytuj plik
-  o: otwórz plik
-  i: ignore or exclude file
-  r: odśwież pliki
-  s: przechowaj zmiany
-  S: wyświetl opcje schowka
-  a: przełącz stan poczekalni wszystkich
-  <enter>: zatwierdź pojedyncze linie
-  g: view upstream reset options
-  D: wyświetl opcje resetu
-  `: toggle file tree view
-  M: open external merge tool (git mergetool)
-  f: pobierz
+  e: Edytuj plik
+  o: Otwórz plik
+  i: Ignore or exclude file
+  r: Odśwież pliki
+  s: Przechowaj zmiany
+  S: Wyświetl opcje schowka
+  a: Przełącz stan poczekalni wszystkich
+  <enter>: Zatwierdź pojedyncze linie
+  g: View upstream reset options
+  D: Wyświetl opcje resetu
+  `: Toggle file tree view
+  M: Open external merge tool (git mergetool)
+  f: Pobierz
## Pliki commita 
-  <c-o>: copy the committed file name to the clipboard
-  c: plik wybierania
-  d: porzuć zmiany commita dla tego pliku
-  o: otwórz plik
-  e: edytuj plik
-  <space>: toggle file included in patch
-  a: toggle all files included in patch
-  <enter>: enter file to add selected lines to the patch (or toggle directory collapsed)
-  `: toggle file tree view
+  <c-o>: Copy the committed file name to the clipboard
+  c: Plik wybierania
+  d: Porzuć zmiany commita dla tego pliku
+  o: Otwórz plik
+  e: Edytuj plik
+  <space>: Toggle file included in patch
+  a: Toggle all files included in patch
+  <enter>: Enter file to add selected lines to the patch (or toggle directory collapsed)
+  `: Toggle file tree view
## Poczekalnia 
-  <left>: poprzedni kawałek
-  <right>: następny kawałek
-  v: toggle drag select
-  V: toggle drag select
-  a: toggle select hunk
-  <c-o>: copy the selected text to the clipboard
-  o: otwórz plik
-  e: edytuj plik
-  <esc>: wróć do panelu plików
-  <tab>: switch to other panel (staged/unstaged changes)
-  <space>: toggle line staged / unstaged
-  d: delete change (git reset)
-  E: edit hunk
+  <left>: Poprzedni kawałek
+  <right>: Następny kawałek
+  v: Toggle drag select
+  V: Toggle drag select
+  a: Toggle select hunk
+  <c-o>: Copy the selected text to the clipboard
+  o: Otwórz plik
+  e: Edytuj plik
+  <esc>: Wróć do panelu plików
+  <tab>: Switch to other panel (staged/unstaged changes)
+  <space>: Toggle line staged / unstaged
+  d: Delete change (git reset)
+  E: Edit hunk
   c: Zatwierdź zmiany
-  w: zatwierdź zmiany bez skryptu pre-commit
+  w: Zatwierdź zmiany bez skryptu pre-commit
   C: Zatwierdź zmiany używając edytora
## Reflog 
-  <c-o>: copy commit SHA to clipboard
-  <space>: checkout commit
-  y: copy commit attribute
-  o: open commit in browser
-  n: create new branch off of commit
-  g: wyświetl opcje resetu
-  c: kopiuj commit (przebieranie)
-  C: kopiuj zakres commitów (przebieranie)
-  <c-r>: reset cherry-picked (copied) commits selection
-  <enter>: view commits
+  <c-o>: Copy commit SHA to clipboard
+  <space>: Checkout commit
+  y: Copy commit attribute
+  o: Open commit in browser
+  n: Create new branch off of commit
+  g: Wyświetl opcje resetu
+  c: Kopiuj commit (przebieranie)
+  C: Kopiuj zakres commitów (przebieranie)
+  <c-r>: Reset cherry-picked (copied) commits selection
+  <enter>: View commits
-## Remote Branches +## Remote branches 
-  <c-o>: copy branch name to clipboard
-  <space>: przełącz
-  n: nowa gałąź
-  M: scal do obecnej gałęzi
-  r: zmiana bazy gałęzi
-  d: usuń gałąź
-  u: set as upstream of checked-out branch
-  <esc>: wróć do listy repozytoriów zdalnych
-  g: wyświetl opcje resetu
-  <enter>: view commits
+  <c-o>: Copy branch name to clipboard
+  <space>: Przełącz
+  n: Nowa gałąź
+  M: Scal do obecnej gałęzi
+  r: Zmiana bazy gałęzi
+  d: Usuń gałąź
+  u: Set as upstream of checked-out branch
+  <esc>: Wróć do listy repozytoriów zdalnych
+  g: Wyświetl opcje resetu
+  <enter>: View commits
## Remotes 
-  f: fetch remote
-  n: add new remote
-  d: remove remote
-  e: edit remote
+  f: Fetch remote
+  n: Add new remote
+  d: Remove remote
+  e: Edit remote
## Scalanie 
-  e: edytuj plik
-  o: otwórz plik
-  <left>: poprzedni konflikt
-  <right>: następny konflikt
-  <up>: wybierz poprzedni kawałek
-  <down>: wybierz następny kawałek
-  z: cofnij
-  M: open external merge tool (git mergetool)
-  <space>: wybierz kawałek
-  b: wybierz wszystkie kawałki
-  <esc>: wróć do panelu plików
+  e: Edytuj plik
+  o: Otwórz plik
+  <left>: Poprzedni konflikt
+  <right>: Następny konflikt
+  <up>: Wybierz poprzedni kawałek
+  <down>: Wybierz następny kawałek
+  z: Cofnij
+  M: Open external merge tool (git mergetool)
+  <space>: Wybierz kawałek
+  b: Wybierz oba kawałki
+  <esc>: Wróć do panelu plików
## Schowek 
-  <space>: zastosuj
-  g: wyciągnij
-  d: porzuć
-  n: nowa gałąź
-  r: rename stash
-  <enter>: przeglądaj pliki commita
+  <space>: Zastosuj
+  g: Wyciągnij
+  d: Porzuć
+  n: Nowa gałąź
+  r: Rename stash
+  <enter>: Przeglądaj pliki commita
## Status 
-  o: otwórz konfigurację
-  e: edytuj konfigurację
-  u: sprawdź aktualizacje
-  <enter>: switch to a recent repo
-  a: pokaż wszystkie logi gałęzi
+  o: Otwórz konfigurację
+  e: Edytuj konfigurację
+  u: Sprawdź aktualizacje
+  <enter>: Switch to a recent repo
+  a: Pokaż wszystkie logi gałęzi
## Sub-commits 
-  <c-o>: copy commit SHA to clipboard
-  <space>: checkout commit
-  y: copy commit attribute
-  o: open commit in browser
-  n: create new branch off of commit
-  g: wyświetl opcje resetu
-  c: kopiuj commit (przebieranie)
-  C: kopiuj zakres commitów (przebieranie)
-  <c-r>: reset cherry-picked (copied) commits selection
-  <enter>: przeglądaj pliki commita
+  <c-o>: Copy commit SHA to clipboard
+  <space>: Checkout commit
+  y: Copy commit attribute
+  o: Open commit in browser
+  n: Create new branch off of commit
+  g: Wyświetl opcje resetu
+  c: Kopiuj commit (przebieranie)
+  C: Kopiuj zakres commitów (przebieranie)
+  <c-r>: Reset cherry-picked (copied) commits selection
+  <enter>: Przeglądaj pliki commita
## Submodules 
-  <c-o>: copy submodule name to clipboard
-  <enter>: enter submodule
-  d: remove submodule
-  u: update submodule
-  n: add new submodule
-  e: update submodule URL
-  i: initialize submodule
-  b: view bulk submodule options
+  <c-o>: Copy submodule name to clipboard
+  <enter>: Enter submodule
+  d: Remove submodule
+  u: Update submodule
+  n: Add new submodule
+  e: Update submodule URL
+  i: Initialize submodule
+  b: View bulk submodule options
## Tags 
-  <space>: przełącz
-  d: delete tag
-  P: push tag
-  n: create tag
-  g: wyświetl opcje resetu
-  <enter>: view commits
+  <space>: Przełącz
+  d: Delete tag
+  P: Push tag
+  n: Create tag
+  g: Wyświetl opcje resetu
+  <enter>: View commits
## Zwykłe 
-  mouse wheel down: przewiń w dół (fn+up)
-  mouse wheel up: przewiń w górę (fn+down)
+  mouse wheel down: Przewiń w dół (fn+up)
+  mouse wheel up: Przewiń w górę (fn+down)
diff --git a/docs/keybindings/Keybindings_zh.md b/docs/keybindings/Keybindings_zh.md index 5ea636284..6275f572d 100644 --- a/docs/keybindings/Keybindings_zh.md +++ b/docs/keybindings/Keybindings_zh.md @@ -49,7 +49,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ 
   <c-o>: 将提交的 SHA 复制到剪贴板
   <space>: 检出提交
-  y: copy commit attribute
+  y: Copy commit attribute
   o: 在浏览器中打开提交
   n: 从提交创建新分支
   g: 查看重置选项
@@ -78,7 +78,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_
   T: 创建标签
   g: 查看重置选项
   R: 重命名分支
-  u: set/unset upstream
+  u: Set/Unset upstream
   <enter>: 查看提交
@@ -87,7 +87,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ 
   <c-o>: 将提交的 SHA 复制到剪贴板
   <space>: 检出提交
-  y: copy commit attribute
+  y: Copy commit attribute
   o: 在浏览器中打开提交
   n: 从提交创建新分支
   g: 查看重置选项
@@ -123,18 +123,18 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_
   d: 删除提交
   e: 编辑提交
   p: 选择提交（变基过程中）
-  F: 为此提交创建修正
+  F: 创建修正提交
   S: 压缩在所选提交之上的所有“fixup!”提交（自动压缩）
   <c-j>: 下移提交
   <c-k>: 上移提交
   v: 粘贴提交（拣选）
   A: 用已暂存的更改来修补提交
-  a: reset commit author
+  a: Set/Reset commit author
   t: 还原提交
   T: 标签提交
   <c-l>: 打开日志菜单
   <space>: 检出提交
-  y: copy commit attribute
+  y: Copy commit attribute
   o: 在浏览器中打开提交
   n: 从提交创建新分支
   g: 查看重置选项
@@ -152,7 +152,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_
   o: 打开文件
   e: 编辑文件
   <space>: 补丁中包含的切换文件
-  a: toggle all files included in patch
+  a: Toggle all files included in patch
   <enter>: 输入文件以将所选行添加到补丁中（或切换目录折叠）
   `: 切换文件树视图
@@ -247,7 +247,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ <tab>: 切换到其他面板 <space>: 切换行暂存状态 d: 取消变更 (git reset) - E: edit hunk + E: Edit hunk c: 提交更改 w: 提交更改而无需预先提交钩子 C: 提交更改（使用编辑器编辑提交信息） @@ -291,7 +291,7 @@ _Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b_ g: 应用并删除 d: 删除 n: 新分支 - r: rename stash + r: Rename stash <enter>: 查看提交的文件 diff --git a/pkg/cheatsheet/generate_test.go b/pkg/cheatsheet/generate_test.go index ba77d3b15..4d0d92e12 100644 --- a/pkg/cheatsheet/generate_test.go +++ b/pkg/cheatsheet/generate_test.go @@ -54,7 +54,7 @@ func TestGetBindingSections(t *testing.T) { }, expected: []*bindingSection{ { - title: "Global Keybindings", + title: "Global keybindings", bindings: []*types.Binding{ { ViewName: "", @@ -139,7 +139,7 @@ func TestGetBindingSections(t *testing.T) { }, expected: []*bindingSection{ { - title: "List Panel Navigation", + title: "List panel navigation", bindings: []*types.Binding{ { ViewName: "files", @@ -215,7 +215,7 @@ func TestGetBindingSections(t *testing.T) { }, expected: []*bindingSection{ { - title: "List Panel Navigation", + title: "List panel navigation", bindings: []*types.Binding{ { ViewName: "files", diff --git a/pkg/gui/constants/constants.go b/pkg/gui/constants/constants.go deleted file mode 100644 index b6c786b73..000000000 --- a/pkg/gui/constants/constants.go +++ /dev/null @@ -1,3 +0,0 @@ -package constants - -const SEARCH_PREFIX = "search: " diff --git a/pkg/gui/controllers/basic_commits_controller.go b/pkg/gui/controllers/basic_commits_controller.go index f2c794abc..71e409483 100644 --- a/pkg/gui/controllers/basic_commits_controller.go +++ b/pkg/gui/controllers/basic_commits_controller.go @@ -37,44 +37,44 @@ func (self *BasicCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ { Key: opts.GetKey(opts.Config.Commits.CheckoutCommit), Handler: self.checkSelected(self.checkout), - Description: self.c.Tr.LcCheckoutCommit, + Description: self.c.Tr.CheckoutCommit, }, { Key: opts.GetKey(opts.Config.Commits.CopyCommitAttributeToClipboard), Handler: self.checkSelected(self.copyCommitAttribute), - Description: self.c.Tr.LcCopyCommitAttributeToClipboard, + Description: self.c.Tr.CopyCommitAttributeToClipboard, OpensMenu: true, }, { Key: opts.GetKey(opts.Config.Commits.OpenInBrowser), Handler: self.checkSelected(self.openInBrowser), - Description: self.c.Tr.LcOpenCommitInBrowser, + Description: self.c.Tr.OpenCommitInBrowser, }, { Key: opts.GetKey(opts.Config.Universal.New), Handler: self.checkSelected(self.newBranch), - Description: self.c.Tr.LcCreateNewBranchFromCommit, + Description: self.c.Tr.CreateNewBranchFromCommit, }, { Key: opts.GetKey(opts.Config.Commits.ViewResetOptions), Handler: self.checkSelected(self.createResetMenu), - Description: self.c.Tr.LcViewResetOptions, + Description: self.c.Tr.ViewResetOptions, OpensMenu: true, }, { Key: opts.GetKey(opts.Config.Commits.CherryPickCopy), Handler: self.checkSelected(self.copy), - Description: self.c.Tr.LcCherryPickCopy, + Description: self.c.Tr.CherryPickCopy, }, { Key: opts.GetKey(opts.Config.Commits.CherryPickCopyRange), Handler: self.checkSelected(self.copyRange), - Description: self.c.Tr.LcCherryPickCopyRange, + Description: self.c.Tr.CherryPickCopyRange, }, { Key: opts.GetKey(opts.Config.Commits.ResetCherryPick), 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, Items: []*types.MenuItem{ { - Label: self.c.Tr.LcCommitSha, + Label: self.c.Tr.CommitSha, OnPress: func() error { return self.copyCommitSHAToClipboard(commit) }, Key: 's', }, { - Label: self.c.Tr.LcCommitURL, + Label: self.c.Tr.CommitURL, OnPress: func() error { return self.copyCommitURLToClipboard(commit) }, Key: 'u', }, { - Label: self.c.Tr.LcCommitDiff, + Label: self.c.Tr.CommitDiff, OnPress: func() error { return self.copyCommitDiffToClipboard(commit) }, Key: 'd', }, { - Label: self.c.Tr.LcCommitMessage, + Label: self.c.Tr.CommitMessage, OnPress: func() error { return self.copyCommitMessageToClipboard(commit) }, Key: 'm', }, { - Label: self.c.Tr.LcCommitAuthor, + Label: self.c.Tr.CommitAuthor, OnPress: func() error { return self.copyAuthorToClipboard(commit) }, @@ -235,7 +235,7 @@ func (self *BasicCommitsController) createResetMenu(commit *models.Commit) error func (self *BasicCommitsController) checkout(commit *models.Commit) error { return self.c.Confirm(types.ConfirmOpts{ - Title: self.c.Tr.LcCheckoutCommit, + Title: self.c.Tr.CheckoutCommit, Prompt: self.c.Tr.SureCheckoutThisCommit, HandleConfirm: func() error { self.c.LogAction(self.c.Tr.Actions.CheckoutCommit) diff --git a/pkg/gui/controllers/bisect_controller.go b/pkg/gui/controllers/bisect_controller.go index 9aab43ee7..7c6145912 100644 --- a/pkg/gui/controllers/bisect_controller.go +++ b/pkg/gui/controllers/bisect_controller.go @@ -31,7 +31,7 @@ func (self *BisectController) GetKeybindings(opts types.KeybindingsOpts) []*type { Key: opts.GetKey(opts.Config.Commits.ViewBisectOptions), Handler: opts.Guards.OutsideFilterMode(self.checkSelected(self.openMenu)), - Description: self.c.Tr.LcViewBisectOptions, + Description: self.c.Tr.ViewBisectOptions, OpensMenu: true, }, } diff --git a/pkg/gui/controllers/branches_controller.go b/pkg/gui/controllers/branches_controller.go index a39fe18e2..972ea6090 100644 --- a/pkg/gui/controllers/branches_controller.go +++ b/pkg/gui/controllers/branches_controller.go @@ -33,53 +33,53 @@ func (self *BranchesController) GetKeybindings(opts types.KeybindingsOpts) []*ty { Key: opts.GetKey(opts.Config.Universal.Select), Handler: self.checkSelected(self.press), - Description: self.c.Tr.LcCheckout, + Description: self.c.Tr.Checkout, }, { Key: opts.GetKey(opts.Config.Universal.New), Handler: self.checkSelected(self.newBranch), - Description: self.c.Tr.LcNewBranch, + Description: self.c.Tr.NewBranch, }, { Key: opts.GetKey(opts.Config.Branches.CreatePullRequest), Handler: self.checkSelected(self.handleCreatePullRequest), - Description: self.c.Tr.LcCreatePullRequest, + Description: self.c.Tr.CreatePullRequest, }, { Key: opts.GetKey(opts.Config.Branches.ViewPullRequestOptions), Handler: self.checkSelected(self.handleCreatePullRequestMenu), - Description: self.c.Tr.LcCreatePullRequestOptions, + Description: self.c.Tr.CreatePullRequestOptions, OpensMenu: true, }, { Key: opts.GetKey(opts.Config.Branches.CopyPullRequestURL), Handler: self.copyPullRequestURL, - Description: self.c.Tr.LcCopyPullRequestURL, + Description: self.c.Tr.CopyPullRequestURL, }, { Key: opts.GetKey(opts.Config.Branches.CheckoutBranchByName), Handler: self.checkoutByName, - Description: self.c.Tr.LcCheckoutByName, + Description: self.c.Tr.CheckoutByName, }, { Key: opts.GetKey(opts.Config.Branches.ForceCheckoutBranch), Handler: self.forceCheckout, - Description: self.c.Tr.LcForceCheckout, + Description: self.c.Tr.ForceCheckout, }, { Key: opts.GetKey(opts.Config.Universal.Remove), Handler: self.checkSelectedAndReal(self.delete), - Description: self.c.Tr.LcDeleteBranch, + Description: self.c.Tr.DeleteBranch, }, { Key: opts.GetKey(opts.Config.Branches.RebaseBranch), Handler: opts.Guards.OutsideFilterMode(self.rebase), - Description: self.c.Tr.LcRebaseBranch, + Description: self.c.Tr.RebaseBranch, }, { Key: opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch), Handler: opts.Guards.OutsideFilterMode(self.merge), - Description: self.c.Tr.LcMergeIntoCurrentBranch, + Description: self.c.Tr.MergeIntoCurrentBranch, }, { 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), Handler: self.checkSelected(self.createTag), - Description: self.c.Tr.LcCreateTag, + Description: self.c.Tr.CreateTag, }, { Key: opts.GetKey(opts.Config.Commits.ViewResetOptions), Handler: self.checkSelected(self.createResetMenu), - Description: self.c.Tr.LcViewResetOptions, + Description: self.c.Tr.ViewResetOptions, OpensMenu: true, }, { Key: opts.GetKey(opts.Config.Branches.RenameBranch), Handler: self.checkSelectedAndReal(self.rename), - Description: self.c.Tr.LcRenameBranch, + Description: self.c.Tr.RenameBranch, }, { Key: opts.GetKey(opts.Config.Branches.SetUpstream), Handler: self.checkSelected(self.setUpstream), - Description: self.c.Tr.LcSetUnsetUpstream, + Description: self.c.Tr.SetUnsetUpstream, OpensMenu: true, }, } @@ -140,7 +140,7 @@ func (self *BranchesController) setUpstream(selectedBranch *models.Branch) error Title: self.c.Tr.Actions.SetUnsetUpstream, Items: []*types.MenuItem{ { - LabelColumns: []string{self.c.Tr.LcUnsetUpstream}, + LabelColumns: []string{self.c.Tr.UnsetUpstream}, OnPress: func() error { if err := self.c.Git().Branch.UnsetUpstream(selectedBranch.Name); err != nil { return self.c.Error(err) @@ -159,7 +159,7 @@ func (self *BranchesController) setUpstream(selectedBranch *models.Branch) error Key: 'u', }, { - LabelColumns: []string{self.c.Tr.LcSetUpstream}, + LabelColumns: []string{self.c.Tr.SetUpstream}, OnPress: func() error { return self.c.Helpers().Upstream.PromptForUpstreamWithoutInitialContent(selectedBranch, func(upstream string) error { 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{ - Title: self.c.Tr.LcRenameBranch, + Title: self.c.Tr.RenameBranch, Prompt: self.c.Tr.RenameBranchWarning, HandleConfirm: promptForNewName, }) @@ -457,13 +457,13 @@ func (self *BranchesController) createPullRequestMenu(selectedBranch *models.Bra menuItemsForBranch := func(branch *models.Branch) []*types.MenuItem { return []*types.MenuItem{ { - LabelColumns: fromToLabelColumns(branch.Name, self.c.Tr.LcDefaultBranch), + LabelColumns: fromToLabelColumns(branch.Name, self.c.Tr.DefaultBranch), OnPress: func() error { return self.createPullRequest(branch.Name, "") }, }, { - LabelColumns: fromToLabelColumns(branch.Name, self.c.Tr.LcSelectBranch), + LabelColumns: fromToLabelColumns(branch.Name, self.c.Tr.SelectBranch), OnPress: func() error { return self.c.Prompt(types.PromptOpts{ Title: branch.Name + " →", diff --git a/pkg/gui/controllers/commit_message_controller.go b/pkg/gui/controllers/commit_message_controller.go index 929e647f3..141f24618 100644 --- a/pkg/gui/controllers/commit_message_controller.go +++ b/pkg/gui/controllers/commit_message_controller.go @@ -29,12 +29,12 @@ func (self *CommitMessageController) GetKeybindings(opts types.KeybindingsOpts) { Key: opts.GetKey(opts.Config.Universal.SubmitEditorText), Handler: self.confirm, - Description: self.c.Tr.LcConfirm, + Description: self.c.Tr.Confirm, }, { Key: opts.GetKey(opts.Config.Universal.Return), Handler: self.close, - Description: self.c.Tr.LcClose, + Description: self.c.Tr.Close, }, { Key: opts.GetKey(opts.Config.Universal.PrevItem), diff --git a/pkg/gui/controllers/commits_files_controller.go b/pkg/gui/controllers/commits_files_controller.go index e4cf18ffc..0cea2bd46 100644 --- a/pkg/gui/controllers/commits_files_controller.go +++ b/pkg/gui/controllers/commits_files_controller.go @@ -30,42 +30,42 @@ func (self *CommitFilesController) GetKeybindings(opts types.KeybindingsOpts) [] { Key: opts.GetKey(opts.Config.CommitFiles.CheckoutCommitFile), Handler: self.checkSelected(self.checkout), - Description: self.c.Tr.LcCheckoutCommitFile, + Description: self.c.Tr.CheckoutCommitFile, }, { Key: opts.GetKey(opts.Config.Universal.Remove), Handler: self.checkSelected(self.discard), - Description: self.c.Tr.LcDiscardOldFileChange, + Description: self.c.Tr.DiscardOldFileChange, }, { Key: opts.GetKey(opts.Config.Universal.OpenFile), Handler: self.checkSelected(self.open), - Description: self.c.Tr.LcOpenFile, + Description: self.c.Tr.OpenFile, }, { Key: opts.GetKey(opts.Config.Universal.Edit), Handler: self.checkSelected(self.edit), - Description: self.c.Tr.LcEditFile, + Description: self.c.Tr.EditFile, }, { Key: opts.GetKey(opts.Config.Universal.Select), Handler: self.checkSelected(self.toggleForPatch), - Description: self.c.Tr.LcToggleAddToPatch, + Description: self.c.Tr.ToggleAddToPatch, }, { Key: opts.GetKey(opts.Config.Files.ToggleStagedAll), Handler: self.checkSelected(self.toggleAllForPatch), - Description: self.c.Tr.LcToggleAllInPatch, + Description: self.c.Tr.ToggleAllInPatch, }, { Key: opts.GetKey(opts.Config.Universal.GoInto), Handler: self.checkSelected(self.enter), - Description: self.c.Tr.LcEnterFile, + Description: self.c.Tr.EnterFile, }, { Key: opts.GetKey(opts.Config.Files.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 { 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 err := self.startPatchBuilder(); err != nil { return err diff --git a/pkg/gui/controllers/confirmation_controller.go b/pkg/gui/controllers/confirmation_controller.go index 09af35586..59ddf8c43 100644 --- a/pkg/gui/controllers/confirmation_controller.go +++ b/pkg/gui/controllers/confirmation_controller.go @@ -26,13 +26,13 @@ func (self *ConfirmationController) GetKeybindings(opts types.KeybindingsOpts) [ { Key: opts.GetKey(opts.Config.Universal.Confirm), Handler: func() error { return self.context().State.OnConfirm() }, - Description: self.c.Tr.LcConfirm, + Description: self.c.Tr.Confirm, Display: true, }, { Key: opts.GetKey(opts.Config.Universal.Return), Handler: func() error { return self.context().State.OnClose() }, - Description: self.c.Tr.LcCloseCancel, + Description: self.c.Tr.CloseCancel, Display: true, }, { diff --git a/pkg/gui/controllers/custom_patch_options_menu_action.go b/pkg/gui/controllers/custom_patch_options_menu_action.go index ff333384a..a511348bb 100644 --- a/pkg/gui/controllers/custom_patch_options_menu_action.go +++ b/pkg/gui/controllers/custom_patch_options_menu_action.go @@ -18,17 +18,17 @@ func (self *CustomPatchOptionsMenuAction) Call() error { menuItems := []*types.MenuItem{ { - Label: "reset patch", + Label: self.c.Tr.ResetPatch, OnPress: self.c.Helpers().PatchBuilding.Reset, Key: 'c', }, { - Label: "apply patch", + Label: self.c.Tr.ApplyPatch, OnPress: func() error { return self.handleApplyPatch(false) }, Key: 'a', }, { - Label: "apply patch in reverse", + Label: self.c.Tr.ApplyPatchInReverse, OnPress: func() error { return self.handleApplyPatch(true) }, 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 { 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, Key: 'd', }, { - Label: "move patch out into index", + Label: self.c.Tr.MovePatchOutIntoIndex, OnPress: self.handleMovePatchIntoWorkingTree, Key: 'i', }, { - Label: "move patch into new commit", + Label: self.c.Tr.MovePatchIntoNewCommit, OnPress: self.handlePullPatchIntoNewCommit, Key: 'n', }, @@ -62,7 +62,7 @@ func (self *CustomPatchOptionsMenuAction) Call() error { append( []*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, Key: 'm', }, @@ -75,7 +75,7 @@ func (self *CustomPatchOptionsMenuAction) Call() error { menuItems = append(menuItems, []*types.MenuItem{ { - Label: "copy patch to clipboard", + Label: self.c.Tr.CopyPatchToClipboard, OnPress: func() error { return self.copyPatchToClipboard() }, Key: 'y', }, diff --git a/pkg/gui/controllers/diffing_menu_action.go b/pkg/gui/controllers/diffing_menu_action.go index 951286ece..ae150c274 100644 --- a/pkg/gui/controllers/diffing_menu_action.go +++ b/pkg/gui/controllers/diffing_menu_action.go @@ -20,7 +20,7 @@ func (self *DiffingMenuAction) Call() error { name := name 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 { self.c.Modes().Diffing.Ref = name // 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{ { - Label: self.c.Tr.LcEnterRefToDiff, + Label: self.c.Tr.EnterRefToDiff, OnPress: func() error { return self.c.Prompt(types.PromptOpts{ - Title: self.c.Tr.LcEnteRefName, + Title: self.c.Tr.EnteRefName, FindSuggestionsFunc: self.c.Helpers().Suggestions.GetRefsSuggestionsFunc(), HandleConfirm: func(response string) error { self.c.Modes().Diffing.Ref = strings.TrimSpace(response) @@ -49,14 +49,14 @@ func (self *DiffingMenuAction) Call() error { if self.c.Modes().Diffing.Active() { menuItems = append(menuItems, []*types.MenuItem{ { - Label: self.c.Tr.LcSwapDiff, + Label: self.c.Tr.SwapDiff, OnPress: func() error { self.c.Modes().Diffing.Reverse = !self.c.Modes().Diffing.Reverse return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) }, }, { - Label: self.c.Tr.LcExitDiffMode, + Label: self.c.Tr.ExitDiffMode, OnPress: func() error { self.c.Modes().Diffing = diffing.New() return self.c.Refresh(types.RefreshOptions{Mode: types.ASYNC}) diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go index 2876f97fb..11d39ee9f 100644 --- a/pkg/gui/controllers/files_controller.go +++ b/pkg/gui/controllers/files_controller.go @@ -31,12 +31,12 @@ func (self *FilesController) GetKeybindings(opts types.KeybindingsOpts) []*types { Key: opts.GetKey(opts.Config.Universal.Select), Handler: self.checkSelectedFileNode(self.press), - Description: self.c.Tr.LcToggleStaged, + Description: self.c.Tr.ToggleStaged, }, { Key: opts.GetKey(opts.Config.Files.OpenStatusFilter), Handler: self.handleStatusFilterPressed, - Description: self.c.Tr.LcFileFilter, + Description: self.c.Tr.FileFilter, }, { 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), Handler: self.c.Helpers().WorkingTree.HandleWIPCommitPress, - Description: self.c.Tr.LcCommitChangesWithoutHook, + Description: self.c.Tr.CommitChangesWithoutHook, }, { 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), Handler: self.checkSelectedFileNode(self.edit), - Description: self.c.Tr.LcEditFile, + Description: self.c.Tr.EditFile, }, { Key: opts.GetKey(opts.Config.Universal.OpenFile), Handler: self.Open, - Description: self.c.Tr.LcOpenFile, + Description: self.c.Tr.OpenFile, }, { Key: opts.GetKey(opts.Config.Files.IgnoreFile), Handler: self.checkSelectedFileNode(self.ignoreOrExcludeMenu), - Description: self.c.Tr.Actions.LcIgnoreExcludeFile, + Description: self.c.Tr.Actions.IgnoreExcludeFile, OpensMenu: true, }, { Key: opts.GetKey(opts.Config.Files.RefreshFiles), Handler: self.refresh, - Description: self.c.Tr.LcRefreshFiles, + Description: self.c.Tr.RefreshFiles, }, { Key: opts.GetKey(opts.Config.Files.StashAllChanges), Handler: self.stash, - Description: self.c.Tr.LcStashAllChanges, + Description: self.c.Tr.StashAllChanges, }, { Key: opts.GetKey(opts.Config.Files.ViewStashOptions), Handler: self.createStashMenu, - Description: self.c.Tr.LcViewStashOptions, + Description: self.c.Tr.ViewStashOptions, OpensMenu: true, }, { Key: opts.GetKey(opts.Config.Files.ToggleStagedAll), Handler: self.toggleStagedAll, - Description: self.c.Tr.LcToggleStagedAll, + Description: self.c.Tr.ToggleStagedAll, }, { 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), Handler: self.createResetToUpstreamMenu, - Description: self.c.Tr.LcViewResetToUpstreamOptions, + Description: self.c.Tr.ViewResetToUpstreamOptions, OpensMenu: true, }, { Key: opts.GetKey(opts.Config.Files.ViewResetOptions), Handler: self.createResetMenu, - Description: self.c.Tr.LcViewResetOptions, + Description: self.c.Tr.ViewResetOptions, OpensMenu: true, }, { Key: opts.GetKey(opts.Config.Files.ToggleTreeView), Handler: self.toggleTreeView, - Description: self.c.Tr.LcToggleTreeView, + Description: self.c.Tr.ToggleTreeView, }, { Key: opts.GetKey(opts.Config.Files.OpenMergeTool), Handler: self.c.Helpers().WorkingTree.OpenMergeTool, - Description: self.c.Tr.LcOpenMergeTool, + Description: self.c.Tr.OpenMergeTool, }, { Key: opts.GetKey(opts.Config.Files.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" { 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 { return err } @@ -585,10 +585,10 @@ func (self *FilesController) exclude(node *filetree.FileNode) error { func (self *FilesController) ignoreOrExcludeMenu(node *filetree.FileNode) error { return self.c.Menu(types.CreateMenuOptions{ - Title: self.c.Tr.Actions.LcIgnoreExcludeFile, + Title: self.c.Tr.Actions.IgnoreExcludeFile, Items: []*types.MenuItem{ { - LabelColumns: []string{self.c.Tr.LcIgnoreFile}, + LabelColumns: []string{self.c.Tr.IgnoreFile}, OnPress: func() error { if err := self.ignore(node); err != nil { return self.c.Error(err) @@ -598,7 +598,7 @@ func (self *FilesController) ignoreOrExcludeMenu(node *filetree.FileNode) error Key: 'i', }, { - LabelColumns: []string{self.c.Tr.LcExcludeFile}, + LabelColumns: []string{self.c.Tr.ExcludeFile}, OnPress: func() error { if err := self.exclude(node); err != nil { return self.c.Error(err) @@ -690,10 +690,10 @@ func (self *FilesController) switchToMerge() error { func (self *FilesController) createStashMenu() error { return self.c.Menu(types.CreateMenuOptions{ - Title: self.c.Tr.LcStashOptions, + Title: self.c.Tr.StashOptions, Items: []*types.MenuItem{ { - Label: self.c.Tr.LcStashAllChanges, + Label: self.c.Tr.StashAllChanges, OnPress: func() error { if !self.c.Helpers().WorkingTree.IsWorkingTreeDirty() { return self.c.ErrorMsg(self.c.Tr.NoFilesToStash) @@ -703,7 +703,7 @@ func (self *FilesController) createStashMenu() error { Key: 'a', }, { - Label: self.c.Tr.LcStashAllChangesKeepIndex, + Label: self.c.Tr.StashAllChangesKeepIndex, OnPress: func() error { if !self.c.Helpers().WorkingTree.IsWorkingTreeDirty() { return self.c.ErrorMsg(self.c.Tr.NoFilesToStash) @@ -714,14 +714,14 @@ func (self *FilesController) createStashMenu() error { Key: 'i', }, { - Label: self.c.Tr.LcStashIncludeUntrackedChanges, + Label: self.c.Tr.StashIncludeUntrackedChanges, OnPress: func() error { return self.handleStashSave(self.c.Git().Stash.StashIncludeUntrackedChanges, self.c.Tr.Actions.StashIncludeUntrackedChanges) }, Key: 'U', }, { - Label: self.c.Tr.LcStashStagedChanges, + Label: self.c.Tr.StashStagedChanges, OnPress: func() error { // there must be something in staging otherwise the current implementation mucks the stash up if !self.c.Helpers().WorkingTree.AnyStagedFiles() { @@ -732,7 +732,7 @@ func (self *FilesController) createStashMenu() error { Key: 's', }, { - Label: self.c.Tr.LcStashUnstagedChanges, + Label: self.c.Tr.StashUnstagedChanges, OnPress: func() error { if !self.c.Helpers().WorkingTree.IsWorkingTreeDirty() { return self.c.ErrorMsg(self.c.Tr.NoFilesToStash) diff --git a/pkg/gui/controllers/files_remove_controller.go b/pkg/gui/controllers/files_remove_controller.go index 35093273c..f25ae1209 100644 --- a/pkg/gui/controllers/files_remove_controller.go +++ b/pkg/gui/controllers/files_remove_controller.go @@ -31,7 +31,7 @@ func (self *FilesRemoveController) GetKeybindings(opts types.KeybindingsOpts) [] { Key: opts.GetKey(opts.Config.Universal.Remove), Handler: self.checkSelectedFileNode(self.remove), - Description: self.c.Tr.LcViewDiscardOptions, + Description: self.c.Tr.ViewDiscardOptions, OpensMenu: true, }, } @@ -44,7 +44,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error { if node.File == nil { menuItems = []*types.MenuItem{ { - Label: self.c.Tr.LcDiscardAllChanges, + Label: self.c.Tr.DiscardAllChanges, OnPress: func() error { self.c.LogAction(self.c.Tr.Actions.DiscardAllChangesInDirectory) 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() { menuItems = append(menuItems, &types.MenuItem{ - Label: self.c.Tr.LcDiscardUnstagedChanges, + Label: self.c.Tr.DiscardUnstagedChanges, OnPress: func() error { self.c.LogAction(self.c.Tr.Actions.DiscardUnstagedChangesInDirectory) 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{ { - Label: self.c.Tr.LcSubmoduleStashAndReset, + Label: self.c.Tr.SubmoduleStashAndReset, OnPress: func() error { return self.ResetSubmodule(submodule) }, @@ -100,7 +100,7 @@ func (self *FilesRemoveController) remove(node *filetree.FileNode) error { } else { menuItems = []*types.MenuItem{ { - Label: self.c.Tr.LcDiscardAllChanges, + Label: self.c.Tr.DiscardAllChanges, OnPress: func() error { self.c.LogAction(self.c.Tr.Actions.DiscardAllChangesInFile) 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 { menuItems = append(menuItems, &types.MenuItem{ - Label: self.c.Tr.LcDiscardUnstagedChanges, + Label: self.c.Tr.DiscardUnstagedChanges, OnPress: func() error { self.c.LogAction(self.c.Tr.Actions.DiscardAllUnstagedChangesInFile) 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 { - 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) file := self.c.Helpers().WorkingTree.FileForSubmodule(submodule) diff --git a/pkg/gui/controllers/filtering_menu_action.go b/pkg/gui/controllers/filtering_menu_action.go index f815d5b3f..6a0f3b2db 100644 --- a/pkg/gui/controllers/filtering_menu_action.go +++ b/pkg/gui/controllers/filtering_menu_action.go @@ -30,7 +30,7 @@ func (self *FilteringMenuAction) Call() error { if fileName != "" { 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 { return self.setFiltering(fileName) }, @@ -38,7 +38,7 @@ func (self *FilteringMenuAction) Call() error { } menuItems = append(menuItems, &types.MenuItem{ - Label: self.c.Tr.LcFilterPathOption, + Label: self.c.Tr.FilterPathOption, OnPress: func() error { return self.c.Prompt(types.PromptOpts{ FindSuggestionsFunc: self.c.Helpers().Suggestions.GetFilePathSuggestionsFunc(), @@ -52,7 +52,7 @@ func (self *FilteringMenuAction) Call() error { if self.c.Modes().Filtering.Active() { menuItems = append(menuItems, &types.MenuItem{ - Label: self.c.Tr.LcExitFilterMode, + Label: self.c.Tr.ExitFilterMode, OnPress: self.c.Helpers().Mode.ClearFiltering, }) } diff --git a/pkg/gui/controllers/git_flow_controller.go b/pkg/gui/controllers/git_flow_controller.go index cba4c7ddc..4086a142b 100644 --- a/pkg/gui/controllers/git_flow_controller.go +++ b/pkg/gui/controllers/git_flow_controller.go @@ -30,7 +30,7 @@ func (self *GitFlowController) GetKeybindings(opts types.KeybindingsOpts) []*typ { Key: opts.GetKey(opts.Config.Branches.ViewGitFlowOptions), Handler: self.checkSelected(self.handleCreateGitFlowMenu), - Description: self.c.Tr.LcGitFlowOptions, + Description: self.c.Tr.GitFlowOptions, OpensMenu: true, }, } diff --git a/pkg/gui/controllers/global_controller.go b/pkg/gui/controllers/global_controller.go index 6f948a630..2942567e8 100644 --- a/pkg/gui/controllers/global_controller.go +++ b/pkg/gui/controllers/global_controller.go @@ -24,7 +24,7 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type { Key: opts.GetKey(opts.Config.Universal.ExecuteCustomCommand), Handler: self.customCommand, - Description: self.c.Tr.LcExecuteCustomCommand, + Description: self.c.Tr.ExecuteCustomCommand, }, { 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), Handler: self.refresh, - Description: self.c.Tr.LcRefresh, + Description: self.c.Tr.Refresh, }, { Key: opts.GetKey(opts.Config.Universal.NextScreenMode), Handler: self.nextScreenMode, - Description: self.c.Tr.LcNextScreenMode, + Description: self.c.Tr.NextScreenMode, }, { Key: opts.GetKey(opts.Config.Universal.PrevScreenMode), Handler: self.prevScreenMode, - Description: self.c.Tr.LcPrevScreenMode, + Description: self.c.Tr.PrevScreenMode, }, { ViewName: "", @@ -65,26 +65,26 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type Modifier: gocui.ModNone, // 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) - Description: self.c.Tr.LcOpenMenu, + Description: self.c.Tr.OpenMenu, Handler: self.createOptionsMenu, }, { ViewName: "", Key: opts.GetKey(opts.Config.Universal.FilteringMenu), Handler: self.createFilteringMenu, - Description: self.c.Tr.LcOpenFilteringMenu, + Description: self.c.Tr.OpenFilteringMenu, OpensMenu: true, }, { Key: opts.GetKey(opts.Config.Universal.DiffingMenu), Handler: self.createDiffingMenu, - Description: self.c.Tr.LcOpenDiffingMenu, + Description: self.c.Tr.OpenDiffingMenu, OpensMenu: true, }, { Key: opts.GetKey(opts.Config.Universal.DiffingMenuAlt), Handler: self.createDiffingMenu, - Description: self.c.Tr.LcOpenDiffingMenu, + Description: self.c.Tr.OpenDiffingMenu, OpensMenu: true, }, { diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go index dfa40e434..0e67fd7ea 100644 --- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go +++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go @@ -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 func (self *MergeAndRebaseHelper) PromptToContinueRebase() error { return self.c.Confirm(types.ConfirmOpts{ - Title: "continue", + Title: self.c.Tr.Continue, Prompt: self.c.Tr.ConflictsResolved, HandleConfirm: func() error { return self.genericMergeCommand(REBASE_OPTION_CONTINUE) diff --git a/pkg/gui/controllers/helpers/mode_helper.go b/pkg/gui/controllers/helpers/mode_helper.go index 02672c6fc..e58fe6cb9 100644 --- a/pkg/gui/controllers/helpers/mode_helper.go +++ b/pkg/gui/controllers/helpers/mode_helper.go @@ -53,7 +53,7 @@ func (self *ModeHelper) Statuses() []ModeStatus { return self.withResetButton( fmt.Sprintf( "%s %s", - self.c.Tr.LcShowingGitDiff, + self.c.Tr.ShowingGitDiff, "git diff "+strings.Join(self.diffHelper.DiffArgs(), " "), ), style.FgMagenta, @@ -64,7 +64,7 @@ func (self *ModeHelper) Statuses() []ModeStatus { { IsActive: self.c.Git().Patch.PatchBuilder.Active, 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, }, @@ -74,7 +74,7 @@ func (self *ModeHelper) Statuses() []ModeStatus { return self.withResetButton( fmt.Sprintf( "%s '%s'", - self.c.Tr.LcFilteringBy, + self.c.Tr.FilteringBy, self.c.Modes().Filtering.GetPath(), ), style.FgRed, @@ -86,9 +86,9 @@ func (self *ModeHelper) Statuses() []ModeStatus { IsActive: self.c.Modes().CherryPicking.Active, Description: func() string { copiedCount := len(self.c.Modes().CherryPicking.CherryPickedCommits) - text := self.c.Tr.LcCommitsCopied + text := self.c.Tr.CommitsCopied if copiedCount == 1 { - text = self.c.Tr.LcCommitCopied + text = self.c.Tr.CommitCopied } return self.withResetButton( @@ -109,7 +109,7 @@ func (self *ModeHelper) Statuses() []ModeStatus { Description: func() string { workingTreeState := self.c.Git().Status.WorkingTreeState() return self.withResetButton( - presentation.FormatWorkingTreeState(workingTreeState), style.FgYellow, + presentation.FormatWorkingTreeStateTitle(self.c.Tr, workingTreeState), style.FgYellow, ) }, Reset: self.mergeAndRebaseHelper.AbortMergeOrRebaseWithConfirm, @@ -119,7 +119,7 @@ func (self *ModeHelper) Statuses() []ModeStatus { return self.c.Model().BisectInfo.Started() }, Description: func() string { - return self.withResetButton("bisecting", style.FgGreen) + return self.withResetButton(self.c.Tr.Bisect.Bisecting, style.FgGreen) }, Reset: self.bisectHelper.Reset, }, diff --git a/pkg/gui/controllers/helpers/refresh_helper.go b/pkg/gui/controllers/helpers/refresh_helper.go index 354a2115b..7b37585a5 100644 --- a/pkg/gui/controllers/helpers/refresh_helper.go +++ b/pkg/gui/controllers/helpers/refresh_helper.go @@ -584,7 +584,7 @@ func (self *RefreshHelper) refreshStatus() { workingTreeState := self.c.Git().Status.WorkingTreeState() 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) diff --git a/pkg/gui/controllers/helpers/refs_helper.go b/pkg/gui/controllers/helpers/refs_helper.go index f40a2ad10..18227a35b 100644 --- a/pkg/gui/controllers/helpers/refs_helper.go +++ b/pkg/gui/controllers/helpers/refs_helper.go @@ -121,18 +121,20 @@ func (self *RefsHelper) ResetToRef(ref string, strength string, envVars []string func (self *RefsHelper) CreateGitResetMenu(ref string) error { type strengthWithKey struct { strength string + label string key types.Key } strengths := []strengthWithKey{ - {strength: "soft", key: 's'}, - {strength: "mixed", key: 'm'}, - {strength: "hard", key: 'h'}, + // not i18'ing because it's git terminology + {strength: "soft", label: "Soft reset", key: 's'}, + {strength: "mixed", label: "Mixed reset", key: 'm'}, + {strength: "hard", label: "Hard reset", key: 'h'}, } menuItems := slices.Map(strengths, func(row strengthWithKey) *types.MenuItem { return &types.MenuItem{ LabelColumns: []string{ - fmt.Sprintf("%s reset", row.strength), + row.label, style.FgRed.Sprintf("reset --%s %s", row.strength, ref), }, OnPress: func() error { @@ -144,7 +146,7 @@ func (self *RefsHelper) CreateGitResetMenu(ref string) error { }) 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, }) } diff --git a/pkg/gui/controllers/helpers/repos_helper.go b/pkg/gui/controllers/helpers/repos_helper.go index 060724a0a..f4e700d7b 100644 --- a/pkg/gui/controllers/helpers/repos_helper.go +++ b/pkg/gui/controllers/helpers/repos_helper.go @@ -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 { diff --git a/pkg/gui/controllers/helpers/suggestions_helper.go b/pkg/gui/controllers/helpers/suggestions_helper.go index 2234e3c2b..786ad7bfe 100644 --- a/pkg/gui/controllers/helpers/suggestions_helper.go +++ b/pkg/gui/controllers/helpers/suggestions_helper.go @@ -100,7 +100,7 @@ func (self *SuggestionsHelper) GetBranchNameSuggestionsFunc() func(string) []*ty // 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 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() // load every non-gitignored file in the repo ignore, err := gitignore.FromGit() diff --git a/pkg/gui/controllers/helpers/tags_helper.go b/pkg/gui/controllers/helpers/tags_helper.go index d3cbf2331..96e6b8fc7 100644 --- a/pkg/gui/controllers/helpers/tags_helper.go +++ b/pkg/gui/controllers/helpers/tags_helper.go @@ -23,13 +23,13 @@ func (self *TagsHelper) CreateTagMenu(ref string, onCreate func()) error { Title: self.c.Tr.TagMenuTitle, Items: []*types.MenuItem{ { - Label: self.c.Tr.LcLightweightTag, + Label: self.c.Tr.LightweightTag, OnPress: func() error { return self.handleCreateLightweightTag(ref, onCreate) }, }, { - Label: self.c.Tr.LcAnnotatedTag, + Label: self.c.Tr.AnnotatedTag, OnPress: func() error { return self.handleCreateAnnotatedTag(ref, onCreate) }, diff --git a/pkg/gui/controllers/helpers/window_arrangement_helper.go b/pkg/gui/controllers/helpers/window_arrangement_helper.go index 8efec0a22..20459993f 100644 --- a/pkg/gui/controllers/helpers/window_arrangement_helper.go +++ b/pkg/gui/controllers/helpers/window_arrangement_helper.go @@ -2,7 +2,6 @@ package helpers import ( "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/types" "github.com/jesseduffield/lazygit/pkg/utils" @@ -179,7 +178,7 @@ func (self *WindowArrangementHelper) infoSectionChildren(informationStr string, return []*boxlayout.Box{ { Window: "searchPrefix", - Size: runewidth.StringWidth(constants.SEARCH_PREFIX), + Size: runewidth.StringWidth(self.c.Tr.SearchPrefix), }, { Window: "search", diff --git a/pkg/gui/controllers/helpers/working_tree_helper.go b/pkg/gui/controllers/helpers/working_tree_helper.go index 96135881e..30b56704b 100644 --- a/pkg/gui/controllers/helpers/working_tree_helper.go +++ b/pkg/gui/controllers/helpers/working_tree_helper.go @@ -154,7 +154,7 @@ func (self *WorkingTreeHelper) HandleCommitPress() error { prefixReplace := commitPrefixConfig.Replace rgx, err := regexp.Compile(prefixPattern) 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) message = prefix diff --git a/pkg/gui/controllers/list_controller.go b/pkg/gui/controllers/list_controller.go index 1ca3a1e12..2f995ebc8 100644 --- a/pkg/gui/controllers/list_controller.go +++ b/pkg/gui/controllers/list_controller.go @@ -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.NextItemAlt), 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.NextPage), Handler: self.HandleNextPage, Description: self.c.Tr.LcNextPage}, - {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.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.NextPage}, + {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.ScrollRight), Handler: self.HandleScrollRight}, { Key: opts.GetKey(opts.Config.Universal.StartSearch), Handler: func() error { self.c.OpenSearch(); return nil }, - Description: self.c.Tr.LcStartSearch, + Description: self.c.Tr.StartSearch, Tag: "navigation", }, { Key: opts.GetKey(opts.Config.Universal.GotoBottom), - Description: self.c.Tr.LcGotoBottom, + Description: self.c.Tr.GotoBottom, Handler: self.HandleGotoBottom, Tag: "navigation", }, diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go index a4c013429..46c3ad6b5 100644 --- a/pkg/gui/controllers/local_commits_controller.go +++ b/pkg/gui/controllers/local_commits_controller.go @@ -45,75 +45,75 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ { Key: opts.GetKey(opts.Config.Commits.SquashDown), Handler: self.checkSelected(self.squashDown), - Description: self.c.Tr.LcSquashDown, + Description: self.c.Tr.SquashDown, }, { Key: opts.GetKey(opts.Config.Commits.MarkCommitAsFixup), Handler: self.checkSelected(self.fixup), - Description: self.c.Tr.LcFixupCommit, + Description: self.c.Tr.FixupCommit, }, { Key: opts.GetKey(opts.Config.Commits.RenameCommit), Handler: self.checkSelected(self.reword), - Description: self.c.Tr.LcRewordCommit, + Description: self.c.Tr.RewordCommit, }, { Key: opts.GetKey(opts.Config.Commits.RenameCommitWithEditor), Handler: self.checkSelected(self.rewordEditor), - Description: self.c.Tr.LcRenameCommitEditor, + Description: self.c.Tr.RenameCommitEditor, }, { Key: opts.GetKey(opts.Config.Universal.Remove), Handler: self.checkSelected(self.drop), - Description: self.c.Tr.LcDeleteCommit, + Description: self.c.Tr.DeleteCommit, }, { Key: opts.GetKey(opts.Config.Universal.Edit), Handler: self.checkSelected(self.edit), - Description: self.c.Tr.LcEditCommit, + Description: self.c.Tr.EditCommit, }, { Key: opts.GetKey(opts.Config.Commits.PickCommit), Handler: self.checkSelected(self.pick), - Description: self.c.Tr.LcPickCommit, + Description: self.c.Tr.PickCommit, }, { Key: opts.GetKey(opts.Config.Commits.CreateFixupCommit), Handler: self.checkSelected(self.createFixupCommit), - Description: self.c.Tr.LcCreateFixupCommit, + Description: self.c.Tr.CreateFixupCommitDescription, }, { Key: opts.GetKey(opts.Config.Commits.SquashAboveCommits), Handler: self.checkSelected(self.squashAllAboveFixupCommits), - Description: self.c.Tr.LcSquashAboveCommits, + Description: self.c.Tr.SquashAboveCommits, }, { Key: opts.GetKey(opts.Config.Commits.MoveDownCommit), Handler: self.checkSelected(self.moveDown), - Description: self.c.Tr.LcMoveDownCommit, + Description: self.c.Tr.MoveDownCommit, }, { Key: opts.GetKey(opts.Config.Commits.MoveUpCommit), Handler: self.checkSelected(self.moveUp), - Description: self.c.Tr.LcMoveUpCommit, + Description: self.c.Tr.MoveUpCommit, }, { Key: opts.GetKey(opts.Config.Commits.PasteCommits), 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 // more commits on demand { Key: opts.GetKey(opts.Config.Universal.StartSearch), Handler: self.openSearch, - Description: self.c.Tr.LcStartSearch, + Description: self.c.Tr.StartSearch, Tag: "navigation", }, { Key: opts.GetKey(opts.Config.Universal.GotoBottom), Handler: self.gotoBottom, - Description: self.c.Tr.LcGotoBottom, + Description: self.c.Tr.GotoBottom, Tag: "navigation", }, } @@ -126,27 +126,28 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [ { Key: opts.GetKey(opts.Config.Commits.AmendToCommit), Handler: self.checkSelected(self.amendTo), - Description: self.c.Tr.LcAmendToCommit, + Description: self.c.Tr.AmendToCommit, }, { Key: opts.GetKey(opts.Config.Commits.ResetCommitAuthor), Handler: self.checkSelected(self.amendAttribute), - Description: self.c.Tr.LcResetCommitAuthor, + Description: self.c.Tr.SetResetCommitAuthor, + OpensMenu: true, }, { Key: opts.GetKey(opts.Config.Commits.RevertCommit), Handler: self.checkSelected(self.revert), - Description: self.c.Tr.LcRevertCommit, + Description: self.c.Tr.RevertCommit, }, { Key: opts.GetKey(opts.Config.Commits.CreateTag), Handler: self.checkSelected(self.createTag), - Description: self.c.Tr.LcTagCommit, + Description: self.c.Tr.TagCommit, }, { Key: opts.GetKey(opts.Config.Commits.OpenLogMenu), Handler: self.handleOpenLogMenu, - Description: self.c.Tr.LcOpenLogMenu, + Description: self.c.Tr.OpenLogMenu, 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 // request us to edit the commit message when prompted. 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 { - return true, self.c.ErrorMsg(self.c.Tr.LcChangingThisActionIsNotAllowed) + return true, self.c.ErrorMsg(self.c.Tr.ChangingThisActionIsNotAllowed) } self.c.LogAction("Update rebase TODO") @@ -537,13 +538,13 @@ func (self *LocalCommitsController) amendAttribute(commit *models.Commit) error Title: "Amend commit attribute", Items: []*types.MenuItem{ { - Label: "reset author", + Label: self.c.Tr.ResetAuthor, OnPress: self.resetAuthor, Key: 'a', 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, Key: 'A', Tooltip: "Set the author based on a prompt", @@ -720,7 +721,7 @@ func (self *LocalCommitsController) handleOpenLogMenu() error { 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( 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 { return func() error { 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( types.RefreshOptions{ Mode: types.SYNC, diff --git a/pkg/gui/controllers/menu_controller.go b/pkg/gui/controllers/menu_controller.go index 58b0fcdd5..3b04f01f2 100644 --- a/pkg/gui/controllers/menu_controller.go +++ b/pkg/gui/controllers/menu_controller.go @@ -32,13 +32,13 @@ func (self *MenuController) GetKeybindings(opts types.KeybindingsOpts) []*types. { Key: opts.GetKey(opts.Config.Universal.Confirm), Handler: self.press, - Description: self.c.Tr.LcExecute, + Description: self.c.Tr.Execute, Display: true, }, { Key: opts.GetKey(opts.Config.Universal.Return), Handler: self.close, - Description: self.c.Tr.LcClose, + Description: self.c.Tr.Close, Display: true, }, } diff --git a/pkg/gui/controllers/merge_conflicts_controller.go b/pkg/gui/controllers/merge_conflicts_controller.go index 2d85040de..c90ada92e 100644 --- a/pkg/gui/controllers/merge_conflicts_controller.go +++ b/pkg/gui/controllers/merge_conflicts_controller.go @@ -30,12 +30,12 @@ func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts) { Key: opts.GetKey(opts.Config.Universal.Edit), Handler: self.HandleEditFile, - Description: self.c.Tr.LcEditFile, + Description: self.c.Tr.EditFile, }, { Key: opts.GetKey(opts.Config.Universal.OpenFile), Handler: self.HandleOpenFile, - Description: self.c.Tr.LcOpenFile, + Description: self.c.Tr.OpenFile, }, { 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), Handler: self.withRenderAndFocus(self.HandleScrollLeft), - Description: self.c.Tr.LcScrollLeft, + Description: self.c.Tr.ScrollLeft, Tag: "navigation", }, { Key: opts.GetKey(opts.Config.Universal.ScrollRight), Handler: self.withRenderAndFocus(self.HandleScrollRight), - Description: self.c.Tr.LcScrollRight, + Description: self.c.Tr.ScrollRight, Tag: "navigation", }, { Key: opts.GetKey(opts.Config.Universal.Undo), Handler: self.withRenderAndFocus(self.HandleUndo), - Description: self.c.Tr.LcUndo, + Description: self.c.Tr.Undo, Display: true, }, { Key: opts.GetKey(opts.Config.Files.OpenMergeTool), Handler: self.c.Helpers().WorkingTree.OpenMergeTool, - Description: self.c.Tr.LcOpenMergeTool, + Description: self.c.Tr.OpenMergeTool, }, { Key: opts.GetKey(opts.Config.Universal.Select), diff --git a/pkg/gui/controllers/options_menu_action.go b/pkg/gui/controllers/options_menu_action.go index 0e747a7ad..1dfe3e8e0 100644 --- a/pkg/gui/controllers/options_menu_action.go +++ b/pkg/gui/controllers/options_menu_action.go @@ -37,7 +37,7 @@ func (self *OptionsMenuAction) Call() error { }) return self.c.Menu(types.CreateMenuOptions{ - Title: self.c.Tr.MenuTitle, + Title: self.c.Tr.Keybindings, Items: menuItems, HideCancel: true, }) diff --git a/pkg/gui/controllers/patch_building_controller.go b/pkg/gui/controllers/patch_building_controller.go index 4f2bd44cb..68179d158 100644 --- a/pkg/gui/controllers/patch_building_controller.go +++ b/pkg/gui/controllers/patch_building_controller.go @@ -27,12 +27,12 @@ func (self *PatchBuildingController) GetKeybindings(opts types.KeybindingsOpts) { Key: opts.GetKey(opts.Config.Universal.OpenFile), Handler: self.OpenFile, - Description: self.c.Tr.LcOpenFile, + Description: self.c.Tr.OpenFile, }, { Key: opts.GetKey(opts.Config.Universal.Edit), Handler: self.EditFile, - Description: self.c.Tr.LcEditFile, + Description: self.c.Tr.EditFile, }, { Key: opts.GetKey(opts.Config.Universal.Select), diff --git a/pkg/gui/controllers/patch_explorer_controller.go b/pkg/gui/controllers/patch_explorer_controller.go index e81cfe1c9..6de8fb8b9 100644 --- a/pkg/gui/controllers/patch_explorer_controller.go +++ b/pkg/gui/controllers/patch_explorer_controller.go @@ -93,24 +93,24 @@ func (self *PatchExplorerController) GetKeybindings(opts types.KeybindingsOpts) Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.PrevPage), Handler: self.withRenderAndFocus(self.HandlePrevPage), - Description: self.c.Tr.LcPrevPage, + Description: self.c.Tr.PrevPage, }, { Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.NextPage), Handler: self.withRenderAndFocus(self.HandleNextPage), - Description: self.c.Tr.LcNextPage, + Description: self.c.Tr.NextPage, }, { Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoTop), Handler: self.withRenderAndFocus(self.HandleGotoTop), - Description: self.c.Tr.LcGotoTop, + Description: self.c.Tr.GotoTop, }, { Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.GotoBottom), - Description: self.c.Tr.LcGotoBottom, + Description: self.c.Tr.GotoBottom, Handler: self.withRenderAndFocus(self.HandleGotoBottom), }, { @@ -127,12 +127,12 @@ func (self *PatchExplorerController) GetKeybindings(opts types.KeybindingsOpts) Tag: "navigation", Key: opts.GetKey(opts.Config.Universal.StartSearch), 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), Handler: self.withLock(self.CopySelectedToClipboard), - Description: self.c.Tr.LcCopySelectedTexToClipboard, + Description: self.c.Tr.CopySelectedTexToClipboard, }, } } diff --git a/pkg/gui/controllers/remote_branches_controller.go b/pkg/gui/controllers/remote_branches_controller.go index c6ee1dd57..c1cc9d46b 100644 --- a/pkg/gui/controllers/remote_branches_controller.go +++ b/pkg/gui/controllers/remote_branches_controller.go @@ -32,32 +32,32 @@ func (self *RemoteBranchesController) GetKeybindings(opts types.KeybindingsOpts) 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 Handler: self.checkSelected(self.newLocalBranch), - Description: self.c.Tr.LcCheckout, + Description: self.c.Tr.Checkout, }, { Key: opts.GetKey(opts.Config.Universal.New), Handler: self.checkSelected(self.newLocalBranch), - Description: self.c.Tr.LcNewBranch, + Description: self.c.Tr.NewBranch, }, { Key: opts.GetKey(opts.Config.Branches.MergeIntoCurrentBranch), 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), 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), Handler: self.checkSelected(self.delete), - Description: self.c.Tr.LcDeleteBranch, + Description: self.c.Tr.DeleteBranch, }, { Key: opts.GetKey(opts.Config.Branches.SetUpstream), Handler: self.checkSelected(self.setAsUpstream), - Description: self.c.Tr.LcSetAsUpstream, + Description: self.c.Tr.SetAsUpstream, }, { 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), Handler: self.checkSelected(self.createResetMenu), - Description: self.c.Tr.LcViewResetOptions, + Description: self.c.Tr.ViewResetOptions, OpensMenu: true, }, } diff --git a/pkg/gui/controllers/remotes_controller.go b/pkg/gui/controllers/remotes_controller.go index 3d6b4b09d..283119886 100644 --- a/pkg/gui/controllers/remotes_controller.go +++ b/pkg/gui/controllers/remotes_controller.go @@ -40,22 +40,22 @@ func (self *RemotesController) GetKeybindings(opts types.KeybindingsOpts) []*typ { Key: opts.GetKey(opts.Config.Branches.FetchRemote), Handler: self.checkSelected(self.fetch), - Description: self.c.Tr.LcFetchRemote, + Description: self.c.Tr.FetchRemote, }, { Key: opts.GetKey(opts.Config.Universal.New), Handler: self.add, - Description: self.c.Tr.LcAddNewRemote, + Description: self.c.Tr.AddNewRemote, }, { Key: opts.GetKey(opts.Config.Universal.Remove), Handler: self.checkSelected(self.remove), - Description: self.c.Tr.LcRemoveRemote, + Description: self.c.Tr.RemoveRemote, }, { Key: opts.GetKey(opts.Config.Universal.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 { return self.c.Prompt(types.PromptOpts{ - Title: self.c.Tr.LcNewRemoteName, + Title: self.c.Tr.NewRemoteName, HandleConfirm: func(remoteName string) error { return self.c.Prompt(types.PromptOpts{ - Title: self.c.Tr.LcNewRemoteUrl, + Title: self.c.Tr.NewRemoteUrl, HandleConfirm: func(remoteUrl string) error { self.c.LogAction(self.c.Tr.Actions.AddRemote) 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 { return self.c.Confirm(types.ConfirmOpts{ - Title: self.c.Tr.LcRemoveRemote, - Prompt: self.c.Tr.LcRemoveRemotePrompt + " '" + remote.Name + "'?", + Title: self.c.Tr.RemoveRemote, + Prompt: self.c.Tr.RemoveRemotePrompt + " '" + remote.Name + "'?", HandleConfirm: func() error { self.c.LogAction(self.c.Tr.Actions.RemoveRemote) 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 { editNameMessage := utils.ResolvePlaceholderString( - self.c.Tr.LcEditRemoteName, + self.c.Tr.EditRemoteName, map[string]string{ "remoteName": remote.Name, }, @@ -167,7 +167,7 @@ func (self *RemotesController) edit(remote *models.Remote) error { } editUrlMessage := utils.ResolvePlaceholderString( - self.c.Tr.LcEditRemoteUrl, + self.c.Tr.EditRemoteUrl, map[string]string{ "remoteName": updatedRemoteName, }, diff --git a/pkg/gui/controllers/staging_controller.go b/pkg/gui/controllers/staging_controller.go index 670b27467..71b11cc06 100644 --- a/pkg/gui/controllers/staging_controller.go +++ b/pkg/gui/controllers/staging_controller.go @@ -42,12 +42,12 @@ func (self *StagingController) GetKeybindings(opts types.KeybindingsOpts) []*typ { Key: opts.GetKey(opts.Config.Universal.OpenFile), Handler: self.OpenFile, - Description: self.c.Tr.LcOpenFile, + Description: self.c.Tr.OpenFile, }, { Key: opts.GetKey(opts.Config.Universal.Edit), Handler: self.EditFile, - Description: self.c.Tr.LcEditFile, + Description: self.c.Tr.EditFile, }, { 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), Handler: self.c.Helpers().WorkingTree.HandleWIPCommitPress, - Description: self.c.Tr.LcCommitChangesWithoutHook, + Description: self.c.Tr.CommitChangesWithoutHook, }, { Key: opts.GetKey(opts.Config.Files.CommitChangesWithEditor), diff --git a/pkg/gui/controllers/stash_controller.go b/pkg/gui/controllers/stash_controller.go index 0dac18f15..1d8a0bbb0 100644 --- a/pkg/gui/controllers/stash_controller.go +++ b/pkg/gui/controllers/stash_controller.go @@ -28,27 +28,27 @@ func (self *StashController) GetKeybindings(opts types.KeybindingsOpts) []*types { Key: opts.GetKey(opts.Config.Universal.Select), Handler: self.checkSelected(self.handleStashApply), - Description: self.c.Tr.LcApply, + Description: self.c.Tr.Apply, }, { Key: opts.GetKey(opts.Config.Stash.PopStash), Handler: self.checkSelected(self.handleStashPop), - Description: self.c.Tr.LcPop, + Description: self.c.Tr.Pop, }, { Key: opts.GetKey(opts.Config.Universal.Remove), Handler: self.checkSelected(self.handleStashDrop), - Description: self.c.Tr.LcDrop, + Description: self.c.Tr.Drop, }, { Key: opts.GetKey(opts.Config.Universal.New), Handler: self.checkSelected(self.handleNewBranchOffStashEntry), - Description: self.c.Tr.LcNewBranch, + Description: self.c.Tr.NewBranch, }, { Key: opts.GetKey(opts.Config.Stash.RenameStash), Handler: self.checkSelected(self.handleRenameStashEntry), - Description: self.c.Tr.LcRenameStash, + Description: self.c.Tr.RenameStash, }, } diff --git a/pkg/gui/controllers/status_controller.go b/pkg/gui/controllers/status_controller.go index f78a83321..8661b99b3 100644 --- a/pkg/gui/controllers/status_controller.go +++ b/pkg/gui/controllers/status_controller.go @@ -45,7 +45,7 @@ func (self *StatusController) GetKeybindings(opts types.KeybindingsOpts) []*type { Key: opts.GetKey(opts.Config.Status.CheckForUpdate), Handler: self.handleCheckForUpdate, - Description: self.c.Tr.LcCheckForUpdate, + Description: self.c.Tr.CheckForUpdate, }, { 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), 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() switch workingTreeState { 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) { return self.c.Helpers().MergeAndRebase.CreateRebaseOptionsMenu() } diff --git a/pkg/gui/controllers/submodules_controller.go b/pkg/gui/controllers/submodules_controller.go index 9a9f5af6b..80ac54cd7 100644 --- a/pkg/gui/controllers/submodules_controller.go +++ b/pkg/gui/controllers/submodules_controller.go @@ -32,37 +32,37 @@ func (self *SubmodulesController) GetKeybindings(opts types.KeybindingsOpts) []* { Key: opts.GetKey(opts.Config.Universal.GoInto), Handler: self.checkSelected(self.enter), - Description: self.c.Tr.LcEnterSubmodule, + Description: self.c.Tr.EnterSubmodule, }, { Key: opts.GetKey(opts.Config.Universal.Remove), Handler: self.checkSelected(self.remove), - Description: self.c.Tr.LcRemoveSubmodule, + Description: self.c.Tr.RemoveSubmodule, }, { Key: opts.GetKey(opts.Config.Submodules.Update), Handler: self.checkSelected(self.update), - Description: self.c.Tr.LcSubmoduleUpdate, + Description: self.c.Tr.SubmoduleUpdate, }, { Key: opts.GetKey(opts.Config.Universal.New), Handler: self.add, - Description: self.c.Tr.LcAddSubmodule, + Description: self.c.Tr.AddSubmodule, }, { Key: opts.GetKey(opts.Config.Universal.Edit), Handler: self.checkSelected(self.editURL), - Description: self.c.Tr.LcEditSubmoduleUrl, + Description: self.c.Tr.EditSubmoduleUrl, }, { Key: opts.GetKey(opts.Config.Submodules.Init), Handler: self.checkSelected(self.init), - Description: self.c.Tr.LcInitSubmodule, + Description: self.c.Tr.InitSubmodule, }, { Key: opts.GetKey(opts.Config.Submodules.BulkMenu), Handler: self.openBulkActionsMenu, - Description: self.c.Tr.LcViewBulkSubmoduleOptions, + Description: self.c.Tr.ViewBulkSubmoduleOptions, OpensMenu: true, }, { @@ -118,19 +118,19 @@ func (self *SubmodulesController) enter(submodule *models.SubmoduleConfig) error func (self *SubmodulesController) add() error { return self.c.Prompt(types.PromptOpts{ - Title: self.c.Tr.LcNewSubmoduleUrl, + Title: self.c.Tr.NewSubmoduleUrl, HandleConfirm: func(submoduleUrl string) error { nameSuggestion := filepath.Base(strings.TrimSuffix(submoduleUrl, filepath.Ext(submoduleUrl))) return self.c.Prompt(types.PromptOpts{ - Title: self.c.Tr.LcNewSubmoduleName, + Title: self.c.Tr.NewSubmoduleName, InitialContent: nameSuggestion, HandleConfirm: func(submoduleName string) error { return self.c.Prompt(types.PromptOpts{ - Title: self.c.Tr.LcNewSubmodulePath, + Title: self.c.Tr.NewSubmodulePath, InitialContent: submoduleName, 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) err := self.c.Git().Submodule.Add(submoduleName, submodulePath, submoduleUrl) if err != nil { @@ -149,10 +149,10 @@ func (self *SubmodulesController) add() error { func (self *SubmodulesController) editURL(submodule *models.SubmoduleConfig) error { 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, 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) err := self.c.Git().Submodule.UpdateUrl(submodule.Name, submodule.Path, newUrl) if err != nil { @@ -166,7 +166,7 @@ func (self *SubmodulesController) editURL(submodule *models.SubmoduleConfig) err } 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) err := self.c.Git().Submodule.Init(submodule.Path) if err != nil { @@ -179,12 +179,12 @@ func (self *SubmodulesController) init(submodule *models.SubmoduleConfig) error func (self *SubmodulesController) openBulkActionsMenu() error { return self.c.Menu(types.CreateMenuOptions{ - Title: self.c.Tr.LcBulkSubmoduleOptions, + Title: self.c.Tr.BulkSubmoduleOptions, 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 { - 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) err := self.c.Git().Submodule.BulkInitCmdObj().Run() if err != nil { @@ -197,9 +197,9 @@ func (self *SubmodulesController) openBulkActionsMenu() error { 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 { - 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) if err := self.c.Git().Submodule.BulkUpdateCmdObj().Run(); err != nil { return self.c.Error(err) @@ -211,9 +211,9 @@ func (self *SubmodulesController) openBulkActionsMenu() error { 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 { - 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) if err := self.c.Git().Submodule.BulkDeinitCmdObj().Run(); err != nil { return self.c.Error(err) @@ -229,7 +229,7 @@ func (self *SubmodulesController) openBulkActionsMenu() 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) err := self.c.Git().Submodule.Update(submodule.Path) if err != nil { diff --git a/pkg/gui/controllers/switch_to_diff_files_controller.go b/pkg/gui/controllers/switch_to_diff_files_controller.go index 8aa929587..ffec6936e 100644 --- a/pkg/gui/controllers/switch_to_diff_files_controller.go +++ b/pkg/gui/controllers/switch_to_diff_files_controller.go @@ -40,7 +40,7 @@ func (self *SwitchToDiffFilesController) GetKeybindings(opts types.KeybindingsOp { Key: opts.GetKey(opts.Config.Universal.GoInto), Handler: self.checkSelected(self.enter), - Description: self.c.Tr.LcViewItemFiles, + Description: self.c.Tr.ViewItemFiles, }, } diff --git a/pkg/gui/controllers/switch_to_sub_commits_controller.go b/pkg/gui/controllers/switch_to_sub_commits_controller.go index c66151190..5ae86f02b 100644 --- a/pkg/gui/controllers/switch_to_sub_commits_controller.go +++ b/pkg/gui/controllers/switch_to_sub_commits_controller.go @@ -39,7 +39,7 @@ func (self *SwitchToSubCommitsController) GetKeybindings(opts types.KeybindingsO { Handler: self.viewCommits, Key: opts.GetKey(opts.Config.Universal.GoInto), - Description: self.c.Tr.LcViewCommits, + Description: self.c.Tr.ViewCommits, }, } diff --git a/pkg/gui/controllers/sync_controller.go b/pkg/gui/controllers/sync_controller.go index 120d9fdac..66373cca7 100644 --- a/pkg/gui/controllers/sync_controller.go +++ b/pkg/gui/controllers/sync_controller.go @@ -30,12 +30,12 @@ func (self *SyncController) GetKeybindings(opts types.KeybindingsOpts) []*types. { Key: opts.GetKey(opts.Config.Universal.Push), Handler: opts.Guards.NoPopupPanel(self.HandlePush), - Description: self.c.Tr.LcPush, + Description: self.c.Tr.Push, }, { Key: opts.GetKey(opts.Config.Universal.Pull), Handler: opts.Guards.NoPopupPanel(self.HandlePull), - Description: self.c.Tr.LcPull, + Description: self.c.Tr.Pull, }, } diff --git a/pkg/gui/controllers/tags_controller.go b/pkg/gui/controllers/tags_controller.go index 39fedc58e..79d5f5466 100644 --- a/pkg/gui/controllers/tags_controller.go +++ b/pkg/gui/controllers/tags_controller.go @@ -28,27 +28,27 @@ func (self *TagsController) GetKeybindings(opts types.KeybindingsOpts) []*types. { Key: opts.GetKey(opts.Config.Universal.Select), Handler: self.withSelectedTag(self.checkout), - Description: self.c.Tr.LcCheckout, + Description: self.c.Tr.Checkout, }, { Key: opts.GetKey(opts.Config.Universal.Remove), Handler: self.withSelectedTag(self.delete), - Description: self.c.Tr.LcDeleteTag, + Description: self.c.Tr.DeleteTag, }, { Key: opts.GetKey(opts.Config.Branches.PushTag), Handler: self.withSelectedTag(self.push), - Description: self.c.Tr.LcPushTag, + Description: self.c.Tr.PushTag, }, { Key: opts.GetKey(opts.Config.Universal.New), Handler: self.create, - Description: self.c.Tr.LcCreateTag, + Description: self.c.Tr.CreateTag, }, { Key: opts.GetKey(opts.Config.Commits.ViewResetOptions), Handler: self.withSelectedTag(self.createResetMenu), - Description: self.c.Tr.LcViewResetOptions, + Description: self.c.Tr.ViewResetOptions, OpensMenu: true, }, } diff --git a/pkg/gui/controllers/undo_controller.go b/pkg/gui/controllers/undo_controller.go index bb87bf89d..8a9b45a95 100644 --- a/pkg/gui/controllers/undo_controller.go +++ b/pkg/gui/controllers/undo_controller.go @@ -54,13 +54,13 @@ func (self *UndoController) GetKeybindings(opts types.KeybindingsOpts) []*types. { Key: opts.GetKey(opts.Config.Universal.Undo), Handler: self.reflogUndo, - Description: self.c.Tr.LcUndoReflog, + Description: self.c.Tr.UndoReflog, Tooltip: self.c.Tr.UndoTooltip, }, { Key: opts.GetKey(opts.Config.Universal.Redo), Handler: self.reflogRedo, - Description: self.c.Tr.LcRedoReflog, + Description: self.c.Tr.RedoReflog, Tooltip: self.c.Tr.RedoTooltip, }, } @@ -77,7 +77,7 @@ func (self *UndoController) reflogUndo() error { undoingStatus := self.c.Tr.UndoingStatus 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) { @@ -125,7 +125,7 @@ func (self *UndoController) reflogRedo() error { redoingStatus := self.c.Tr.RedoingStatus 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) { diff --git a/pkg/gui/controllers/workspace_reset_controller.go b/pkg/gui/controllers/workspace_reset_controller.go index 5104b5ac8..db247ae25 100644 --- a/pkg/gui/controllers/workspace_reset_controller.go +++ b/pkg/gui/controllers/workspace_reset_controller.go @@ -14,13 +14,13 @@ func (self *FilesController) createResetMenu() error { nukeStr := "git reset --hard HEAD && git clean -fd" 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{ { LabelColumns: []string{ - self.c.Tr.LcDiscardAllChangesToAllFiles, + self.c.Tr.DiscardAllChangesToAllFiles, red.Sprint(nukeStr), }, OnPress: func() error { @@ -36,7 +36,7 @@ func (self *FilesController) createResetMenu() error { }, { LabelColumns: []string{ - self.c.Tr.LcDiscardAnyUnstagedChanges, + self.c.Tr.DiscardAnyUnstagedChanges, red.Sprint("git checkout -- ."), }, OnPress: func() error { @@ -51,7 +51,7 @@ func (self *FilesController) createResetMenu() error { }, { LabelColumns: []string{ - self.c.Tr.LcDiscardUntrackedFiles, + self.c.Tr.DiscardUntrackedFiles, red.Sprint("git clean -fd"), }, OnPress: func() error { @@ -66,7 +66,7 @@ func (self *FilesController) createResetMenu() error { }, { LabelColumns: []string{ - self.c.Tr.LcDiscardStagedChanges, + self.c.Tr.DiscardStagedChanges, red.Sprint("stash staged and drop stash"), }, Tooltip: self.c.Tr.DiscardStagedChangesDescription, @@ -88,7 +88,7 @@ func (self *FilesController) createResetMenu() error { }, { LabelColumns: []string{ - self.c.Tr.LcSoftReset, + self.c.Tr.SoftReset, red.Sprint("git reset --soft HEAD"), }, OnPress: func() error { @@ -118,7 +118,7 @@ func (self *FilesController) createResetMenu() error { }, { LabelColumns: []string{ - self.c.Tr.LcHardReset, + self.c.Tr.HardReset, red.Sprint("git reset --hard HEAD"), }, OnPress: func() error { diff --git a/pkg/gui/global_handlers.go b/pkg/gui/global_handlers.go index fc07b5846..99ac93585 100644 --- a/pkg/gui/global_handlers.go +++ b/pkg/gui/global_handlers.go @@ -133,7 +133,7 @@ func (gui *Gui) handleCopySelectedSideContextItemToClipboard() error { 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 } diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index c4715de52..30ddb8951 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -89,14 +89,14 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi Key: opts.GetKey(opts.Config.Universal.ScrollUpMain), Handler: self.scrollUpMain, Alternative: "fn+up/shift+k", - Description: self.c.Tr.LcScrollUpMainPanel, + Description: self.c.Tr.ScrollUpMainPanel, }, { ViewName: "", Key: opts.GetKey(opts.Config.Universal.ScrollDownMain), Handler: self.scrollDownMain, Alternative: "fn+down/shift+j", - Description: self.c.Tr.LcScrollDownMainPanel, + Description: self.c.Tr.ScrollDownMainPanel, }, { ViewName: "", @@ -126,43 +126,43 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi ViewName: "files", Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), Handler: self.handleCopySelectedSideContextItemToClipboard, - Description: self.c.Tr.LcCopyFileNameToClipboard, + Description: self.c.Tr.CopyFileNameToClipboard, }, { ViewName: "localBranches", Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), Handler: self.handleCopySelectedSideContextItemToClipboard, - Description: self.c.Tr.LcCopyBranchNameToClipboard, + Description: self.c.Tr.CopyBranchNameToClipboard, }, { ViewName: "remoteBranches", Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), Handler: self.handleCopySelectedSideContextItemToClipboard, - Description: self.c.Tr.LcCopyBranchNameToClipboard, + Description: self.c.Tr.CopyBranchNameToClipboard, }, { ViewName: "commits", Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), Handler: self.handleCopySelectedSideContextItemToClipboard, - Description: self.c.Tr.LcCopyCommitShaToClipboard, + Description: self.c.Tr.CopyCommitShaToClipboard, }, { ViewName: "commits", Key: opts.GetKey(opts.Config.Commits.ResetCherryPick), Handler: self.helpers.CherryPick.Reset, - Description: self.c.Tr.LcResetCherryPick, + Description: self.c.Tr.ResetCherryPick, }, { ViewName: "reflogCommits", Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), Handler: self.handleCopySelectedSideContextItemToClipboard, - Description: self.c.Tr.LcCopyCommitShaToClipboard, + Description: self.c.Tr.CopyCommitShaToClipboard, }, { ViewName: "subCommits", Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), Handler: self.handleCopySelectedSideContextItemToClipboard, - Description: self.c.Tr.LcCopyCommitShaToClipboard, + Description: self.c.Tr.CopyCommitShaToClipboard, }, { ViewName: "information", @@ -174,13 +174,13 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi ViewName: "commitFiles", Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), Handler: self.handleCopySelectedSideContextItemToClipboard, - Description: self.c.Tr.LcCopyCommitFileNameToClipboard, + Description: self.c.Tr.CopyCommitFileNameToClipboard, }, { ViewName: "", Key: opts.GetKey(opts.Config.Universal.ExtrasMenu), Handler: self.handleCreateExtrasMenuPanel, - Description: self.c.Tr.LcOpenExtrasMenu, + Description: self.c.Tr.OpenExtrasMenu, OpensMenu: true, }, { @@ -255,7 +255,7 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi ViewName: "submodules", Key: opts.GetKey(opts.Config.Universal.CopyToClipboard), Handler: self.handleCopySelectedSideContextItemToClipboard, - Description: self.c.Tr.LcCopySubmoduleNameToClipboard, + Description: self.c.Tr.CopySubmoduleNameToClipboard, }, { ViewName: "extras", @@ -321,14 +321,14 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi ViewName: "", Key: opts.GetKey(opts.Config.Universal.NextTab), Handler: self.handleNextTab, - Description: self.c.Tr.LcNextTab, + Description: self.c.Tr.NextTab, Tag: "navigation", }, { ViewName: "", Key: opts.GetKey(opts.Config.Universal.PrevTab), Handler: self.handlePrevTab, - Description: self.c.Tr.LcPrevTab, + Description: self.c.Tr.PrevTab, Tag: "navigation", }, }...) diff --git a/pkg/gui/menu_panel.go b/pkg/gui/menu_panel.go index 24d9ff681..f830526db 100644 --- a/pkg/gui/menu_panel.go +++ b/pkg/gui/menu_panel.go @@ -12,7 +12,7 @@ func (gui *Gui) createMenu(opts types.CreateMenuOptions) error { if !opts.HideCancel { // this is mutative but I'm okay with that for now opts.Items = append(opts.Items, &types.MenuItem{ - LabelColumns: []string{gui.c.Tr.LcCancel}, + LabelColumns: []string{gui.c.Tr.Cancel}, OnPress: func() error { return nil }, diff --git a/pkg/gui/options_map.go b/pkg/gui/options_map.go index 0052a85af..769b6866f 100644 --- a/pkg/gui/options_map.go +++ b/pkg/gui/options_map.go @@ -58,27 +58,27 @@ func (self *OptionsMapMgr) globalOptions() []bindingInfo { return []bindingInfo{ { 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), - description: self.c.Tr.LcCancel, + description: self.c.Tr.Cancel, }, { key: keybindings.Label(keybindingConfig.Universal.Quit), - description: self.c.Tr.LcQuit, + description: self.c.Tr.Quit, }, { 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])), - 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)), - description: self.c.Tr.LcScrollLeftRight, + description: self.c.Tr.ScrollLeftRight, }, } } diff --git a/pkg/gui/presentation/working_tree.go b/pkg/gui/presentation/working_tree.go index 5ce46b734..1e1954bc9 100644 --- a/pkg/gui/presentation/working_tree.go +++ b/pkg/gui/presentation/working_tree.go @@ -1,14 +1,30 @@ 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 { case enums.REBASE_MODE_REBASING: - return "rebasing" + return tr.RebasingStatus case enums.REBASE_MODE_MERGING: - return "merging" + return tr.MergingStatus 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" } } diff --git a/pkg/gui/searching.go b/pkg/gui/searching.go index 270fe1efd..21a07c4c2 100644 --- a/pkg/gui/searching.go +++ b/pkg/gui/searching.go @@ -51,9 +51,9 @@ func (gui *Gui) onSelectItemWrapper(innerFunc func(int) error) func(int, int, in gui.c.SetViewContent( gui.Views.Search, fmt.Sprintf( - "no matches for '%s' %s", + gui.Tr.NoMatchesFor, 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 @@ -61,12 +61,12 @@ func (gui *Gui) onSelectItemWrapper(innerFunc func(int) error) func(int, int, in gui.c.SetViewContent( gui.Views.Search, fmt.Sprintf( - "matches for '%s' (%d of %d) %s", + gui.Tr.MatchesFor, gui.State.Searching.searchString, index+1, total, 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.PrevMatch), keybindings.Label(keybindingConfig.Universal.Return), diff --git a/pkg/gui/services/custom_commands/handler_creator.go b/pkg/gui/services/custom_commands/handler_creator.go index 6ec005a37..da1c449fd 100644 --- a/pkg/gui/services/custom_commands/handler_creator.go +++ b/pkg/gui/services/custom_commands/handler_creator.go @@ -194,7 +194,7 @@ func (self *HandlerCreator) finalHandler(customCommand config.CustomCommand, ses loadingText := customCommand.LoadingText if loadingText == "" { - loadingText = self.c.Tr.LcRunningCustomCommandStatus + loadingText = self.c.Tr.RunningCustomCommandStatus } return self.c.WithWaitingStatus(loadingText, func() error { diff --git a/pkg/gui/views.go b/pkg/gui/views.go index e761d4cad..6b97f17b7 100644 --- a/pkg/gui/views.go +++ b/pkg/gui/views.go @@ -3,7 +3,6 @@ package gui import ( "github.com/jesseduffield/generics/slices" "github.com/jesseduffield/gocui" - "github.com/jesseduffield/lazygit/pkg/gui/constants" "github.com/jesseduffield/lazygit/pkg/theme" ) @@ -94,7 +93,7 @@ func (gui *Gui) createAllViews() error { gui.Views.SearchPrefix.BgColor = gocui.ColorDefault gui.Views.SearchPrefix.FgColor = gocui.ColorGreen 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 diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go index 9c19bd410..835201762 100644 --- a/pkg/i18n/chinese.go +++ b/pkg/i18n/chinese.go @@ -59,24 +59,23 @@ func chineseTranslationSet() TranslationSet { NoCommitToAmend: "没有需要提交的修补。", CommitChangesWithEditor: "提交更改（使用编辑器编辑提交信息）", StatusTitle: "状态", - LcNavigate: "导航", - LcMenu: "菜单", - LcExecute: "执行", - LcToggleStaged: "切换暂存状态", - LcToggleStagedAll: "切换所有文件的暂存状态", - LcToggleTreeView: "切换文件树视图", - LcOpenMergeTool: "打开外部合并工具 (git mergetool)", - LcRefresh: "刷新", - LcPush: "推送", - LcPull: "拉取", - LcScroll: "滚动", + Menu: "菜单", + Execute: "执行", + ToggleStaged: "切换暂存状态", + ToggleStagedAll: "切换所有文件的暂存状态", + ToggleTreeView: "切换文件树视图", + OpenMergeTool: "打开外部合并工具 (git mergetool)", + Refresh: "刷新", + Push: "推送", + Pull: "拉取", + Scroll: "滚动", MergeConflictsTitle: "合并冲突", - LcCheckout: "检出", + Checkout: "检出", NoChangedFiles: "没有更改过文件", PullWait: "正在拉取…", PushWait: "正在推送…", FetchWait: "正在抓取…", - LcSoftReset: "软重置", + SoftReset: "软重置", AlreadyCheckedOutBranch: "您已经检出至此分支", SureForceCheckout: "您确定要强制检出吗？您将丢失所有本地更改", ForceCheckoutBranch: "强制检出分支", @@ -86,45 +85,44 @@ func chineseTranslationSet() TranslationSet { DeleteBranch: "删除分支", DeleteBranchMessage: "您确定要删除分支 {{.selectedBranchName}} 吗？", ForceDeleteBranchMessage: "{{.selectedBranchName}} 还没有被完全合并。您确定要删除它吗？", - LcRebaseBranch: "将已检出的分支变基到该分支", + RebaseBranch: "将已检出的分支变基到该分支", CantRebaseOntoSelf: "您不能将分支变基到其自身", CantMergeBranchIntoItself: "您不能将分支合并到其自身", - LcForceCheckout: "强制检出", - LcCheckoutByName: "按名称检出", - LcNewBranch: "新分支", - LcDeleteBranch: "删除分支", + ForceCheckout: "强制检出", + CheckoutByName: "按名称检出", + NewBranch: "新分支", NoBranchesThisRepo: "此仓库中没有分支", CommitWithoutMessageErr: "您必须编写提交消息才能进行提交", - LcCloseCancel: "关闭", - LcConfirm: "确认", - LcClose: "关闭", - LcQuit: "退出", - LcSquashDown: "向下压缩", - LcFixupCommit: "修正提交（fixup）", + CloseCancel: "关闭", + Confirm: "确认", + Close: "关闭", + Quit: "退出", + SquashDown: "向下压缩", + FixupCommit: "修正提交（fixup）", NoCommitsThisBranch: "该分支没有提交", CannotSquashOrFixupFirstCommit: "There's no commit below to squash into", Fixup: "修正（fixup）", SureFixupThisCommit: "您确定要“修正”此提交吗？它将合并到下面的提交中", SureSquashThisCommit: "您确定要将这个提交压缩到下面的提交中吗？", Squash: "压缩", - LcPickCommit: "选择提交（变基过程中）", - LcRevertCommit: "还原提交", - LcRewordCommit: "改写提交", - LcDeleteCommit: "删除提交", - LcMoveDownCommit: "下移提交", - LcMoveUpCommit: "上移提交", - LcEditCommit: "编辑提交", - LcAmendToCommit: "用已暂存的更改来修补提交", - LcRenameCommitEditor: "使用编辑器重命名提交", + PickCommit: "选择提交（变基过程中）", + RevertCommit: "还原提交", + RewordCommit: "改写提交", + DeleteCommit: "删除提交", + MoveDownCommit: "下移提交", + MoveUpCommit: "上移提交", + EditCommit: "编辑提交", + AmendToCommit: "用已暂存的更改来修补提交", + RenameCommitEditor: "使用编辑器重命名提交", Error: "错误", - LcPickHunk: "选中区块", - LcPickAllHunks: "选中所有区块", - LcUndo: "撤销", - LcUndoReflog: "（通过 reflog）撤销「实验功能」", - LcRedoReflog: "（通过 reflog）重做「实验功能」", - LcPop: "应用并删除", - LcDrop: "删除", - LcApply: "应用", + PickHunk: "选中区块", + PickAllHunks: "选中所有区块", + Undo: "撤销", + UndoReflog: "（通过 reflog）撤销「实验功能」", + RedoReflog: "（通过 reflog）重做「实验功能」", + Pop: "应用并删除", + Drop: "删除", + Apply: "应用", NoStashEntries: "没有贮藏条目", StashDrop: "删除贮藏", SureDropStashEntry: "您确定要删除此贮藏条目吗？", @@ -134,7 +132,7 @@ func chineseTranslationSet() TranslationSet { SureApplyStashEntry: "您确定要应用此贮藏条目？", NoTrackedStagedFilesStash: "没有可以贮藏的已跟踪/暂存文件", StashChanges: "贮藏更改", - LcRenameStash: "rename stash", + RenameStash: "Rename stash", RenameStashPrompt: "Rename stash: {{.stashName}}", OpenConfig: "打开配置文件", EditConfig: "编辑配置文件", @@ -142,7 +140,7 @@ func chineseTranslationSet() TranslationSet { ForcePushPrompt: "您的分支已与远程分支不同。按‘esc’取消，或‘enter’强制推送.", ForcePushDisabled: "您的分支已与远程分支不同, 并且您已经禁用了强行推送", UpdatesRejectedAndForcePushDisabled: "更新被拒绝，您已禁用强制推送", - LcCheckForUpdate: "检查更新", + CheckForUpdate: "检查更新", CheckingForUpdates: "正在检查更新…", OnLatestVersionErr: "已是最新版本", MajorVersionErr: "新版本 ({{.newVersion}}) 与当前版本 ({{.currentVersion}}) 相比，具有非向后兼容的更改", @@ -151,19 +149,19 @@ func chineseTranslationSet() TranslationSet { MergeToolPrompt: "确定要打开 `git mergetool` 吗?", IntroPopupMessage: chineseIntroPopupMessage, GitconfigParseErr: `由于存在未加引号的'\'字符，因此 Gogit 无法解析您的 gitconfig 文件。删除它们应该可以解决问题。`, - LcEditFile: `编辑文件`, - LcOpenFile: `打开文件`, - LcIgnoreFile: `添加到 .gitignore`, - LcRefreshFiles: `刷新文件`, - LcMergeIntoCurrentBranch: `合并到当前检出的分支`, + EditFile: `编辑文件`, + OpenFile: `打开文件`, + IgnoreFile: `添加到 .gitignore`, + RefreshFiles: `刷新文件`, + MergeIntoCurrentBranch: `合并到当前检出的分支`, ConfirmQuit: `您确定要退出吗？`, SwitchRepo: `切换到最近的仓库`, - LcAllBranchesLogGraph: `显示所有分支的日志`, + AllBranchesLogGraph: `显示所有分支的日志`, UnsupportedGitService: `不支持的 git 服务`, - LcCreatePullRequest: `创建抓取请求`, - LcCopyPullRequestURL: `将抓取请求 URL 复制到剪贴板`, + CreatePullRequest: `创建抓取请求`, + CopyPullRequestURL: `将抓取请求 URL 复制到剪贴板`, NoBranchOnRemote: `该分支在远程上不存在. 您需要先将其推送到远程.`, - LcFetch: `抓取`, + Fetch: `抓取`, NoAutomaticGitFetchTitle: `无法自动进行 "git fetch"`, NoAutomaticGitFetchBody: `Lazygit 不能在私人仓库中使用 "git fetch"; 请在文件面板中使用 'f' 手动运行 "git fetch"`, FileEnter: `暂存单个 块/行 用于文件, 或 折叠/展开 目录`, @@ -179,8 +177,6 @@ func chineseTranslationSet() TranslationSet { Fetching: "抓取并快进 {{.from}} -> {{.to}} ...", FoundConflicts: "冲突！需要中止操作请按‘esc’, 否则按‘enter’", FoundConflictsTitle: "自动合并失败", - PickHunk: "选中区块", - PickAllHunks: "选中所有区块", ViewMergeRebaseOptions: "查看 合并/变基 选项", NotMergingOrRebasing: "您目前既不进行变基也不进行合并", RecentRepos: "最近的仓库", @@ -206,10 +202,10 @@ func chineseTranslationSet() TranslationSet { ErrorOccurred: "发生错误！请在以下位置创建 issue", NoRoom: "空间不足", YouAreHere: "您在这里", - LcRewordNotSupported: "当前不支持交互式重新基准化时的重新措词提交", - LcCherryPickCopy: "复制提交（拣选）", - LcCherryPickCopyRange: "复制提交范围（拣选）", - LcPasteCommits: "粘贴提交（拣选）", + RewordNotSupported: "当前不支持交互式重新基准化时的重新措词提交", + CherryPickCopy: "复制提交（拣选）", + CherryPickCopyRange: "复制提交范围（拣选）", + PasteCommits: "粘贴提交（拣选）", SureCherryPick: "您确定要将选中的提交进行拣选到这个分支吗？", CherryPick: "拣选 (Cherry-Pick)", Donate: "捐助", @@ -224,8 +220,8 @@ func chineseTranslationSet() TranslationSet { SelectNextHunk: "选择底部块", ScrollDown: "向下滚动", ScrollUp: "向上滚动", - LcScrollUpMainPanel: "向上滚动主面板", - LcScrollDownMainPanel: "向下滚动主面板", + ScrollUpMainPanel: "向上滚动主面板", + ScrollDownMainPanel: "向下滚动主面板", AmendCommitTitle: "修改提交", AmendCommitPrompt: "您确定要使用暂存文件来修改此提交吗？", DeleteCommitTitle: "删除提交", @@ -242,10 +238,10 @@ func chineseTranslationSet() TranslationSet { CheckingOutStatus: "长子检出", CommittingStatus: "正在提交", CommitFiles: "提交文件", - LcViewItemFiles: "查看提交的文件", + ViewItemFiles: "查看提交的文件", CommitFilesTitle: "提交文件", - LcCheckoutCommitFile: "检出文件", - LcDiscardOldFileChange: "放弃对此文件的提交更改", + CheckoutCommitFile: "检出文件", + DiscardOldFileChange: "放弃对此文件的提交更改", DiscardFileChangesTitle: "放弃文件更改", DiscardFileChangesPrompt: "您确定要舍弃此提交对该文件的更改吗？如果此文件是在此提交中创建的，它将被删除", DisabledForGPG: "该功能不适用于使用 GPG 的用户", @@ -253,170 +249,168 @@ func chineseTranslationSet() TranslationSet { AutoStashTitle: "自动存储？", AutoStashPrompt: "您必须隐藏并弹出更改以使更改生效。自动执行？(enter/esc)", StashPrefix: "自动隐藏更改 ", - LcViewDiscardOptions: "查看'放弃更改'选项", - LcCancel: "取消", - LcDiscardAllChanges: "放弃所有更改", - LcDiscardUnstagedChanges: "放弃未暂存的变更", - LcDiscardAllChangesToAllFiles: "清空工作区", - LcDiscardAnyUnstagedChanges: "丢弃未暂存的变更", - LcDiscardUntrackedFiles: "丢弃未跟踪的文件", - LcHardReset: "硬重置", - LcViewResetOptions: `查看重置选项`, - LcCreateFixupCommit: `为此提交创建修正`, - LcSquashAboveCommits: `压缩在所选提交之上的所有“fixup!”提交（自动压缩）`, + ViewDiscardOptions: "查看'放弃更改'选项", + Cancel: "取消", + DiscardAllChanges: "放弃所有更改", + DiscardUnstagedChanges: "放弃未暂存的变更", + DiscardAllChangesToAllFiles: "清空工作区", + DiscardAnyUnstagedChanges: "丢弃未暂存的变更", + DiscardUntrackedFiles: "丢弃未跟踪的文件", + HardReset: "硬重置", + ViewResetOptions: `查看重置选项`, + CreateFixupCommit: `为此提交创建修正`, SquashAboveCommits: `压缩在所选提交之上的所有“fixup!”提交（自动压缩）`, SureSquashAboveCommits: `您确定要压缩在 {{.commit}} 之上的所有“fixup!”提交吗?`, - CreateFixupCommit: `创建修正提交`, + CreateFixupCommitDescription: `创建修正提交`, SureCreateFixupCommit: `您确定要对 {{.commit}} 创建修正提交吗？`, - LcExecuteCustomCommand: "执行自定义命令", + ExecuteCustomCommand: "执行自定义命令", CustomCommand: "自定义命令：", - LcCommitChangesWithoutHook: "提交更改而无需预先提交钩子", + CommitChangesWithoutHook: "提交更改而无需预先提交钩子", SkipHookPrefixNotConfigured: "您尚未配置用于跳过钩子的提交消息前缀。请在您的配置中设置 `git.skipHookPrefix ='WIP'`", - LcResetTo: `重置为`, + ResetTo: `重置为`, PressEnterToReturn: "按下 Enter 键返回 lazygit", - LcViewStashOptions: "查看贮藏选项", - LcStashAllChanges: "将所有更改加入贮藏", - LcStashAllChangesKeepIndex: "将已暂存的更改加入贮藏", - LcStashOptions: "贮藏选项", + ViewStashOptions: "查看贮藏选项", + StashAllChanges: "将所有更改加入贮藏", + StashAllChangesKeepIndex: "将已暂存的更改加入贮藏", + StashOptions: "贮藏选项", NotARepository: "错误：必须在 git 仓库中运行", - LcJump: "跳到面板", - LcScrollLeftRight: "左右滚动", - LcScrollLeft: "向左滚动", - LcScrollRight: "向右滚动", + Jump: "跳到面板", + ScrollLeftRight: "左右滚动", + ScrollLeft: "向左滚动", + ScrollRight: "向右滚动", DiscardPatch: "丢弃补丁", DiscardPatchConfirm: "您一次只能通过一个提交或贮藏条目构建补丁。需要放弃当前补丁吗？", CantPatchWhileRebasingError: "处于合并或变基状态时，您无法构建修补程序或运行修补程序命令", - LcToggleAddToPatch: "补丁中包含的切换文件", + ToggleAddToPatch: "补丁中包含的切换文件", ViewPatchOptions: "查看自定义补丁选项", PatchOptionsTitle: "补丁选项", NoPatchError: "尚未创建补丁。你可以在提交中的文件上按下“空格”或使用“回车”添加其中的特定行以开始构建补丁", - LcEnterFile: "输入文件以将所选行添加到补丁中（或切换目录折叠）", + EnterFile: "输入文件以将所选行添加到补丁中（或切换目录折叠）", ExitCustomPatchBuilder: `退出逐行模式`, EnterUpstream: `以这种格式输入上游：'<远程仓库> <分支名称>'`, InvalidUpstream: "上游格式无效，格式应当为：' '", ReturnToRemotesList: `返回远程仓库列表`, - LcAddNewRemote: `添加新的远程仓库`, - LcNewRemoteName: `新远程仓库名称:`, - LcNewRemoteUrl: `新远程仓库 URL:`, - LcEditRemoteName: `输入远程仓库 {{.remoteName}} 的新名称：`, - LcEditRemoteUrl: `输入远程仓库 {{.remoteName}} 的新 URL：`, - LcRemoveRemote: `删除远程`, - LcRemoveRemotePrompt: "您确定要删除远程仓库吗？", + AddNewRemote: `添加新的远程仓库`, + NewRemoteName: `新远程仓库名称:`, + NewRemoteUrl: `新远程仓库 URL:`, + EditRemoteName: `输入远程仓库 {{.remoteName}} 的新名称：`, + EditRemoteUrl: `输入远程仓库 {{.remoteName}} 的新 URL：`, + RemoveRemote: `删除远程`, + RemoveRemotePrompt: "您确定要删除远程仓库吗？", DeleteRemoteBranch: "删除远程分支", DeleteRemoteBranchMessage: "您确定要删除远程分支吗？", - LcSetUpstream: "设置为检出分支的上游", - LcSetAsUpstream: "设置为检出分支的上游", + SetUpstream: "设置为检出分支的上游", + SetAsUpstream: "设置为检出分支的上游", SetUpstreamTitle: "设置上游分支", SetUpstreamMessage: "您确定要将 {{.checkedOut}} 的上游分支设置为 {{.selected}} 吗？", - LcEditRemote: "编辑远程仓库", - LcTagCommit: "标签提交", + EditRemote: "编辑远程仓库", + TagCommit: "标签提交", TagMenuTitle: "创建标签", TagNameTitle: "标签名称：", TagMessageTitle: "标签消息：", - LcAnnotatedTag: "附注标签", - LcLightweightTag: "轻量标签", - LcDeleteTag: "删除标签", + AnnotatedTag: "附注标签", + LightweightTag: "轻量标签", + DeleteTag: "删除标签", DeleteTagTitle: "删除标签", DeleteTagPrompt: "您确定要删除标签 {{.tagName}} 吗？", PushTagTitle: "将 {{.tagName}} 推送到远程仓库：", - LcPushTag: "推送标签", - LcCreateTag: "创建标签", + PushTag: "推送标签", + CreateTag: "创建标签", CreateTagTitle: "标签名称：", - LcFetchRemote: "抓取远程仓库", + FetchRemote: "抓取远程仓库", FetchingRemoteStatus: "抓取远程仓库中", - LcCheckoutCommit: "检出提交", + CheckoutCommit: "检出提交", SureCheckoutThisCommit: "您确定要检出此提交吗?", - LcGitFlowOptions: "显示 git-flow 选项", + GitFlowOptions: "显示 git-flow 选项", NotAGitFlowBranch: "这似乎不是 git flow 分支", NewGitFlowBranchPrompt: "新的 {{.branchType}} 名称：", IgnoreTracked: "忽略跟踪文件", IgnoreTrackedPrompt: "您确定要忽略已跟踪的文件吗？", - LcViewResetToUpstreamOptions: "查看上游重置选项", - LcNextScreenMode: "下一屏模式（正常/半屏/全屏）", - LcPrevScreenMode: "上一屏模式", - LcStartSearch: "开始搜索", + ViewResetToUpstreamOptions: "查看上游重置选项", + NextScreenMode: "下一屏模式（正常/半屏/全屏）", + PrevScreenMode: "上一屏模式", + StartSearch: "开始搜索", Panel: "面板", Keybindings: "按键绑定", - LcRenameBranch: "重命名分支", + RenameBranch: "重命名分支", NewBranchNamePrompt: "输入分支的新名称", RenameBranchWarning: "该分支正在跟踪远程仓库。此操作将仅会重命名本地分支名称，而不会重命名远程分支的名称。确定继续？", - LcOpenMenu: "打开菜单", - LcResetCherryPick: "重置已拣选（复制）的提交", - LcNextTab: "下一个标签", - LcPrevTab: "上一个标签", - LcCantUndoWhileRebasing: "进行基础调整时无法撤消", - LcCantRedoWhileRebasing: "变基时无法重做", + OpenMenu: "打开菜单", + ResetCherryPick: "重置已拣选（复制）的提交", + NextTab: "下一个标签", + PrevTab: "上一个标签", + CantUndoWhileRebasing: "进行基础调整时无法撤消", + CantRedoWhileRebasing: "变基时无法重做", MustStashWarning: "将补丁拉出到索引中需要存储和取消存储所做的更改。如果出现问题，您将可以从存储中访问文件。继续？", MustStashTitle: "必须保存进度", ConfirmationTitle: "确认面板", - LcPrevPage: "上一页", - LcNextPage: "下一页", - LcGotoTop: "滚动到顶部", - LcGotoBottom: "滚动到底部", - LcFilteringBy: "过滤依据", + PrevPage: "上一页", + NextPage: "下一页", + GotoTop: "滚动到顶部", + GotoBottom: "滚动到底部", + FilteringBy: "过滤依据", ResetInParentheses: "（重置）", - LcOpenFilteringMenu: "查看按路径过滤选项", - LcFilterBy: "过滤", - LcExitFilterMode: "停止按路径过滤", - LcFilterPathOption: "输入要过滤的路径", + OpenFilteringMenu: "查看按路径过滤选项", + FilterBy: "过滤", + ExitFilterMode: "停止按路径过滤", + FilterPathOption: "输入要过滤的路径", EnterFileName: "输入路径：", FilteringMenuTitle: "正在过滤", MustExitFilterModeTitle: "命令不可用", MustExitFilterModePrompt: "命令在过滤模式下不可用。退出过滤模式？", - LcDiff: "差异", - LcEnterRefToDiff: "输入 ref 以 diff", - LcEnteRefName: "输入 ref：", - LcExitDiffMode: "退出差异模式", + Diff: "差异", + EnterRefToDiff: "输入 ref 以 diff", + EnteRefName: "输入 ref：", + ExitDiffMode: "退出差异模式", DiffingMenuTitle: "正在 diff", - LcSwapDiff: "反向 diff", - LcOpenDiffingMenu: "打开 diff 菜单", + SwapDiff: "反向 diff", + OpenDiffingMenu: "打开 diff 菜单", // 实际视图 (actual view) 是附加视图 (extras view)，未来,我打算为附加视图提供更多选项卡，但现在，上面的文本只需要提及“命令日志”这个部分 - LcOpenExtrasMenu: "打开命令日志菜单", - LcShowingGitDiff: "显示输出：", - LcCopyCommitShaToClipboard: "将提交的 SHA 复制到剪贴板", - LcCopyCommitMessageToClipboard: "将提交消息复制到剪贴板", - LcCopyBranchNameToClipboard: "将分支名称复制到剪贴板", - LcCopyFileNameToClipboard: "将文件名复制到剪贴板", - LcCopyCommitFileNameToClipboard: "将提交的文件名复制到剪贴板", - LcCopySelectedTexToClipboard: "将选中文本复制到剪贴板", - LcCommitPrefixPatternError: "提交前缀模式错误", + OpenExtrasMenu: "打开命令日志菜单", + ShowingGitDiff: "显示输出：", + CopyCommitShaToClipboard: "将提交的 SHA 复制到剪贴板", + CopyCommitMessageToClipboard: "将提交消息复制到剪贴板", + CopyBranchNameToClipboard: "将分支名称复制到剪贴板", + CopyFileNameToClipboard: "将文件名复制到剪贴板", + CopyCommitFileNameToClipboard: "将提交的文件名复制到剪贴板", + CopySelectedTexToClipboard: "将选中文本复制到剪贴板", + CommitPrefixPatternError: "提交前缀模式错误", NoFilesStagedTitle: "没有暂存文件", NoFilesStagedPrompt: "您尚未暂存任何文件。提交所有文件？", BranchNotFoundTitle: "找不到分支", BranchNotFoundPrompt: "找不到分支。创建一个新分支命名为：", UnstageLinesTitle: "取消暂存选中的行", UnstageLinesPrompt: "您确定要删除所选的行（git reset）吗？这是不可逆的。\n要禁用此对话框，请将 'gui.skipUnstageLineWarning' 的配置键设置为 true", - LcCreateNewBranchFromCommit: "从提交创建新分支", - LcBuildingPatch: "正在构建补丁", - LcViewCommits: "查看提交", + CreateNewBranchFromCommit: "从提交创建新分支", + BuildingPatch: "正在构建补丁", + ViewCommits: "查看提交", MinGitVersionError: "Git 版本必须至少为 2.20（即从 2018 年开始的版本）。请更新 git。或者在 https://github.com/jesseduffield/lazygit/issues 上提出一个问题，以使 lazygit 更加向后兼容。", - LcRunningCustomCommandStatus: "正在运行自定义命令", - LcSubmoduleStashAndReset: "存放未提交的子模块更改和更新", - LcAndResetSubmodules: "和重置子模块", - LcEnterSubmodule: "输入子模块", - LcCopySubmoduleNameToClipboard: "将子模块名称复制到剪贴板", + RunningCustomCommandStatus: "正在运行自定义命令", + SubmoduleStashAndReset: "存放未提交的子模块更改和更新", + AndResetSubmodules: "和重置子模块", + EnterSubmodule: "输入子模块", + CopySubmoduleNameToClipboard: "将子模块名称复制到剪贴板", RemoveSubmodule: "删除子模块", - LcRemoveSubmodule: "删除子模块", RemoveSubmodulePrompt: "您确定要删除子模块 '%s' 及其对应的目录吗？这是不可逆的。", - LcResettingSubmoduleStatus: "正在重置子模块", - LcNewSubmoduleName: "新的子模块名称：", - LcNewSubmoduleUrl: "新的子模块 URL：", - LcNewSubmodulePath: "新的子模块路径：", - LcAddSubmodule: "添加新的子模块", - LcAddingSubmoduleStatus: "添加子模块", - LcUpdateSubmoduleUrl: "更新子模块 '%s' 的 URL", - LcUpdatingSubmoduleUrlStatus: "更新 URL 中", - LcEditSubmoduleUrl: "更新子模块 URL", - LcInitializingSubmoduleStatus: "正在初始化子模块", - LcInitSubmodule: "初始化子模块", - LcSubmoduleUpdate: "更新子模块", - LcUpdatingSubmoduleStatus: "正在更新子模块", - LcBulkInitSubmodules: "批量初始化子模块", - LcBulkUpdateSubmodules: "批量更新子模块", - LcBulkDeinitSubmodules: "批量反初始化子模块", - LcViewBulkSubmoduleOptions: "查看批量子模块选项", - LcBulkSubmoduleOptions: "批量子模块选项", - LcRunningCommand: "运行命令", + ResettingSubmoduleStatus: "正在重置子模块", + NewSubmoduleName: "新的子模块名称：", + NewSubmoduleUrl: "新的子模块 URL：", + NewSubmodulePath: "新的子模块路径：", + AddSubmodule: "添加新的子模块", + AddingSubmoduleStatus: "添加子模块", + UpdateSubmoduleUrl: "更新子模块 '%s' 的 URL", + UpdatingSubmoduleUrlStatus: "更新 URL 中", + EditSubmoduleUrl: "更新子模块 URL", + InitializingSubmoduleStatus: "正在初始化子模块", + InitSubmodule: "初始化子模块", + SubmoduleUpdate: "更新子模块", + UpdatingSubmoduleStatus: "正在更新子模块", + BulkInitSubmodules: "批量初始化子模块", + BulkUpdateSubmodules: "批量更新子模块", + BulkDeinitSubmodules: "批量反初始化子模块", + ViewBulkSubmoduleOptions: "查看批量子模块选项", + BulkSubmoduleOptions: "批量子模块选项", + RunningCommand: "运行命令", SubCommitsTitle: "子提交", SubmodulesTitle: "子模块", NavigationTitle: "列表面板导航", @@ -426,7 +420,7 @@ func chineseTranslationSet() TranslationSet { PushingTagStatus: "推送标签", PullRequestURLCopiedToClipboard: "抓取请求网址已复制到剪贴板", CommitMessageCopiedToClipboard: "提交消息复制到剪贴板", - LcCopiedToClipboard: "复制到剪贴板", + CopiedToClipboard: "复制到剪贴板", ErrCannotEditDirectory: "无法编辑目录：您只能编辑单个文件", ErrStageDirWithInlineMergeConflicts: "无法 暂存/取消暂存 包含具有内联合并冲突的文件的目录。请先解决合并冲突", ErrRepositoryMovedOrDeleted: "找不到仓库。它可能已被移动或删除 ¯\\_(ツ)_/¯", @@ -439,28 +433,26 @@ func chineseTranslationSet() TranslationSet { ToggleWhitespaceInDiffView: "切换是否在差异视图中显示空白字符差异", IncreaseContextInDiffView: "扩大差异视图中显示的上下文范围", DecreaseContextInDiffView: "缩小差异视图中显示的上下文范围", - CreatePullRequest: "创建抓取请求", CreatePullRequestOptions: "创建抓取请求选项", - LcCreatePullRequestOptions: "创建抓取请求选项", - LcDefaultBranch: "默认分支", - LcSelectBranch: "选择分支", + DefaultBranch: "默认分支", + SelectBranch: "选择分支", SelectConfigFile: "选择配置文件", NoConfigFileFoundErr: "找不到配置文件", - LcLoadingFileSuggestions: "正在加载文件建议", - LcLoadingCommits: "正在加载提交", + LoadingFileSuggestions: "正在加载文件建议", + LoadingCommits: "正在加载提交", MustSpecifyOriginError: "指定分支时，必须同时指定远程", GitOutput: "Git 输出：", GitCommandFailed: "Git 命令执行失败。查看命令日志了解详情 (使用 %s 打开)", AbortTitle: "放弃 %s", AbortPrompt: "您确定要放弃当前 %s 吗？", - LcOpenLogMenu: "打开日志菜单", + OpenLogMenu: "打开日志菜单", LogMenuTitle: "提交日志选项", ToggleShowGitGraphAll: "切换显示完整 git 分支图 (向 `git log` 命令传入 `--all` 选项)", ShowGitGraph: "显示 git 分支图", SortCommits: "提交排序", CantChangeContextSizeError: "无法在补丁构建模式下更改上下文，因为我们在发布该功能时懒得支持它。 如果你真的想要这么做，请告诉我们！", - LcOpenCommitInBrowser: "在浏览器中打开提交", - LcViewBisectOptions: "查看二分查找选项", + OpenCommitInBrowser: "在浏览器中打开提交", + ViewBisectOptions: "查看二分查找选项", Actions: Actions{ // TODO: combine this with the original keybinding descriptions (those are all in lowercase atm) CheckoutCommit: "检出提交", @@ -498,7 +490,7 @@ func chineseTranslationSet() TranslationSet { UnstageFile: "取消暂存文件", UnstageAllFiles: "取消暂存所有文件", StageAllFiles: "暂存所有文件", - LcIgnoreExcludeFile: "忽略文件", + IgnoreExcludeFile: "忽略文件", Commit: "提交 (Commit)", EditFile: "编辑文件", Push: "推送 (Push)", @@ -506,8 +498,8 @@ func chineseTranslationSet() TranslationSet { OpenFile: "打开文件", StashAllChanges: "贮藏所有更改", StashStagedChanges: "贮藏暂存的更改", - GitFlowFinish: "Git flow 结果", - GitFlowStart: "Git Flow 开始", + GitFlowFinish: "git flow 结果", + GitFlowStart: "git flow 开始", CopyToClipboard: "复制到剪贴板", CopySelectedTextToClipboard: "将选中文本复制到剪贴板", RemovePatchFromCommit: "从提交中删除补丁", diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go index 8e8c9d21a..0be8cd2aa 100644 --- a/pkg/i18n/dutch.go +++ b/pkg/i18n/dutch.go @@ -8,8 +8,8 @@ func dutchTranslationSet() TranslationSet { BranchesTitle: "Branches", CommitsTitle: "Commits", StashTitle: "Stash", - UnstagedChanges: `Unstaged wijzigingen`, - StagedChanges: `Staged wijzigingen`, + UnstagedChanges: "Unstaged wijzigingen", + StagedChanges: "Staged wijzigingen", MainTitle: "Hoofd", StagingTitle: "Staging", NormalTitle: "Normaal", @@ -18,31 +18,30 @@ func dutchTranslationSet() TranslationSet { CredentialsPassword: "Wachtwoord", CredentialsPassphrase: "Voer een wachtwoordzin in voor de SSH-sleutel", PassUnameWrong: "Wachtwoord en/of gebruikersnaam verkeerd", - CommitChanges: "commit veranderingen", - AmendLastCommit: "wijzig laatste commit", - AmendLastCommitTitle: "Wijzig Laatste Commit", + CommitChanges: "Commit veranderingen", + AmendLastCommit: "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.", NoCommitToAmend: "Er is geen commits om te wijzigen.", - CommitChangesWithEditor: "commit veranderingen met de git editor", + CommitChangesWithEditor: "Commit veranderingen met de git editor", StatusTitle: "Status", - LcNavigate: "navigeer", - LcMenu: "menu", - LcExecute: "uitvoeren", - LcToggleStaged: "toggle staged", - LcToggleStagedAll: "toggle staged alle", - LcRefresh: "verversen", - LcPush: "push", - LcPull: "pull", - LcScroll: "scroll", + Menu: "Menu", + Execute: "Uitvoeren", + ToggleStaged: "Toggle staged", + ToggleStagedAll: "Toggle staged alle", + Refresh: "Verversen", + Push: "Push", + Pull: "Pull", + Scroll: "Scroll", FilterStagedFiles: "Show only staged files", FilterUnstagedFiles: "Show only unstaged files", ResetCommitFilterState: "Reset commit file state filter", - MergeConflictsTitle: "Merge Conflicten", - LcCheckout: "uitchecken", + MergeConflictsTitle: "Merge conflicten", + Checkout: "Uitchecken", PullWait: "Pullen...", PushWait: "Pushen...", FetchWait: "Fetchen...", - LcSoftReset: "zacht reset", + SoftReset: "Zacht reset", AlreadyCheckedOutBranch: "Je hebt deze branch al uitgecheckt", SureForceCheckout: "Weet je zeker dat je het uitchecken wil forceren? Al je lokale verandering zullen worden verwijdert", ForceCheckoutBranch: "Forceer uitchecken op deze branch", @@ -52,45 +51,44 @@ func dutchTranslationSet() TranslationSet { DeleteBranch: "Verwijder branch", DeleteBranchMessage: "Weet je zeker dat je branch '{{.selectedBranchName}}' wilt 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", CantMergeBranchIntoItself: "Je kan niet een branch in zichzelf mergen", - LcForceCheckout: "forceer checkout", - LcCheckoutByName: "uitchecken bij naam", - LcNewBranch: "nieuwe branch", - LcDeleteBranch: "verwijder branch", + ForceCheckout: "Forceer checkout", + CheckoutByName: "Uitchecken bij naam", + NewBranch: "Nieuwe branch", NoBranchesThisRepo: "Geen branches voor deze repo", CommitWithoutMessageErr: "Je kan geen commit maken zonder commit bericht", - LcCloseCancel: "sluiten", - LcConfirm: "bevestig", - LcClose: "sluiten", - LcQuit: "quit", - LcSquashDown: "squash beneden", - LcFixupCommit: "Fixup commit", + CloseCancel: "Sluiten", + Confirm: "Bevestig", + Close: "Sluiten", + Quit: "Quit", + SquashDown: "Squash beneden", + FixupCommit: "Fixup commit", CannotSquashOrFixupFirstCommit: "There's no commit below to squash into", Fixup: "Fixup", 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?", Squash: "Squash", - LcPickCommit: "kies commit (wanneer midden in rebase)", - LcRevertCommit: "commit ongedaan maken", - LcRewordCommit: "hernoem commit", - LcDeleteCommit: "verwijder commit", - LcMoveDownCommit: "verplaats commit 1 naar beneden", - LcMoveUpCommit: "verplaats commit 1 naar boven", - LcEditCommit: "wijzig commit", - LcAmendToCommit: "wijzig commit met staged veranderingen", - LcRenameCommitEditor: "hernoem commit met editor", + PickCommit: "Kies commit (wanneer midden in rebase)", + RevertCommit: "Commit ongedaan maken", + RewordCommit: "Hernoem commit", + DeleteCommit: "Verwijder commit", + MoveDownCommit: "Verplaats commit 1 naar beneden", + MoveUpCommit: "Verplaats commit 1 naar boven", + EditCommit: "Wijzig commit", + AmendToCommit: "Wijzig commit met staged veranderingen", + RenameCommitEditor: "Hernoem commit met editor", NoCommitsThisBranch: "Geen commits in deze branch", Error: "Foutmelding", - LcPickHunk: "kies stuk", - LcPickAllHunks: "kies beide stukken", - LcUndo: "ongedaan maken", - LcUndoReflog: "ongedaan maken (via reflog) (experimenteel)", - LcRedoReflog: "redo (via reflog) (experimenteel)", - LcPop: "pop", - LcDrop: "laten vallen", - LcApply: "toepassen", + PickHunk: "Kies stuk", + PickAllHunks: "Kies beide stukken", + Undo: "Ongedaan maken", + UndoReflog: "Ongedaan maken (via reflog) (experimenteel)", + RedoReflog: "Redo (via reflog) (experimenteel)", + Pop: "Pop", + Drop: "Laten vallen", + Apply: "Toepassen", NoStashEntries: "Geen stash items", StashDrop: "Stash 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?", NoTrackedStagedFilesStash: "Je hebt geen tracked/staged bestanden om te laten stashen", StashChanges: "Stash veranderingen", - LcRenameStash: "rename stash", + RenameStash: "Rename stash", RenameStashPrompt: "Rename stash: {{.stashName}}", NoChangedFiles: "Geen veranderde bestanden", - OpenConfig: "open config bestand", - EditConfig: "verander config bestand", + OpenConfig: "Open config bestand", + EditConfig: "Verander config bestand", ForcePush: "Forceer push", 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", UpdatesRejectedAndForcePushDisabled: "Updates were rejected and you have disabled force pushing", - LcCheckForUpdate: "check voor updates", - CheckingForUpdates: "zoeken naar updates...", + CheckForUpdate: "Check voor updates", + CheckingForUpdates: "Zoeken naar updates...", OnLatestVersionErr: "Je hebt al de laatste versie", MajorVersionErr: "Nieuwe versie ({{.newVersion}}) is niet backwards compatibele vergeleken met de huidige versie ({{.currentVersion}})", 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", 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`, - LcOpenFile: `open bestand`, - LcIgnoreFile: `voeg toe aan .gitignore`, - LcRefreshFiles: `refresh bestanden`, - LcMergeIntoCurrentBranch: `merge in met huidige checked out branch`, + EditFile: `Verander bestand`, + OpenFile: `Open bestand`, + IgnoreFile: `Voeg toe aan .gitignore`, + RefreshFiles: `Refresh bestanden`, + MergeIntoCurrentBranch: `Merge in met huidige checked out branch`, ConfirmQuit: `Weet je zeker dat je dit programma wil sluiten?`, - SwitchRepo: "wissel naar een recente repo", - LcAllBranchesLogGraph: `alle logs van de branch laten zien`, + SwitchRepo: "Wissel naar een recente repo", + AllBranchesLogGraph: `Alle logs van de branch laten zien`, UnsupportedGitService: `Niet-ondersteunde git-service`, - LcCreatePullRequest: `maak een pull-request`, - LcCopyPullRequestURL: `kopieer de URL van het pull-verzoek naar het klembord`, + CreatePullRequest: `Maak een pull-request`, + 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.`, - LcFetch: `fetch`, + Fetch: `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`, - FileEnter: `stage individuele hunks/lijnen`, + FileEnter: `Stage individuele hunks/lijnen`, FileStagingRequirements: `Kan alleen individuele lijnen stagen van getrackte bestanden met onstaged veranderingen`, - StageSelection: `toggle lijnen staged / unstaged`, - ResetSelection: `verwijdert change (git reset)`, - ToggleDragSelect: `toggle drag selecteer`, - ToggleSelectHunk: `toggle selecteer hunk`, - ToggleSelectionForPatch: `voeg toe/verwijder lijn(en) in patch`, - ToggleStagingPanel: `ga naar een ander paneel`, - ReturnToFilesPanel: `ga terug naar het bestanden paneel`, - FastForward: `fast-forward deze branch vanaf zijn upstream`, - Fetching: "fetching en fast-forwarding {{.from}} -> {{.to}} ...", + StageSelection: `Toggle lijnen staged / unstaged`, + ResetSelection: `Verwijdert change (git reset)`, + ToggleDragSelect: `Toggle drag selecteer`, + ToggleSelectHunk: `Toggle selecteer hunk`, + ToggleSelectionForPatch: `Voeg toe/verwijder lijn(en) in patch`, + ToggleStagingPanel: `Ga naar een ander paneel`, + ReturnToFilesPanel: `Ga terug naar het bestanden paneel`, + FastForward: `Fast-forward deze branch vanaf zijn upstream`, + Fetching: "Fetching en fast-forwarding {{.from}} -> {{.to}} ...", FoundConflicts: "Conflicten!, Om af te breken druk 'esc', anders druk op 'enter'", FoundConflictsTitle: "Auto-merge mislukt", - PickHunk: "kies hunk", - PickAllHunks: "kies bijde hunks", - ViewMergeRebaseOptions: "bekijk merge/rebase opties", + ViewMergeRebaseOptions: "Bekijk merge/rebase opties", NotMergingOrRebasing: "Je bent momenteel niet aan het rebasen of mergen", - RecentRepos: "recente repositories", - MergeOptionsTitle: "Merge Opties", - RebaseOptionsTitle: "Rebase Opties", - CommitMessageTitle: "Commit Bericht", + RecentRepos: "Recente repositories", + MergeOptionsTitle: "Merge opties", + RebaseOptionsTitle: "Rebase opties", + CommitMessageTitle: "Commit bericht", LocalBranchesTitle: "Branches", SearchTitle: "Zoek", TagsTitle: "Tags", MenuTitle: "Menu", RemotesTitle: "Remotes", - RemoteBranchesTitle: "Remote Branches", - PatchBuildingTitle: "Patch Bouwen", + RemoteBranchesTitle: "Remote branches", + PatchBuildingTitle: "Patch bouwen", InformationTitle: "Informatie", SecondaryTitle: "Secondary", ReflogCommitsTitle: "Reflog", - GlobalTitle: "Globale Sneltoetsen", - ConflictsResolved: "alle merge conflicten zijn opgelost. Wilt je verder gaan?", + GlobalTitle: "Globale sneltoetsen", + ConflictsResolved: "Alle merge conflicten zijn opgelost. Wilt je verder gaan?", MergingTitle: "Mergen", ConfirmMerge: "Weet je zeker dat je '{{.selectedBranch}}' in '{{.checkedOutBranch}}' wil mergen?", 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", NoRoom: "Niet genoeg ruimte", YouAreHere: "JE BENT HIER", - LcRewordNotSupported: "herformatteren van commits in interactief rebasen is nog niet ondersteund", - LcCherryPickCopy: "kopieer commit (cherry-pick)", - LcCherryPickCopyRange: "kopieer commit reeks (cherry-pick)", - LcPasteCommits: "plak commits (cherry-pick)", + RewordNotSupported: "Herformatteren van commits in interactief rebasen is nog niet ondersteund", + CherryPickCopy: "Kopieer commit (cherry-pick)", + CherryPickCopyRange: "Kopieer commit reeks (cherry-pick)", + PasteCommits: "Plak commits (cherry-pick)", SureCherryPick: "Weet je zeker dat je de gekopieerde commits naar deze branch wil cherry-picken?", CherryPick: "Cherry-Pick", Donate: "Doneer", - PrevLine: "selecteer de vorige lijn", - NextLine: "selecteer de volgende lijn", - PrevHunk: "selecteer de vorige hunk", - NextHunk: "selecteer de volgende hunk", - PrevConflict: "selecteer voorgaand conflict", - NextConflict: "selecteer volgende conflict", - SelectPrevHunk: "selecteer bovenste hunk", - SelectNextHunk: "selecteer onderste hunk", - ScrollDown: "scroll omlaag", - ScrollUp: "scroll omhoog", - LcScrollUpMainPanel: "scroll naar beneden vanaf hoofdpaneel", - LcScrollDownMainPanel: "scroll naar beneden vanaf hoofdpaneel", + PrevLine: "Selecteer de vorige lijn", + NextLine: "Selecteer de volgende lijn", + PrevHunk: "Selecteer de vorige hunk", + NextHunk: "Selecteer de volgende hunk", + PrevConflict: "Selecteer voorgaand conflict", + NextConflict: "Selecteer volgende conflict", + SelectPrevHunk: "Selecteer bovenste hunk", + SelectNextHunk: "Selecteer onderste hunk", + ScrollDown: "Scroll omlaag", + ScrollUp: "Scroll omhoog", + ScrollUpMainPanel: "Scroll naar beneden vanaf hoofdpaneel", + ScrollDownMainPanel: "Scroll naar beneden vanaf hoofdpaneel", AmendCommitTitle: "Commit wijzigen", 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?", - SquashingStatus: "squashen", - FixingStatus: "fixing up", - DeletingStatus: "verwijderen", - MovingStatus: "verplaatsen", - RebasingStatus: "rebasen", - AmendingStatus: "wijzigen", - CherryPickingStatus: "cherry-picken", - UndoingStatus: "ongedaan maken", - RedoingStatus: "redoing", - CheckingOutStatus: "uitchecken", + SquashingStatus: "Squashen", + FixingStatus: "Fixing up", + DeletingStatus: "Verwijderen", + MovingStatus: "Verplaatsen", + RebasingStatus: "Rebasen", + AmendingStatus: "Wijzigen", + CherryPickingStatus: "Cherry-picken", + UndoingStatus: "Ongedaan maken", + RedoingStatus: "Redoing", + CheckingOutStatus: "Uitchecken", CommitFiles: "Commit bestanden", - LcViewItemFiles: "bekijk gecommite bestanden", + ViewItemFiles: "Bekijk gecommite bestanden", CommitFilesTitle: "Commit bestanden", - LcCheckoutCommitFile: "bestand uitchecken", - LcDiscardOldFileChange: "uitsluit deze commit zijn veranderingen aan dit bestand", - DiscardFileChangesTitle: "uitsluit bestand zijn veranderingen", + CheckoutCommitFile: "Bestand uitchecken", + DiscardOldFileChange: "Uitsluit deze commit zijn veranderingen aan dit bestand", + 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", DisabledForGPG: "Onderdelen niet beschikbaar voor gebruikers die GPG gebruiken", CreateRepo: "Niet in een git repository. Creëer een nieuwe git repository? (y/n): ", AutoStashTitle: "Autostash?", AutoStashPrompt: "Je moet je veranderingen stashen en poppen om ze over te brengen. Dit automatisch doen? (enter/esc)", StashPrefix: "Auto-stashing veranderingen voor ", - LcViewDiscardOptions: "bekijk 'veranderingen ongedaan maken' opties", - LcCancel: "annuleren", - LcDiscardAllChanges: "negeer alle wijzigingen", - LcDiscardUnstagedChanges: "negeer unstaged wijzigingen", - LcDiscardAllChangesToAllFiles: "verwijder werkende tree", - LcDiscardAnyUnstagedChanges: "gooi unstaged wijzigingen weg", - LcDiscardUntrackedFiles: "negeer niet-gevonden bestanden", - LcViewResetOptions: `bekijk reset opties`, - LcHardReset: "harde reset", - LcCreateFixupCommit: `creëer fixup commit voor deze commit`, - LcSquashAboveCommits: `squash bovenstaande commits`, + ViewDiscardOptions: "Bekijk 'veranderingen ongedaan maken' opties", + Cancel: "Annuleren", + DiscardAllChanges: "Negeer alle wijzigingen", + DiscardUnstagedChanges: "Negeer unstaged wijzigingen", + DiscardAllChangesToAllFiles: "Verwijder werkende tree", + DiscardAnyUnstagedChanges: "Gooi unstaged wijzigingen weg", + DiscardUntrackedFiles: "Negeer niet-gevonden bestanden", + ViewResetOptions: `Bekijk reset opties`, + HardReset: "Harde reset", + CreateFixupCommit: `Creëer fixup commit voor deze commit`, SquashAboveCommits: `Squash bovenstaande commits`, 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}}?`, - LcExecuteCustomCommand: "voer aangepaste commando uit", + ExecuteCustomCommand: "Voer aangepaste commando uit", 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", - LcResetTo: `reset naar`, + ResetTo: `Reset naar`, PressEnterToReturn: "Press om terug te gaan naar lazygit", - LcViewStashOptions: "bekijk stash opties", - LcStashAllChanges: "stash-bestanden", - LcStashAllChangesKeepIndex: "stash staged wijzigingen", - LcStashOptions: "Stash opties", + ViewStashOptions: "Bekijk stash opties", + StashAllChanges: "Stash-bestanden", + StashAllChangesKeepIndex: "Stash staged wijzigingen", + StashOptions: "Stash opties", NotARepository: "Fout: moet in een git repository uitgevoerd worden", - LcJump: "ga naar paneel", + Jump: "Ga naar paneel", DiscardPatch: "Patch weg gooien", 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", - LcToggleAddToPatch: "toggle bestand inbegrepen in patch", - ViewPatchOptions: "bekijk aangepaste patch opties", - PatchOptionsTitle: "Patch Opties", + ToggleAddToPatch: "Toggle bestand inbegrepen in patch", + ViewPatchOptions: "Bekijk aangepaste 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", - LcEnterFile: "enter bestand om geselecteerde regels toe te voegen aan de patch", - ExitCustomPatchBuilder: `sluit lijn-bij-lijn modus`, + EnterFile: "Enter bestand om geselecteerde regels toe te voegen aan de patch", + ExitCustomPatchBuilder: `Sluit lijn-bij-lijn modus`, EnterUpstream: `Enter upstream als ' '`, - ReturnToRemotesList: `ga terug naar remotes lijst`, - LcAddNewRemote: `voeg een nieuwe remote toe`, - LcNewRemoteName: `Nieuwe remote name:`, - LcNewRemoteUrl: `Nieuwe remote url:`, - LcEditRemoteName: `Enter updated remote naam voor {{.remoteName}}:`, - LcEditRemoteUrl: `Enter updated remote url voor {{.remoteName}}:`, - LcRemoveRemote: `verwijder remote`, - LcRemoveRemotePrompt: "Weet je zeker dat je deze remote wilt verwijderen", - DeleteRemoteBranch: "Verwijder Remote Branch", + ReturnToRemotesList: `Ga terug naar remotes lijst`, + AddNewRemote: `Voeg een nieuwe remote toe`, + NewRemoteName: `Nieuwe remote name:`, + NewRemoteUrl: `Nieuwe remote url:`, + EditRemoteName: `Enter updated remote naam voor {{.remoteName}}:`, + EditRemoteUrl: `Enter updated remote url voor {{.remoteName}}:`, + RemoveRemote: `Verwijder remote`, + RemoveRemotePrompt: "Weet je zeker dat je deze remote wilt verwijderen", + DeleteRemoteBranch: "Verwijder remote branch", DeleteRemoteBranchMessage: "Weet je zeker dat je deze remote branch wilt verwijderen", - LcSetUpstream: "stel in als upstream van uitgecheckte branch", - LcSetAsUpstream: "stel in als upstream van uitgecheckte branch", + SetUpstream: "Stel in als upstream van uitgecheckte branch", + SetAsUpstream: "Stel in als upstream van uitgecheckte branch", SetUpstreamTitle: "Stel in als upstream branch", SetUpstreamMessage: "Weet je zeker dat je de upstream branch van '{{.checkedOut}}' naar '{{.selected}}' wilt zetten", - LcEditRemote: "wijzig remote", - LcTagCommit: "tag commit", + EditRemote: "Wijzig remote", + TagCommit: "Tag commit", TagNameTitle: "Tag naam:", - LcDeleteTag: "verwijder tag", + DeleteTag: "Verwijder tag", DeleteTagTitle: "Verwijder tag", DeleteTagPrompt: "Weet je zeker dat je '{{.tagName}}' wil verwijderen?", - PushTagTitle: "remote om tag '{{.tagName}}' te pushen naar:", - LcPushTag: "push tag", - LcCreateTag: "creëer tag", + PushTagTitle: "Remote om tag '{{.tagName}}' te pushen naar:", + PushTag: "Push tag", + CreateTag: "Creëer tag", CreateTagTitle: "Tag naam:", - LcFetchRemote: "fetch remote", - FetchingRemoteStatus: "remote fetchen", - LcCheckoutCommit: "checkout commit", + FetchRemote: "Fetch remote", + FetchingRemoteStatus: "Remote fetchen", + CheckoutCommit: "Checkout commit", 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", - NewGitFlowBranchPrompt: "nieuwe '{{.branchType}}' naam:", + NewGitFlowBranchPrompt: "Nieuwe '{{.branchType}}' naam:", IgnoreTracked: "Negeer tracked bestand", - IgnoreTrackedPrompt: "weet je zeker dat je een getracked bestand wil negeren?", - LcViewResetToUpstreamOptions: "bekijk upstream reset opties", - LcNextScreenMode: "volgende scherm modus (normaal/half/groot)", - LcPrevScreenMode: "vorige scherm modus", - LcStartSearch: "start met zoeken", + IgnoreTrackedPrompt: "Weet je zeker dat je een getracked bestand wil negeren?", + ViewResetToUpstreamOptions: "Bekijk upstream reset opties", + NextScreenMode: "Volgende scherm modus (normaal/half/groot)", + PrevScreenMode: "Vorige scherm modus", + StartSearch: "Start met zoeken", Panel: "Paneel", Keybindings: "Sneltoetsen", - LcRenameBranch: "hernoem branch", + RenameBranch: "Hernoem branch", 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?", - LcOpenMenu: "open menu", - LcResetCherryPick: "reset cherry-picked (gekopieerde) commits selectie", - LcNextTab: "volgende tabblad", - LcPrevTab: "vorige tabblad", - LcCantUndoWhileRebasing: "Kan niet ongedaan maken terwijl je aan het rebasen bent", - LcCantRedoWhileRebasing: "Kan niet opnieuw doen (redo) terwijl je aan het rebasen bent", + OpenMenu: "Open menu", + ResetCherryPick: "Reset cherry-picked (gekopieerde) commits selectie", + NextTab: "Volgende tabblad", + PrevTab: "Vorige tabblad", + CantUndoWhileRebasing: "Kan niet ongedaan maken 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?", MustStashTitle: "Moet stashen", ConfirmationTitle: "Bevestigingspaneel", - LcPrevPage: "vorige pagina", - LcNextPage: "volgende pagina", - LcGotoTop: "scroll naar boven", - LcGotoBottom: "scroll naar beneden", - LcFilteringBy: "filteren bij", + PrevPage: "Vorige pagina", + NextPage: "Volgende pagina", + GotoTop: "Scroll naar boven", + GotoBottom: "Scroll naar beneden", + FilteringBy: "Filteren bij", ResetInParentheses: "(reset)", - LcOpenFilteringMenu: "bekijk scoping opties", - LcFilterBy: "filter bij", - LcExitFilterMode: "stop met filteren bij pad", - LcFilterPathOption: "vulin pad om op te filteren", + OpenFilteringMenu: "Bekijk scoping opties", + FilterBy: "Filter bij", + ExitFilterMode: "Stop met filteren bij pad", + FilterPathOption: "Vulin pad om op te filteren", EnterFileName: "Vulin path:", FilteringMenuTitle: "Filteren", MustExitFilterModeTitle: "Command niet beschikbaar", MustExitFilterModePrompt: "Command niet beschikbaar in filter modus. Sluit filter modus?", - LcDiff: "diff", - LcEnterRefToDiff: "vul in ref naar diff", - LcEnteRefName: "vul in ref:", - LcExitDiffMode: "sluit diff mode", + Diff: "Diff", + EnterRefToDiff: "Vul in ref naar diff", + EnteRefName: "Vul in ref:", + ExitDiffMode: "Sluit diff mode", DiffingMenuTitle: "Diffen", - LcSwapDiff: "keer diff richting om", - LcOpenDiffingMenu: "open diff menu", - LcShowingGitDiff: "laat output zien voor:", - LcCopyCommitShaToClipboard: "kopieer commit SHA naar klembord", - LcCopyCommitMessageToClipboard: "kopieer commit bericht naar klembord", - LcCopyBranchNameToClipboard: "kopieer branch name naar klembord", - LcCopyFileNameToClipboard: "kopieer de bestandsnaam naar het klembord", - LcCopyCommitFileNameToClipboard: "kopieer de vastgelegde bestandsnaam naar het klembord", - LcCommitPrefixPatternError: "Fout in commitPrefix patroon", - NoFilesStagedTitle: "geen bestanden gestaged", + SwapDiff: "Keer diff richting om", + OpenDiffingMenu: "Open diff menu", + ShowingGitDiff: "Laat output zien voor:", + CopyCommitShaToClipboard: "Kopieer commit SHA naar klembord", + CopyCommitMessageToClipboard: "Kopieer commit bericht naar klembord", + CopyBranchNameToClipboard: "Kopieer branch name naar klembord", + CopyFileNameToClipboard: "Kopieer de bestandsnaam naar het klembord", + CopyCommitFileNameToClipboard: "Kopieer de vastgelegde bestandsnaam naar het klembord", + CommitPrefixPatternError: "Fout in commitPrefix patroon", + NoFilesStagedTitle: "Geen bestanden gestaged", NoFilesStagedPrompt: "Je hebt geen bestanden gestaged. Commit alle bestanden?", BranchNotFoundTitle: "Branch niet gevonden", BranchNotFoundPrompt: "Branch niet gevonden. Creëer een nieuwe branch genaamd", PullRequestURLCopiedToClipboard: "Pull-aanvraag-URL gekopieerd naar klembord", CommitMessageCopiedToClipboard: "Commit message gekopieerd naar klembord", - LcCopiedToClipboard: "gekopieerd naar klembord", - NavigationTitle: "Lijstpaneel Navigatie", - LcViewCommits: "bekijk commits", - LcToggleTreeView: "toggle bestandsboom weergave", - LcCreateNewBranchFromCommit: "creëer nieuwe branch van commit", - LcCopySubmoduleNameToClipboard: "kopieer submodule naam naar klembord", - LcEnterSubmodule: "enter submodule", - LcAddSubmodule: "voeg nieuwe submodule toe", - LcInitSubmodule: "initialiseer submodule", - LcViewBulkSubmoduleOptions: "bekijk bulk submodule opties", + CopiedToClipboard: "Gekopieerd naar klembord", + NavigationTitle: "Lijstpaneel navigatie", + ViewCommits: "Bekijk commits", + ToggleTreeView: "Toggle bestandsboom weergave", + CreateNewBranchFromCommit: "Creëer nieuwe branch van commit", + CopySubmoduleNameToClipboard: "Kopieer submodule naam naar klembord", + EnterSubmodule: "Enter submodule", + AddSubmodule: "Voeg nieuwe submodule toe", + InitSubmodule: "Initialiseer submodule", + ViewBulkSubmoduleOptions: "Bekijk bulk submodule opties", CreatePullRequestOptions: "Bekijk opties voor pull-aanvraag", - LcCreatePullRequestOptions: "bekijk opties voor pull-aanvraag", ConfirmRevertCommit: "Weet u zeker dat u {{.selectedCommit}} ongedaan wilt maken?", } } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index ed2191508..8c3b2fc87 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -41,28 +41,27 @@ type TranslationSet struct { CommitChangesWithEditor string StatusTitle string GlobalTitle string - LcNavigate string - LcMenu string - LcExecute string - LcToggleStaged string - LcToggleStagedAll string - LcToggleTreeView string - LcOpenMergeTool string - LcRefresh string - LcPush string - LcPull string - LcScroll string - LcFileFilter string + Menu string + Execute string + ToggleStaged string + ToggleStagedAll string + ToggleTreeView string + OpenMergeTool string + Refresh string + Push string + Pull string + Scroll string + FileFilter string FilterStagedFiles string FilterUnstagedFiles string ResetCommitFilterState string MergeConflictsTitle string - LcCheckout string + Checkout string NoChangedFiles string PullWait string PushWait string FetchWait string - LcSoftReset string + SoftReset string AlreadyCheckedOutBranch string SureForceCheckout string ForceCheckoutBranch string @@ -72,53 +71,52 @@ type TranslationSet struct { DeleteBranch string DeleteBranchMessage string ForceDeleteBranchMessage string - LcRebaseBranch string + RebaseBranch string CantRebaseOntoSelf string CantMergeBranchIntoItself string - LcForceCheckout string - LcCheckoutByName string - LcNewBranch string - LcDeleteBranch string + ForceCheckout string + CheckoutByName string + NewBranch string NoBranchesThisRepo string CommitWithoutMessageErr string - LcClose string - LcCloseCancel string - LcConfirm string - LcQuit string - LcSquashDown string - LcFixupCommit string + Close string + CloseCancel string + Confirm string + Quit string + SquashDown string + FixupCommit string CannotSquashOrFixupFirstCommit string Fixup string SureFixupThisCommit string SureSquashThisCommit string Squash string - LcPickCommit string - LcRevertCommit string - LcRewordCommit string - LcDeleteCommit string - LcMoveDownCommit string - LcMoveUpCommit string - LcEditCommit string - LcAmendToCommit string - LcResetCommitAuthor string + PickCommit string + RevertCommit string + RewordCommit string + DeleteCommit string + MoveDownCommit string + MoveUpCommit string + EditCommit string + AmendToCommit string + ResetAuthor string + SetAuthor string + SetResetCommitAuthor string SetAuthorPromptTitle string SureResetCommitAuthor string - LcRenameCommitEditor string + RenameCommitEditor string NoCommitsThisBranch string UpdateRefHere string Error string - LcPickHunk string - LcPickAllHunks string - LcUndo string - LcUndoReflog string - LcRedoReflog string + Undo string + UndoReflog string + RedoReflog string UndoTooltip string RedoTooltip string DiscardAllTooltip string DiscardUnstagedTooltip string - LcPop string - LcDrop string - LcApply string + Pop string + Drop string + Apply string NoStashEntries string StashDrop string SureDropStashEntry string @@ -129,7 +127,7 @@ type TranslationSet struct { NoTrackedStagedFilesStash string NoFilesToStash string StashChanges string - LcRenameStash string + RenameStash string RenameStashPrompt string OpenConfig string EditConfig string @@ -137,7 +135,7 @@ type TranslationSet struct { ForcePushPrompt string ForcePushDisabled string UpdatesRejectedAndForcePushDisabled string - LcCheckForUpdate string + CheckForUpdate string CheckingForUpdates string UpdateAvailableTitle string UpdateAvailable string @@ -156,20 +154,19 @@ type TranslationSet struct { IntroPopupMessage string DeprecatedEditConfigWarning string GitconfigParseErr string - LcEditFile string - LcOpenFile string - LcIgnoreFile string - LcExcludeFile string - LcRefreshFiles string - LcMergeIntoCurrentBranch string + EditFile string + OpenFile string + IgnoreFile string + ExcludeFile string + RefreshFiles string + MergeIntoCurrentBranch string ConfirmQuit string SwitchRepo string - LcAllBranchesLogGraph string + AllBranchesLogGraph string UnsupportedGitService string - LcCreatePullRequest string - LcCopyPullRequestURL string + CopyPullRequestURL string NoBranchOnRemote string - LcFetch string + Fetch string NoAutomaticGitFetchTitle string NoAutomaticGitFetchBody string FileEnter string @@ -208,6 +205,7 @@ type TranslationSet struct { SecondaryTitle string ReflogCommitsTitle string ConflictsResolved string + Continue string RebasingTitle string SimpleRebase string InteractiveRebase string @@ -220,11 +218,11 @@ type TranslationSet struct { NoRoom string YouAreHere string YouDied string - LcRewordNotSupported string - LcChangingThisActionIsNotAllowed string - LcCherryPickCopy string - LcCherryPickCopyRange string - LcPasteCommits string + RewordNotSupported string + ChangingThisActionIsNotAllowed string + CherryPickCopy string + CherryPickCopyRange string + PasteCommits string SureCherryPick string CherryPick string Donate string @@ -239,8 +237,8 @@ type TranslationSet struct { SelectNextHunk string ScrollDown string ScrollUp string - LcScrollUpMainPanel string - LcScrollDownMainPanel string + ScrollUpMainPanel string + ScrollDownMainPanel string AmendCommitTitle string AmendCommitPrompt string DeleteCommitTitle string @@ -250,6 +248,9 @@ type TranslationSet struct { DeletingStatus string MovingStatus string RebasingStatus string + MergingStatus string + LowercaseRebasingStatus string + LowercaseMergingStatus string AmendingStatus string CherryPickingStatus string UndoingStatus string @@ -260,10 +261,10 @@ type TranslationSet struct { SubCommitsDynamicTitle string CommitFilesDynamicTitle string RemoteBranchesDynamicTitle string - LcViewItemFiles string + ViewItemFiles string CommitFilesTitle string - LcCheckoutCommitFile string - LcDiscardOldFileChange string + CheckoutCommitFile string + DiscardOldFileChange string DiscardFileChangesTitle string DiscardFileChangesPrompt string DisabledForGPG string @@ -275,187 +276,185 @@ type TranslationSet struct { AutoStashTitle string AutoStashPrompt string StashPrefix string - LcViewDiscardOptions string - LcCancel string - LcDiscardAllChanges string - LcDiscardUnstagedChanges string - LcDiscardAllChangesToAllFiles string - LcDiscardAnyUnstagedChanges string - LcDiscardUntrackedFiles string - LcDiscardStagedChanges string - LcHardReset string - LcViewResetOptions string - LcCreateFixupCommit string - LcSquashAboveCommits string + ViewDiscardOptions string + Cancel string + DiscardAllChanges string + DiscardUnstagedChanges string + DiscardAllChangesToAllFiles string + DiscardAnyUnstagedChanges string + DiscardUntrackedFiles string + DiscardStagedChanges string + HardReset string + ViewResetOptions string + CreateFixupCommit string + CreateFixupCommitDescription string SquashAboveCommits string SureSquashAboveCommits string - CreateFixupCommit string SureCreateFixupCommit string - LcExecuteCustomCommand string + ExecuteCustomCommand string CustomCommand string - LcCommitChangesWithoutHook string + CommitChangesWithoutHook string SkipHookPrefixNotConfigured string - LcResetTo string + ResetTo string PressEnterToReturn string - LcViewStashOptions string - LcStashAllChanges string - LcStashStagedChanges string - LcStashAllChangesKeepIndex string - LcStashUnstagedChanges string - LcStashIncludeUntrackedChanges string - LcStashOptions string + ViewStashOptions string + StashAllChanges string + StashStagedChanges string + StashAllChangesKeepIndex string + StashUnstagedChanges string + StashIncludeUntrackedChanges string + StashOptions string NotARepository string - LcJump string - LcScrollLeftRight string - LcScrollLeft string - LcScrollRight string + Jump string + ScrollLeftRight string + ScrollLeft string + ScrollRight string DiscardPatch string DiscardPatchConfirm string CantPatchWhileRebasingError string - LcToggleAddToPatch string - LcToggleAllInPatch string - LcUpdatingPatch string + ToggleAddToPatch string + ToggleAllInPatch string + UpdatingPatch string ViewPatchOptions string PatchOptionsTitle string NoPatchError string - LcEnterFile string + EnterFile string ExitCustomPatchBuilder string EnterUpstream string InvalidUpstream string ReturnToRemotesList string - LcAddNewRemote string - LcNewRemoteName string - LcNewRemoteUrl string - LcEditRemoteName string - LcEditRemoteUrl string - LcRemoveRemote string - LcRemoveRemotePrompt string + AddNewRemote string + NewRemoteName string + NewRemoteUrl string + EditRemoteName string + EditRemoteUrl string + RemoveRemote string + RemoveRemotePrompt string DeleteRemoteBranch string DeleteRemoteBranchMessage string - LcSetAsUpstream string - LcSetUpstream string - LcUnsetUpstream string + SetAsUpstream string + SetUpstream string + UnsetUpstream string SetUpstreamTitle string SetUpstreamMessage string - LcEditRemote string - LcTagCommit string + EditRemote string + TagCommit string TagMenuTitle string TagNameTitle string TagMessageTitle string - LcLightweightTag string - LcAnnotatedTag string - LcDeleteTag string + LightweightTag string + AnnotatedTag string + DeleteTag string DeleteTagTitle string DeleteTagPrompt string PushTagTitle string - LcPushTag string - LcCreateTag string + PushTag string + CreateTag string CreateTagTitle string - LcFetchRemote string + FetchRemote string FetchingRemoteStatus string - LcCheckoutCommit string + CheckoutCommit string SureCheckoutThisCommit string - LcGitFlowOptions string + GitFlowOptions string NotAGitFlowBranch string NewBranchNamePrompt string IgnoreTracked string ExcludeTracked string IgnoreTrackedPrompt string ExcludeTrackedPrompt string - LcViewResetToUpstreamOptions string - LcNextScreenMode string - LcPrevScreenMode string - LcStartSearch string + ViewResetToUpstreamOptions string + NextScreenMode string + PrevScreenMode string + StartSearch string Panel string Keybindings string KeybindingsLegend string - LcRenameBranch string - LcSetUnsetUpstream string + RenameBranch string + SetUnsetUpstream string NewGitFlowBranchPrompt string RenameBranchWarning string - LcOpenMenu string - LcResetCherryPick string - LcNextTab string - LcPrevTab string - LcCantUndoWhileRebasing string - LcCantRedoWhileRebasing string + OpenMenu string + ResetCherryPick string + NextTab string + PrevTab string + CantUndoWhileRebasing string + CantRedoWhileRebasing string MustStashWarning string MustStashTitle string ConfirmationTitle string - LcPrevPage string - LcNextPage string - LcGotoTop string - LcGotoBottom string - LcFilteringBy string + PrevPage string + NextPage string + GotoTop string + GotoBottom string + FilteringBy string ResetInParentheses string - LcOpenFilteringMenu string - LcFilterBy string - LcExitFilterMode string - LcFilterPathOption string + OpenFilteringMenu string + FilterBy string + ExitFilterMode string + FilterPathOption string EnterFileName string FilteringMenuTitle string MustExitFilterModeTitle string MustExitFilterModePrompt string - LcDiff string - LcEnterRefToDiff string - LcEnteRefName string - LcExitDiffMode string + Diff string + EnterRefToDiff string + EnteRefName string + ExitDiffMode string DiffingMenuTitle string - LcSwapDiff string - LcOpenDiffingMenu string - LcOpenExtrasMenu string - LcShowingGitDiff string - LcCommitDiff string - LcCopyCommitShaToClipboard string - LcCommitSha string - LcCommitURL string - LcCopyCommitMessageToClipboard string - LcCommitMessage string - LcCommitAuthor string - LcCopyCommitAttributeToClipboard string - LcCopyBranchNameToClipboard string - LcCopyFileNameToClipboard string - LcCopyCommitFileNameToClipboard string - LcCommitPrefixPatternError string - LcCopySelectedTexToClipboard string + SwapDiff string + OpenDiffingMenu string + OpenExtrasMenu string + ShowingGitDiff string + CommitDiff string + CopyCommitShaToClipboard string + CommitSha string + CommitURL string + CopyCommitMessageToClipboard string + CommitMessage string + CommitAuthor string + CopyCommitAttributeToClipboard string + CopyBranchNameToClipboard string + CopyFileNameToClipboard string + CopyCommitFileNameToClipboard string + CommitPrefixPatternError string + CopySelectedTexToClipboard string NoFilesStagedTitle string NoFilesStagedPrompt string BranchNotFoundTitle string BranchNotFoundPrompt string - LcBranchUnknown string + BranchUnknown string UnstageLinesTitle string UnstageLinesPrompt string - LcCreateNewBranchFromCommit string - LcBuildingPatch string - LcViewCommits string + CreateNewBranchFromCommit string + BuildingPatch string + ViewCommits string MinGitVersionError string - LcRunningCustomCommandStatus string - LcSubmoduleStashAndReset string - LcAndResetSubmodules string - LcEnterSubmodule string - LcCopySubmoduleNameToClipboard string + RunningCustomCommandStatus string + SubmoduleStashAndReset string + AndResetSubmodules string + EnterSubmodule string + CopySubmoduleNameToClipboard string RemoveSubmodule string - LcRemoveSubmodule string RemoveSubmodulePrompt string - LcResettingSubmoduleStatus string - LcNewSubmoduleName string - LcNewSubmoduleUrl string - LcNewSubmodulePath string - LcAddSubmodule string - LcAddingSubmoduleStatus string - LcUpdateSubmoduleUrl string - LcUpdatingSubmoduleUrlStatus string - LcEditSubmoduleUrl string - LcInitializingSubmoduleStatus string - LcInitSubmodule string - LcSubmoduleUpdate string - LcUpdatingSubmoduleStatus string - LcBulkInitSubmodules string - LcBulkUpdateSubmodules string - LcBulkDeinitSubmodules string - LcViewBulkSubmoduleOptions string - LcBulkSubmoduleOptions string - LcRunningCommand string + ResettingSubmoduleStatus string + NewSubmoduleName string + NewSubmoduleUrl string + NewSubmodulePath string + AddSubmodule string + AddingSubmoduleStatus string + UpdateSubmoduleUrl string + UpdatingSubmoduleUrlStatus string + EditSubmoduleUrl string + InitializingSubmoduleStatus string + InitSubmodule string + SubmoduleUpdate string + UpdatingSubmoduleStatus string + BulkInitSubmodules string + BulkUpdateSubmodules string + BulkDeinitSubmodules string + ViewBulkSubmoduleOptions string + BulkSubmoduleOptions string + RunningCommand string SubCommitsTitle string SubmodulesTitle string NavigationTitle string @@ -471,7 +470,7 @@ type TranslationSet struct { CommitMessageCopiedToClipboard string CommitAuthorCopiedToClipboard string PatchCopiedToClipboard string - LcCopiedToClipboard string + CopiedToClipboard string ErrCannotEditDirectory string ErrStageDirWithInlineMergeConflicts string ErrRepositoryMovedOrDeleted string @@ -487,27 +486,26 @@ type TranslationSet struct { IncreaseContextInDiffView string DecreaseContextInDiffView string CreatePullRequestOptions string - LcCreatePullRequestOptions string - LcDefaultBranch string - LcSelectBranch string + DefaultBranch string + SelectBranch string CreatePullRequest string SelectConfigFile string NoConfigFileFoundErr string - LcLoadingFileSuggestions string - LcLoadingCommits string + LoadingFileSuggestions string + LoadingCommits string MustSpecifyOriginError string GitOutput string GitCommandFailed string AbortTitle string AbortPrompt string - LcOpenLogMenu string + OpenLogMenu string LogMenuTitle string ToggleShowGitGraphAll string ShowGitGraph string SortCommits string CantChangeContextSizeError string - LcOpenCommitInBrowser string - LcViewBisectOptions string + OpenCommitInBrowser string + ViewBisectOptions string ConfirmRevertCommit string RewordInEditorTitle string RewordInEditorPrompt string @@ -519,8 +517,21 @@ type TranslationSet struct { EmptyOutput string Patch string CustomPatch string - LcCommitsCopied string - LcCommitCopied string + CommitsCopied string + CommitCopied string + ResetPatch string + ApplyPatch string + ApplyPatchInReverse string + RemovePatchFromOriginalCommit string + MovePatchOutIntoIndex string + MovePatchIntoNewCommit string + MovePatchToSelectedCommit string + CopyPatchToClipboard string + NoMatchesFor string + MatchesFor string + SearchKeybindings string + SearchPrefix string + ExitSearchMode string Actions Actions Bisect Bisect } @@ -538,6 +549,7 @@ type Bisect struct { CompleteTitle string CompletePrompt string CompletePromptIndeterminate string + Bisecting string } type Actions struct { @@ -585,7 +597,7 @@ type Actions struct { UnstageFile string UnstageAllFiles string StageAllFiles string - LcIgnoreExcludeFile string + IgnoreExcludeFile string IgnoreFileErr string ExcludeFile string ExcludeFileErr string @@ -690,14 +702,14 @@ func EnglishTranslationSet() TranslationSet { CommitsTitle: "Commits", StashTitle: "Stash", SnakeTitle: "Snake", - EasterEgg: "easter egg", - UnstagedChanges: `Unstaged Changes`, - StagedChanges: `Staged Changes`, + EasterEgg: "Easter egg", + UnstagedChanges: "Unstaged changes", + StagedChanges: "Staged changes", MainTitle: "Main", MergeConfirmTitle: "Merge", - StagingTitle: "Main Panel (Staging)", - MergingTitle: "Main Panel (Merging)", - NormalTitle: "Main Panel (Normal)", + StagingTitle: "Main panel (staging)", + MergingTitle: "Main panel (merging)", + NormalTitle: "Main panel (normal)", LogTitle: "Log", CommitSummary: "Commit summary", CredentialsUsername: "Username", @@ -705,27 +717,26 @@ func EnglishTranslationSet() TranslationSet { CredentialsPassphrase: "Enter passphrase for SSH key", CredentialsPIN: "Enter PIN for SSH key", PassUnameWrong: "Password, passphrase and/or username wrong", - CommitChanges: "commit changes", - AmendLastCommit: "amend last commit", - AmendLastCommitTitle: "Amend Last Commit", - SureToAmend: "Are you sure you want to amend last commit? Afterwards, you can change commit message from the commits panel.", + CommitChanges: "Commit changes", + AmendLastCommit: "Amend last commit", + AmendLastCommitTitle: "Amend last commit", + SureToAmend: "Are you sure you want to amend last commit? Afterwards, you can change the commit message from the commits panel.", NoCommitToAmend: "There's no commit to amend.", - CommitChangesWithEditor: "commit changes using git editor", + CommitChangesWithEditor: "Commit changes using git editor", StatusTitle: "Status", - LcNavigate: "navigate", - LcMenu: "menu", - LcExecute: "execute", - LcToggleStaged: "toggle staged", - LcToggleStagedAll: "stage/unstage all", - LcToggleTreeView: "toggle file tree view", - LcOpenMergeTool: "open external merge tool (git mergetool)", - LcRefresh: "refresh", - LcPush: "push", - LcPull: "pull", - LcScroll: "scroll", - MergeConflictsTitle: "Merge Conflicts", - LcCheckout: "checkout", - LcFileFilter: "Filter files (staged/unstaged)", + Menu: "Menu", + Execute: "Execute", + ToggleStaged: "Toggle staged", + ToggleStagedAll: "Stage/unstage all", + ToggleTreeView: "Toggle file tree view", + OpenMergeTool: "Open external merge tool (git mergetool)", + Refresh: "Refresh", + Push: "Push", + Pull: "Pull", + Scroll: "Scroll", + MergeConflictsTitle: "Merge conflicts", + Checkout: "Checkout", + FileFilter: "Filter files (staged/unstaged)", FilterStagedFiles: "Show only staged files", FilterUnstagedFiles: "Show only unstaged files", ResetCommitFilterState: "Reset filter", @@ -733,31 +744,30 @@ func EnglishTranslationSet() TranslationSet { PullWait: "Pulling...", PushWait: "Pushing...", FetchWait: "Fetching...", - LcSoftReset: "soft reset", + SoftReset: "Soft reset", AlreadyCheckedOutBranch: "You have already checked out this branch", SureForceCheckout: "Are you sure you want force checkout? You will lose all local changes", - ForceCheckoutBranch: "Force Checkout Branch", + ForceCheckoutBranch: "Force checkout branch", BranchName: "Branch name", - NewBranchNameBranchOff: "New Branch Name (Branch is off of '{{.branchName}}')", + NewBranchNameBranchOff: "New branch name (branch is off of '{{.branchName}}')", CantDeleteCheckOutBranch: "You cannot delete the checked out branch!", - DeleteBranch: "Delete Branch", + DeleteBranch: "Delete branch", DeleteBranchMessage: "Are you sure you want to delete the branch '{{.selectedBranchName}}'?", ForceDeleteBranchMessage: "'{{.selectedBranchName}}' is not fully merged. Are you sure you want to delete it?", - LcRebaseBranch: "rebase checked-out branch onto this branch", + RebaseBranch: "Rebase checked-out branch onto this branch", CantRebaseOntoSelf: "You cannot rebase a branch onto itself", CantMergeBranchIntoItself: "You cannot merge a branch into itself", - LcForceCheckout: "force checkout", - LcCheckoutByName: "checkout by name", - LcNewBranch: "new branch", - LcDeleteBranch: "delete branch", + ForceCheckout: "Force checkout", + CheckoutByName: "Checkout by name", + NewBranch: "New branch", NoBranchesThisRepo: "No branches for this repo", CommitWithoutMessageErr: "You cannot commit without a commit message", - LcClose: "close", - LcCloseCancel: "close/cancel", - LcConfirm: "confirm", - LcQuit: "quit", - LcSquashDown: "squash down", - LcFixupCommit: "fixup commit", + Close: "Close", + CloseCancel: "Close/Cancel", + Confirm: "Confirm", + Quit: "Quit", + SquashDown: "Squash down", + FixupCommit: "Fixup commit", NoCommitsThisBranch: "No commits for this branch", UpdateRefHere: "Update branch '{{.ref}}' here", CannotSquashOrFixupFirstCommit: "There's no commit below to squash into", @@ -765,31 +775,33 @@ func EnglishTranslationSet() TranslationSet { 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?", Squash: "Squash", - LcPickCommit: "pick commit (when mid-rebase)", - LcRevertCommit: "revert commit", - LcRewordCommit: "reword commit", - LcDeleteCommit: "delete commit", - LcMoveDownCommit: "move commit down one", - LcMoveUpCommit: "move commit up one", - LcEditCommit: "edit commit", - LcAmendToCommit: "amend commit with staged changes", - LcResetCommitAuthor: "reset commit author", + PickCommit: "Pick commit (when mid-rebase)", + RevertCommit: "Revert commit", + RewordCommit: "Reword commit", + DeleteCommit: "Delete commit", + MoveDownCommit: "Move commit down one", + MoveUpCommit: "Move commit up one", + EditCommit: "Edit commit", + AmendToCommit: "Amend commit with staged changes", + ResetAuthor: "Reset author", + SetAuthor: "Set author", + SetResetCommitAuthor: "Set/Reset commit author", SetAuthorPromptTitle: "Set author (must look like 'Name ')", SureResetCommitAuthor: "The author field of this commit will be updated to match the configured user. This also renews the author timestamp. Continue?", - LcRenameCommitEditor: "reword commit with editor", + RenameCommitEditor: "Reword commit with editor", Error: "Error", - LcPickHunk: "pick hunk", - LcPickAllHunks: "pick all hunks", - LcUndo: "undo", - LcUndoReflog: "undo (via reflog) (experimental)", - LcRedoReflog: "redo (via reflog) (experimental)", + PickHunk: "Pick hunk", + PickAllHunks: "Pick all hunks", + Undo: "Undo", + UndoReflog: "Undo", + RedoReflog: "Redo", UndoTooltip: "The reflog will be used to determine what git command to run to undo the last git command. This does not include changes to the working tree; only commits are taken into consideration.", RedoTooltip: "The reflog will be used to determine what git command to run to redo the last git command. This does not include changes to the working tree; only commits are taken into consideration.", DiscardAllTooltip: "Discard both staged and unstaged changes in '{{.path}}'.", DiscardUnstagedTooltip: "Discard unstaged changes in '{{.path}}'.", - LcPop: "pop", - LcDrop: "drop", - LcApply: "apply", + Pop: "Pop", + Drop: "Drop", + Apply: "Apply", NoStashEntries: "No stash entries", StashDrop: "Stash drop", SureDropStashEntry: "Are you sure you want to drop this stash entry?", @@ -800,19 +812,19 @@ func EnglishTranslationSet() TranslationSet { NoTrackedStagedFilesStash: "You have no tracked/staged files to stash", NoFilesToStash: "You have no files to stash", StashChanges: "Stash changes", - LcRenameStash: "rename stash", + RenameStash: "Rename stash", RenameStashPrompt: "Rename stash: {{.stashName}}", - OpenConfig: "open config file", - EditConfig: "edit config file", + OpenConfig: "Open config file", + EditConfig: "Edit config file", ForcePush: "Force push", ForcePushPrompt: "Your branch has diverged from the remote branch. Press 'esc' to cancel, or 'enter' to force push.", 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", - LcCheckForUpdate: "check for update", + CheckForUpdate: "Check for update", CheckingForUpdates: "Checking for updates...", UpdateAvailableTitle: "Update available!", UpdateAvailable: "Download and install version {{.newVersion}}?", - UpdateInProgressWaitingStatus: "updating", + UpdateInProgressWaitingStatus: "Updating", UpdateCompletedTitle: "Update completed!", UpdateCompleted: "Update has been installed successfully. Restart lazygit for it to take effect.", FailedToRetrieveLatestVersionErr: "Failed to retrieve version information", @@ -820,69 +832,69 @@ func EnglishTranslationSet() TranslationSet { MajorVersionErr: "New version ({{.newVersion}}) has non-backwards compatible changes compared to the current version ({{.currentVersion}})", CouldNotFindBinaryErr: "Could not find any binary at {{.url}}", UpdateFailedErr: "Update failed: {{.errMessage}}", - ConfirmQuitDuringUpdateTitle: "Currently Updating", + ConfirmQuitDuringUpdateTitle: "Currently updating", ConfirmQuitDuringUpdate: "An update is in progress. Are you sure you want to quit?", MergeToolTitle: "Merge tool", MergeToolPrompt: "Are you sure you want to open `git mergetool`?", IntroPopupMessage: englishIntroPopupMessage, DeprecatedEditConfigWarning: englishDeprecatedEditConfigWarning, GitconfigParseErr: `Gogit failed to parse your gitconfig file due to the presence of unquoted '\' characters. Removing these should fix the issue.`, - LcEditFile: `edit file`, - LcOpenFile: `open file`, - LcIgnoreFile: `add to .gitignore`, - LcExcludeFile: `add to .git/info/exclude`, - LcRefreshFiles: `refresh files`, - LcMergeIntoCurrentBranch: `merge into currently checked out branch`, + EditFile: `Edit file`, + OpenFile: `Open file`, + IgnoreFile: `Add to .gitignore`, + ExcludeFile: `Add to .git/info/exclude`, + RefreshFiles: `Refresh files`, + MergeIntoCurrentBranch: `Merge into currently checked out branch`, ConfirmQuit: `Are you sure you want to quit?`, - SwitchRepo: `switch to a recent repo`, - LcAllBranchesLogGraph: `show all branch logs`, + SwitchRepo: `Switch to a recent repo`, + AllBranchesLogGraph: `Show all branch logs`, UnsupportedGitService: `Unsupported git service`, - LcCreatePullRequest: `create pull request`, - LcCopyPullRequestURL: `copy pull request URL to clipboard`, + CreatePullRequest: `Create pull request`, + CopyPullRequestURL: `Copy pull request URL to clipboard`, NoBranchOnRemote: `This branch doesn't exist on remote. You need to push it to remote first.`, - LcFetch: `fetch`, + Fetch: `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`, - FileEnter: `stage individual hunks/lines for file, or collapse/expand for directory`, + FileEnter: `Stage individual hunks/lines for file, or collapse/expand for directory`, FileStagingRequirements: `Can only stage individual lines for tracked files`, - StageSelection: `toggle line staged / unstaged`, - ResetSelection: `delete change (git reset)`, - ToggleDragSelect: `toggle drag select`, - ToggleSelectHunk: `toggle select hunk`, - ToggleSelectionForPatch: `add/remove line(s) to patch`, - EditHunk: `edit hunk`, - ToggleStagingPanel: `switch to other panel (staged/unstaged changes)`, - ReturnToFilesPanel: `return to files panel`, - FastForward: `fast-forward this branch from its upstream`, - Fetching: "fetching and fast-forwarding {{.from}} -> {{.to}} ...", + StageSelection: `Toggle line staged / unstaged`, + ResetSelection: `Delete change (git reset)`, + ToggleDragSelect: `Toggle drag select`, + ToggleSelectHunk: `Toggle select hunk`, + ToggleSelectionForPatch: `Add/Remove line(s) to patch`, + EditHunk: `Edit hunk`, + ToggleStagingPanel: `Switch to other panel (staged/unstaged changes)`, + ReturnToFilesPanel: `Return to files panel`, + FastForward: `Fast-forward this branch from its upstream`, + Fetching: "Fetching and fast-forwarding {{.from}} -> {{.to}} ...", FoundConflicts: "Conflicts! To abort press 'esc', otherwise press 'enter'", FoundConflictsTitle: "Auto-merge failed", - PickHunk: "pick hunk", - PickAllHunks: "pick all hunks", - ViewMergeRebaseOptions: "view merge/rebase options", + ViewMergeRebaseOptions: "View merge/rebase options", NotMergingOrRebasing: "You are currently neither rebasing nor merging", AlreadyRebasing: "Can't perform this action during a rebase", - RecentRepos: "recent repositories", - MergeOptionsTitle: "Merge Options", - RebaseOptionsTitle: "Rebase Options", - CommitMessageTitle: "Commit Summary", + RecentRepos: "Recent repositories", + MergeOptionsTitle: "Merge options", + RebaseOptionsTitle: "Rebase options", + CommitMessageTitle: "Commit summary", CommitDescriptionTitle: "Commit description", CommitDescriptionSubTitle: "Press tab to toggle focus", - LocalBranchesTitle: "Local Branches", + LocalBranchesTitle: "Local branches", SearchTitle: "Search", TagsTitle: "Tags", MenuTitle: "Menu", RemotesTitle: "Remotes", - RemoteBranchesTitle: "Remote Branches", - PatchBuildingTitle: "Main Panel (Patch Building)", + RemoteBranchesTitle: "Remote branches", + PatchBuildingTitle: "Main panel (patch building)", InformationTitle: "Information", SecondaryTitle: "Secondary", ReflogCommitsTitle: "Reflog", - GlobalTitle: "Global Keybindings", - ConflictsResolved: "all merge conflicts resolved. Continue?", + GlobalTitle: "Global keybindings", + ConflictsResolved: "All merge conflicts resolved. Continue?", + Continue: "Continue", + Keybindings: "Keybindings", RebasingTitle: "Rebase '{{.checkedOutBranch}}' onto '{{.ref}}'", - SimpleRebase: "simple rebase", - InteractiveRebase: "interactive rebase", + SimpleRebase: "Simple rebase", + InteractiveRebase: "Interactive rebase", InteractiveRebaseTooltip: "Begin an interactive rebase with a break at the start, so you can update the TODO commits before continuing", ConfirmMerge: "Are you sure you want to merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'?", FwdNoUpstream: "Cannot fast-forward a branch with no upstream", @@ -892,50 +904,53 @@ func EnglishTranslationSet() TranslationSet { NoRoom: "Not enough room", YouAreHere: "YOU ARE HERE", YouDied: "YOU DIED!", - LcRewordNotSupported: "rewording commits while interactively rebasing is not currently supported", - LcChangingThisActionIsNotAllowed: "changing this kind of rebase todo entry is not allowed", - LcCherryPickCopy: "copy commit (cherry-pick)", - LcCherryPickCopyRange: "copy commit range (cherry-pick)", - LcPasteCommits: "paste commits (cherry-pick)", + RewordNotSupported: "Rewording commits while interactively rebasing is not currently supported", + ChangingThisActionIsNotAllowed: "Changing this kind of rebase todo entry is not allowed", + CherryPickCopy: "Copy commit (cherry-pick)", + CherryPickCopyRange: "Copy commit range (cherry-pick)", + PasteCommits: "Paste commits (cherry-pick)", SureCherryPick: "Are you sure you want to cherry-pick the copied commits onto this branch?", - CherryPick: "Cherry-Pick", + CherryPick: "Cherry-pick", Donate: "Donate", AskQuestion: "Ask Question", - PrevLine: "select previous line", - NextLine: "select next line", - PrevHunk: "select previous hunk", - NextHunk: "select next hunk", - PrevConflict: "select previous conflict", - NextConflict: "select next conflict", - SelectPrevHunk: "select previous hunk", - SelectNextHunk: "select next hunk", - ScrollDown: "scroll down", - ScrollUp: "scroll up", - LcScrollUpMainPanel: "scroll up main panel", - LcScrollDownMainPanel: "scroll down main panel", - AmendCommitTitle: "Amend Commit", + PrevLine: "Select previous line", + NextLine: "Select next line", + PrevHunk: "Select previous hunk", + NextHunk: "Select next hunk", + PrevConflict: "Select previous conflict", + NextConflict: "Select next conflict", + SelectPrevHunk: "Select previous hunk", + SelectNextHunk: "Select next hunk", + ScrollDown: "Scroll down", + ScrollUp: "Scroll up", + ScrollUpMainPanel: "Scroll up main panel", + ScrollDownMainPanel: "Scroll down main panel", + AmendCommitTitle: "Amend commit", AmendCommitPrompt: "Are you sure you want to amend this commit with your staged files?", - DeleteCommitTitle: "Delete Commit", + DeleteCommitTitle: "Delete commit", DeleteCommitPrompt: "Are you sure you want to delete this commit?", - SquashingStatus: "squashing", - FixingStatus: "fixing up", - DeletingStatus: "deleting", - MovingStatus: "moving", - RebasingStatus: "rebasing", - AmendingStatus: "amending", - CherryPickingStatus: "cherry-picking", - UndoingStatus: "undoing", - RedoingStatus: "redoing", - CheckingOutStatus: "checking out", - CommittingStatus: "committing", + SquashingStatus: "Squashing", + FixingStatus: "Fixing up", + DeletingStatus: "Deleting", + MovingStatus: "Moving", + RebasingStatus: "Rebasing", + MergingStatus: "Merging", + LowercaseRebasingStatus: "rebasing", // lowercase because it shows up in parentheses + LowercaseMergingStatus: "merging", // lowercase because it shows up in parentheses + AmendingStatus: "Amending", + CherryPickingStatus: "Cherry-picking", + UndoingStatus: "Undoing", + RedoingStatus: "Redoing", + CheckingOutStatus: "Checking out", + CommittingStatus: "Committing", CommitFiles: "Commit files", SubCommitsDynamicTitle: "Commits (%s)", CommitFilesDynamicTitle: "Diff files (%s)", RemoteBranchesDynamicTitle: "Remote branches (%s)", - LcViewItemFiles: "view selected item's files", - CommitFilesTitle: "Commit Files", - LcCheckoutCommitFile: "checkout file", - LcDiscardOldFileChange: "discard this commit's changes to this file", + ViewItemFiles: "View selected item's files", + CommitFilesTitle: "Commit files", + CheckoutCommitFile: "Checkout file", + DiscardOldFileChange: "Discard this commit's changes to this file", DiscardFileChangesTitle: "Discard file changes", 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", @@ -947,195 +962,192 @@ func EnglishTranslationSet() TranslationSet { AutoStashTitle: "Autostash?", AutoStashPrompt: "You must stash and pop your changes to bring them across. Do this automatically? (enter/esc)", StashPrefix: "Auto-stashing changes for ", - LcViewDiscardOptions: "view 'discard changes' options", - LcCancel: "cancel", - LcDiscardAllChanges: "discard all changes", - LcDiscardUnstagedChanges: "discard unstaged changes", - LcDiscardAllChangesToAllFiles: "nuke working tree", - LcDiscardAnyUnstagedChanges: "discard unstaged changes", - LcDiscardUntrackedFiles: "discard untracked files", - LcDiscardStagedChanges: "discard staged changes", - LcHardReset: "hard reset", - LcViewResetOptions: `view reset options`, - LcCreateFixupCommit: `create fixup commit for this commit`, - LcSquashAboveCommits: `squash all 'fixup!' commits above selected commit (autosquash)`, + ViewDiscardOptions: "View 'discard changes' options", + Cancel: "Cancel", + DiscardAllChanges: "Discard all changes", + DiscardUnstagedChanges: "Discard unstaged changes", + DiscardAllChangesToAllFiles: "Nuke working tree", + DiscardAnyUnstagedChanges: "Discard unstaged changes", + DiscardUntrackedFiles: "Discard untracked files", + DiscardStagedChanges: "Discard staged changes", + HardReset: "Hard reset", + ViewResetOptions: `View reset options`, + CreateFixupCommitDescription: `Create fixup commit for this commit`, SquashAboveCommits: `Squash all 'fixup!' commits above selected commit (autosquash)`, SureSquashAboveCommits: `Are you sure you want to squash all fixup! commits above {{.commit}}?`, CreateFixupCommit: `Create fixup commit`, SureCreateFixupCommit: `Are you sure you want to create a fixup! commit for commit {{.commit}}?`, - LcExecuteCustomCommand: "execute custom command", - CustomCommand: "Custom Command:", - LcCommitChangesWithoutHook: "commit changes without pre-commit hook", + ExecuteCustomCommand: "Execute custom command", + CustomCommand: "Custom command:", + 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", - LcResetTo: `reset to`, + ResetTo: `Reset to`, PressEnterToReturn: "Press enter to return to lazygit", - LcViewStashOptions: "view stash options", - LcStashAllChanges: "stash all changes", - LcStashStagedChanges: "stash staged changes", - LcStashAllChangesKeepIndex: "stash all changes and keep index", - LcStashUnstagedChanges: "stash unstaged changes", - LcStashIncludeUntrackedChanges: "stash all changes including untracked files", - LcStashOptions: "Stash options", + ViewStashOptions: "View stash options", + StashAllChanges: "Stash all changes", + StashStagedChanges: "Stash staged changes", + StashAllChangesKeepIndex: "Stash all changes and keep index", + StashUnstagedChanges: "Stash unstaged changes", + StashIncludeUntrackedChanges: "Stash all changes including untracked files", + StashOptions: "Stash options", NotARepository: "Error: must be run inside a git repository", - LcJump: "jump to panel", - LcScrollLeftRight: "scroll left/right", - LcScrollLeft: "scroll left", - LcScrollRight: "scroll right", - DiscardPatch: "Discard Patch", + Jump: "Jump to panel", + ScrollLeftRight: "Scroll left/right", + ScrollLeft: "Scroll left", + ScrollRight: "Scroll right", + DiscardPatch: "Discard 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", - LcToggleAddToPatch: "toggle file included in patch", - LcToggleAllInPatch: "toggle all files included in patch", - LcUpdatingPatch: "updating patch", - ViewPatchOptions: "view custom patch options", - PatchOptionsTitle: "Patch Options", + ToggleAddToPatch: "Toggle file included in patch", + ToggleAllInPatch: "Toggle all files included in patch", + UpdatingPatch: "Updating patch", + ViewPatchOptions: "View custom 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", - LcEnterFile: "enter file to add selected lines to the patch (or toggle directory collapsed)", - ExitCustomPatchBuilder: `exit custom patch builder`, + EnterFile: "Enter file to add selected lines to the patch (or toggle directory collapsed)", + ExitCustomPatchBuilder: `Exit custom patch builder`, EnterUpstream: `Enter upstream as ' '`, InvalidUpstream: "Invalid upstream. Must be in the format ' '", ReturnToRemotesList: `Return to remotes list`, - LcAddNewRemote: `add new remote`, - LcNewRemoteName: `New remote name:`, - LcNewRemoteUrl: `New remote url:`, - LcEditRemoteName: `Enter updated remote name for {{.remoteName}}:`, - LcEditRemoteUrl: `Enter updated remote url for {{.remoteName}}:`, - LcRemoveRemote: `remove remote`, - LcRemoveRemotePrompt: "Are you sure you want to remove remote", + AddNewRemote: `Add new remote`, + NewRemoteName: `New remote name:`, + NewRemoteUrl: `New remote url:`, + EditRemoteName: `Enter updated remote name for {{.remoteName}}:`, + EditRemoteUrl: `Enter updated remote url for {{.remoteName}}:`, + RemoveRemote: `Remove remote`, + RemoveRemotePrompt: "Are you sure you want to remove remote", DeleteRemoteBranch: "Delete Remote Branch", DeleteRemoteBranchMessage: "Are you sure you want to delete remote branch", - LcSetAsUpstream: "set as upstream of checked-out branch", - LcSetUpstream: "set upstream of selected branch", - LcUnsetUpstream: "unset upstream of selected branch", + SetAsUpstream: "Set as upstream of checked-out branch", + SetUpstream: "Set upstream of selected branch", + UnsetUpstream: "Unset upstream of selected branch", SetUpstreamTitle: "Set upstream branch", SetUpstreamMessage: "Are you sure you want to set the upstream branch of '{{.checkedOut}}' to '{{.selected}}'", - LcEditRemote: "edit remote", - LcTagCommit: "tag commit", + EditRemote: "Edit remote", + TagCommit: "Tag commit", TagMenuTitle: "Create tag", TagNameTitle: "Tag name:", TagMessageTitle: "Tag message:", - LcAnnotatedTag: "annotated tag", - LcLightweightTag: "lightweight tag", - LcDeleteTag: "delete tag", + AnnotatedTag: "Annotated tag", + LightweightTag: "Lightweight tag", + DeleteTag: "Delete tag", DeleteTagTitle: "Delete tag", DeleteTagPrompt: "Are you sure you want to delete tag '{{.tagName}}'?", - PushTagTitle: "remote to push tag '{{.tagName}}' to:", - LcPushTag: "push tag", - LcCreateTag: "create tag", + PushTagTitle: "Remote to push tag '{{.tagName}}' to:", + PushTag: "Push tag", + CreateTag: "Create tag", CreateTagTitle: "Tag name:", - LcFetchRemote: "fetch remote", - FetchingRemoteStatus: "fetching remote", - LcCheckoutCommit: "checkout commit", + FetchRemote: "Fetch remote", + FetchingRemoteStatus: "Fetching remote", + CheckoutCommit: "Checkout commit", SureCheckoutThisCommit: "Are you sure you want to checkout this commit?", - LcGitFlowOptions: "show git-flow options", + GitFlowOptions: "Show git-flow options", NotAGitFlowBranch: "This does not seem to be a git flow branch", - NewGitFlowBranchPrompt: "new {{.branchType}} name:", + NewGitFlowBranchPrompt: "New {{.branchType}} name:", IgnoreTracked: "Ignore tracked file", IgnoreTrackedPrompt: "Are you sure you want to ignore a tracked file?", ExcludeTracked: "Exclude tracked file", ExcludeTrackedPrompt: "Are you sure you want to exclude a tracked file?", - LcViewResetToUpstreamOptions: "view upstream reset options", - LcNextScreenMode: "next screen mode (normal/half/fullscreen)", - LcPrevScreenMode: "prev screen mode", - LcStartSearch: "start search", + ViewResetToUpstreamOptions: "View upstream reset options", + NextScreenMode: "Next screen mode (normal/half/fullscreen)", + PrevScreenMode: "Prev screen mode", + StartSearch: "Start search", Panel: "Panel", - Keybindings: "Keybindings", KeybindingsLegend: "Legend: `` means ctrl+b, `` means alt+b, `B` means shift+b", - LcRenameBranch: "rename branch", - LcSetUnsetUpstream: "set/unset upstream", + RenameBranch: "Rename branch", + SetUnsetUpstream: "Set/Unset upstream", NewBranchNamePrompt: "Enter new branch name for branch", 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: "open menu", - LcResetCherryPick: "reset cherry-picked (copied) commits selection", - LcNextTab: "next tab", - LcPrevTab: "previous tab", - LcCantUndoWhileRebasing: "Can't undo while rebasing", - LcCantRedoWhileRebasing: "Can't redo while rebasing", + OpenMenu: "Open menu", + ResetCherryPick: "Reset cherry-picked (copied) commits selection", + NextTab: "Next tab", + PrevTab: "Previous tab", + CantUndoWhileRebasing: "Can't undo while rebasing", + CantRedoWhileRebasing: "Can't redo while rebasing", 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", - ConfirmationTitle: "Confirmation Panel", - LcPrevPage: "previous page", - LcNextPage: "next page", - LcGotoTop: "scroll to top", - LcGotoBottom: "scroll to bottom", - LcFilteringBy: "filtering by", - ResetInParentheses: "(reset)", - LcOpenFilteringMenu: "view filter-by-path options", - LcFilterBy: "filter by", - LcExitFilterMode: "stop filtering by path", - LcFilterPathOption: "enter path to filter by", + ConfirmationTitle: "Confirmation panel", + PrevPage: "Previous page", + NextPage: "Next page", + GotoTop: "Scroll to top", + GotoBottom: "Scroll to bottom", + FilteringBy: "Filtering by", + ResetInParentheses: "(Reset)", + OpenFilteringMenu: "View filter-by-path options", + FilterBy: "Filter by", + ExitFilterMode: "Stop filtering by path", + FilterPathOption: "Enter path to filter by", EnterFileName: "Enter path:", FilteringMenuTitle: "Filtering", MustExitFilterModeTitle: "Command not available", MustExitFilterModePrompt: "Command not available in filtered mode. Exit filtered mode?", - LcDiff: "diff", - LcEnterRefToDiff: "enter ref to diff", - LcEnteRefName: "enter ref:", - LcExitDiffMode: "exit diff mode", + Diff: "Diff", + EnterRefToDiff: "Enter ref to diff", + EnteRefName: "Enter ref:", + ExitDiffMode: "Exit diff mode", DiffingMenuTitle: "Diffing", - LcSwapDiff: "reverse diff direction", - LcOpenDiffingMenu: "open diff menu", + SwapDiff: "Reverse diff direction", + OpenDiffingMenu: "Open diff menu", // 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: "open command log menu", - LcShowingGitDiff: "showing output for:", - LcCommitDiff: "commit diff", - LcCopyCommitShaToClipboard: "copy commit SHA to clipboard", - LcCommitSha: "commit SHA", - LcCommitURL: "commit URL", - LcCopyCommitMessageToClipboard: "copy commit message to clipboard", - LcCommitMessage: "commit message", - LcCommitAuthor: "commit author", - LcCopyCommitAttributeToClipboard: "copy commit attribute", - LcCopyBranchNameToClipboard: "copy branch name to clipboard", - LcCopyFileNameToClipboard: "copy the file name to the clipboard", - LcCopyCommitFileNameToClipboard: "copy the committed file name to the clipboard", - LcCopySelectedTexToClipboard: "copy the selected text to the clipboard", - LcCommitPrefixPatternError: "Error in commitPrefix pattern", + OpenExtrasMenu: "Open command log menu", + ShowingGitDiff: "Showing output for:", + CommitDiff: "Commit diff", + CopyCommitShaToClipboard: "Copy commit SHA to clipboard", + CommitSha: "Commit SHA", + CommitURL: "Commit URL", + CopyCommitMessageToClipboard: "Copy commit message to clipboard", + CommitMessage: "Commit message", + CommitAuthor: "Commit author", + CopyCommitAttributeToClipboard: "Copy commit attribute", + CopyBranchNameToClipboard: "Copy branch name to clipboard", + CopyFileNameToClipboard: "Copy the file name to the clipboard", + CopyCommitFileNameToClipboard: "Copy the committed file name to the clipboard", + CopySelectedTexToClipboard: "Copy the selected text to the clipboard", + CommitPrefixPatternError: "Error in commitPrefix pattern", NoFilesStagedTitle: "No files staged", NoFilesStagedPrompt: "You have not staged any files. Commit all files?", BranchNotFoundTitle: "Branch not found", BranchNotFoundPrompt: "Branch not found. Create a new branch named", - LcBranchUnknown: "branch unknown", + BranchUnknown: "Branch unknown", UnstageLinesTitle: "Unstage lines", UnstageLinesPrompt: "Are you sure you want to delete the selected lines (git reset)? It is irreversible.\nTo disable this dialogue set the config key of 'gui.skipUnstageLineWarning' to true", - LcCreateNewBranchFromCommit: "create new branch off of commit", - LcBuildingPatch: "building patch", - LcViewCommits: "view commits", + CreateNewBranchFromCommit: "Create new branch off of commit", + BuildingPatch: "Building patch", + ViewCommits: "View commits", MinGitVersionError: "Git version must be at least 2.20 (i.e. from 2018 onwards). Please upgrade your git version. Alternatively raise an issue at https://github.com/jesseduffield/lazygit/issues for lazygit to be more backwards compatible.", - LcRunningCustomCommandStatus: "running custom command", - LcSubmoduleStashAndReset: "stash uncommitted submodule changes and update", - LcAndResetSubmodules: "and reset submodules", - LcEnterSubmodule: "enter submodule", - LcCopySubmoduleNameToClipboard: "copy submodule name to clipboard", + RunningCustomCommandStatus: "Running custom command", + SubmoduleStashAndReset: "Stash uncommitted submodule changes and update", + AndResetSubmodules: "And reset submodules", + EnterSubmodule: "Enter submodule", + CopySubmoduleNameToClipboard: "Copy submodule name to clipboard", RemoveSubmodule: "Remove submodule", - LcRemoveSubmodule: "remove submodule", RemoveSubmodulePrompt: "Are you sure you want to remove submodule '%s' and its corresponding directory? This is irreversible.", - LcResettingSubmoduleStatus: "resetting submodule", - LcNewSubmoduleName: "new submodule name:", - LcNewSubmoduleUrl: "new submodule URL:", - LcNewSubmodulePath: "new submodule path:", - LcAddSubmodule: "add new submodule", - LcAddingSubmoduleStatus: "adding submodule", - LcUpdateSubmoduleUrl: "update URL for submodule '%s'", - LcUpdatingSubmoduleUrlStatus: "updating URL", - LcEditSubmoduleUrl: "update submodule URL", - LcInitializingSubmoduleStatus: "initializing submodule", - LcInitSubmodule: "initialize submodule", - LcSubmoduleUpdate: "update submodule", - LcUpdatingSubmoduleStatus: "updating submodule", - LcBulkInitSubmodules: "bulk init submodules", - LcBulkUpdateSubmodules: "bulk update submodules", - LcBulkDeinitSubmodules: "bulk deinit submodules", - LcViewBulkSubmoduleOptions: "view bulk submodule options", - LcBulkSubmoduleOptions: "bulk submodule options", - LcRunningCommand: "running command", + ResettingSubmoduleStatus: "Resetting submodule", + NewSubmoduleName: "New submodule name:", + NewSubmoduleUrl: "New submodule URL:", + NewSubmodulePath: "New submodule path:", + AddSubmodule: "Add new submodule", + AddingSubmoduleStatus: "Adding submodule", + UpdateSubmoduleUrl: "Update URL for submodule '%s'", + UpdatingSubmoduleUrlStatus: "Updating URL", + EditSubmoduleUrl: "Update submodule URL", + InitializingSubmoduleStatus: "Initializing submodule", + InitSubmodule: "Initialize submodule", + SubmoduleUpdate: "Update submodule", + UpdatingSubmoduleStatus: "Updating submodule", + BulkInitSubmodules: "Bulk init submodules", + BulkUpdateSubmodules: "Bulk update submodules", + BulkDeinitSubmodules: "Bulk deinit submodules", + ViewBulkSubmoduleOptions: "View bulk submodule options", + BulkSubmoduleOptions: "Bulk submodule options", + RunningCommand: "Running command", SubCommitsTitle: "Sub-commits", SubmodulesTitle: "Submodules", - NavigationTitle: "List Panel Navigation", + NavigationTitle: "List panel navigation", SuggestionsCheatsheetTitle: "Suggestions", SuggestionsTitle: "Suggestions (press %s to focus)", - ExtrasTitle: "Command Log", - PushingTagStatus: "pushing tag", + ExtrasTitle: "Command log", + PushingTagStatus: "Pushing tag", PullRequestURLCopiedToClipboard: "Pull request URL copied to clipboard", CommitDiffCopiedToClipboard: "Commit diff copied to clipboard", CommitSHACopiedToClipboard: "Commit SHA copied to clipboard", @@ -1143,43 +1155,41 @@ func EnglishTranslationSet() TranslationSet { CommitMessageCopiedToClipboard: "Commit message copied to clipboard", CommitAuthorCopiedToClipboard: "Commit author copied to clipboard", PatchCopiedToClipboard: "Patch copied to clipboard", - LcCopiedToClipboard: "copied to clipboard", + CopiedToClipboard: "Copied to clipboard", ErrCannotEditDirectory: "Cannot edit directory: you can only edit individual files", ErrStageDirWithInlineMergeConflicts: "Cannot stage/unstage directory containing files with inline merge conflicts. Please fix up the merge conflicts first", ErrRepositoryMovedOrDeleted: "Cannot find repo. It might have been moved or deleted ¯\\_(ツ)_/¯", - CommandLog: "Command Log", + CommandLog: "Command log", ToggleShowCommandLog: "Toggle show/hide command log", FocusCommandLog: "Focus command log", CommandLogHeader: "You can hide/focus this panel by pressing '%s'\n", - RandomTip: "Random Tip", + RandomTip: "Random tip", SelectParentCommitForMerge: "Select parent commit for merge", ToggleWhitespaceInDiffView: "Toggle whether or not whitespace changes are shown in the diff view", IgnoreWhitespaceDiffViewSubTitle: "(ignoring whitespace)", IgnoreWhitespaceNotSupportedHere: "Ignoring whitespace is not supported in this 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", - CreatePullRequest: "Create pull request", CreatePullRequestOptions: "Create pull request options", - LcCreatePullRequestOptions: "create pull request options", - LcDefaultBranch: "default branch", - LcSelectBranch: "select branch", + DefaultBranch: "Default branch", + SelectBranch: "Select branch", SelectConfigFile: "Select config file", NoConfigFileFoundErr: "No config file found", - LcLoadingFileSuggestions: "loading file suggestions", - LcLoadingCommits: "loading commits", + LoadingFileSuggestions: "Loading file suggestions", + LoadingCommits: "Loading commits", MustSpecifyOriginError: "Must specify a remote if specifying a branch", GitOutput: "Git output:", GitCommandFailed: "Git command failed. Check command log for details (open with %s)", AbortTitle: "Abort %s", AbortPrompt: "Are you sure you want to abort the current %s?", - LcOpenLogMenu: "open log menu", + OpenLogMenu: "Open log menu", LogMenuTitle: "Commit Log Options", - ToggleShowGitGraphAll: "toggle show whole git graph (pass the `--all` flag to `git log`)", - ShowGitGraph: "show git graph", - SortCommits: "commit sort order", + ToggleShowGitGraphAll: "Toggle show whole git graph (pass the `--all` flag to `git log`)", + ShowGitGraph: "Show git graph", + SortCommits: "Commit sort order", 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: "open commit in browser", - LcViewBisectOptions: "view bisect options", + OpenCommitInBrowser: "Open commit in browser", + ViewBisectOptions: "View bisect options", ConfirmRevertCommit: "Are you sure you want to revert {{.selectedCommit}}?", RewordInEditorTitle: "Reword in editor", RewordInEditorPrompt: "Are you sure you want to reword this commit in your editor?", @@ -1188,11 +1198,24 @@ func EnglishTranslationSet() TranslationSet { UpstreamGone: "(upstream gone)", NukeDescription: "If you want to make all the changes in the worktree go away, this is the way to do it. If there are dirty submodule changes this will stash those changes in the submodule(s).", DiscardStagedChangesDescription: "This will create a new stash entry containing only staged files and then drop it, so that the working tree is left with only unstaged changes", - EmptyOutput: "", + EmptyOutput: "", Patch: "Patch", CustomPatch: "Custom patch", - LcCommitsCopied: "commits copied", - LcCommitCopied: "commit copied", + CommitsCopied: "commits copied", // lowercase because it's used in a sentence + CommitCopied: "commit copied", // lowercase because it's used in a sentence + ResetPatch: "Reset patch", + ApplyPatch: "Apply patch", + ApplyPatchInReverse: "Apply patch in reverse", + RemovePatchFromOriginalCommit: "Remove patch from original commit (%s)", + MovePatchOutIntoIndex: "Move patch out into index", + MovePatchIntoNewCommit: "Move patch into new commit", + MovePatchToSelectedCommit: "Move patch to selected commit (%s)", + CopyPatchToClipboard: "Copy patch to clipboard", + NoMatchesFor: "No matches for '%s' %s", + ExitSearchMode: "%s: Exit search mode", + MatchesFor: "matches for '%s' (%d of %d) %s", // lowercase because it's after other text + SearchKeybindings: "%s: Next match, %s: Previous match, %s: Exit search mode", + SearchPrefix: "Search: ", Actions: Actions{ // TODO: combine this with the original keybinding descriptions (those are all in lowercase atm) CheckoutCommit: "Checkout commit", @@ -1203,9 +1226,9 @@ func EnglishTranslationSet() TranslationSet { Merge: "Merge", RebaseBranch: "Rebase branch", RenameBranch: "Rename branch", - SetUnsetUpstream: "Set/unset upstream", + SetUnsetUpstream: "Set/Unset upstream", CreateBranch: "Create branch", - CherryPick: "(Cherry-pick) Paste commits", + CherryPick: "(Cherry-pick) paste commits", CheckoutFile: "Checkout file", DiscardOldFileChange: "Discard old file change", SquashCommitDown: "Squash commit down", @@ -1240,7 +1263,7 @@ func EnglishTranslationSet() TranslationSet { UnstageFile: "Unstage file", UnstageAllFiles: "Unstage all files", StageAllFiles: "Stage all files", - LcIgnoreExcludeFile: "ignore or exclude file", + IgnoreExcludeFile: "Ignore or exclude file", IgnoreFileErr: "Cannot ignore .gitignore", ExcludeFile: "Exclude file", ExcludeFileErr: "Cannot exclude .git/info/exclude", @@ -1255,8 +1278,8 @@ func EnglishTranslationSet() TranslationSet { StashStagedChanges: "Stash staged changes", StashUnstagedChanges: "Stash unstaged changes", StashIncludeUntrackedChanges: "Stash all changes including untracked files", - GitFlowFinish: "Git flow finish", - GitFlowStart: "Git Flow start", + GitFlowFinish: "git flow finish", + GitFlowStart: "git flow start", CopyToClipboard: "Copy to clipboard", CopySelectedTextToClipboard: "Copy selected text to clipboard", RemovePatchFromCommit: "Remove patch from commit", @@ -1302,16 +1325,17 @@ func EnglishTranslationSet() TranslationSet { BisectMark: "Bisect mark", }, Bisect: Bisect{ - Mark: "mark %s as %s", - MarkStart: "mark %s as %s (start bisect)", - Skip: "skip %s", + Mark: "Mark %s as %s", + MarkStart: "Mark %s as %s (start bisect)", + Skip: "Skip %s", ResetTitle: "Reset 'git bisect'", ResetPrompt: "Are you sure you want to reset 'git bisect'?", - ResetOption: "reset bisect", + ResetOption: "Reset bisect", BisectMenuTitle: "Bisect", CompleteTitle: "Bisect complete", 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?", + Bisecting: "Bisecting", }, } } diff --git a/pkg/i18n/japanese.go b/pkg/i18n/japanese.go index d4efc55f0..49941f6c0 100644 --- a/pkg/i18n/japanese.go +++ b/pkg/i18n/japanese.go @@ -43,23 +43,22 @@ func japaneseTranslationSet() TranslationSet { AmendLastCommit: "最新のコミットにamend", AmendLastCommitTitle: "最新のコミットにamend", SureToAmend: "最新のコミットに変更をamendします。よろしいですか? コミットメッセージはコミットパネルから変更できます。", - NoCommitToAmend: "amend可能なコミットが存在しません。", + NoCommitToAmend: "Amend可能なコミットが存在しません。", CommitChangesWithEditor: "gitエディタを使用して変更をコミット", StatusTitle: "ステータス", - LcNavigate: "移動", - LcMenu: "メニュー", - LcExecute: "実行", - LcToggleStaged: "ステージ/アンステージ", - LcToggleStagedAll: "すべての変更をステージ/アンステージ", - LcToggleTreeView: "ファイルツリーの表示を切り替え", - LcOpenMergeTool: "git mergetoolを開く", - LcRefresh: "リフレッシュ", - LcPush: "push", - LcPull: "pull", - LcScroll: "スクロール", + Menu: "メニュー", + Execute: "実行", + ToggleStaged: "ステージ/アンステージ", + ToggleStagedAll: "すべての変更をステージ/アンステージ", + ToggleTreeView: "ファイルツリーの表示を切り替え", + OpenMergeTool: "Git mergetoolを開く", + Refresh: "リフレッシュ", + Push: "Push", + Pull: "Pull", + Scroll: "スクロール", MergeConflictsTitle: "マージコンフリクト", - LcCheckout: "チェックアウト", - LcFileFilter: "ファイルをフィルタ (ステージ/アンステージ)", + Checkout: "チェックアウト", + FileFilter: "ファイルをフィルタ (ステージ/アンステージ)", FilterStagedFiles: "ステージされたファイルのみを表示", FilterUnstagedFiles: "ステージされていないファイルのみを表示", ResetCommitFilterState: "フィルタをリセット", @@ -67,7 +66,7 @@ func japaneseTranslationSet() TranslationSet { PullWait: "Pull中...", PushWait: "Push中...", FetchWait: "Fetch中...", - LcSoftReset: "softリセット", + SoftReset: "Softリセット", AlreadyCheckedOutBranch: "ブランチはすでにチェックアウトされています。", // SureForceCheckout: "Are you sure you want force checkout? You will lose all local changes", // ForceCheckoutBranch: "Force Checkout Branch", @@ -77,45 +76,44 @@ func japaneseTranslationSet() TranslationSet { DeleteBranch: "ブランチを削除", DeleteBranchMessage: "ブランチ '{{.selectedBranchName}}' を削除します。よろしいですか?", ForceDeleteBranchMessage: "'{{.selectedBranchName}}' はマージされていません。本当に削除しますか?", - // LcRebaseBranch: "rebase checked-out branch onto this branch", + // LcRebaseBranch: "Rebase checked-out branch onto this branch", CantRebaseOntoSelf: "ブランチを自分自身にリベースすることはできません。", CantMergeBranchIntoItself: "ブランチを自分自身にマージすることはできません。", - // LcForceCheckout: "force checkout", - // LcCheckoutByName: "checkout by name", - LcNewBranch: "新しいブランチを作成", - LcDeleteBranch: "ブランチを削除", + // LcForceCheckout: "Force checkout", + // LcCheckoutByName: "Checkout by name", + NewBranch: "新しいブランチを作成", NoBranchesThisRepo: "リポジトリにブランチが存在しません", CommitWithoutMessageErr: "コミットメッセージを入力してください", - LcCloseCancel: "閉じる/キャンセル", - LcConfirm: "確認", - LcClose: "閉じる", - LcQuit: "終了", - // LcSquashDown: "squash down", - // LcFixupCommit: "fixup commit", + CloseCancel: "閉じる/キャンセル", + Confirm: "確認", + Close: "閉じる", + Quit: "終了", + // LcSquashDown: "Squash down", + // LcFixupCommit: "Fixup commit", // NoCommitsThisBranch: "No commits for this branch", // CannotSquashOrFixupFirstCommit: "There's no commit below to squash into", // Fixup: "Fixup", // 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?", // Squash: "Squash", - // LcPickCommit: "pick commit (when mid-rebase)", - LcRevertCommit: "コミットをrevert", - LcRewordCommit: "コミットメッセージを変更", - LcDeleteCommit: "コミットを削除", - LcMoveDownCommit: "コミットを1つ下に移動", - LcMoveUpCommit: "コミットを1つ上に移動", - LcEditCommit: "コミットを編集", - LcAmendToCommit: "ステージされた変更でamendコミット", - LcRenameCommitEditor: "エディタでコミットメッセージを編集", - Error: "エラー", - // LcPickHunk: "pick hunk", - // LcPickAllHunks: "pick all hunks", - LcUndo: "アンドゥ", - LcUndoReflog: "アンドゥ (via reflog) (experimental)", - LcRedoReflog: "リドゥ (via reflog) (experimental)", - LcPop: "pop", - LcDrop: "drop", - LcApply: "適用", + // LcPickCommit: "Pick commit (when mid-rebase)", + RevertCommit: "コミットをrevert", + RewordCommit: "コミットメッセージを変更", + DeleteCommit: "コミットを削除", + MoveDownCommit: "コミットを1つ下に移動", + MoveUpCommit: "コミットを1つ上に移動", + EditCommit: "コミットを編集", + AmendToCommit: "ステージされた変更でamendコミット", + RenameCommitEditor: "エディタでコミットメッセージを編集", + Error: "エラー", + // LcPickHunk: "Pick hunk", + // LcPickAllHunks: "Pick all hunks", + Undo: "アンドゥ", + UndoReflog: "アンドゥ (via reflog) (experimental)", + RedoReflog: "リドゥ (via reflog) (experimental)", + Pop: "Pop", + Drop: "Drop", + Apply: "適用", NoStashEntries: "Stashが存在しません", StashDrop: "Stashを削除", SureDropStashEntry: "Stashを削除します。よろしいですか?", @@ -125,7 +123,7 @@ func japaneseTranslationSet() TranslationSet { SureApplyStashEntry: "Stashを適用します。よろしいですか?", // NoTrackedStagedFilesStash: "You have no tracked/staged files to stash", StashChanges: "変更をStash", - LcRenameStash: "Stashを変更", + RenameStash: "Stashを変更", RenameStashPrompt: "Stash名を変更: {{.stashName}}", OpenConfig: "設定ファイルを開く", EditConfig: "設定ファイルを編集", @@ -133,7 +131,7 @@ func japaneseTranslationSet() TranslationSet { ForcePushPrompt: "ブランチがリモートブランチから分岐しています。'esc'でキャンセル, または'enter'でforce pushします。", ForcePushDisabled: "ブランチがリモートブランチから分岐しています。force pushは無効化されています。", // UpdatesRejectedAndForcePushDisabled: "Updates were rejected and you have disabled force pushing", - LcCheckForUpdate: "更新を確認", + CheckForUpdate: "更新を確認", CheckingForUpdates: "更新を確認中...", UpdateAvailableTitle: "最新リリース!", UpdateAvailable: "バージョン {{.newVersion}} をインストールしますか?", @@ -151,19 +149,19 @@ func japaneseTranslationSet() TranslationSet { MergeToolPrompt: "`git mergetool`を開きます。よろしいですか?", IntroPopupMessage: japaneseIntroPopupMessage, // GitconfigParseErr: `Gogit failed to parse your gitconfig file due to the presence of unquoted '\' characters. Removing these should fix the issue.`, - LcEditFile: `ファイルを編集`, - LcOpenFile: `ファイルを開く`, - LcIgnoreFile: `.gitignoreに追加`, - LcRefreshFiles: `ファイルをリフレッシュ`, - LcMergeIntoCurrentBranch: `現在のブランチにマージ`, - ConfirmQuit: `終了します。よろしいですか?`, - SwitchRepo: `最近使用したリポジトリに切り替え`, - LcAllBranchesLogGraph: `すべてのブランチログを表示`, - UnsupportedGitService: `サポートされていないGitサービスです。`, - LcCreatePullRequest: `Pull Requestを作成`, - LcCopyPullRequestURL: `Pull RequestのURLをクリップボードにコピー`, - NoBranchOnRemote: `ブランチがリモートに存在しません。リモートにpushしてください。`, - LcFetch: `fetch`, + EditFile: `ファイルを編集`, + OpenFile: `ファイルを開く`, + IgnoreFile: `.gitignoreに追加`, + RefreshFiles: `ファイルをリフレッシュ`, + MergeIntoCurrentBranch: `現在のブランチにマージ`, + ConfirmQuit: `終了します。よろしいですか?`, + SwitchRepo: `最近使用したリポジトリに切り替え`, + AllBranchesLogGraph: `すべてのブランチログを表示`, + UnsupportedGitService: `サポートされていないGitサービスです。`, + CreatePullRequest: `Pull Requestを作成`, + CopyPullRequestURL: `Pull RequestのURLをクリップボードにコピー`, + NoBranchOnRemote: `ブランチがリモートに存在しません。リモートにpushしてください。`, + Fetch: `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`, // FileEnter: `stage individual hunks/lines for file, or collapse/expand for directory`, @@ -171,17 +169,17 @@ func japaneseTranslationSet() TranslationSet { StageSelection: `選択行をステージ/アンステージ`, ResetSelection: `変更を削除 (git reset)`, ToggleDragSelect: `範囲選択を切り替え`, - ToggleSelectHunk: `hunk選択を切り替え`, + ToggleSelectHunk: `Hunk選択を切り替え`, ToggleSelectionForPatch: `行をパッチに追加/削除`, ToggleStagingPanel: `パネルを切り替え`, ReturnToFilesPanel: `ファイル一覧に戻る`, // 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'", // FoundConflictsTitle: "Auto-merge failed", - // PickHunk: "pick hunk", - // PickAllHunks: "pick all hunks", - // ViewMergeRebaseOptions: "view merge/rebase options", + // PickHunk: "Pick hunk", + // PickAllHunks: "Pick all hunks", + // ViewMergeRebaseOptions: "View merge/rebase options", // NotMergingOrRebasing: "You are currently neither rebasing nor merging", RecentRepos: "最近使用したリポジトリ", // MergeOptionsTitle: "Merge Options", @@ -198,7 +196,7 @@ func japaneseTranslationSet() TranslationSet { SecondaryTitle: "Secondary", ReflogCommitsTitle: "参照ログ", GlobalTitle: "グローバルキーバインド", - // ConflictsResolved: "all merge conflicts resolved. Continue?", + // ConflictsResolved: "All merge conflicts resolved. Continue?", // RebasingTitle: "Rebasing", // ConfirmRebase: "Are you sure you want to rebase '{{.checkedOutBranch}}' onto '{{.selectedBranch}}'?", // ConfirmMerge: "Are you sure you want to merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'?", @@ -208,49 +206,49 @@ func japaneseTranslationSet() TranslationSet { ErrorOccurred: "エラーが発生しました! issueを作成してください: ", // NoRoom: "Not enough room", YouAreHere: "現在位置", - // LcRewordNotSupported: "rewording commits while interactively rebasing is not currently supported", - LcCherryPickCopy: "コミットをコピー (cherry-pick)", - LcCherryPickCopyRange: "コミットを範囲コピー (cherry-pick)", - LcPasteCommits: "コミットを貼り付け (cherry-pick)", + // LcRewordNotSupported: "Rewording commits while interactively rebasing is not currently supported", + CherryPickCopy: "コミットをコピー (cherry-pick)", + CherryPickCopyRange: "コミットを範囲コピー (cherry-pick)", + PasteCommits: "コミットを貼り付け (cherry-pick)", // SureCherryPick: "Are you sure you want to cherry-pick the copied commits onto this branch?", - CherryPick: "Cherry-Pick", - Donate: "支援", - AskQuestion: "質問", - PrevLine: "前の行を選択", - NextLine: "次の行を選択", - PrevHunk: "前のhunkを選択", - NextHunk: "次のhunkを選択", - PrevConflict: "前のコンフリクトを選択", - NextConflict: "次のコンフリクトを選択", - SelectPrevHunk: "前のhunkを選択", - SelectNextHunk: "次のhunkを選択", - ScrollDown: "下にスクロール", - ScrollUp: "上にスクロール", - LcScrollUpMainPanel: "メインパネルを上にスクロール", - LcScrollDownMainPanel: "メインパネルを下にスクロール", - AmendCommitTitle: "amendコミット", - AmendCommitPrompt: "ステージされたファイルで現在のコミットをamendします。よろしいですか?", - DeleteCommitTitle: "コミットを削除", - DeleteCommitPrompt: "選択されたコミットを削除します。よろしいですか?", - // SquashingStatus: "squashing", - // FixingStatus: "fixing up", - // DeletingStatus: "deleting", - // MovingStatus: "moving", - // RebasingStatus: "rebasing", - // AmendingStatus: "amending", - // CherryPickingStatus: "cherry-picking", - // UndoingStatus: "undoing", - // RedoingStatus: "redoing", - // CheckingOutStatus: "checking out", - // CommittingStatus: "committing", + CherryPick: "Cherry-Pick", + Donate: "支援", + AskQuestion: "質問", + PrevLine: "前の行を選択", + NextLine: "次の行を選択", + PrevHunk: "前のhunkを選択", + NextHunk: "次のhunkを選択", + PrevConflict: "前のコンフリクトを選択", + NextConflict: "次のコンフリクトを選択", + SelectPrevHunk: "前のhunkを選択", + SelectNextHunk: "次のhunkを選択", + ScrollDown: "下にスクロール", + ScrollUp: "上にスクロール", + ScrollUpMainPanel: "メインパネルを上にスクロール", + ScrollDownMainPanel: "メインパネルを下にスクロール", + AmendCommitTitle: "Amendコミット", + AmendCommitPrompt: "ステージされたファイルで現在のコミットをamendします。よろしいですか?", + DeleteCommitTitle: "コミットを削除", + DeleteCommitPrompt: "選択されたコミットを削除します。よろしいですか?", + // SquashingStatus: "Squashing", + // FixingStatus: "Fixing up", + // DeletingStatus: "Deleting", + // MovingStatus: "Moving", + // RebasingStatus: "Rebasing", + // AmendingStatus: "Amending", + // CherryPickingStatus: "Cherry-picking", + // UndoingStatus: "Undoing", + // RedoingStatus: "Redoing", + // CheckingOutStatus: "Checking out", + // CommittingStatus: "Committing", CommitFiles: "Commit files", SubCommitsDynamicTitle: "コミット (%s)", CommitFilesDynamicTitle: "Diff files (%s)", RemoteBranchesDynamicTitle: "リモートブランチ (%s)", - // LcViewItemFiles: "view selected item's files", + // LcViewItemFiles: "View selected item's files", CommitFilesTitle: "コミットファイル", - // LcCheckoutCommitFile: "checkout file", - // LcDiscardOldFileChange: "discard this commit's changes to this file", + // LcCheckoutCommitFile: "Checkout file", + // LcDiscardOldFileChange: "Discard this commit's changes to this file", 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", // DisabledForGPG: "Feature not available for users using GPG", @@ -258,191 +256,190 @@ func japaneseTranslationSet() TranslationSet { // AutoStashTitle: "Autostash?", // AutoStashPrompt: "You must stash and pop your changes to bring them across. Do this automatically? (enter/esc)", // StashPrefix: "Auto-stashing changes for ", - // LcViewDiscardOptions: "view 'discard changes' options", - LcCancel: "キャンセル", - LcDiscardAllChanges: "すべての変更を破棄", - // LcDiscardUnstagedChanges: "discard unstaged changes", - // LcDiscardAllChangesToAllFiles: "nuke working tree", - // LcDiscardAnyUnstagedChanges: "discard unstaged changes", - // LcDiscardUntrackedFiles: "discard untracked files", - LcHardReset: "hardリセット", + // LcViewDiscardOptions: "View 'discard changes' options", + Cancel: "キャンセル", + DiscardAllChanges: "すべての変更を破棄", + // LcDiscardUnstagedChanges: "Discard unstaged changes", + // LcDiscardAllChangesToAllFiles: "Nuke working tree", + // LcDiscardAnyUnstagedChanges: "Discard unstaged changes", + // LcDiscardUntrackedFiles: "Discard untracked files", + HardReset: "hardリセット", // LcViewResetOptions: `view reset options`, - LcCreateFixupCommit: `このコミットに対するfixupコミットを作成`, + CreateFixupCommitDescription: `このコミットに対するfixupコミットを作成`, // LcSquashAboveCommits: `squash all 'fixup!' commits above selected commit (autosquash)`, // SquashAboveCommits: `Squash all 'fixup!' commits above selected commit (autosquash)`, - SureSquashAboveCommits: `{{.commit}}に対するすべての fixup! コミットをsquashします。よろしいですか?`, - CreateFixupCommit: `fixupコミットを作成`, - SureCreateFixupCommit: `{{.commit}} に対する fixup! コミットを作成します。よろしいですか?`, - LcExecuteCustomCommand: "カスタムコマンドを実行", - CustomCommand: "カスタムコマンド:", - LcCommitChangesWithoutHook: "pre-commitフックを実行せずに変更をコミット", + SureSquashAboveCommits: `{{.commit}}に対するすべての fixup! コミットをsquashします。よろしいですか?`, + CreateFixupCommit: `Fixupコミットを作成`, + SureCreateFixupCommit: `{{.commit}} に対する fixup! コミットを作成します。よろしいですか?`, + ExecuteCustomCommand: "カスタムコマンドを実行", + CustomCommand: "カスタムコマンド:", + CommitChangesWithoutHook: "pre-commitフックを実行せずに変更をコミット", // SkipHookPrefixNotConfigured: "You have not configured a commit message prefix for skipping hooks. Set `git.skipHookPrefix = 'WIP'` in your config", // LcResetTo: `reset to`, PressEnterToReturn: "Enterを入力してください", - // LcViewStashOptions: "view stash options", - LcStashAllChanges: "変更をstash", - // LcStashStagedChanges: "stash staged changes", + // LcViewStashOptions: "View stash options", + StashAllChanges: "変更をstash", + // LcStashStagedChanges: "Stash staged changes", // LcStashOptions: "Stash options", // NotARepository: "Error: must be run inside a git repository", - LcJump: "パネルに移動", - LcScrollLeftRight: "左右にスクロール", - LcScrollLeft: "左スクロール", - LcScrollRight: "右スクロール", - DiscardPatch: "パッチを破棄", + Jump: "パネルに移動", + ScrollLeftRight: "左右にスクロール", + ScrollLeft: "左スクロール", + ScrollRight: "右スクロール", + DiscardPatch: "パッチを破棄", // 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", - // LcToggleAddToPatch: "toggle file included in patch", - // LcToggleAllInPatch: "toggle all files included in patch", - // LcUpdatingPatch: "updating patch", - // ViewPatchOptions: "view custom patch options", + // LcToggleAddToPatch: "Toggle file included in patch", + // LcToggleAllInPatch: "Toggle all files included in patch", + // LcUpdatingPatch: "Updating patch", + // ViewPatchOptions: "View custom 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", - // 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: ``, EnterUpstream: `' ' の形式でupstreamを入力`, - InvalidUpstream: "upstreamの形式が正しくありません。' ' の形式で入力してください。", + InvalidUpstream: "Upstreamの形式が正しくありません。' ' の形式で入力してください。", ReturnToRemotesList: `リモート一覧に戻る`, - LcAddNewRemote: `リモートを新規追加`, - LcNewRemoteName: `新規リモート名:`, - LcNewRemoteUrl: `新規リモートURL:`, - LcEditRemoteName: `{{.remoteName}} の新しいリモート名を入力:`, - LcEditRemoteUrl: `{{.remoteName}} の新しいリモートURLを入力:`, - LcRemoveRemote: `リモートを削除`, - LcRemoveRemotePrompt: "リモートを削除します。よろしいですか?", + AddNewRemote: `リモートを新規追加`, + NewRemoteName: `新規リモート名:`, + NewRemoteUrl: `新規リモートURL:`, + EditRemoteName: `{{.remoteName}} の新しいリモート名を入力:`, + EditRemoteUrl: `{{.remoteName}} の新しいリモートURLを入力:`, + RemoveRemote: `リモートを削除`, + RemoveRemotePrompt: "リモートを削除します。よろしいですか?", DeleteRemoteBranch: "リモートブランチを削除", DeleteRemoteBranchMessage: "リモートブランチを削除します。よろしいですか", - // LcSetUpstream: "set as upstream of checked-out branch", + // LcSetUpstream: "Set as upstream of checked-out branch", // SetUpstreamTitle: "Set upstream branch", // SetUpstreamMessage: "Are you sure you want to set the upstream branch of '{{.checkedOut}}' to '{{.selected}}'", - LcEditRemote: "リモートを編集", - LcTagCommit: "タグを作成", + EditRemote: "リモートを編集", + TagCommit: "タグを作成", TagMenuTitle: "タグを作成", TagNameTitle: "タグ名:", TagMessageTitle: "タグメッセージ: ", - LcAnnotatedTag: "注釈付きタグ", - LcLightweightTag: "軽量タグ", - LcDeleteTag: "タグを削除", + AnnotatedTag: "注釈付きタグ", + LightweightTag: "軽量タグ", + DeleteTag: "タグを削除", DeleteTagTitle: "タグを削除", DeleteTagPrompt: "タグ '{{.tagName}}' を削除します。よろしいですか?", PushTagTitle: "リモートにタグ '{{.tagName}}' をpush", - LcPushTag: "タグをpush", - LcCreateTag: "タグを作成", + PushTag: "タグをpush", + CreateTag: "タグを作成", CreateTagTitle: "タグ名:", - LcFetchRemote: "リモートをfetch", + FetchRemote: "リモートをfetch", FetchingRemoteStatus: "リモートをfetch", - LcCheckoutCommit: "コミットをチェックアウト", + CheckoutCommit: "コミットをチェックアウト", SureCheckoutThisCommit: "選択されたコミットをチェックアウトします。よろしいですか?", - // LcGitFlowOptions: "show git-flow options", + // LcGitFlowOptions: "Show git-flow options", // NotAGitFlowBranch: "This does not seem to be a git flow branch", - // NewGitFlowBranchPrompt: "new {{.branchType}} name:", + // NewGitFlowBranchPrompt: "New {{.branchType}} name:", // IgnoreTracked: "Ignore tracked file", // IgnoreTrackedPrompt: "Are you sure you want to ignore a tracked file?", - // LcViewResetToUpstreamOptions: "view upstream reset options", - LcNextScreenMode: "次のスクリーンモード (normal/half/fullscreen)", - LcPrevScreenMode: "前のスクリーンモード", - LcStartSearch: "検索を開始", + // LcViewResetToUpstreamOptions: "View upstream reset options", + NextScreenMode: "次のスクリーンモード (normal/half/fullscreen)", + PrevScreenMode: "前のスクリーンモード", + StartSearch: "検索を開始", Panel: "パネル", Keybindings: "キーバインド", - LcRenameBranch: "ブランチ名を変更", + RenameBranch: "ブランチ名を変更", 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?", - LcOpenMenu: "メニューを開く", - // LcResetCherryPick: "reset cherry-picked (copied) commits selection", - LcNextTab: "次のタブ", - LcPrevTab: "前のタブ", - LcCantUndoWhileRebasing: "リベース中はアンドゥできません。", - LcCantRedoWhileRebasing: "リベース中はリドゥできません。", + OpenMenu: "メニューを開く", + // LcResetCherryPick: "Reset cherry-picked (copied) commits selection", + NextTab: "次のタブ", + PrevTab: "前のタブ", + CantUndoWhileRebasing: "リベース中はアンドゥできません。", + 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?", // MustStashTitle: "Must stash", ConfirmationTitle: "確認パネル", - LcPrevPage: "前のページ", - LcNextPage: "次のページ", - LcGotoTop: "最上部までスクロール", - LcGotoBottom: "最下部までスクロール", - // LcFilteringBy: "filtering by", + PrevPage: "前のページ", + NextPage: "次のページ", + GotoTop: "最上部までスクロール", + GotoBottom: "最下部までスクロール", + // LcFilteringBy: "Filtering by", // ResetInParentheses: "(reset)", - // LcOpenFilteringMenu: "view filter-by-path options", - // LcFilterBy: "filter by", - // LcExitFilterMode: "stop filtering by path", - // LcFilterPathOption: "enter path to filter by", + // LcOpenFilteringMenu: "View filter-by-path options", + // LcFilterBy: "Filter by", + // LcExitFilterMode: "Stop filtering by path", + // LcFilterPathOption: "Enter path to filter by", // EnterFileName: "Enter path:", // FilteringMenuTitle: "Filtering", // MustExitFilterModeTitle: "Command not available", // MustExitFilterModePrompt: "Command not available in filtered mode. Exit filtered mode?", - LcDiff: "差分", - // LcEnterRefToDiff: "enter ref to diff", - LcEnteRefName: "参照を入力:", - LcExitDiffMode: "差分モードを終了", + Diff: "差分", + // LcEnterRefToDiff: "Enter ref to diff", + EnteRefName: "参照を入力:", + ExitDiffMode: "差分モードを終了", DiffingMenuTitle: "差分", - // LcSwapDiff: "reverse diff direction", - LcOpenDiffingMenu: "差分メニューを開く", + // LcSwapDiff: "Reverse diff direction", + 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 - LcOpenExtrasMenu: "コマンドログメニューを開く", - // LcShowingGitDiff: "showing output for:", - LcCommitDiff: "コミットの差分", - LcCopyCommitShaToClipboard: "コミットのSHAをクリップボードにコピー", - LcCommitSha: "コミットのSHA", - LcCommitURL: "コミットのURL", - LcCopyCommitMessageToClipboard: "コミットメッセージをクリップボードにコピー", - LcCommitMessage: "コミットメッセージ", - LcCommitAuthor: "コミットの作成者名", - LcCopyCommitAttributeToClipboard: "コミットの情報をコピー", - LcCopyBranchNameToClipboard: "ブランチ名をクリップボードにコピー", - LcCopyFileNameToClipboard: "ファイル名をクリップボードにコピー", - LcCopyCommitFileNameToClipboard: "コミットされたファイル名をクリップボードにコピー", - LcCopySelectedTexToClipboard: "選択されたテキストをクリップボードにコピー", + OpenExtrasMenu: "コマンドログメニューを開く", + // LcShowingGitDiff: "Showing output for:", + CommitDiff: "コミットの差分", + CopyCommitShaToClipboard: "コミットのSHAをクリップボードにコピー", + CommitSha: "コミットのSHA", + CommitURL: "コミットのURL", + CopyCommitMessageToClipboard: "コミットメッセージをクリップボードにコピー", + CommitMessage: "コミットメッセージ", + CommitAuthor: "コミットの作成者名", + CopyCommitAttributeToClipboard: "コミットの情報をコピー", + CopyBranchNameToClipboard: "ブランチ名をクリップボードにコピー", + CopyFileNameToClipboard: "ファイル名をクリップボードにコピー", + CopyCommitFileNameToClipboard: "コミットされたファイル名をクリップボードにコピー", + CopySelectedTexToClipboard: "選択されたテキストをクリップボードにコピー", // LcCommitPrefixPatternError: "Error in commitPrefix pattern", - NoFilesStagedTitle: "ファイルがステージされていません", - NoFilesStagedPrompt: "ファイルがステージされていません。すべての変更をコミットしますか?", - BranchNotFoundTitle: "ブランチが見つかりませんでした。", - BranchNotFoundPrompt: "ブランチが見つかりませんでした。新しくブランチを作成します ", - UnstageLinesTitle: "選択行をアンステージ", - UnstageLinesPrompt: "選択された行を削除 (git reset) します。よろしいですか? この操作は取り消せません。\nこの警告を無効化するには設定ファイルの 'gui.skipUnstageLineWarning' を true に設定してください。", - LcCreateNewBranchFromCommit: "コミットにブランチを作成", - LcBuildingPatch: "パッチを構築", - LcViewCommits: "コミットを閲覧", - MinGitVersionError: "lazygitの実行にはGit 2.20以降のバージョンが必要です。Gitを更新してください。もしくは、lazygitの後方互換性を改善するために https://github.com/jesseduffield/lazygit/issues にissueを作成してください。", - LcRunningCustomCommandStatus: "カスタムコマンドを実行", - // LcSubmoduleStashAndReset: "stash uncommitted submodule changes and update", - // LcAndResetSubmodules: "and reset submodules", - LcEnterSubmodule: "サブモジュールを開く", - LcCopySubmoduleNameToClipboard: "サブモジュール名をクリップボードにコピー", - RemoveSubmodule: "サブモジュールを削除", - LcRemoveSubmodule: "サブモジュールを削除", - RemoveSubmodulePrompt: "サブモジュール '%s' とそのディレクトリを削除します。よろしいですか? この操作は取り消せません。", - LcResettingSubmoduleStatus: "サブモジュールをリセット", - LcNewSubmoduleName: "新規サブモジュール名:", - LcNewSubmoduleUrl: "新規サブモジュールのURL:", - LcNewSubmodulePath: "新規サブモジュールのパス:", - LcAddSubmodule: "サブモジュールを新規追加", - LcAddingSubmoduleStatus: "サブモジュールを新規追加", - LcUpdateSubmoduleUrl: "サブモジュール '%s' のURLを更新", - LcUpdatingSubmoduleUrlStatus: "URLを更新", - LcEditSubmoduleUrl: "サブモジュールのURLを更新", - LcInitializingSubmoduleStatus: "サブモジュールを初期化", - LcInitSubmodule: "サブモジュールを初期化", - LcSubmoduleUpdate: "サブモジュールを更新", - LcUpdatingSubmoduleStatus: "サブモジュールを更新", - LcBulkInitSubmodules: "サブモジュールを一括初期化", - LcBulkUpdateSubmodules: "サブモジュールを一括更新", - // LcBulkDeinitSubmodules: "bulk deinit submodules", - // LcViewBulkSubmoduleOptions: "view bulk submodule options", - // LcBulkSubmoduleOptions: "bulk submodule options", - // LcRunningCommand: "running command", + NoFilesStagedTitle: "ファイルがステージされていません", + NoFilesStagedPrompt: "ファイルがステージされていません。すべての変更をコミットしますか?", + BranchNotFoundTitle: "ブランチが見つかりませんでした。", + BranchNotFoundPrompt: "ブランチが見つかりませんでした。新しくブランチを作成します ", + UnstageLinesTitle: "選択行をアンステージ", + UnstageLinesPrompt: "選択された行を削除 (git reset) します。よろしいですか? この操作は取り消せません。\nこの警告を無効化するには設定ファイルの 'gui.skipUnstageLineWarning' を true に設定してください。", + CreateNewBranchFromCommit: "コミットにブランチを作成", + BuildingPatch: "パッチを構築", + ViewCommits: "コミットを閲覧", + MinGitVersionError: "Lazygitの実行にはGit 2.20以降のバージョンが必要です。Gitを更新してください。もしくは、lazygitの後方互換性を改善するために https://github.com/jesseduffield/lazygit/issues にissueを作成してください。", + RunningCustomCommandStatus: "カスタムコマンドを実行", + // LcSubmoduleStashAndReset: "Stash uncommitted submodule changes and update", + // LcAndResetSubmodules: "And reset submodules", + EnterSubmodule: "サブモジュールを開く", + CopySubmoduleNameToClipboard: "サブモジュール名をクリップボードにコピー", + RemoveSubmodule: "サブモジュールを削除", + RemoveSubmodulePrompt: "サブモジュール '%s' とそのディレクトリを削除します。よろしいですか? この操作は取り消せません。", + ResettingSubmoduleStatus: "サブモジュールをリセット", + NewSubmoduleName: "新規サブモジュール名:", + NewSubmoduleUrl: "新規サブモジュールのURL:", + NewSubmodulePath: "新規サブモジュールのパス:", + AddSubmodule: "サブモジュールを新規追加", + AddingSubmoduleStatus: "サブモジュールを新規追加", + UpdateSubmoduleUrl: "サブモジュール '%s' のURLを更新", + UpdatingSubmoduleUrlStatus: "URLを更新", + EditSubmoduleUrl: "サブモジュールのURLを更新", + InitializingSubmoduleStatus: "サブモジュールを初期化", + InitSubmodule: "サブモジュールを初期化", + SubmoduleUpdate: "サブモジュールを更新", + UpdatingSubmoduleStatus: "サブモジュールを更新", + BulkInitSubmodules: "サブモジュールを一括初期化", + BulkUpdateSubmodules: "サブモジュールを一括更新", + // LcBulkDeinitSubmodules: "Bulk deinit submodules", + // LcViewBulkSubmoduleOptions: "View bulk submodule options", + // LcBulkSubmoduleOptions: "Bulk submodule options", + // LcRunningCommand: "Running command", // SubCommitsTitle: "Sub-commits", SubmodulesTitle: "サブモジュール", NavigationTitle: "一覧パネルの操作", // SuggestionsCheatsheetTitle: "Suggestions", // SuggestionsTitle: "Suggestions (press %s to focus)", ExtrasTitle: "コマンドログ", - // PushingTagStatus: "pushing tag", - PullRequestURLCopiedToClipboard: "pull requestのURLがクリップボードにコピーされました", + // PushingTagStatus: "Pushing tag", + PullRequestURLCopiedToClipboard: "Pull requestのURLがクリップボードにコピーされました", CommitDiffCopiedToClipboard: "コミットの差分がクリップボードにコピーされました", CommitSHACopiedToClipboard: "コミットのSHAがクリップボードにコピーされました", CommitURLCopiedToClipboard: "コミットのURLがクリップボードにコピーされました", CommitMessageCopiedToClipboard: "コミットメッセージがクリップボードにコピーされました", CommitAuthorCopiedToClipboard: "コミットの作成者名がクリップボードにコピーされました", - LcCopiedToClipboard: "クリップボードにコピーされました", + CopiedToClipboard: "クリップボードにコピーされました", ErrCannotEditDirectory: "ディレクトリは編集できません。", ErrStageDirWithInlineMergeConflicts: "マージコンフリクトの発生したファイルを含むディレクトリはステージ/アンステージできません。マージコンフリクトを解決してください。", ErrRepositoryMovedOrDeleted: "リポジトリが見つかりません。すでに削除されたか、移動された可能性があります ¯\\_(ツ)_/¯", @@ -455,28 +452,27 @@ func japaneseTranslationSet() TranslationSet { ToggleWhitespaceInDiffView: "空白文字の差分の表示有無を切り替え", // 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", - CreatePullRequest: "pull requestを作成", // CreatePullRequestOptions: "Create pull request options", - // LcCreatePullRequestOptions: "create pull request options", - LcDefaultBranch: "デフォルトブランチ", - LcSelectBranch: "ブランチを選択", + // LcCreatePullRequestOptions: "Create pull request options", + DefaultBranch: "デフォルトブランチ", + SelectBranch: "ブランチを選択", SelectConfigFile: "設定ファイルを選択", NoConfigFileFoundErr: "設定ファイルが見つかりませんでした。", - // LcLoadingFileSuggestions: "loading file suggestions", - // LcLoadingCommits: "loading commits", + // LcLoadingFileSuggestions: "Loading file suggestions", + // LcLoadingCommits: "Loading commits", // MustSpecifyOriginError: "Must specify a remote if specifying a branch", // GitOutput: "Git output:", // GitCommandFailed: "Git command failed. Check command log for details (open with %s)", - AbortTitle: "%sを中止", - AbortPrompt: "実施中の%sを中止します。よろしいですか?", - LcOpenLogMenu: "ログメニューを開く", - LogMenuTitle: "コミットログオプション", - // ToggleShowGitGraphAll: "toggle show whole git graph (pass the `--all` flag to `git log`)", + AbortTitle: "%sを中止", + AbortPrompt: "実施中の%sを中止します。よろしいですか?", + OpenLogMenu: "ログメニューを開く", + LogMenuTitle: "コミットログオプション", + // ToggleShowGitGraphAll: "Toggle show whole git graph (pass the `--all` flag to `git log`)", ShowGitGraph: "コミットグラフの表示", 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!", - LcOpenCommitInBrowser: "ブラウザでコミットを開く", - // LcViewBisectOptions: "view bisect options", + OpenCommitInBrowser: "ブラウザでコミットを開く", + // LcViewBisectOptions: "View bisect options", // ConfirmRevertCommit: "Are you sure you want to revert {{.selectedCommit}}?", RewordInEditorTitle: "コミットメッセージをエディタで編集", // RewordInEditorPrompt: "Are you sure you want to reword this commit in your editor?", @@ -498,11 +494,11 @@ func japaneseTranslationSet() TranslationSet { CheckoutFile: "ファイルをチェックアウトs", // DiscardOldFileChange: "Discard old file change", // SquashCommitDown: "Squash commit down", - FixupCommit: "fixupコミット", + FixupCommit: "Fixupコミット", RewordCommit: "コミットメッセージを変更", DropCommit: "コミットを削除", EditCommit: "コミットを編集", - AmendCommit: "amendコミット", + AmendCommit: "Amendコミット", RevertCommit: "コミットをrevert", CreateFixupCommit: "fixupコミットを作成", // SquashAllAboveFixupCommits: "Squash all above fixup commits", @@ -526,7 +522,7 @@ func japaneseTranslationSet() TranslationSet { UnstageFile: "ファイルをアンステージ", UnstageAllFiles: "すべてのファイルをアンステージ", StageAllFiles: "すべてのファイルをステージ", - LcIgnoreExcludeFile: "ファイルをignore", + IgnoreExcludeFile: "ファイルをignore", Commit: "コミット", EditFile: "ファイルを編集", Push: "Push", @@ -543,7 +539,7 @@ func japaneseTranslationSet() TranslationSet { MovePatchIntoIndex: "パッチをindexに移動", MovePatchIntoNewCommit: "パッチを次のコミットに移動", DeleteRemoteBranch: "リモートブランチを削除", - SetBranchUpstream: "upstreamブランチを設定", + SetBranchUpstream: "Upstreamブランチを設定", AddRemote: "リモートを追加", RemoveRemote: "リモートを削除", UpdateRemote: "リモートを更新", @@ -570,22 +566,22 @@ func japaneseTranslationSet() TranslationSet { FastForwardBranch: "ブランチをfast forward", Undo: "アンドゥ", Redo: "リドゥ", - CopyPullRequestURL: "pull requestのURLをコピー", + CopyPullRequestURL: "Pull requestのURLをコピー", OpenMergeTool: "マージツールを開く", OpenCommitInBrowser: "コミットをブラウザで開く", - OpenPullRequest: "pull requestをブラウザで開く", - StartBisect: "bisectを開始", - ResetBisect: "bisectをリセット", - BisectSkip: "bisectをスキップ", - BisectMark: "bisectをマーク", + OpenPullRequest: "Pull requestをブラウザで開く", + StartBisect: "Bisectを開始", + ResetBisect: "Bisectをリセット", + BisectSkip: "Bisectをスキップ", + BisectMark: "Bisectをマーク", }, Bisect: Bisect{ - // Mark: "mark %s as %s", - // MarkStart: "mark %s as %s (start bisect)", + // Mark: "Mark %s as %s", + // MarkStart: "Mark %s as %s (start bisect)", Skip: "%s をスキップする", ResetTitle: "'git bisect' をリセット", ResetPrompt: "'git bisect' をリセットします。よろしいですか?", - ResetOption: "bisectをリセット", + ResetOption: "Bisectをリセット", BisectMenuTitle: "bisect", CompleteTitle: "Bisect完了", // CompletePrompt: "Bisect complete! The following commit introduced the change:\n\n%s\n\nDo you want to reset 'git bisect' now?", diff --git a/pkg/i18n/korean.go b/pkg/i18n/korean.go index ffb5b5da4..0f0a1f2c2 100644 --- a/pkg/i18n/korean.go +++ b/pkg/i18n/korean.go @@ -42,23 +42,22 @@ func koreanTranslationSet() TranslationSet { AmendLastCommit: "마지맛 커밋 수정", AmendLastCommitTitle: "마지막 커밋 수정", SureToAmend: "마지막 커밋을 수정하시겠습니까? 그런 다음 커밋 패널에서 커밋 메시지를 변경할 수 있습니다.", - NoCommitToAmend: "amend 가능한 커밋이 없습니다.", + NoCommitToAmend: "Amend 가능한 커밋이 없습니다.", CommitChangesWithEditor: "Git 편집기를 사용하여 변경 내용을 커밋합니다.", StatusTitle: "상태", - LcNavigate: "이동", - LcMenu: "메뉴", - LcExecute: "실행", - LcToggleStaged: "Staged 전환", - LcToggleStagedAll: "모든 변경을 Staged/unstaged으로 전환", - LcToggleTreeView: "파일 트리뷰로 전환", - LcOpenMergeTool: "git mergetool를 열기", - LcRefresh: "새로고침", - LcPush: "푸시", - LcPull: "업데이트", - LcScroll: "스크롤", + Menu: "메뉴", + Execute: "실행", + ToggleStaged: "Staged 전환", + ToggleStagedAll: "모든 변경을 Staged/unstaged으로 전환", + ToggleTreeView: "파일 트리뷰로 전환", + OpenMergeTool: "Git mergetool를 열기", + Refresh: "새로고침", + Push: "푸시", + Pull: "업데이트", + Scroll: "스크롤", MergeConflictsTitle: "병합 충돌 내용", - LcCheckout: "체크아웃", - LcFileFilter: "파일을 필터하기 (Staged/unstaged)", + Checkout: "체크아웃", + FileFilter: "파일을 필터하기 (Staged/unstaged)", FilterStagedFiles: "Staged된 파일만 표시", FilterUnstagedFiles: "Stage되지 않은 파일만 표시", ResetCommitFilterState: "필터 리셋", @@ -66,57 +65,56 @@ func koreanTranslationSet() TranslationSet { PullWait: "업데이트 중...", PushWait: "푸시 중...", FetchWait: "패치 중...", - LcSoftReset: "소프트 리셋", + SoftReset: "소프트 리셋", AlreadyCheckedOutBranch: "브랜치가 이미 체크아웃 되었습니다", SureForceCheckout: "강제로 체크아웃하시겠습니까? 모든 로컬 변경 사항을 잃게 됩니다.", ForceCheckoutBranch: "브랜치 강제 체크아웃", BranchName: "브랜치 이름", - NewBranchNameBranchOff: "새 브랜치 이름 (Branch is off of '{{.branchName}}')", + NewBranchNameBranchOff: "새 브랜치 이름 (branch is off of '{{.branchName}}')", CantDeleteCheckOutBranch: "체크아웃하는 브랜치는 삭제할 수 없습니다!", DeleteBranch: "브랜치 삭제", DeleteBranchMessage: "정말로 브랜치 '{{.selectedBranchName}}' 를 삭제하시겠습니까?", ForceDeleteBranchMessage: "'{{.selectedBranchName}}'는 완전히 병합되지 않았습니다. 정말 삭제하시겠습니까?", - LcRebaseBranch: "체크아웃된 브랜치를 이 브랜치에 리베이스", + RebaseBranch: "체크아웃된 브랜치를 이 브랜치에 리베이스", CantRebaseOntoSelf: "브랜치를 자기 자신에게 리베이스할 수는 없습니다.", CantMergeBranchIntoItself: "브랜치를 자기 자신에게 병합할 수는 없습니다.", - LcForceCheckout: "강제 체크아웃", - LcCheckoutByName: "이름으로 체크아웃", - LcNewBranch: "새 브랜치 생성", - LcDeleteBranch: "브랜치 삭제", + ForceCheckout: "강제 체크아웃", + CheckoutByName: "이름으로 체크아웃", + NewBranch: "새 브랜치 생성", NoBranchesThisRepo: "저장소에 브랜치가 존재하지 않습니다.", CommitWithoutMessageErr: "커밋 메시지를 입력하세요.", - LcCloseCancel: "닫기/취소", - LcConfirm: "확인", - LcClose: "닫기", - LcQuit: "종료", - LcSquashDown: "squash down", - LcFixupCommit: "fixup commit", + CloseCancel: "닫기/취소", + Confirm: "확인", + Close: "닫기", + Quit: "종료", + SquashDown: "Squash down", + FixupCommit: "Fixup commit", NoCommitsThisBranch: "이 브랜치에 커밋이 없습니다.", CannotSquashOrFixupFirstCommit: "There's no commit below to squash into", Fixup: "Fixup", 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?", Squash: "Squash", - LcPickCommit: "pick commit (when mid-rebase)", - LcRevertCommit: "커밋 되돌리기", - LcRewordCommit: "커밋메시지 변경", - LcDeleteCommit: "커밋 삭제", - LcMoveDownCommit: "커밋을 1개 아래로 이동", - LcMoveUpCommit: "커밋을 1개 위로 이동", - LcEditCommit: "커밋을 편집", - LcAmendToCommit: "amend commit with staged changes", - LcResetCommitAuthor: "reset commit author", + PickCommit: "Pick commit (when mid-rebase)", + RevertCommit: "커밋 되돌리기", + RewordCommit: "커밋메시지 변경", + DeleteCommit: "커밋 삭제", + MoveDownCommit: "커밋을 1개 아래로 이동", + MoveUpCommit: "커밋을 1개 위로 이동", + EditCommit: "커밋을 편집", + AmendToCommit: "Amend commit with staged changes", + 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?", - LcRenameCommitEditor: "에디터에서 커밋메시지 수정", + RenameCommitEditor: "에디터에서 커밋메시지 수정", Error: "오류", - LcPickHunk: "pick hunk", - LcPickAllHunks: "pick all hunks", - LcUndo: "되돌리기", - LcUndoReflog: "되돌리기 (reflog) (실험적)", - LcRedoReflog: "다시 실행 (reflog) (실험적)", - LcPop: "pop", - LcDrop: "drop", - LcApply: "적용", + PickHunk: "Pick hunk", + PickAllHunks: "Pick all hunks", + Undo: "되돌리기", + UndoReflog: "되돌리기 (reflog) (실험적)", + RedoReflog: "다시 실행 (reflog) (실험적)", + Pop: "Pop", + Drop: "Drop", + Apply: "적용", NoStashEntries: "Stash가 존재하지 않습니다.", StashDrop: "Stash를 삭제", SureDropStashEntry: "정말로 Stash를 삭제하시겠습니까?", @@ -126,7 +124,7 @@ func koreanTranslationSet() TranslationSet { SureApplyStashEntry: "정말로 Stash를 적용하시겠습니까?", NoTrackedStagedFilesStash: "You have no tracked/staged files to stash", StashChanges: "변경을 Stash", - LcRenameStash: "rename stash", + RenameStash: "Rename stash", RenameStashPrompt: "Rename stash: {{.stashName}}", OpenConfig: "설정 파일 열기", EditConfig: "설정 파일 수정", @@ -134,7 +132,7 @@ func koreanTranslationSet() TranslationSet { ForcePushPrompt: "브랜치가 원격 브랜치에서 분기하고 있습니다. 'esc'를 눌러 취소하거나, 'enter'를 눌러 강제로 푸시하세요.", ForcePushDisabled: "브랜치가 원격 브랜치에서 분기하고 있습니다. force push가 비활성화 되었습니다.", UpdatesRejectedAndForcePushDisabled: "업데이트가 거부되었으며 강제 푸시를 비활성화했습니다.", - LcCheckForUpdate: "업데이트 확인", + CheckForUpdate: "업데이트 확인", CheckingForUpdates: "업데이트 확인 중...", UpdateAvailableTitle: "새로운 업데이트 사용가능!", UpdateAvailable: "버전 {{.newVersion}} 을(를) 설치하시겠습니까?", @@ -152,41 +150,39 @@ func koreanTranslationSet() TranslationSet { MergeToolPrompt: "정말로 `git mergetool`을 여시겠습니까?", IntroPopupMessage: koreanIntroPopupMessage, GitconfigParseErr: `따옴표로 묶이지 않은 '\' 문자가 있어서 Gogit이 gitconfig 파일을 분석하지 못했습니다. 이를 제거하면 문제가 해결됩니다.`, - LcEditFile: `파일 편집`, - LcOpenFile: `파일 닫기`, - LcIgnoreFile: `.gitignore에 추가`, - LcRefreshFiles: `파일 새로고침`, - LcMergeIntoCurrentBranch: `현재 브랜치에 병합`, + EditFile: `파일 편집`, + OpenFile: `파일 닫기`, + IgnoreFile: `.gitignore에 추가`, + RefreshFiles: `파일 새로고침`, + MergeIntoCurrentBranch: `현재 브랜치에 병합`, ConfirmQuit: `정말로 종료하시겠습니까?`, SwitchRepo: `최근에 사용한 저장소로 전환`, - LcAllBranchesLogGraph: `모든 브랜치 로그 표시`, + AllBranchesLogGraph: `모든 브랜치 로그 표시`, UnsupportedGitService: `지원되지 않는 Git 서비스입니다.`, - LcCreatePullRequest: `풀 리퀘스트 생성`, - LcCopyPullRequestURL: `풀 리퀘스트 URL을 클립보드에 복사`, + CreatePullRequest: `풀 리퀘스트 생성`, + CopyPullRequestURL: `풀 리퀘스트 URL을 클립보드에 복사`, NoBranchOnRemote: `브랜치가 원격에 없습니다. 원격에 먼저 푸시해야합니다.`, - LcFetch: `fetch`, + Fetch: `Fetch`, NoAutomaticGitFetchTitle: `자동 git 업데이트) 없음`, 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할 수 있습니다.`, StageSelection: `선택한 행을 staged / unstaged`, ResetSelection: `변경을 삭제 (git reset)`, ToggleDragSelect: `드래그 선택 전환`, - ToggleSelectHunk: `toggle select hunk`, - ToggleSelectionForPatch: `line(s)을 패치에 추가/삭제`, + ToggleSelectHunk: `Toggle select hunk`, + ToggleSelectionForPatch: `Line(s)을 패치에 추가/삭제`, ToggleStagingPanel: `패널 전환`, ReturnToFilesPanel: `파일 목록으로 돌아가기`, - FastForward: `fast-forward this branch from its upstream`, - Fetching: "fetching and fast-forwarding {{.from}} -> {{.to}} ...", + FastForward: `Fast-forward this branch from its upstream`, + Fetching: "Fetching and fast-forwarding {{.from}} -> {{.to}} ...", FoundConflicts: "Conflicts! To abort press 'esc', otherwise press 'enter'", FoundConflictsTitle: "Auto-merge failed", - PickHunk: "pick hunk", - PickAllHunks: "pick all hunks", - ViewMergeRebaseOptions: "view merge/rebase options", + ViewMergeRebaseOptions: "View merge/rebase options", NotMergingOrRebasing: "You are currently neither rebasing nor merging", RecentRepos: "최근에 사용한 저장소", - MergeOptionsTitle: "Merge Options", - RebaseOptionsTitle: "Rebase Options", + MergeOptionsTitle: "Merge options", + RebaseOptionsTitle: "Rebase options", CommitMessageTitle: "커밋메시지", LocalBranchesTitle: "브랜치", SearchTitle: "검색", @@ -207,10 +203,10 @@ func koreanTranslationSet() TranslationSet { ErrorOccurred: "오류가 발생했습니다! issue를 작성해 주세요: ", NoRoom: "Not enough room", YouAreHere: "현재 위치", - LcRewordNotSupported: "rewording commits while interactively rebasing is not currently supported", - LcCherryPickCopy: "커밋을 복사 (cherry-pick)", - LcCherryPickCopyRange: "커밋을 범위로 복사 (cherry-pick)", - LcPasteCommits: "커밋을 붙여넣기 (cherry-pick)", + RewordNotSupported: "Rewording commits while interactively rebasing is not currently supported", + CherryPickCopy: "커밋을 복사 (cherry-pick)", + CherryPickCopyRange: "커밋을 범위로 복사 (cherry-pick)", + PasteCommits: "커밋을 붙여넣기 (cherry-pick)", SureCherryPick: "정말로 복사한 커밋을 이 브랜치에 체리픽하시겠습니까?", CherryPick: "체리픽", Donate: "후원", @@ -225,31 +221,31 @@ func koreanTranslationSet() TranslationSet { SelectNextHunk: "다음 hunk를 선택", ScrollDown: "아래로 스크롤", ScrollUp: "위로 스크롤", - LcScrollUpMainPanel: "메인 패널을 위로 스크롤", - LcScrollDownMainPanel: "메인 패널을 아래로로 스크롤", - AmendCommitTitle: "Amend Commit", + ScrollUpMainPanel: "메인 패널을 위로 스크롤", + ScrollDownMainPanel: "메인 패널을 아래로로 스크롤", + AmendCommitTitle: "Amend commit", AmendCommitPrompt: "Are you sure you want to amend this commit with your staged files?", DeleteCommitTitle: "커밋 삭제", DeleteCommitPrompt: "정말로 선택한 커밋을 삭제하시겠습니까?", - SquashingStatus: "squashing", - FixingStatus: "fixing up", - DeletingStatus: "deleting", - MovingStatus: "moving", - RebasingStatus: "rebasing", - AmendingStatus: "amending", - CherryPickingStatus: "cherry-picking", - UndoingStatus: "undoing", - RedoingStatus: "redoing", - CheckingOutStatus: "checking out", - CommittingStatus: "committing", + SquashingStatus: "Squashing", + FixingStatus: "Fixing up", + DeletingStatus: "Deleting", + MovingStatus: "Moving", + RebasingStatus: "Rebasing", + AmendingStatus: "Amending", + CherryPickingStatus: "Cherry-picking", + UndoingStatus: "Undoing", + RedoingStatus: "Redoing", + CheckingOutStatus: "Checking out", + CommittingStatus: "Committing", CommitFiles: "Commit files", SubCommitsDynamicTitle: "커밋 (%s)", CommitFilesDynamicTitle: "Diff files (%s)", RemoteBranchesDynamicTitle: "원격브랜치 (%s)", - LcViewItemFiles: "view selected item's files", + ViewItemFiles: "View selected item's files", CommitFilesTitle: "커밋 파일", - LcCheckoutCommitFile: "checkout file", - LcDiscardOldFileChange: "discard this commit's changes to this file", + CheckoutCommitFile: "Checkout file", + DiscardOldFileChange: "Discard this commit's changes to this file", 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", DisabledForGPG: "Feature not available for users using GPG", @@ -257,191 +253,189 @@ func koreanTranslationSet() TranslationSet { AutoStashTitle: "Autostash?", AutoStashPrompt: "You must stash and pop your changes to bring them across. Do this automatically? (enter/esc)", StashPrefix: "Auto-stashing changes for ", - LcViewDiscardOptions: "view 'discard changes' options", - LcCancel: "취소", - LcDiscardAllChanges: "모든 변경사항 버리기", - LcDiscardUnstagedChanges: "discard unstaged changes", - LcDiscardAllChangesToAllFiles: "nuke working tree", - LcDiscardAnyUnstagedChanges: "discard unstaged changes", - LcDiscardUntrackedFiles: "discard untracked files", - LcHardReset: "hard reset", - LcViewResetOptions: `view reset options`, - LcCreateFixupCommit: `create fixup commit for this commit`, - LcSquashAboveCommits: `squash all 'fixup!' commits above selected commit (autosquash)`, + ViewDiscardOptions: "View 'discard changes' options", + Cancel: "취소", + DiscardAllChanges: "모든 변경사항 버리기", + DiscardUnstagedChanges: "Discard unstaged changes", + DiscardAllChangesToAllFiles: "Nuke working tree", + DiscardAnyUnstagedChanges: "Discard unstaged changes", + DiscardUntrackedFiles: "Discard untracked files", + HardReset: "Hard reset", + ViewResetOptions: `View reset options`, + CreateFixupCommitDescription: `Create fixup commit for this commit`, SquashAboveCommits: `Squash all 'fixup!' commits above selected commit (autosquash)`, SureSquashAboveCommits: `Are you sure you want to squash all fixup! commits above {{.commit}}?`, CreateFixupCommit: `Create fixup commit`, SureCreateFixupCommit: `Are you sure you want to create a fixup! commit for commit {{.commit}}?`, - LcExecuteCustomCommand: "execute custom command", - CustomCommand: "Custom Command:", - LcCommitChangesWithoutHook: "commit changes without pre-commit hook", + ExecuteCustomCommand: "Execute custom command", + CustomCommand: "Custom command:", + 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", - LcResetTo: `reset to`, + ResetTo: `Reset to`, PressEnterToReturn: "엔터를 눌러 lazygit으로 돌아갑니다.", - LcViewStashOptions: "Stash 옵션 보기", - LcStashAllChanges: "변경사항을 Stash", - LcStashStagedChanges: "stash staged changes", - LcStashOptions: "Stash 옵션", + ViewStashOptions: "Stash 옵션 보기", + StashAllChanges: "변경사항을 Stash", + StashStagedChanges: "Stash staged changes", + StashOptions: "Stash 옵션", NotARepository: "Error: must be run inside a git repository", - LcJump: "패널로 이동", - LcScrollLeftRight: "좌우로 스크롤", - LcScrollLeft: "우 스크롤", - LcScrollRight: "좌 스크롤", - DiscardPatch: "patch 버리기", + Jump: "패널로 이동", + ScrollLeftRight: "좌우로 스크롤", + ScrollLeft: "우 스크롤", + ScrollRight: "좌 스크롤", + DiscardPatch: "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", - LcToggleAddToPatch: "toggle file included in patch", - LcToggleAllInPatch: "toggle all files included in patch", - LcUpdatingPatch: "updating patch", + ToggleAddToPatch: "Toggle file included in patch", + ToggleAllInPatch: "Toggle all files included in patch", + UpdatingPatch: "Updating patch", ViewPatchOptions: "커스텀 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", - 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: ``, - EnterUpstream: `' '와 같은 형식으로 입력하세요.`, - InvalidUpstream: "upstream의 형식이 잘못되었습니다.' ' 와 같은 형식으로 입력하세요.", - ReturnToRemotesList: `원격목록으로 돌아가기`, - LcAddNewRemote: `새로운 Remote 추가`, - LcNewRemoteName: `새로운 Remote 이름:`, - LcNewRemoteUrl: `새로운 Remote URL:`, - LcEditRemoteName: `{{.remoteName}} 의 새로운 Remote 이름 입력:`, - LcEditRemoteUrl: `{{.remoteName}} 의 새로운 Remote URL 입력:`, - LcRemoveRemote: `Remote를 삭제`, - LcRemoveRemotePrompt: "정말로 Remote를 삭제하시겠습니까?", - DeleteRemoteBranch: "원격 브랜치를 삭제", - DeleteRemoteBranchMessage: "정말로 원격 브랜치를 삭제하시겠습니까?", - LcSetUpstream: "set as upstream of checked-out branch", - SetUpstreamTitle: "Set upstream branch", - SetUpstreamMessage: "Are you sure you want to set the upstream branch of '{{.checkedOut}}' to '{{.selected}}'", - LcEditRemote: "Remote를 수정", - LcTagCommit: "tag commit", - TagMenuTitle: "태그 작성", - TagNameTitle: "태그 이름:", - TagMessageTitle: "태그 메시지: ", - LcAnnotatedTag: "annotated tag", - LcLightweightTag: "lightweight tag", - LcDeleteTag: "태그 삭제", - DeleteTagTitle: "태그 삭제", - DeleteTagPrompt: "정말로 태그 '{{.tagName}}' 를 삭제하시겠습니까?", - PushTagTitle: "원격에 태그 '{{.tagName}}' 를 푸시", - LcPushTag: "태그를 push", - LcCreateTag: "태그를 생성", - CreateTagTitle: "태그 이름:", - LcFetchRemote: "원격을 업데이트", - FetchingRemoteStatus: "원격을 업데이트 중", - LcCheckoutCommit: "커밋을 체크아웃", - SureCheckoutThisCommit: "정말로 선택한 커밋을 체크아웃 하시겠습니까?", - LcGitFlowOptions: "git-flow 옵션 보기", - NotAGitFlowBranch: "This does not seem to be a git flow branch", - NewGitFlowBranchPrompt: "new {{.branchType}} name:", - IgnoreTracked: "Ignore tracked file", - IgnoreTrackedPrompt: "Are you sure you want to ignore a tracked file?", - LcViewResetToUpstreamOptions: "view upstream reset options", - LcNextScreenMode: "다음 스크린 모드 (normal/half/fullscreen)", - LcPrevScreenMode: "이전 스크린 모드", - LcStartSearch: "검색 시작", - Panel: "패널", - Keybindings: "키 바인딩", - LcRenameBranch: "브랜치 이름 변경", - 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?", - LcOpenMenu: "매뉴 열기", - LcResetCherryPick: "reset cherry-picked (copied) commits selection", - LcNextTab: "이전 탭", - LcPrevTab: "다음 탭", - LcCantUndoWhileRebasing: "리베이스중에는 되돌릴 수 없습니다.", - LcCantRedoWhileRebasing: "리베이스중에는 다시 실행할 수 없습니다.", - 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", - ConfirmationTitle: "확인 패널", - LcPrevPage: "이전 페이지", - LcNextPage: "다음 페이지", - LcGotoTop: "맨 위로 스크롤 ", - LcGotoBottom: "맨 아래로 스크롤 ", - LcFilteringBy: "filtering by", - ResetInParentheses: "(reset)", - LcOpenFilteringMenu: "view filter-by-path options", - LcFilterBy: "filter by", - LcExitFilterMode: "stop filtering by path", - LcFilterPathOption: "enter path to filter by", - EnterFileName: "Enter path:", - FilteringMenuTitle: "Filtering", - MustExitFilterModeTitle: "Command not available", - MustExitFilterModePrompt: "Command not available in filtered mode. Exit filtered mode?", - LcDiff: "Diff", - LcEnterRefToDiff: "enter ref to diff", - LcEnteRefName: "ref 입력:", - LcExitDiffMode: "Diff 모드 종료", - DiffingMenuTitle: "Diff", - LcSwapDiff: "reverse diff direction", - LcOpenDiffingMenu: "Diff 메뉴 열기", + EnterUpstream: `' '와 같은 형식으로 입력하세요.`, + InvalidUpstream: "Upstream의 형식이 잘못되었습니다.' ' 와 같은 형식으로 입력하세요.", + ReturnToRemotesList: `원격목록으로 돌아가기`, + AddNewRemote: `새로운 Remote 추가`, + NewRemoteName: `새로운 Remote 이름:`, + NewRemoteUrl: `새로운 Remote URL:`, + EditRemoteName: `{{.remoteName}} 의 새로운 Remote 이름 입력:`, + EditRemoteUrl: `{{.remoteName}} 의 새로운 Remote URL 입력:`, + RemoveRemote: `Remote를 삭제`, + RemoveRemotePrompt: "정말로 Remote를 삭제하시겠습니까?", + DeleteRemoteBranch: "원격 브랜치를 삭제", + DeleteRemoteBranchMessage: "정말로 원격 브랜치를 삭제하시겠습니까?", + SetUpstream: "Set as upstream of checked-out branch", + SetUpstreamTitle: "Set upstream branch", + SetUpstreamMessage: "Are you sure you want to set the upstream branch of '{{.checkedOut}}' to '{{.selected}}'", + EditRemote: "Remote를 수정", + TagCommit: "Tag commit", + TagMenuTitle: "태그 작성", + TagNameTitle: "태그 이름:", + TagMessageTitle: "태그 메시지: ", + AnnotatedTag: "Annotated tag", + LightweightTag: "Lightweight tag", + DeleteTag: "태그 삭제", + DeleteTagTitle: "태그 삭제", + DeleteTagPrompt: "정말로 태그 '{{.tagName}}' 를 삭제하시겠습니까?", + PushTagTitle: "원격에 태그 '{{.tagName}}' 를 푸시", + PushTag: "태그를 push", + CreateTag: "태그를 생성", + CreateTagTitle: "태그 이름:", + FetchRemote: "원격을 업데이트", + FetchingRemoteStatus: "원격을 업데이트 중", + CheckoutCommit: "커밋을 체크아웃", + SureCheckoutThisCommit: "정말로 선택한 커밋을 체크아웃 하시겠습니까?", + GitFlowOptions: "Git-flow 옵션 보기", + NotAGitFlowBranch: "This does not seem to be a git flow branch", + NewGitFlowBranchPrompt: "New {{.branchType}} name:", + IgnoreTracked: "Ignore tracked file", + IgnoreTrackedPrompt: "Are you sure you want to ignore a tracked file?", + ViewResetToUpstreamOptions: "View upstream reset options", + NextScreenMode: "다음 스크린 모드 (normal/half/fullscreen)", + PrevScreenMode: "이전 스크린 모드", + StartSearch: "검색 시작", + Panel: "패널", + Keybindings: "키 바인딩", + RenameBranch: "브랜치 이름 변경", + 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?", + OpenMenu: "매뉴 열기", + ResetCherryPick: "Reset cherry-picked (copied) commits selection", + NextTab: "이전 탭", + PrevTab: "다음 탭", + CantUndoWhileRebasing: "리베이스중에는 되돌릴 수 없습니다.", + 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?", + MustStashTitle: "Must stash", + ConfirmationTitle: "확인 패널", + PrevPage: "이전 페이지", + NextPage: "다음 페이지", + GotoTop: "맨 위로 스크롤 ", + GotoBottom: "맨 아래로 스크롤 ", + FilteringBy: "Filtering by", + ResetInParentheses: "(reset)", + OpenFilteringMenu: "View filter-by-path options", + FilterBy: "Filter by", + ExitFilterMode: "Stop filtering by path", + FilterPathOption: "Enter path to filter by", + EnterFileName: "Enter path:", + FilteringMenuTitle: "Filtering", + MustExitFilterModeTitle: "Command not available", + MustExitFilterModePrompt: "Command not available in filtered mode. Exit filtered mode?", + Diff: "Diff", + EnterRefToDiff: "Enter ref to diff", + EnteRefName: "Ref 입력:", + ExitDiffMode: "Diff 모드 종료", + DiffingMenuTitle: "Diff", + SwapDiff: "Reverse diff direction", + 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 - LcOpenExtrasMenu: "명령어 로그 메뉴 열기", - LcShowingGitDiff: "showing output for:", - LcCommitDiff: "커밋의 iff", - LcCopyCommitShaToClipboard: "커밋 SHA를 클립보드에 복사", - LcCommitSha: "커밋 SHA", - LcCommitURL: "커밋 URL", - LcCopyCommitMessageToClipboard: "커밋 메시지를 클립보드에 복사", - LcCommitMessage: "커밋 메시지", - LcCommitAuthor: "커밋 작성자", - LcCopyCommitAttributeToClipboard: "커밋 attribute 복사", - LcCopyBranchNameToClipboard: "브랜치명을 클립보드에 복사", - LcCopyFileNameToClipboard: "파일명을 클립보드에 복사", - LcCopyCommitFileNameToClipboard: "커밋한 파일명을 클립보드에 복사", - LcCopySelectedTexToClipboard: "선택한 텍스트를 클립보드에 복사", - LcCommitPrefixPatternError: "Error in commitPrefix pattern", + OpenExtrasMenu: "명령어 로그 메뉴 열기", + ShowingGitDiff: "Showing output for:", + CommitDiff: "커밋의 iff", + CopyCommitShaToClipboard: "커밋 SHA를 클립보드에 복사", + CommitSha: "커밋 SHA", + CommitURL: "커밋 URL", + CopyCommitMessageToClipboard: "커밋 메시지를 클립보드에 복사", + CommitMessage: "커밋 메시지", + CommitAuthor: "커밋 작성자", + CopyCommitAttributeToClipboard: "커밋 attribute 복사", + CopyBranchNameToClipboard: "브랜치명을 클립보드에 복사", + CopyFileNameToClipboard: "파일명을 클립보드에 복사", + CopyCommitFileNameToClipboard: "커밋한 파일명을 클립보드에 복사", + CopySelectedTexToClipboard: "선택한 텍스트를 클립보드에 복사", + CommitPrefixPatternError: "Error in commitPrefix pattern", NoFilesStagedTitle: "파일이 Staged 되지 않았습니다.", NoFilesStagedPrompt: "파일이 Staged 되지 않았습니다. 모든 파일을 커밋하시겠습니까?", BranchNotFoundTitle: "브랜치를 찾을 수 없습니다.", BranchNotFoundPrompt: "브랜치를 찾을 수 없습니다. 새로운 브랜치를 생성합니다.", UnstageLinesTitle: "선택한 라인을 unstaged", UnstageLinesPrompt: "정말로 선택한 라인을 삭제 (git reset) 하시겠습니까? 이 조작은 취소할 수 없습니다.\n이 경고를 비활성화 하려면 설정 파일의 'gui.skipUnstageLineWarning' 를 true로 설정하세요.", - LcCreateNewBranchFromCommit: "커밋에서 새 브랜치를 만듭니다.", - LcBuildingPatch: "building patch", - LcViewCommits: "커밋 보기", - MinGitVersionError: "lazygit 실행을 위해서는 Git 2.20 이후의 버전(2018년 이후의)이 필요합니다. Git를 업데이트 해주세요. 아니면 lazygit이 이전 버전과 더 잘 호환되도록 https://github.com/jesseduffield/lazygit/issues 에 issue를 작성해 주세요.", - LcRunningCustomCommandStatus: "커스텀 명령어 실행", - LcSubmoduleStashAndReset: "stash uncommitted submodule changes and update", - LcAndResetSubmodules: "and reset submodules", - LcEnterSubmodule: "서브모듈 열기", - LcCopySubmoduleNameToClipboard: "서브모듈 이름을 클립보드에 복사", + CreateNewBranchFromCommit: "커밋에서 새 브랜치를 만듭니다.", + BuildingPatch: "Building patch", + ViewCommits: "커밋 보기", + MinGitVersionError: "Lazygit 실행을 위해서는 Git 2.20 이후의 버전(2018년 이후의)이 필요합니다. Git를 업데이트 해주세요. 아니면 lazygit이 이전 버전과 더 잘 호환되도록 https://github.com/jesseduffield/lazygit/issues 에 issue를 작성해 주세요.", + RunningCustomCommandStatus: "커스텀 명령어 실행", + SubmoduleStashAndReset: "Stash uncommitted submodule changes and update", + AndResetSubmodules: "And reset submodules", + EnterSubmodule: "서브모듈 열기", + CopySubmoduleNameToClipboard: "서브모듈 이름을 클립보드에 복사", RemoveSubmodule: "서브모듈 삭제", - LcRemoveSubmodule: "서브모듈 삭제", RemoveSubmodulePrompt: "정말로 서브모듈 '%s'및 해당 디렉토리를 제거하시겠습니까? 이것은 되돌릴 수 없습니다.", - LcResettingSubmoduleStatus: "서브모듈를 리셋", - LcNewSubmoduleName: "새로운 서브모듈이름 :", - LcNewSubmoduleUrl: "새로운 서브모듈의 URL:", - LcNewSubmodulePath: "새로운 서브모듈의 경로", - LcAddSubmodule: "새로운 서브모듈 추가", - LcAddingSubmoduleStatus: "새로운 서브모듈 추가", - LcUpdateSubmoduleUrl: "서브모듈 '%s' 의 URL을 업데이트", - LcUpdatingSubmoduleUrlStatus: "updating URL", - LcEditSubmoduleUrl: "서브모듈의 URL을 수정", - LcInitializingSubmoduleStatus: "서브모듈 초기화", - LcInitSubmodule: "서브모듈 초기화", - LcSubmoduleUpdate: "서브모듈 업데이트", - LcUpdatingSubmoduleStatus: "서브모듈 업데이트", - LcBulkInitSubmodules: "서브모듈 일괄 초기화", - LcBulkUpdateSubmodules: "서브모듈 일괄 업데이트", - LcBulkDeinitSubmodules: "bulk deinit submodules", - LcViewBulkSubmoduleOptions: "view bulk submodule options", - LcBulkSubmoduleOptions: "bulk submodule options", - LcRunningCommand: "running command", + ResettingSubmoduleStatus: "서브모듈를 리셋", + NewSubmoduleName: "새로운 서브모듈이름 :", + NewSubmoduleUrl: "새로운 서브모듈의 URL:", + NewSubmodulePath: "새로운 서브모듈의 경로", + AddSubmodule: "새로운 서브모듈 추가", + AddingSubmoduleStatus: "새로운 서브모듈 추가", + UpdateSubmoduleUrl: "서브모듈 '%s' 의 URL을 업데이트", + UpdatingSubmoduleUrlStatus: "Updating URL", + EditSubmoduleUrl: "서브모듈의 URL을 수정", + InitializingSubmoduleStatus: "서브모듈 초기화", + InitSubmodule: "서브모듈 초기화", + SubmoduleUpdate: "서브모듈 업데이트", + UpdatingSubmoduleStatus: "서브모듈 업데이트", + BulkInitSubmodules: "서브모듈 일괄 초기화", + BulkUpdateSubmodules: "서브모듈 일괄 업데이트", + BulkDeinitSubmodules: "Bulk deinit submodules", + ViewBulkSubmoduleOptions: "View bulk submodule options", + BulkSubmoduleOptions: "Bulk submodule options", + RunningCommand: "Running command", SubCommitsTitle: "Sub-commits", SubmodulesTitle: "서브모듈", - NavigationTitle: "List Panel Navigation", + NavigationTitle: "List panel navigation", SuggestionsCheatsheetTitle: "추천", SuggestionsTitle: "추천 (press %s to focus)", ExtrasTitle: "명령어 로그", - PushingTagStatus: "pushing tag", + PushingTagStatus: "Pushing tag", PullRequestURLCopiedToClipboard: "풀 리퀘스트의 URL을 클립보드에 복사했습니다.", CommitDiffCopiedToClipboard: "커밋의 Diff를 클립보드에 복사했습니다.", CommitSHACopiedToClipboard: "커밋의 SHA를 클립보드에 복사했습니다.", CommitURLCopiedToClipboard: "커밋의 URL를 클립보드에 복사했습니다.", CommitMessageCopiedToClipboard: "커밋 메시지를 클립보드에 복사했습니다.", CommitAuthorCopiedToClipboard: "커밋 작성자를 클립보드에 복사했습니다.", - LcCopiedToClipboard: "클립보드에 복사했습니다.", + CopiedToClipboard: "클립보드에 복사했습니다.", ErrCannotEditDirectory: "디렉토리는 편집할 수 없습니다.", ErrStageDirWithInlineMergeConflicts: "병합 충돌이 발생한 파일을 포함하는 디렉토리는 Staged/untaged할 수 없습니다. 병합 충돌을 먼저 해결하세요.", ErrRepositoryMovedOrDeleted: "저장소를 찾을 수 없습니다. 이미 삭제되었거나 이동되었을 가능성이 있습니다. ¯\\_(ツ)_/¯", @@ -452,30 +446,28 @@ func koreanTranslationSet() TranslationSet { RandomTip: "랜덤 Tip", SelectParentCommitForMerge: "병합을 위한 상위 커밋 선택", ToggleWhitespaceInDiffView: "공백문자를 Diff 뷰에서 표시 여부 전환", - IncreaseContextInDiffView: "diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기", - DecreaseContextInDiffView: "diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기", - CreatePullRequest: "풀 리퀘스트 생성", + IncreaseContextInDiffView: "Diff 보기의 변경 사항 주위에 표시되는 컨텍스트의 크기를 늘리기", + DecreaseContextInDiffView: "Diff 보기의 변경 사항 주위에 표시되는 컨텍스트 크기 줄이기", CreatePullRequestOptions: "풀 리퀘스트 생성 옵션", - LcCreatePullRequestOptions: "풀 리퀘스트 생성 옵션", - LcDefaultBranch: "기본 브랜치", - LcSelectBranch: "브랜치를 선택", + DefaultBranch: "기본 브랜치", + SelectBranch: "브랜치를 선택", SelectConfigFile: "설정파일 선택", NoConfigFileFoundErr: "설정 파일을 찾지 못했습니다.", - LcLoadingFileSuggestions: "파일 제안 로딩 중", - LcLoadingCommits: "커밋 로딩", + LoadingFileSuggestions: "파일 제안 로딩 중", + LoadingCommits: "커밋 로딩", MustSpecifyOriginError: "Must specify a remote if specifying a branch", GitOutput: "Git output:", GitCommandFailed: "Git command failed. Check command log for details (open with %s)", AbortTitle: "%s 중지", AbortPrompt: "정말로 실행중인 %s 를 중지할까요?", - LcOpenLogMenu: "로그 메뉴 열기", + OpenLogMenu: "로그 메뉴 열기", 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: "커밋 그래프 표시", 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!", - LcOpenCommitInBrowser: "브라우저에서 커밋 열기", - LcViewBisectOptions: "bisect 옵션 보기", + OpenCommitInBrowser: "브라우저에서 커밋 열기", + ViewBisectOptions: "Bisect 옵션 보기", ConfirmRevertCommit: "Are you sure you want to revert {{.selectedCommit}}?", RewordInEditorTitle: "커밋 메시지를 에디터에서 수정", RewordInEditorPrompt: "Are you sure you want to reword this commit in your editor?", @@ -492,7 +484,7 @@ func koreanTranslationSet() TranslationSet { Merge: "병합", RebaseBranch: "브랜치 리베이스", RenameBranch: "브랜치 이름 변경", - SetUnsetUpstream: "Set/unset upstream", + SetUnsetUpstream: "Set/Unset upstream", CreateBranch: "브랜치 생성", CherryPick: "(Cherry-pick) 커밋 붙여넣기", CheckoutFile: "체크아웃 파일", @@ -505,7 +497,7 @@ func koreanTranslationSet() TranslationSet { AmendCommit: "커밋 Amend", ResetCommitAuthor: "커밋 작성자 Reset", RevertCommit: "커밋 Revert", - CreateFixupCommit: "fixup 커밋 생성", + CreateFixupCommit: "Fixup 커밋 생성", SquashAllAboveFixupCommits: "Squash all above fixup commits", CreateLightweightTag: "Create lightweight tag", CreateAnnotatedTag: "Create annotated tag", @@ -527,7 +519,7 @@ func koreanTranslationSet() TranslationSet { UnstageFile: "Unstage file", UnstageAllFiles: "Unstage all files", StageAllFiles: "Stage all files", - LcIgnoreExcludeFile: "ignore file", + IgnoreExcludeFile: "Ignore file", Commit: "커밋", EditFile: "파일 수정", Push: "푸시", @@ -537,8 +529,8 @@ func koreanTranslationSet() TranslationSet { StashAllChangesKeepIndex: "Stash all changes and keep index", StashStagedChanges: "Stash staged changes", StashUnstagedChanges: "Stash unstaged changes", - GitFlowFinish: "Git flow finish", - GitFlowStart: "Git Flow start", + GitFlowFinish: "git flow finish", + GitFlowStart: "git flow start", CopyToClipboard: "Copy to clipboard", CopySelectedTextToClipboard: "Copy selected text to clipboard", RemovePatchFromCommit: "Remove patch from commit", @@ -565,9 +557,9 @@ func koreanTranslationSet() TranslationSet { DeleteTag: "태그 삭제", PushTag: "태그 푸시g", NukeWorkingTree: "Nuke working tree", - DiscardUnstagedFileChanges: "unstaged 파일 변경사항 버리기", - RemoveUntrackedFiles: "untracked 파일 삭제", - RemoveStagedFiles: "staged 파일 삭제", + DiscardUnstagedFileChanges: "Unstaged 파일 변경사항 버리기", + RemoveUntrackedFiles: "Untracked 파일 삭제", + RemoveStagedFiles: "Staged 파일 삭제", SoftReset: "Soft reset", MixedReset: "Mixed reset", HardReset: "Hard reset", @@ -584,13 +576,13 @@ func koreanTranslationSet() TranslationSet { BisectMark: "Bisect mark", }, Bisect: Bisect{ - Mark: "mark %s as %s", - MarkStart: "mark %s as %s (start bisect)", + Mark: "Mark %s as %s", + MarkStart: "Mark %s as %s (start bisect)", Skip: "%s 를 스킵", ResetTitle: "'git bisect' 를 리셋", ResetPrompt: "정말로 'git bisect' 를 리셋하시겠습니까?", - ResetOption: "bisect를 리셋", - BisectMenuTitle: "bisect", + ResetOption: "Bisect를 리셋", + BisectMenuTitle: "Bisect", CompleteTitle: "Bisect 완료", 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?", diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go index 5fdbbad74..729902cb4 100644 --- a/pkg/i18n/polish.go +++ b/pkg/i18n/polish.go @@ -17,23 +17,22 @@ func polishTranslationSet() TranslationSet { PassUnameWrong: "Niewłaściwe hasło, fraza lub nazwa użytkownika", CommitChanges: "Zatwierdź zmiany", 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.", NoCommitToAmend: "Brak commitów do zmiany.", CommitChangesWithEditor: "Zatwierdź zmiany używając edytora", StatusTitle: "Status", GlobalTitle: "Globalne", - LcNavigate: "nawiguj", - LcMenu: "menu", - LcExecute: "wykonaj", - LcToggleStaged: "przełącz stan poczekalni", - LcToggleStagedAll: "przełącz stan poczekalni wszystkich", - LcRefresh: "odśwież", - LcScroll: "przewiń", + Menu: "Menu", + Execute: "Wykonaj", + ToggleStaged: "Przełącz stan poczekalni", + ToggleStagedAll: "Przełącz stan poczekalni wszystkich", + Refresh: "Odśwież", + Scroll: "Przewiń", FilterStagedFiles: "Pokaż tylko pliki w poczekalni", FilterUnstagedFiles: "Pokaż tylko pliki poza poczekalnią", ResetCommitFilterState: "Resetuj filtr commitów", - LcCheckout: "przełącz", + Checkout: "Przełącz", NoChangedFiles: "Brak zmienionych plików", PullWait: "Pobieranie zmian...", PushWait: "Wysyłanie zmian...", @@ -47,69 +46,68 @@ func polishTranslationSet() TranslationSet { DeleteBranch: "Usuń gałąź", DeleteBranchMessage: "Jesteś pewien, że chcesz usunąć gałąź '{{.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ą", CantMergeBranchIntoItself: "Nie możesz scalić gałęzi do samej siebie", - LcForceCheckout: "wymuś przełączenie", - LcCheckoutByName: "przełącz używając nazwy", - LcNewBranch: "nowa gałąź", - LcDeleteBranch: "usuń gałąź", + ForceCheckout: "Wymuś przełączenie", + CheckoutByName: "Przełącz używając nazwy", + NewBranch: "Nowa gałąź", NoBranchesThisRepo: "Brak gałęzi dla tego repozytorium", CommitWithoutMessageErr: "Nie możesz commitować bez komunikatu", - LcCloseCancel: "zamknij", - LcConfirm: "potwierdź", - LcClose: "zamknij", - LcSquashDown: "ściśnij", - LcFixupCommit: "napraw commit", + CloseCancel: "Zamknij", + Confirm: "Potwierdź", + Close: "Zamknij", + SquashDown: "Ściśnij", + FixupCommit: "Napraw commit", NoCommitsThisBranch: "Brak commitów dla tej gałęzi", CannotSquashOrFixupFirstCommit: "There's no commit below to squash into", Fixup: "Napraw", SureFixupThisCommit: "Jesteś pewny, ze chcesz naprawić ten commit? Commit poniżej zostanie spłaszczony w górę wraz z tym", - LcRewordCommit: "zmień nazwę commita", - LcRenameCommitEditor: "zmień nazwę commita w edytorze", + RewordCommit: "Zmień nazwę commita", + RenameCommitEditor: "Zmień nazwę commita w edytorze", Error: "Błąd", - LcPickHunk: "wybierz kawałek", - LcPickAllHunks: "wybierz oba kawałki", - LcUndo: "cofnij", - LcPop: "wyciągnij", - LcDrop: "porzuć", - LcApply: "zastosuj", + PickHunk: "Wybierz kawałek", + PickAllHunks: "Wybierz oba kawałki", + Undo: "Cofnij", + Pop: "Wyciągnij", + Drop: "Porzuć", + Apply: "Zastosuj", NoStashEntries: "Brak pozycji w schowku", StashDrop: "Porzuć schowek", SureDropStashEntry: "Jesteś pewny, że chcesz porzucić tę pozycję w schowku?", NoTrackedStagedFilesStash: "Nie masz śledzonych/zatwierdzonych plików do przechowania", StashChanges: "Przechowaj zmiany", - LcRenameStash: "rename stash", + RenameStash: "Rename stash", RenameStashPrompt: "Rename stash: {{.stashName}}", - OpenConfig: "otwórz konfigurację", - EditConfig: "edytuj konfigurację", + OpenConfig: "Otwórz konfigurację", + EditConfig: "Edytuj konfigurację", 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.", 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", - LcCheckForUpdate: "sprawdź aktualizacje", + CheckForUpdate: "Sprawdź aktualizacje", CheckingForUpdates: "Sprawdzanie aktualizacji...", OnLatestVersionErr: "Już posiadasz najnowszą wersję", MajorVersionErr: "Nowa wersja ({{.newVersion}}) posiada niekompatybilne zmiany w porównaniu do obecnej wersji ({{.currentVersion}})", CouldNotFindBinaryErr: "Nie można znaleźć pliku binarnego w {{.url}}", - LcEditFile: "edytuj plik", - LcOpenFile: "otwórz plik", - LcIgnoreFile: "dodaj do .gitignore", - LcRefreshFiles: "odśwież pliki", - LcMergeIntoCurrentBranch: "scal do obecnej gałęzi", + EditFile: "Edytuj plik", + OpenFile: "Otwórz plik", + IgnoreFile: "Dodaj do .gitignore", + RefreshFiles: "Odśwież pliki", + MergeIntoCurrentBranch: "Scal do obecnej gałęzi", 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", - LcCreatePullRequest: "utwórz żądanie pobrania", - LcCopyPullRequestURL: "skopiuj adres URL żądania pobrania do schowka", + CreatePullRequest: "Utwórz żądanie pobrania", + CopyPullRequestURL: "Skopiuj adres URL żądania pobrania do schowka", NoBranchOnRemote: "Ta gałąź nie istnieje w zdalnym repo. Najpierw musisz ją wysłać.", - LcFetch: "pobierz", + Fetch: "Pobierz", 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`, - FileEnter: "zatwierdź pojedyncze linie", + FileEnter: "Zatwierdź pojedyncze linie", FileStagingRequirements: "Można tylko zatwierdzić pojedyncze linie dla śledzonych plików z niezatwierdzonymi zmianami", StagingTitle: "Poczekalnia", - ReturnToFilesPanel: "wróć do panelu plików", + ReturnToFilesPanel: "Wróć do panelu plików", MergingTitle: "Scalanie", ConfirmMerge: "Czy na pewno chcesz scalić '{{.selectedBranch}}' do '{{.checkedOutBranch}}'?", 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", MainTitle: "Główne", NormalTitle: "Zwykłe", - LcSoftReset: "miękki reset", + SoftReset: "Miękki reset", SureSquashThisCommit: "Czy na pewno spłaszczyć ten commit do commita niżej?", Squash: "Spłaszcz", - LcPickCommit: "wybierz commit (podczas zmiany bazy)", - LcRevertCommit: "odwróć commit", - LcDeleteCommit: "usuń commit", - LcMoveDownCommit: "przenieś commit 1 w dół", - LcMoveUpCommit: "przenieś commit 1 w górę", - LcEditCommit: "edytuj commit", - LcAmendToCommit: "popraw commit zmianami z poczekalni", + PickCommit: "Wybierz commit (podczas zmiany bazy)", + RevertCommit: "Odwróć commit", + DeleteCommit: "Usuń commit", + MoveDownCommit: "Przenieś commit 1 w dół", + MoveUpCommit: "Przenieś commit 1 w górę", + EditCommit: "Edytuj commit", + AmendToCommit: "Popraw commit zmianami z poczekalni", FoundConflicts: "Konflikty! Wciśnij 'esc' żeby przerwać, w przeciwnym razie wciśnij 'enter'", FoundConflictsTitle: "Automatyczne scalenie nie powiodło się", - PickHunk: "wybierz kawałek", - PickAllHunks: "wybierz wszystkie kawałki", - ViewMergeRebaseOptions: "widok scalenia/opcje zmiany bazy", + ViewMergeRebaseOptions: "Widok scalenia/opcje zmiany bazy", NotMergingOrRebasing: "W tej chwili nie scalasz ani nie zmieniasz bazy", - RecentRepos: "ostatnie repozytoria", + RecentRepos: "Ostatnie repozytoria", MergeOptionsTitle: "Opcje scalania", RebaseOptionsTitle: "Opcje zmiany bazy", ConflictsResolved: "Wszystkie konflikty scalania rozwiązane. Kontynuować?", NoRoom: "Brak miejsca", YouAreHere: "JESTEŚ TU", - LcRewordNotSupported: "przeredagowanie commitów podczas interaktywnej zmiany bazy nie jest obecnie wspierane", - LcCherryPickCopy: "kopiuj commit (przebieranie)", - LcCherryPickCopyRange: "kopiuj zakres commitów (przebieranie)", - LcPasteCommits: "wklej commity (przebieranie)", + RewordNotSupported: "Przeredagowanie commitów podczas interaktywnej zmiany bazy nie jest obecnie wspierane", + CherryPickCopy: "Kopiuj commit (przebieranie)", + CherryPickCopyRange: "Kopiuj zakres commitów (przebieranie)", + PasteCommits: "Wklej commity (przebieranie)", SureCherryPick: "Czy na pewno chcesz przebierać w skopiowanych commitach na tej gałęzi?", CherryPick: "Przebieranie", Donate: "Wesprzyj", - PrevLine: "poprzednia linia", - NextLine: "następna linia", - PrevHunk: "poprzedni kawałek", - NextHunk: "następny kawałek", - PrevConflict: "poprzedni konflikt", - NextConflict: "następny konflikt", - SelectPrevHunk: "wybierz poprzedni kawałek", - SelectNextHunk: "wybierz następny kawałek", - ScrollDown: "przewiń w dół", - ScrollUp: "przewiń w górę", + PrevLine: "Poprzednia linia", + NextLine: "Następna linia", + PrevHunk: "Poprzedni kawałek", + NextHunk: "Następny kawałek", + PrevConflict: "Poprzedni konflikt", + NextConflict: "Następny konflikt", + SelectPrevHunk: "Wybierz poprzedni kawałek", + SelectNextHunk: "Wybierz następny kawałek", + ScrollDown: "Przewiń w dół", + ScrollUp: "Przewiń w górę", AmendCommitTitle: "Popraw commit", AmendCommitPrompt: "Czy na pewno chcesz poprawić ten commit plikami z poczekalni?", DeleteCommitTitle: "Usuń commit", DeleteCommitPrompt: "Czy na pewno usunąć ten commit?", - SquashingStatus: "spłaszczanie", - FixingStatus: "naprawianie", - DeletingStatus: "usuwanie", - MovingStatus: "przenoszenie", - RebasingStatus: "zmiana bazy", - AmendingStatus: "poprawianie", - CherryPickingStatus: "przebieranie", + SquashingStatus: "Spłaszczanie", + FixingStatus: "Naprawianie", + DeletingStatus: "Usuwanie", + MovingStatus: "Przenoszenie", + RebasingStatus: "Zmiana bazy", + AmendingStatus: "Poprawianie", + CherryPickingStatus: "Przebieranie", CommitFiles: "Pliki commita", - LcViewItemFiles: "przeglądaj pliki commita", + ViewItemFiles: "Przeglądaj pliki commita", CommitFilesTitle: "Pliki commita", - LcCheckoutCommitFile: "plik wybierania", - LcDiscardOldFileChange: "porzuć zmiany commita dla tego pliku", + CheckoutCommitFile: "Plik wybierania", + DiscardOldFileChange: "Porzuć zmiany commita dla tego 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", DisabledForGPG: "Funkcja niedostępna dla użytkowników GPG", @@ -179,48 +175,46 @@ func polishTranslationSet() TranslationSet { AutoStashTitle: "Automatyczny schowek", AutoStashPrompt: "Musisz schować i wyciągnąć zmiany żeby je przenosić. Robić to automatycznie? (enter/esc)", StashPrefix: "Automatyczne dodawanie zmian do schowka dla ", - LcViewDiscardOptions: "pokaż opcje porzucania zmian", - LcCancel: "anuluj", - LcDiscardAllChanges: "porzuć wszystkie zmiany", - LcDiscardUnstagedChanges: "porzuć zmiany poza poczekalnią", - LcDiscardAllChangesToAllFiles: "wytnij drzewo robocze", - LcDiscardAnyUnstagedChanges: "porzuć zmiany poza poczekalnią", - LcDiscardUntrackedFiles: "porzuć pliki nieśledzone", - LcHardReset: "twardy reset", - LcViewResetOptions: "wyświetl opcje resetu", - LcCreateFixupCommit: "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)`, + ViewDiscardOptions: "Pokaż opcje porzucania zmian", + Cancel: "Anuluj", + DiscardAllChanges: "Porzuć wszystkie zmiany", + DiscardUnstagedChanges: "Porzuć zmiany poza poczekalnią", + DiscardAllChangesToAllFiles: "Wytnij drzewo robocze", + DiscardAnyUnstagedChanges: "Porzuć zmiany poza poczekalnią", + DiscardUntrackedFiles: "Porzuć pliki nieśledzone", + HardReset: "Twardy reset", + ViewResetOptions: "Wyświetl opcje resetu", + CreateFixupCommitDescription: "Utwórz commit naprawczy dla tego commita", + SquashAboveCommits: `Spłaszcz wszystkie commity naprawcze powyżej zaznaczonych commitów (autosquash)`, SureSquashAboveCommits: `Na pewno chcesz spłaszczyć wszystkie commity naprawcze powyżej {{.commit}}?`, CreateFixupCommit: `Utwóż commit naprawczy`, SureCreateFixupCommit: `Na pewno utworzyć commit naprawczy dla commita {{.commit}}?`, - LcExecuteCustomCommand: "wykonaj własną komendę", + ExecuteCustomCommand: "Wykonaj własną komendę", 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", - LcResetTo: "zresetuj do", + ResetTo: "Zresetuj do", PressEnterToReturn: "Wciśnij enter żeby wrócić do lazygit", - LcViewStashOptions: "wyświetl opcje schowka", - LcStashAllChanges: "przechowaj zmiany", - LcStashAllChangesKeepIndex: "przechowaj zmiany z poczekalni", - LcStashOptions: "Opcje schowka", + ViewStashOptions: "Wyświetl opcje schowka", + StashAllChanges: "Przechowaj zmiany", + StashAllChangesKeepIndex: "Przechowaj zmiany z poczekalni", + StashOptions: "Opcje schowka", NotARepository: "Błąd: nie jesteś w repozytorium", - LcJump: "przeskocz do panelu", - ExitCustomPatchBuilder: `wyście z trybu "linia po linii"`, + Jump: "Przeskocz do panelu", + ExitCustomPatchBuilder: `Wyście z trybu "linia po linii"`, EnterUpstream: `Podaj gałąź nadrzędną jako ' '`, - ReturnToRemotesList: `wróć do listy repozytoriów zdalnych`, + ReturnToRemotesList: `Wróć do listy repozytoriów zdalnych`, IgnoreTracked: "Ignoruj 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", NoFilesStagedPrompt: "Nie masz plików w poczekalni. Zatwierdzić wszystkie pliki?", BranchNotFoundTitle: "Nie znaleziono gałęzi", BranchNotFoundPrompt: "Nie znaleziono gałęzi. Utwórz nową gałąź ", PullRequestURLCopiedToClipboard: "URL żądania ściągnięcia 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", - LcCreatePullRequestOptions: "utwórz opcje żądania ściągnięcia", ConfirmRevertCommit: "Czy na pewno chcesz obrócić {{.selectedCommit}}?", } } diff --git a/pkg/integration/components/common.go b/pkg/integration/components/common.go index 7be48e4bd..0f2e3b871 100644 --- a/pkg/integration/components/common.go +++ b/pkg/integration/components/common.go @@ -9,7 +9,7 @@ func (self *Common) ContinueMerge() { self.t.GlobalPress(self.t.keys.Universal.CreateRebaseOptionsMenu) self.t.ExpectPopup().Menu(). - Title(Equals("Rebase Options")). + Title(Equals("Rebase options")). Select(Contains("continue")). Confirm() } @@ -27,8 +27,8 @@ func (self *Common) AcknowledgeConflicts() { func (self *Common) ContinueOnConflictsResolved() { self.t.ExpectPopup().Confirmation(). - Title(Equals("continue")). - Content(Contains("all merge conflicts resolved. Continue?")). + Title(Equals("Continue")). + Content(Contains("All merge conflicts resolved. Continue?")). Confirm() } @@ -42,5 +42,5 @@ func (self *Common) ConfirmDiscardLines() { func (self *Common) SelectPatchOption(matcher *Matcher) { 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() } diff --git a/pkg/integration/tests/bisect/basic.go b/pkg/integration/tests/bisect/basic.go index 14e1e6b49..e17f0d50f 100644 --- a/pkg/integration/tests/bisect/basic.go +++ b/pkg/integration/tests/bisect/basic.go @@ -19,14 +19,14 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Commits(). 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() { t.Views().Commits(). 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(). @@ -36,7 +36,7 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{ Tap(func() { markCommitAsBad() - t.Views().Information().Content(Contains("bisecting")) + t.Views().Information().Content(Contains("Bisecting")) }). SelectedLine(Contains("<-- bad")). NavigateToLine(Contains("commit 02")). @@ -54,6 +54,6 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). Content(Contains("commit 04")) - t.Views().Information().Content(DoesNotContain("bisecting")) + t.Views().Information().Content(DoesNotContain("Bisecting")) }, }) diff --git a/pkg/integration/tests/bisect/from_other_branch.go b/pkg/integration/tests/bisect/from_other_branch.go index a7c6b8358..24e49104b 100644 --- a/pkg/integration/tests/bisect/from_other_branch.go +++ b/pkg/integration/tests/bisect/from_other_branch.go @@ -19,7 +19,7 @@ var FromOtherBranch = NewIntegrationTest(NewIntegrationTestArgs{ }, SetupConfig: func(cfg *config.AppConfig) {}, Run: func(t *TestDriver, keys config.KeybindingConfig) { - t.Views().Information().Content(Contains("bisecting")) + t.Views().Information().Content(Contains("Bisecting")) t.Views().Commits(). Focus(). @@ -32,11 +32,11 @@ var FromOtherBranch = NewIntegrationTest(NewIntegrationTestArgs{ SelectNextItem(). Press(keys.Commits.ViewBisectOptions). 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.Views().Information().Content(DoesNotContain("bisecting")) + t.Views().Information().Content(DoesNotContain("Bisecting")) }). // back in master branch which just had the one commit Lines( diff --git a/pkg/integration/tests/branch/create_tag.go b/pkg/integration/tests/branch/create_tag.go index 289d04c0a..68f91ec1b 100644 --- a/pkg/integration/tests/branch/create_tag.go +++ b/pkg/integration/tests/branch/create_tag.go @@ -28,7 +28,7 @@ var CreateTag = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Menu(). Title(Equals("Create tag")). - Select(Contains("lightweight")). + Select(Contains("Lightweight")). Confirm() t.ExpectPopup().Prompt(). diff --git a/pkg/integration/tests/branch/delete.go b/pkg/integration/tests/branch/delete.go index c653e1cde..78c21f7a7 100644 --- a/pkg/integration/tests/branch/delete.go +++ b/pkg/integration/tests/branch/delete.go @@ -32,7 +32,7 @@ var Delete = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Universal.Remove). Tap(func() { t.ExpectPopup().Confirmation(). - Title(Equals("Delete Branch")). + Title(Equals("Delete branch")). Content(Contains("Are you sure you want to delete the branch 'branch-one'?")). Confirm() }). diff --git a/pkg/integration/tests/branch/detached_head.go b/pkg/integration/tests/branch/detached_head.go index 494d164d6..9a419540b 100644 --- a/pkg/integration/tests/branch/detached_head.go +++ b/pkg/integration/tests/branch/detached_head.go @@ -25,7 +25,7 @@ var DetachedHead = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Universal.New) 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"). Confirm() diff --git a/pkg/integration/tests/branch/rebase.go b/pkg/integration/tests/branch/rebase.go index 24462d1ea..66a235107 100644 --- a/pkg/integration/tests/branch/rebase.go +++ b/pkg/integration/tests/branch/rebase.go @@ -32,7 +32,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Menu(). Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")). - Select(Contains("simple rebase")). + Select(Contains("Simple rebase")). Confirm() t.Common().AcknowledgeConflicts() @@ -46,11 +46,11 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). PressPrimaryAction() - t.Views().Information().Content(Contains("rebasing")) + t.Views().Information().Content(Contains("Rebasing")) t.Common().ContinueOnConflictsResolved() - t.Views().Information().Content(DoesNotContain("rebasing")) + t.Views().Information().Content(DoesNotContain("Rebasing")) t.Views().Commits().TopLines( Contains("second-change-branch unrelated change"), diff --git a/pkg/integration/tests/branch/rebase_and_drop.go b/pkg/integration/tests/branch/rebase_and_drop.go index c27a91091..9c95e40e1 100644 --- a/pkg/integration/tests/branch/rebase_and_drop.go +++ b/pkg/integration/tests/branch/rebase_and_drop.go @@ -38,10 +38,10 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Menu(). Title(Equals("Rebase 'first-change-branch' onto 'second-change-branch'")). - Select(Contains("simple rebase")). + Select(Contains("Simple rebase")). Confirm() - t.Views().Information().Content(Contains("rebasing")) + t.Views().Information().Content(Contains("Rebasing")) t.Common().AcknowledgeConflicts() @@ -77,7 +77,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ t.Common().ContinueOnConflictsResolved() - t.Views().Information().Content(DoesNotContain("rebasing")) + t.Views().Information().Content(DoesNotContain("Rebasing")) t.Views().Commits().TopLines( Contains("to keep"), diff --git a/pkg/integration/tests/branch/rebase_does_not_autosquash.go b/pkg/integration/tests/branch/rebase_does_not_autosquash.go index 11562c80f..66ad870c4 100644 --- a/pkg/integration/tests/branch/rebase_does_not_autosquash.go +++ b/pkg/integration/tests/branch/rebase_does_not_autosquash.go @@ -41,7 +41,7 @@ var RebaseDoesNotAutosquash = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Menu(). Title(Equals("Rebase 'my-branch' onto 'master'")). - Select(Contains("simple rebase")). + Select(Contains("Simple rebase")). Confirm() t.Views().Commits().Lines( diff --git a/pkg/integration/tests/branch/reset.go b/pkg/integration/tests/branch/reset.go index b999f3af7..bafc712d1 100644 --- a/pkg/integration/tests/branch/reset.go +++ b/pkg/integration/tests/branch/reset.go @@ -36,8 +36,8 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Commits.ViewResetOptions) t.ExpectPopup().Menu(). - Title(Contains("reset to other-branch")). - Select(Contains("hard reset")). + Title(Contains("Reset to other-branch")). + Select(Contains("Hard reset")). Confirm() // assert that we now have the expected commits in the commit panel diff --git a/pkg/integration/tests/branch/reset_upstream.go b/pkg/integration/tests/branch/reset_upstream.go index 87101e19a..0fe11767d 100644 --- a/pkg/integration/tests/branch/reset_upstream.go +++ b/pkg/integration/tests/branch/reset_upstream.go @@ -25,8 +25,8 @@ var ResetUpstream = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Branches.SetUpstream). Tap(func() { t.ExpectPopup().Menu(). - Title(Equals("Set/unset upstream")). - Select(Contains("unset upstream of selected branch")). + Title(Equals("Set/Unset upstream")). + Select(Contains("Unset upstream of selected branch")). Confirm() }). Lines( diff --git a/pkg/integration/tests/branch/set_upstream.go b/pkg/integration/tests/branch/set_upstream.go index ef759ca11..37117b0d7 100644 --- a/pkg/integration/tests/branch/set_upstream.go +++ b/pkg/integration/tests/branch/set_upstream.go @@ -24,8 +24,8 @@ var SetUpstream = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Branches.SetUpstream). Tap(func() { t.ExpectPopup().Menu(). - Title(Equals("Set/unset upstream")). - Select(Contains(" set upstream of selected branch")). // using leading space to disambiguate from the 'reset' option + Title(Equals("Set/Unset upstream")). + Select(Contains(" Set upstream of selected branch")). // using leading space to disambiguate from the 'reset' option Confirm() t.ExpectPopup().Prompt(). diff --git a/pkg/integration/tests/cherry_pick/cherry_pick.go b/pkg/integration/tests/cherry_pick/cherry_pick.go index 6b77f8cc0..f0778a05a 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick.go @@ -61,7 +61,7 @@ var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Commits.PasteCommits). Tap(func() { 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?")). Confirm() }). diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go index 54e69c044..b2ec0b24f 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go @@ -48,7 +48,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Commits.PasteCommits) 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?")). Confirm() diff --git a/pkg/integration/tests/commit/amend.go b/pkg/integration/tests/commit/amend.go index 123d62343..a67705fd4 100644 --- a/pkg/integration/tests/commit/amend.go +++ b/pkg/integration/tests/commit/amend.go @@ -26,7 +26,7 @@ var Amend = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Commits.AmendToCommit) t.ExpectPopup().Confirmation().Title( - Equals("Amend Last Commit")). + Equals("Amend last commit")). Content(Contains("Are you sure you want to amend last commit?")). Confirm() diff --git a/pkg/integration/tests/commit/create_tag.go b/pkg/integration/tests/commit/create_tag.go index d081a8fa8..22a4baa86 100644 --- a/pkg/integration/tests/commit/create_tag.go +++ b/pkg/integration/tests/commit/create_tag.go @@ -25,7 +25,7 @@ var CreateTag = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Menu(). Title(Equals("Create tag")). - Select(Contains("lightweight")). + Select(Contains("Lightweight")). Confirm() t.ExpectPopup().Prompt(). diff --git a/pkg/integration/tests/commit/new_branch.go b/pkg/integration/tests/commit/new_branch.go index c73a2b88a..91e8fa4f2 100644 --- a/pkg/integration/tests/commit/new_branch.go +++ b/pkg/integration/tests/commit/new_branch.go @@ -28,7 +28,7 @@ var NewBranch = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Universal.New). Tap(func() { 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) }). diff --git a/pkg/integration/tests/commit/reset_author.go b/pkg/integration/tests/commit/reset_author.go index 16b43da69..506beb9f8 100644 --- a/pkg/integration/tests/commit/reset_author.go +++ b/pkg/integration/tests/commit/reset_author.go @@ -29,7 +29,7 @@ var ResetAuthor = NewIntegrationTest(NewIntegrationTestArgs{ Tap(func() { t.ExpectPopup().Menu(). Title(Equals("Amend commit attribute")). - Select(Contains("reset author")). + Select(Contains("Reset author")). Confirm() }). Lines( diff --git a/pkg/integration/tests/commit/revert_merge.go b/pkg/integration/tests/commit/revert_merge.go index 1ddc1635a..5d27970d0 100644 --- a/pkg/integration/tests/commit/revert_merge.go +++ b/pkg/integration/tests/commit/revert_merge.go @@ -26,7 +26,7 @@ var RevertMerge = NewIntegrationTest(NewIntegrationTestArgs{ Lines( Contains("first change"), Contains("second-change-branch unrelated change"), - Contains("cancel"), + Contains("Cancel"), ). Select(Contains("first change")). Confirm() diff --git a/pkg/integration/tests/commit/set_author.go b/pkg/integration/tests/commit/set_author.go index f9f1e42ca..ecfc201fd 100644 --- a/pkg/integration/tests/commit/set_author.go +++ b/pkg/integration/tests/commit/set_author.go @@ -32,7 +32,7 @@ var SetAuthor = NewIntegrationTest(NewIntegrationTestArgs{ Tap(func() { t.ExpectPopup().Menu(). 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() t.ExpectPopup().Prompt(). diff --git a/pkg/integration/tests/custom_commands/basic_cmd_at_runtime.go b/pkg/integration/tests/custom_commands/basic_cmd_at_runtime.go index f83a5d514..9e1d1a185 100644 --- a/pkg/integration/tests/custom_commands/basic_cmd_at_runtime.go +++ b/pkg/integration/tests/custom_commands/basic_cmd_at_runtime.go @@ -20,7 +20,7 @@ var BasicCmdAtRuntime = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Universal.ExecuteCustomCommand) t.ExpectPopup().Prompt(). - Title(Equals("Custom Command:")). + Title(Equals("Custom command:")). Type("touch file.txt"). Confirm() diff --git a/pkg/integration/tests/custom_commands/complex_cmd_at_runtime.go b/pkg/integration/tests/custom_commands/complex_cmd_at_runtime.go index 2b7075ecd..de3c5f60f 100644 --- a/pkg/integration/tests/custom_commands/complex_cmd_at_runtime.go +++ b/pkg/integration/tests/custom_commands/complex_cmd_at_runtime.go @@ -20,7 +20,7 @@ var ComplexCmdAtRuntime = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Universal.ExecuteCustomCommand) t.ExpectPopup().Prompt(). - Title(Equals("Custom Command:")). + Title(Equals("Custom command:")). Type("sh -c \"touch file.txt\""). Confirm() diff --git a/pkg/integration/tests/custom_commands/omit_from_history.go b/pkg/integration/tests/custom_commands/omit_from_history.go index b28ee08a1..8bb26461c 100644 --- a/pkg/integration/tests/custom_commands/omit_from_history.go +++ b/pkg/integration/tests/custom_commands/omit_from_history.go @@ -16,13 +16,13 @@ var OmitFromHistory = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { t.GlobalPress(keys.Universal.ExecuteCustomCommand) t.ExpectPopup().Prompt(). - Title(Equals("Custom Command:")). + Title(Equals("Custom command:")). Type("echo aubergine"). Confirm() t.GlobalPress(keys.Universal.ExecuteCustomCommand) t.ExpectPopup().Prompt(). - Title(Equals("Custom Command:")). + Title(Equals("Custom command:")). SuggestionLines(Contains("aubergine")). SuggestionLines(DoesNotContain("tangerine")). Type(" echo tangerine"). @@ -30,7 +30,7 @@ var OmitFromHistory = NewIntegrationTest(NewIntegrationTestArgs{ t.GlobalPress(keys.Universal.ExecuteCustomCommand) t.ExpectPopup().Prompt(). - Title(Equals("Custom Command:")). + Title(Equals("Custom command:")). SuggestionLines(Contains("aubergine")). SuggestionLines(DoesNotContain("tangerine")). Cancel() diff --git a/pkg/integration/tests/diff/diff.go b/pkg/integration/tests/diff/diff.go index 3a856ab4d..ef1eb40a6 100644 --- a/pkg/integration/tests/diff/diff.go +++ b/pkg/integration/tests/diff/diff.go @@ -30,16 +30,16 @@ var Diff = NewIntegrationTest(NewIntegrationTestArgs{ ). 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(). IsFocused(). 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(). 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")) }). PressEnter() @@ -66,8 +66,8 @@ var Diff = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). Press(keys.Universal.DiffingMenu) - 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.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().Main().Content(Contains("-second line")) }, }) diff --git a/pkg/integration/tests/diff/diff_and_apply_patch.go b/pkg/integration/tests/diff/diff_and_apply_patch.go index 8f5c55712..caf2338b4 100644 --- a/pkg/integration/tests/diff/diff_and_apply_patch.go +++ b/pkg/integration/tests/diff/diff_and_apply_patch.go @@ -30,15 +30,15 @@ var DiffAndApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{ ). 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(). IsFocused(). SelectNextItem(). 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")) }). PressEnter() @@ -60,14 +60,14 @@ var DiffAndApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{ PressPrimaryAction(). // add the file to the patch Press(keys.Universal.DiffingMenu). 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) - // 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() + // 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.Views().Files(). Focus(). diff --git a/pkg/integration/tests/diff/diff_commits.go b/pkg/integration/tests/diff/diff_commits.go index f502c034f..769773b29 100644 --- a/pkg/integration/tests/diff/diff_commits.go +++ b/pkg/integration/tests/diff/diff_commits.go @@ -28,9 +28,9 @@ var DiffCommits = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Universal.DiffingMenu). 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(). @@ -40,7 +40,7 @@ var DiffCommits = NewIntegrationTest(NewIntegrationTestArgs{ }). Press(keys.Universal.DiffingMenu). 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")) }). diff --git a/pkg/integration/tests/file/discard_changes.go b/pkg/integration/tests/file/discard_changes.go index b23b9888e..435d64def 100644 --- a/pkg/integration/tests/file/discard_changes.go +++ b/pkg/integration/tests/file/discard_changes.go @@ -85,7 +85,7 @@ var DiscardChanges = NewIntegrationTest(NewIntegrationTestArgs{ SelectedLine(Contains(file.status + " " + file.label)). 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(). - Title(Equals("continue")). - Content(Contains("all merge conflicts resolved. Continue?")). + Title(Equals("Continue")). + Content(Contains("All merge conflicts resolved. Continue?")). Cancel() discardOneByOne([]statusFile{ diff --git a/pkg/integration/tests/file/discard_staged_changes.go b/pkg/integration/tests/file/discard_staged_changes.go index 6e82f232e..022796bdf 100644 --- a/pkg/integration/tests/file/discard_staged_changes.go +++ b/pkg/integration/tests/file/discard_staged_changes.go @@ -37,7 +37,7 @@ var DiscardStagedChanges = NewIntegrationTest(NewIntegrationTestArgs{ ). 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 t.Views().Files(). diff --git a/pkg/integration/tests/file/gitignore.go b/pkg/integration/tests/file/gitignore.go index d23f218ad..e206f19e1 100644 --- a/pkg/integration/tests/file/gitignore.go +++ b/pkg/integration/tests/file/gitignore.go @@ -27,14 +27,14 @@ var Gitignore = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Files.IgnoreFile). // ensure we can't exclude the .gitignore file 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() }). Press(keys.Files.IgnoreFile). // ensure we can't ignore the .gitignore file 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() @@ -45,7 +45,7 @@ var Gitignore = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Files.IgnoreFile). // exclude a file 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(".git/info/exclude", Contains("toExclude")) @@ -54,7 +54,7 @@ var Gitignore = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Files.IgnoreFile). // ignore a file 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(".git/info/exclude", Contains("toExclude")) diff --git a/pkg/integration/tests/file/remember_commit_message_after_fail.go b/pkg/integration/tests/file/remember_commit_message_after_fail.go index 1f3b05689..0999fb0f3 100644 --- a/pkg/integration/tests/file/remember_commit_message_after_fail.go +++ b/pkg/integration/tests/file/remember_commit_message_after_fail.go @@ -42,7 +42,7 @@ var RememberCommitMessageAfterFail = NewIntegrationTest(NewIntegrationTestArgs{ }). Press(keys.Universal.Remove). // remove file that triggers pre-commit hook to fail 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( Contains("one"), diff --git a/pkg/integration/tests/filter_by_path/select_file.go b/pkg/integration/tests/filter_by_path/select_file.go index a0875e319..13454e1e8 100644 --- a/pkg/integration/tests/filter_by_path/select_file.go +++ b/pkg/integration/tests/filter_by_path/select_file.go @@ -23,7 +23,7 @@ var SelectFile = NewIntegrationTest(NewIntegrationTestArgs{ Contains(`only otherFile`), Contains(`both files`), ). - SelectNextItem(). + NavigateToLine(Contains(`only filterFile`)). PressEnter() // 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) - 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) }, diff --git a/pkg/integration/tests/filter_by_path/shared.go b/pkg/integration/tests/filter_by_path/shared.go index 675a2d9df..3d514b96b 100644 --- a/pkg/integration/tests/filter_by_path/shared.go +++ b/pkg/integration/tests/filter_by_path/shared.go @@ -19,7 +19,7 @@ func commonSetup(shell *Shell) { } func postFilterTest(t *TestDriver) { - t.Views().Information().Content(Contains("filtering by 'filterFile'")) + t.Views().Information().Content(Contains("Filtering by 'filterFile'")) t.Views().Commits(). IsFocused(). diff --git a/pkg/integration/tests/filter_by_path/type_file.go b/pkg/integration/tests/filter_by_path/type_file.go index dad3068f0..650c12cbf 100644 --- a/pkg/integration/tests/filter_by_path/type_file.go +++ b/pkg/integration/tests/filter_by_path/type_file.go @@ -21,7 +21,7 @@ var TypeFile = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Menu(). Title(Equals("Filtering")). - Select(Contains("enter path to filter by")). + Select(Contains("Enter path to filter by")). Confirm() t.ExpectPopup().Prompt(). diff --git a/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go b/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go index 25ddfc43f..43ac8eb7f 100644 --- a/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go +++ b/pkg/integration/tests/interactive_rebase/advanced_interactive_rebase.go @@ -40,7 +40,7 @@ var AdvancedInteractiveRebase = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Menu(). Title(Equals(fmt.Sprintf("Rebase '%s' onto '%s'", TOP_BRANCH, BASE_BRANCH))). - Select(Contains("interactive rebase")). + Select(Contains("Interactive rebase")). Confirm() t.Views().Commits(). IsFocused(). diff --git a/pkg/integration/tests/interactive_rebase/amend_first_commit.go b/pkg/integration/tests/interactive_rebase/amend_first_commit.go index 720be2176..02ce4e112 100644 --- a/pkg/integration/tests/interactive_rebase/amend_first_commit.go +++ b/pkg/integration/tests/interactive_rebase/amend_first_commit.go @@ -26,7 +26,7 @@ var AmendFirstCommit = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Commits.AmendToCommit). Tap(func() { 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?")). Confirm() }). diff --git a/pkg/integration/tests/interactive_rebase/amend_fixup_commit.go b/pkg/integration/tests/interactive_rebase/amend_fixup_commit.go index ebac45745..3140899be 100644 --- a/pkg/integration/tests/interactive_rebase/amend_fixup_commit.go +++ b/pkg/integration/tests/interactive_rebase/amend_fixup_commit.go @@ -32,7 +32,7 @@ var AmendFixupCommit = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Commits.AmendToCommit). Tap(func() { 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?")). Confirm() }). diff --git a/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go b/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go index fbd72053d..16e34e160 100644 --- a/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go +++ b/pkg/integration/tests/interactive_rebase/amend_head_commit_during_rebase.go @@ -43,7 +43,7 @@ var AmendHeadCommitDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Commits.AmendToCommit). Tap(func() { t.ExpectPopup().Confirmation(). - Title(Equals("Amend Last Commit")). + Title(Equals("Amend last commit")). Content(Contains("Are you sure you want to amend last commit?")). Confirm() }). diff --git a/pkg/integration/tests/interactive_rebase/amend_merge.go b/pkg/integration/tests/interactive_rebase/amend_merge.go index c5bb036cd..13662ce54 100644 --- a/pkg/integration/tests/interactive_rebase/amend_merge.go +++ b/pkg/integration/tests/interactive_rebase/amend_merge.go @@ -42,7 +42,7 @@ var AmendMerge = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Commits.AmendToCommit) t.ExpectPopup().Confirmation(). - Title(Equals("Amend Last Commit")). + Title(Equals("Amend last commit")). Content(Contains("Are you sure you want to amend last commit?")). Confirm() diff --git a/pkg/integration/tests/patch_building/apply.go b/pkg/integration/tests/patch_building/apply.go index 6cf28ecfc..8774f07d7 100644 --- a/pkg/integration/tests/patch_building/apply.go +++ b/pkg/integration/tests/patch_building/apply.go @@ -46,11 +46,11 @@ var Apply = NewIntegrationTest(NewIntegrationTestArgs{ ). PressPrimaryAction() - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views().PatchBuildingSecondary().Content(Contains("second line")) - t.Common().SelectPatchOption(MatchesRegexp(`apply patch$`)) + t.Common().SelectPatchOption(MatchesRegexp(`Apply patch$`)) t.Views().Files(). Focus(). diff --git a/pkg/integration/tests/patch_building/apply_in_reverse.go b/pkg/integration/tests/patch_building/apply_in_reverse.go index e25911786..c587d8fc1 100644 --- a/pkg/integration/tests/patch_building/apply_in_reverse.go +++ b/pkg/integration/tests/patch_building/apply_in_reverse.go @@ -31,11 +31,11 @@ var ApplyInReverse = NewIntegrationTest(NewIntegrationTestArgs{ ). PressPrimaryAction() - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views().PatchBuildingSecondary().Content(Contains("+file1 content")) - t.Common().SelectPatchOption(Contains("apply patch in reverse")) + t.Common().SelectPatchOption(Contains("Apply patch in reverse")) t.Views().Files(). Focus(). diff --git a/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go b/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go index d98c95262..f767ba3a0 100644 --- a/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go +++ b/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go @@ -40,7 +40,7 @@ var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ // Add both files to the patch; the first will conflict, the second won't PressPrimaryAction(). Tap(func() { - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views().PatchBuildingSecondary().Content( Contains("+more file1 content")) @@ -51,7 +51,7 @@ var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().PatchBuildingSecondary().Content( Contains("+more file1 content").Contains("+more file2 content")) - t.Common().SelectPatchOption(Contains("apply patch in reverse")) + t.Common().SelectPatchOption(Contains("Apply patch in reverse")) t.ExpectPopup().Alert(). Title(Equals("Error")). diff --git a/pkg/integration/tests/patch_building/copy_patch_to_clipboard.go b/pkg/integration/tests/patch_building/copy_patch_to_clipboard.go index d1d877a1d..18c0cae09 100644 --- a/pkg/integration/tests/patch_building/copy_patch_to_clipboard.go +++ b/pkg/integration/tests/patch_building/copy_patch_to_clipboard.go @@ -38,7 +38,7 @@ var CopyPatchToClipboard = NewIntegrationTest(NewIntegrationTestArgs{ ). PressPrimaryAction() - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Common().SelectPatchOption(Contains("copy patch to clipboard")) diff --git a/pkg/integration/tests/patch_building/move_to_earlier_commit.go b/pkg/integration/tests/patch_building/move_to_earlier_commit.go index e1c89bc0b..4336f8bc5 100644 --- a/pkg/integration/tests/patch_building/move_to_earlier_commit.go +++ b/pkg/integration/tests/patch_building/move_to_earlier_commit.go @@ -46,13 +46,13 @@ var MoveToEarlierCommit = NewIntegrationTest(NewIntegrationTestArgs{ PressPrimaryAction(). PressEscape() - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views().Commits(). IsFocused(). SelectNextItem() - t.Common().SelectPatchOption(Contains("move patch to selected commit")) + t.Common().SelectPatchOption(Contains("Move patch to selected commit")) t.Views().Commits(). IsFocused(). diff --git a/pkg/integration/tests/patch_building/move_to_earlier_commit_no_keep_empty.go b/pkg/integration/tests/patch_building/move_to_earlier_commit_no_keep_empty.go index aefb85c73..bbe1373e0 100644 --- a/pkg/integration/tests/patch_building/move_to_earlier_commit_no_keep_empty.go +++ b/pkg/integration/tests/patch_building/move_to_earlier_commit_no_keep_empty.go @@ -46,13 +46,13 @@ var MoveToEarlierCommitNoKeepEmpty = NewIntegrationTest(NewIntegrationTestArgs{ PressPrimaryAction(). PressEscape() - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views().Commits(). IsFocused(). SelectNextItem() - t.Common().SelectPatchOption(Contains("move patch to selected commit")) + t.Common().SelectPatchOption(Contains("Move patch to selected commit")) t.Views().Commits(). IsFocused(). diff --git a/pkg/integration/tests/patch_building/move_to_index.go b/pkg/integration/tests/patch_building/move_to_index.go index f648b3e3f..5ae6a4d33 100644 --- a/pkg/integration/tests/patch_building/move_to_index.go +++ b/pkg/integration/tests/patch_building/move_to_index.go @@ -31,11 +31,11 @@ var MoveToIndex = NewIntegrationTest(NewIntegrationTestArgs{ ). PressPrimaryAction() - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views().PatchBuildingSecondary().Content(Contains("+file1 content")) - t.Common().SelectPatchOption(Contains("move patch out into index")) + t.Common().SelectPatchOption(Contains("Move patch out into index")) t.Views().Files(). Lines( diff --git a/pkg/integration/tests/patch_building/move_to_index_part_of_adjacent_added_lines.go b/pkg/integration/tests/patch_building/move_to_index_part_of_adjacent_added_lines.go index d18ce3178..b67140a2e 100644 --- a/pkg/integration/tests/patch_building/move_to_index_part_of_adjacent_added_lines.go +++ b/pkg/integration/tests/patch_building/move_to_index_part_of_adjacent_added_lines.go @@ -43,9 +43,9 @@ var MoveToIndexPartOfAdjacentAddedLines = NewIntegrationTest(NewIntegrationTestA PressEnter(). PressPrimaryAction() - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) - t.Common().SelectPatchOption(Contains("move patch out into index")) + t.Common().SelectPatchOption(Contains("Move patch out into index")) t.Views().CommitFiles(). IsFocused(). diff --git a/pkg/integration/tests/patch_building/move_to_index_partial.go b/pkg/integration/tests/patch_building/move_to_index_partial.go index 00eb97e17..f35155202 100644 --- a/pkg/integration/tests/patch_building/move_to_index_partial.go +++ b/pkg/integration/tests/patch_building/move_to_index_partial.go @@ -51,7 +51,7 @@ var MoveToIndexPartial = NewIntegrationTest(NewIntegrationTestArgs{ SelectNextItem(). PressPrimaryAction(). Tap(func() { - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views().PatchBuildingSecondary(). ContainsLines( @@ -61,7 +61,7 @@ var MoveToIndexPartial = NewIntegrationTest(NewIntegrationTestArgs{ Contains(` third line`), ) - t.Common().SelectPatchOption(Contains("move patch out into index")) + t.Common().SelectPatchOption(Contains("Move patch out into index")) t.Views().Files(). Lines( diff --git a/pkg/integration/tests/patch_building/move_to_index_with_conflict.go b/pkg/integration/tests/patch_building/move_to_index_with_conflict.go index 941f5a4d0..775fce94a 100644 --- a/pkg/integration/tests/patch_building/move_to_index_with_conflict.go +++ b/pkg/integration/tests/patch_building/move_to_index_with_conflict.go @@ -38,9 +38,9 @@ var MoveToIndexWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ ). PressPrimaryAction() - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) - t.Common().SelectPatchOption(Contains("move patch out into index")) + t.Common().SelectPatchOption(Contains("Move patch out into index")) t.Common().AcknowledgeConflicts() diff --git a/pkg/integration/tests/patch_building/move_to_later_commit.go b/pkg/integration/tests/patch_building/move_to_later_commit.go index 530dec1cb..0e2a2ad86 100644 --- a/pkg/integration/tests/patch_building/move_to_later_commit.go +++ b/pkg/integration/tests/patch_building/move_to_later_commit.go @@ -46,13 +46,13 @@ var MoveToLaterCommit = NewIntegrationTest(NewIntegrationTestArgs{ PressPrimaryAction(). PressEscape() - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views().Commits(). IsFocused(). SelectPreviousItem() - t.Common().SelectPatchOption(Contains("move patch to selected commit")) + t.Common().SelectPatchOption(Contains("Move patch to selected commit")) t.Views().Commits(). IsFocused(). diff --git a/pkg/integration/tests/patch_building/move_to_later_commit_partial_hunk.go b/pkg/integration/tests/patch_building/move_to_later_commit_partial_hunk.go index e213a02fe..66ef430fd 100644 --- a/pkg/integration/tests/patch_building/move_to_later_commit_partial_hunk.go +++ b/pkg/integration/tests/patch_building/move_to_later_commit_partial_hunk.go @@ -44,7 +44,7 @@ var MoveToLaterCommitPartialHunk = NewIntegrationTest(NewIntegrationTestArgs{ PressPrimaryAction(). PressEscape() - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views().CommitFiles(). IsFocused(). @@ -54,7 +54,7 @@ var MoveToLaterCommitPartialHunk = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). SelectPreviousItem() - t.Common().SelectPatchOption(Contains("move patch to selected commit")) + t.Common().SelectPatchOption(Contains("Move patch to selected commit")) t.Views().Commits(). IsFocused(). diff --git a/pkg/integration/tests/patch_building/move_to_new_commit.go b/pkg/integration/tests/patch_building/move_to_new_commit.go index 9e32535dd..44d5ac167 100644 --- a/pkg/integration/tests/patch_building/move_to_new_commit.go +++ b/pkg/integration/tests/patch_building/move_to_new_commit.go @@ -46,9 +46,9 @@ var MoveToNewCommit = NewIntegrationTest(NewIntegrationTestArgs{ PressPrimaryAction(). PressEscape() - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) - t.Common().SelectPatchOption(Contains("move patch into new commit")) + t.Common().SelectPatchOption(Contains("Move patch into new commit")) t.Views().Commits(). IsFocused(). diff --git a/pkg/integration/tests/patch_building/move_to_new_commit_partial_hunk.go b/pkg/integration/tests/patch_building/move_to_new_commit_partial_hunk.go index 55d7c2f65..69c7cb9de 100644 --- a/pkg/integration/tests/patch_building/move_to_new_commit_partial_hunk.go +++ b/pkg/integration/tests/patch_building/move_to_new_commit_partial_hunk.go @@ -43,9 +43,9 @@ var MoveToNewCommitPartialHunk = NewIntegrationTest(NewIntegrationTestArgs{ PressEnter(). PressPrimaryAction() - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) - t.Common().SelectPatchOption(Contains("move patch into new commit")) + t.Common().SelectPatchOption(Contains("Move patch into new commit")) t.Views().CommitFiles(). IsFocused(). diff --git a/pkg/integration/tests/patch_building/remove_from_commit.go b/pkg/integration/tests/patch_building/remove_from_commit.go index 198b3a917..fddbdc839 100644 --- a/pkg/integration/tests/patch_building/remove_from_commit.go +++ b/pkg/integration/tests/patch_building/remove_from_commit.go @@ -31,11 +31,11 @@ var RemoveFromCommit = NewIntegrationTest(NewIntegrationTestArgs{ ). PressPrimaryAction() - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views().PatchBuildingSecondary().Content(Contains("+file1 content")) - t.Common().SelectPatchOption(Contains("remove patch from original commit")) + t.Common().SelectPatchOption(Contains("Remove patch from original commit")) t.Views().Files().IsEmpty() diff --git a/pkg/integration/tests/patch_building/reset_with_escape.go b/pkg/integration/tests/patch_building/reset_with_escape.go index 559d689e6..7046890d3 100644 --- a/pkg/integration/tests/patch_building/reset_with_escape.go +++ b/pkg/integration/tests/patch_building/reset_with_escape.go @@ -29,7 +29,7 @@ var ResetWithEscape = NewIntegrationTest(NewIntegrationTestArgs{ ). PressPrimaryAction(). Tap(func() { - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) }). PressEscape() @@ -38,6 +38,6 @@ var ResetWithEscape = NewIntegrationTest(NewIntegrationTestArgs{ IsFocused(). PressEscape() - t.Views().Information().Content(DoesNotContain("building patch")) + t.Views().Information().Content(DoesNotContain("Building patch")) }, }) diff --git a/pkg/integration/tests/patch_building/select_all_files.go b/pkg/integration/tests/patch_building/select_all_files.go index f7f340e63..711d31c29 100644 --- a/pkg/integration/tests/patch_building/select_all_files.go +++ b/pkg/integration/tests/patch_building/select_all_files.go @@ -33,7 +33,7 @@ var SelectAllFiles = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Files.ToggleStagedAll) - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views().Secondary().Content( Contains("file1").Contains("file3").Contains("file3"), diff --git a/pkg/integration/tests/patch_building/specific_selection.go b/pkg/integration/tests/patch_building/specific_selection.go index 53131e9f0..cfb7e64f1 100644 --- a/pkg/integration/tests/patch_building/specific_selection.go +++ b/pkg/integration/tests/patch_building/specific_selection.go @@ -39,7 +39,7 @@ var SpecificSelection = NewIntegrationTest(NewIntegrationTestArgs{ ). PressPrimaryAction(). Tap(func() { - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views().Secondary().Content(Contains("direct file content")) }). @@ -78,7 +78,7 @@ var SpecificSelection = NewIntegrationTest(NewIntegrationTestArgs{ Contains(` 1f`), ). Tap(func() { - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views().Secondary().Content( // when we're inside the patch building panel, we only show the patch @@ -113,7 +113,7 @@ var SpecificSelection = NewIntegrationTest(NewIntegrationTestArgs{ NavigateToLine(Contains("+2g")). PressPrimaryAction(). Tap(func() { - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views().Secondary().ContainsLines( Contains("+2a"), diff --git a/pkg/integration/tests/patch_building/start_new_patch.go b/pkg/integration/tests/patch_building/start_new_patch.go index 2b70feb8c..88402a953 100644 --- a/pkg/integration/tests/patch_building/start_new_patch.go +++ b/pkg/integration/tests/patch_building/start_new_patch.go @@ -33,7 +33,7 @@ var StartNewPatch = NewIntegrationTest(NewIntegrationTestArgs{ ). PressPrimaryAction(). Tap(func() { - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views().Secondary().Content(Contains("file2")) }). @@ -52,7 +52,7 @@ var StartNewPatch = NewIntegrationTest(NewIntegrationTestArgs{ PressPrimaryAction(). Tap(func() { t.ExpectPopup().Confirmation(). - Title(Contains("Discard Patch")). + Title(Contains("Discard patch")). Content(Contains("You can only build a patch from one commit/stash-entry at a time. Discard current patch?")). Confirm() diff --git a/pkg/integration/tests/reflog/checkout.go b/pkg/integration/tests/reflog/checkout.go index 29af72449..94ca6e7ef 100644 --- a/pkg/integration/tests/reflog/checkout.go +++ b/pkg/integration/tests/reflog/checkout.go @@ -29,7 +29,7 @@ var Checkout = NewIntegrationTest(NewIntegrationTestArgs{ PressPrimaryAction(). Tap(func() { t.ExpectPopup().Confirmation(). - Title(Contains("checkout commit")). + Title(Contains("Checkout commit")). Content(Contains("Are you sure you want to checkout this commit?")). Confirm() }). diff --git a/pkg/integration/tests/reflog/cherry_pick.go b/pkg/integration/tests/reflog/cherry_pick.go index 4167f06a9..b8f8a9260 100644 --- a/pkg/integration/tests/reflog/cherry_pick.go +++ b/pkg/integration/tests/reflog/cherry_pick.go @@ -38,7 +38,7 @@ var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Commits.PasteCommits). Tap(func() { 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?")). Confirm() }). diff --git a/pkg/integration/tests/reflog/patch.go b/pkg/integration/tests/reflog/patch.go index cce33962c..7cbdcba83 100644 --- a/pkg/integration/tests/reflog/patch.go +++ b/pkg/integration/tests/reflog/patch.go @@ -47,15 +47,15 @@ var Patch = NewIntegrationTest(NewIntegrationTestArgs{ ). PressPrimaryAction() - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views(). CommitFiles(). Press(keys.Universal.CreatePatchOptionsMenu) t.ExpectPopup().Menu(). - Title(Equals("Patch Options")). - Select(MatchesRegexp(`apply patch$`)).Confirm() + Title(Equals("Patch options")). + Select(MatchesRegexp(`Apply patch$`)).Confirm() t.Views().Files().Lines( Contains("file1"), diff --git a/pkg/integration/tests/reflog/reset.go b/pkg/integration/tests/reflog/reset.go index 550be5607..320daabf3 100644 --- a/pkg/integration/tests/reflog/reset.go +++ b/pkg/integration/tests/reflog/reset.go @@ -29,8 +29,8 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Commits.ViewResetOptions). Tap(func() { t.ExpectPopup().Menu(). - Title(Contains("reset to")). - Select(Contains("hard reset")). + Title(Contains("Reset to")). + Select(Contains("Hard reset")). Confirm() }). TopLines( diff --git a/pkg/integration/tests/stash/apply_patch.go b/pkg/integration/tests/stash/apply_patch.go index 4c7a19841..ba454178b 100644 --- a/pkg/integration/tests/stash/apply_patch.go +++ b/pkg/integration/tests/stash/apply_patch.go @@ -35,15 +35,15 @@ var ApplyPatch = NewIntegrationTest(NewIntegrationTestArgs{ ). PressPrimaryAction() - t.Views().Information().Content(Contains("building patch")) + t.Views().Information().Content(Contains("Building patch")) t.Views(). CommitFiles(). Press(keys.Universal.CreatePatchOptionsMenu) t.ExpectPopup().Menu(). - Title(Equals("Patch Options")). - Select(MatchesRegexp(`apply patch$`)).Confirm() + Title(Equals("Patch options")). + Select(MatchesRegexp(`Apply patch$`)).Confirm() }) t.Views().Files().Lines( diff --git a/pkg/integration/tests/stash/create_branch.go b/pkg/integration/tests/stash/create_branch.go index 995a0c27e..0e280de97 100644 --- a/pkg/integration/tests/stash/create_branch.go +++ b/pkg/integration/tests/stash/create_branch.go @@ -27,7 +27,7 @@ var CreateBranch = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Universal.New). Tap(func() { t.ExpectPopup().Prompt(). - Title(Contains("New Branch Name (Branch is off of 'stash@{0}: On master: stash one'")). + Title(Contains("New branch name (branch is off of 'stash@{0}: On master: stash one'")). Type("new_branch"). Confirm() }) diff --git a/pkg/integration/tests/stash/stash_all.go b/pkg/integration/tests/stash/stash_all.go index 74116fcee..78ce15e24 100644 --- a/pkg/integration/tests/stash/stash_all.go +++ b/pkg/integration/tests/stash/stash_all.go @@ -25,7 +25,7 @@ var StashAll = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Files.ViewStashOptions) - t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("stash all changes$")).Confirm() + t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("Stash all changes$")).Confirm() t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() diff --git a/pkg/integration/tests/stash/stash_and_keep_index.go b/pkg/integration/tests/stash/stash_and_keep_index.go index 3201e70fb..db37e7328 100644 --- a/pkg/integration/tests/stash/stash_and_keep_index.go +++ b/pkg/integration/tests/stash/stash_and_keep_index.go @@ -28,7 +28,7 @@ var StashAndKeepIndex = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Files.ViewStashOptions) - t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(Contains("stash all changes and keep index")).Confirm() + t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(Contains("Stash all changes and keep index")).Confirm() t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() diff --git a/pkg/integration/tests/stash/stash_including_untracked_files.go b/pkg/integration/tests/stash/stash_including_untracked_files.go index 17283e3c0..1db09394f 100644 --- a/pkg/integration/tests/stash/stash_including_untracked_files.go +++ b/pkg/integration/tests/stash/stash_including_untracked_files.go @@ -27,7 +27,7 @@ var StashIncludingUntrackedFiles = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Files.ViewStashOptions) - t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(Contains("stash all changes including untracked files")).Confirm() + t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(Contains("Stash all changes including untracked files")).Confirm() t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() diff --git a/pkg/integration/tests/stash/stash_staged.go b/pkg/integration/tests/stash/stash_staged.go index 86ac6f327..11347d98d 100644 --- a/pkg/integration/tests/stash/stash_staged.go +++ b/pkg/integration/tests/stash/stash_staged.go @@ -28,7 +28,7 @@ var StashStaged = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Files.ViewStashOptions) - t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("stash staged changes$")).Confirm() + t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("Stash staged changes$")).Confirm() t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() diff --git a/pkg/integration/tests/stash/stash_unstaged.go b/pkg/integration/tests/stash/stash_unstaged.go index 5af7ac2bd..8027ec387 100644 --- a/pkg/integration/tests/stash/stash_unstaged.go +++ b/pkg/integration/tests/stash/stash_unstaged.go @@ -28,7 +28,7 @@ var StashUnstaged = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Files.ViewStashOptions) - t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("stash unstaged changes$")).Confirm() + t.ExpectPopup().Menu().Title(Equals("Stash options")).Select(MatchesRegexp("Stash unstaged changes$")).Confirm() t.ExpectPopup().Prompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm() diff --git a/pkg/integration/tests/submodule/add.go b/pkg/integration/tests/submodule/add.go index 45babd186..9437a205a 100644 --- a/pkg/integration/tests/submodule/add.go +++ b/pkg/integration/tests/submodule/add.go @@ -19,16 +19,16 @@ var Add = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Universal.New). Tap(func() { t.ExpectPopup().Prompt(). - Title(Equals("new submodule URL:")). + Title(Equals("New submodule URL:")). Type("../other_repo").Confirm() t.ExpectPopup().Prompt(). - Title(Equals("new submodule name:")). + Title(Equals("New submodule name:")). InitialText(Equals("other_repo")). Clear().Type("my_submodule").Confirm() t.ExpectPopup().Prompt(). - Title(Equals("new submodule path:")). + Title(Equals("New submodule path:")). InitialText(Equals("my_submodule")). Clear().Type("my_submodule_path").Confirm() }). diff --git a/pkg/integration/tests/submodule/reset.go b/pkg/integration/tests/submodule/reset.go index f9bf2afe2..f38276464 100644 --- a/pkg/integration/tests/submodule/reset.go +++ b/pkg/integration/tests/submodule/reset.go @@ -71,7 +71,7 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{ ). Press(keys.Universal.Remove). Tap(func() { - t.ExpectPopup().Menu().Title(Equals("my_submodule")).Select(Contains("stash uncommitted submodule changes and update")).Confirm() + t.ExpectPopup().Menu().Title(Equals("my_submodule")).Select(Contains("Stash uncommitted submodule changes and update")).Confirm() }). IsEmpty() diff --git a/pkg/integration/tests/sync/push_tag.go b/pkg/integration/tests/sync/push_tag.go index 4016470a1..b83dc1665 100644 --- a/pkg/integration/tests/sync/push_tag.go +++ b/pkg/integration/tests/sync/push_tag.go @@ -28,7 +28,7 @@ var PushTag = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Branches.PushTag) t.ExpectPopup().Prompt(). - Title(Equals("remote to push tag 'mytag' to:")). + Title(Equals("Remote to push tag 'mytag' to:")). InitialText(Equals("origin")). SuggestionLines( Contains("origin"), diff --git a/pkg/integration/tests/sync/rename_branch_and_pull.go b/pkg/integration/tests/sync/rename_branch_and_pull.go index 99f7b7eea..38f2cf52a 100644 --- a/pkg/integration/tests/sync/rename_branch_and_pull.go +++ b/pkg/integration/tests/sync/rename_branch_and_pull.go @@ -34,7 +34,7 @@ var RenameBranchAndPull = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Branches.RenameBranch). Tap(func() { t.ExpectPopup().Confirmation(). - Title(Equals("rename branch")). + Title(Equals("Rename branch")). Content(Equals("This branch is tracking a remote. This action will only rename the local branch name, not the name of the remote branch. Continue?")). Confirm() diff --git a/pkg/integration/tests/tag/crud_annotated.go b/pkg/integration/tests/tag/crud_annotated.go index ca7b294b1..af40b32df 100644 --- a/pkg/integration/tests/tag/crud_annotated.go +++ b/pkg/integration/tests/tag/crud_annotated.go @@ -21,7 +21,7 @@ var CrudAnnotated = NewIntegrationTest(NewIntegrationTestArgs{ Tap(func() { t.ExpectPopup().Menu(). Title(Equals("Create tag")). - Select(Contains("annotated")). + Select(Contains("Annotated")). Confirm() t.ExpectPopup().Prompt(). diff --git a/pkg/integration/tests/tag/crud_lightweight.go b/pkg/integration/tests/tag/crud_lightweight.go index e1a779595..12d75a05a 100644 --- a/pkg/integration/tests/tag/crud_lightweight.go +++ b/pkg/integration/tests/tag/crud_lightweight.go @@ -21,7 +21,7 @@ var CrudLightweight = NewIntegrationTest(NewIntegrationTestArgs{ Tap(func() { t.ExpectPopup().Menu(). Title(Equals("Create tag")). - Select(Contains("lightweight")). + Select(Contains("Lightweight")). Confirm() t.ExpectPopup().Prompt(). diff --git a/pkg/integration/tests/tag/reset.go b/pkg/integration/tests/tag/reset.go index 749406d41..657f69824 100644 --- a/pkg/integration/tests/tag/reset.go +++ b/pkg/integration/tests/tag/reset.go @@ -29,8 +29,8 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{ Press(keys.Commits.ViewResetOptions) t.ExpectPopup().Menu(). - Title(Contains("reset to tag")). - Select(Contains("hard reset")). + Title(Contains("Reset to tag")). + Select(Contains("Hard reset")). Confirm() t.Views().Commits().Lines( diff --git a/pkg/integration/tests/ui/double_popup.go b/pkg/integration/tests/ui/double_popup.go index 14a1edf7b..2d6b7fe20 100644 --- a/pkg/integration/tests/ui/double_popup.go +++ b/pkg/integration/tests/ui/double_popup.go @@ -25,7 +25,7 @@ var DoublePopup = NewIntegrationTest(NewIntegrationTestArgs{ t.GlobalPress(keys.Universal.OpenRecentRepos) - t.ExpectPopup().Menu().Title(Contains("recent repositories")).Cancel() + t.ExpectPopup().Menu().Title(Contains("Recent repositories")).Cancel() t.Views().Branches().IsFocused() diff --git a/pkg/integration/tests/ui/switch_tab_from_menu.go b/pkg/integration/tests/ui/switch_tab_from_menu.go index 88caf5d62..26219f422 100644 --- a/pkg/integration/tests/ui/switch_tab_from_menu.go +++ b/pkg/integration/tests/ui/switch_tab_from_menu.go @@ -16,8 +16,8 @@ var SwitchTabFromMenu = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().Files().IsFocused(). Press(keys.Universal.OptionMenuAlt1) - t.ExpectPopup().Menu().Title(Equals("Menu")). - Select(Contains("next tab")). + t.ExpectPopup().Menu().Title(Equals("Keybindings")). + Select(Contains("Next tab")). Confirm() t.Views().Submodules().IsFocused() diff --git a/pkg/integration/tests/undo/undo_checkout_and_drop.go b/pkg/integration/tests/undo/undo_checkout_and_drop.go index a6dfc89c3..4dc5a0a33 100644 --- a/pkg/integration/tests/undo/undo_checkout_and_drop.go +++ b/pkg/integration/tests/undo/undo_checkout_and_drop.go @@ -24,7 +24,7 @@ var UndoCheckoutAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ confirmCommitDrop := func() { t.ExpectPopup().Confirmation(). - Title(Equals("Delete Commit")). + Title(Equals("Delete commit")). Content(Equals("Are you sure you want to delete this commit?")). Confirm() } diff --git a/pkg/integration/tests/undo/undo_drop.go b/pkg/integration/tests/undo/undo_drop.go index 6cf851ed3..3a99fce8b 100644 --- a/pkg/integration/tests/undo/undo_drop.go +++ b/pkg/integration/tests/undo/undo_drop.go @@ -19,7 +19,7 @@ var UndoDrop = NewIntegrationTest(NewIntegrationTestArgs{ Run: func(t *TestDriver, keys config.KeybindingConfig) { confirmCommitDrop := func() { t.ExpectPopup().Confirmation(). - Title(Equals("Delete Commit")). + Title(Equals("Delete commit")). Content(Equals("Are you sure you want to delete this commit?")). Confirm() }