Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions docs-master/keybindings/Keybindings_zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
| `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
| `` o `` | 在浏览器中打开提交 | |
| `` n `` | 从提交创建新分支 | |
| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后,在本地提交视图中,您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
| `` <c-r> `` | 重置已拣选(复制)的提交 | |
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
| `` * `` | 选择当前分支的提交 | |
| `` 0 `` | Focus main view | |
| `` 0 `` | 聚焦主视图 | |
| `` <enter> `` | 查看提交 | |
| `` w `` | 查看工作区选项 | |
| `` / `` | 通过文本过滤当前视图 | |
Expand All @@ -89,13 +89,13 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
| `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
| `` o `` | 在浏览器中打开提交 | |
| `` n `` | 从提交创建新分支 | |
| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后,在本地提交视图中,您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
| `` <c-r> `` | 重置已拣选(复制)的提交 | |
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
| `` * `` | 选择当前分支的提交 | |
| `` 0 `` | Focus main view | |
| `` 0 `` | 聚焦主视图 | |
| `` <enter> `` | 查看提交的文件 | |
| `` w `` | 查看工作区选项 | |
| `` / `` | 开始搜索 | |
Expand Down Expand Up @@ -154,12 +154,12 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
| `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
| `` o `` | 在浏览器中打开提交 | |
| `` n `` | 从提交创建新分支 | |
| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后,在本地提交视图中,您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
| `` * `` | 选择当前分支的提交 | |
| `` 0 `` | Focus main view | |
| `` 0 `` | 聚焦主视图 | |
| `` <enter> `` | 查看提交的文件 | |
| `` w `` | 查看工作区选项 | |
| `` / `` | 开始搜索 | |
Expand All @@ -185,10 +185,10 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
| `` <space> `` | 补丁中包含的切换文件 | 切换文件是否包含在自定义补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
| `` a `` | 操作所有文件 | 添加或删除所有提交中的文件到自定义的补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
| `` <enter> `` | 输入文件以将所选行添加到补丁中(或切换目录折叠) | 如果已选择一个文件,则Enter进入该文件,以便您可以向自定义补丁添加/删除单独的行。如果选择了目录,则切换目录。 |
| `` ` `` | 切换文件树视图 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
| `` ` `` | 切换文件树视图 | 在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径,树布局按目录分组文件。<br><br>可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。 |
| `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 |
| `` = `` | 展开全部文件 | 展开文件树中的全部目录 |
| `` 0 `` | Focus main view | |
| `` 0 `` | 聚焦主视图 | |
| `` / `` | 开始搜索 | |

## 文件
Expand All @@ -215,13 +215,13 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
| `` d `` | 查看'放弃变更'选项 | 查看选中文件的放弃变更选项 |
| `` g `` | 查看上游重置选项 | |
| `` D `` | 重置 | 查看工作树的重置选项(例如:清除工作树)。 |
| `` ` `` | 切换文件树视图 | Toggle file view between flat and tree layout. Flat layout shows all file paths in a single list, tree layout groups files by directory.<br><br>The default can be changed in the config file with the key 'gui.showFileTree'. |
| `` ` `` | 切换文件树视图 | 在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径,树布局按目录分组文件。<br><br>可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。 |
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
| `` M `` | View merge conflict options | View options for resolving merge conflicts. |
| `` f `` | 抓取 | 从远程获取变更 |
| `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 |
| `` = `` | 展开全部文件 | 展开文件树中的全部目录 |
| `` 0 `` | Focus main view | |
| `` 0 `` | 聚焦主视图 | |
| `` / `` | 开始搜索 | |

## 本地分支
Expand All @@ -232,12 +232,12 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
| `` i `` | 显示 git-flow 选项 | |
| `` <space> `` | 检出 | 检出选中的项目 |
| `` n `` | 新分支 | |
| `` N `` | Move commits to new branch | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
| `` N `` | 移动提交至新分支 | Create a new branch and move the unpushed commits of the current branch to it. Useful if you meant to start new work and forgot to create a new branch first.<br><br>Note that this disregards the selection, the new branch is always created either from the main branch or stacked on top of the current branch (you get to choose which). |
| `` o `` | 创建拉取请求 | |
| `` O `` | 创建拉取请求选项 | |
| `` <c-y> `` | 复制拉取请求 URL 到剪贴板 | |
| `` c `` | 按名称检出 | 按名称检出。在输入框中,您可以输入'-' 来切换到最后一个分支。 |
| `` - `` | Checkout previous branch | |
| `` - `` | 签出上一个分支 | |
| `` F `` | 强制检出 | 强制检出所选分支。这将在检出所选分支之前放弃工作目录中的所有本地更改。 |
| `` d `` | 删除 | 查看本地/远程分支的删除选项 |
| `` r `` | 变基 | 将检出的分支变基到所选的分支上。 |
Expand All @@ -249,7 +249,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
| `` R `` | 重命名分支 | |
| `` u `` | 查看上游选项 | 查看与分支上游相关的选项,例如设置/取消设置上游和重置为上游。 |
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
| `` 0 `` | Focus main view | |
| `` 0 `` | 聚焦主视图 | |
| `` <enter> `` | 查看提交 | |
| `` w `` | 查看工作区选项 | |
| `` / `` | 通过文本过滤当前视图 | |
Expand All @@ -261,7 +261,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
| `` <left> `` | 选择上一个区块 | |
| `` <right> `` | 选择下一个区块 | |
| `` v `` | 切换拖动选择 | |
| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
| `` a `` | 切换代码块选择 | Toggle line-by-line vs. hunk selection mode. |
| `` <c-o> `` | 复制选中文本到剪贴板 | |
| `` o `` | 打开文件 | 使用默认程序打开该文件 |
| `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
Expand All @@ -280,7 +280,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
| `` P `` | 推送标签 | 推送选择的标签到远端。您将在弹窗中选择一个远端。 |
| `` g `` | 重置 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
| `` 0 `` | Focus main view | |
| `` 0 `` | 聚焦主视图 | |
| `` <enter> `` | 查看提交 | |
| `` w `` | 查看工作区选项 | |
| `` / `` | 通过文本过滤当前视图 | |
Expand Down Expand Up @@ -316,7 +316,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
| `` <left> `` | 选择上一个区块 | |
| `` <right> `` | 选择下一个区块 | |
| `` v `` | 切换拖动选择 | |
| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
| `` a `` | 切换代码块选择 | Toggle line-by-line vs. hunk selection mode. |
| `` <c-o> `` | 复制选中文本到剪贴板 | |
| `` <space> `` | 切换暂存状态 | 切换行暂存状态 |
| `` d `` | 取消变更(git reset) | 当选择未暂存的变更时,使用git reset丢弃该变更。当选择已暂存的变更时,取消暂存该变更 |
Expand Down Expand Up @@ -350,7 +350,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
| `` u `` | 检查更新 | |
| `` <enter> `` | 切换到最近的仓库 | |
| `` a `` | 显示/循环所有分支日志 | |
| `` 0 `` | Focus main view | |
| `` 0 `` | 聚焦主视图 | |

## 确认面板

Expand All @@ -377,7 +377,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
| `` d `` | 删除 | 从贮藏列表中删除该贮藏项 |
| `` n `` | 新分支 | 从选定的贮藏项创建一个新分支。这是通过 git 检查创建贮藏项的提交,从该提交创建一个新分支,然后将贮藏项作为附加提交应用到新分支来实现的。 |
| `` r `` | 重命名贮藏 | |
| `` 0 `` | Focus main view | |
| `` 0 `` | 聚焦主视图 | |
| `` <enter> `` | 查看提交的文件 | |
| `` w `` | 查看工作区选项 | |
| `` / `` | 通过文本过滤当前视图 | |
Expand Down Expand Up @@ -408,7 +408,7 @@ _图例:`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
| `` s `` | 排序 | |
| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
| `` 0 `` | Focus main view | |
| `` 0 `` | 聚焦主视图 | |
| `` <enter> `` | 查看提交 | |
| `` w `` | 查看工作区选项 | |
| `` / `` | 通过文本过滤当前视图 | |
2 changes: 1 addition & 1 deletion pkg/i18n/translations/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"MergingTitle": "メインパネル(マージ中)",
"NormalTitle": "メインパネル(通常)",
"LogTitle": "ログ",
"LogXOfYTitle": "ログ(%d / %d)",
"CommitSummary": "コミット概要",
"CredentialsUsername": "ユーザー名",
"CredentialsPassword": "パスワード",
Expand Down Expand Up @@ -786,7 +787,6 @@
"NewWorktreePath": "新しいワークツリーのパス",
"NewWorktreeBase": "新しいワークツリーのベース参照",
"RemoveWorktreeTooltip": "選択したワークツリーを削除します。これはワークツリーのディレクトリとワークツリーに関するメタデータの両方を.gitディレクトリから削除します。",
"BranchNameCannotBeBlank": "ブランチ名は空白にできません",
"NewBranchName": "新しいブランチ名",
"NewBranchNameLeaveBlank": "新しいブランチ名({{.default}} をチェックアウトするには空白のままにしてください)",
"ViewWorktreeOptions": "ワークツリーオプションを表示",
Expand Down
1 change: 0 additions & 1 deletion pkg/i18n/translations/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,6 @@
"NewWorktreePath": "Nowa ścieżka drzewa pracy",
"NewWorktreeBase": "Nowa bazowa ref drzewa pracy",
"RemoveWorktreeTooltip": "Usuń wybrane drzewo pracy. To usunie zarówno katalog drzewa pracy, jak i metadane o drzewie pracy w katalogu .git.",
"BranchNameCannotBeBlank": "Nazwa brancha nie może być pusta",
"NewBranchName": "Nowa nazwa brancha",
"NewBranchNameLeaveBlank": "Nowa nazwa brancha (pozostaw puste, aby przełączyć {{.default}})",
"ViewWorktreeOptions": "Zobacz opcje drzewa pracy",
Expand Down
15 changes: 14 additions & 1 deletion pkg/i18n/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"MergingTitle": "正在合并",
"NormalTitle": "正常",
"LogTitle": "日志",
"LogXOfYTitle": "日志 (%d / %d)",
"CommitSummary": "提交信息",
"CredentialsUsername": "用户名",
"CredentialsPassword": "密码",
Expand Down Expand Up @@ -43,6 +44,7 @@
"ToggleStagedAll": "切换所有文件的暂存状态",
"ToggleStagedAllTooltip": "切换工作区中所有文件的已暂存/未暂存状态",
"ToggleTreeView": "切换文件树视图",
"ToggleTreeViewTooltip": "在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径,树布局按目录分组文件。\n\n可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。",
"OpenDiffTool": "使用外部差异比较工具(git difftool)",
"OpenMergeTool": "打开外部合并工具(git mergetool)",
"Refresh": "刷新",
Expand Down Expand Up @@ -120,6 +122,7 @@
"ForceCheckoutTooltip": "强制检出所选分支。这将在检出所选分支之前放弃工作目录中的所有本地更改。",
"CheckoutByName": "按名称检出",
"CheckoutByNameTooltip": "按名称检出。在输入框中,您可以输入'-' 来切换到最后一个分支。",
"CheckoutPreviousBranch": "签出上一个分支",
"RemoteBranchCheckoutTitle": "检出 {{.branchName}}",
"RemoteBranchCheckoutPrompt": "您希望已什么方式检出到该分支?",
"CheckoutTypeNewBranch": "新建本地分支",
Expand All @@ -128,6 +131,9 @@
"CheckoutTypeDetachedHeadTooltip": "将远程分支检出作为分离HEAD,如果您只想用来测试而不是正式使用,这会很有用。您之后仍可以根据它创建本地分支。",
"NewBranch": "新分支",
"NewBranchFromStashTooltip": "从选定的贮藏项创建一个新分支。这是通过 git 检查创建贮藏项的提交,从该提交创建一个新分支,然后将贮藏项作为附加提交应用到新分支来实现的。",
"MoveCommitsToNewBranch": "移动提交至新分支",
"CannotMoveCommitsFromDetachedHead": "无法从分离头移动提交",
"CannotMoveCommitsNoUpstream": "无法从没有上游分支的分支中移动提交",
"NoBranchesThisRepo": "此仓库中没有分支",
"CommitWithoutMessageErr": "您必须编写提交消息才能进行提交",
"Close": "关闭",
Expand Down Expand Up @@ -235,8 +241,11 @@
"IgnoreFile": "添加到 .gitignore",
"ExcludeFile": "添加到 .git/info/exclude",
"RefreshFiles": "刷新文件",
"FocusMainView": "聚焦主视图",
"Merge": "合并到当前检出的分支",
"MergeBranchTooltip": "Merge selected branch into currently checked out branch.",
"SquashMergeUncommitted": "压缩合并并保持未提交状态",
"SquashMergeCommitted": "压缩合并,然后提交",
"ConfirmQuit": "您确定要退出吗?",
"SwitchRepo": "切换到最近的仓库",
"AllBranchesLogGraph": "显示/循环所有分支日志",
Expand All @@ -255,6 +264,7 @@
"StageSelectionTooltip": "切换行暂存状态",
"DiscardSelection": "取消变更(git reset)",
"DiscardSelectionTooltip": "当选择未暂存的变更时,使用git reset丢弃该变更。当选择已暂存的变更时,取消暂存该变更",
"ToggleSelectHunk": "切换代码块选择",
"ToggleSelectionForPatch": "添加/移除 行到补丁",
"EditHunk": "编辑代码块",
"EditHunkTooltip": "在外部编辑器中编辑选中的代码块",
Expand All @@ -273,11 +283,13 @@
"ViewMergeRebaseOptionsTooltip": "查看当前合并或变基的中止、继续、跳过选项",
"ViewMergeOptions": "查看合并选项",
"ViewRebaseOptions": "查看变基选项",
"ViewRevertOptions": "查看撤销选项",
"NotMergingOrRebasing": "您目前既不进行变基也不进行合并",
"AlreadyRebasing": "在变基时无法执行此操作",
"RecentRepos": "最近的仓库",
"MergeOptionsTitle": "合并选项",
"RebaseOptionsTitle": "变基选项",
"RevertOptionsTitle": "撤销选项",
"CommitSummaryTitle": "提交信息",
"CommitDescriptionTitle": "提交信息说明",
"CommitDescriptionSubTitle": "按 {{.togglePanelKeyBinding}} 键切换焦点, {{.commitMenuKeybinding}} 打开菜单",
Expand Down Expand Up @@ -308,6 +320,8 @@
"FwdCommitsToPush": "此分支带有尚未推送的提交,无法快进",
"PullRequestNoUpstream": "没有设置上游的分支无法执行拉取请求",
"ErrorOccurred": "发生错误!请在以下位置创建 issue",
"ConflictLabel": "冲突",
"CommitsSectionHeader": "提交",
"YouDied": "您死了!",
"RewordNotSupported": "当前不支持交互式重新基准化时的重新措词提交",
"ChangingThisActionIsNotAllowed": "不允许更改这类变基待办项目",
Expand Down Expand Up @@ -762,7 +776,6 @@
"NewWorktreePath": "新建工作树路径",
"NewWorktreeBase": "新建工作树基于ref",
"RemoveWorktreeTooltip": "删除选定的工作树。这将删除工作树的目录以及 .git 目录中有关工作树的元数据。",
"BranchNameCannotBeBlank": "分支名称不能为空",
"NewBranchName": "新分支名称",
"NewBranchNameLeaveBlank": "新分支名称(为空则默认检出为 {{.default}})",
"ViewWorktreeOptions": "查看工作区选项",
Expand Down
Loading