Skip to content

Commit 17c6a89

Browse files
stefanhallerstefanhaller
authored
Update translations from Crowdin (#5090)
2 parents cc96d8c + 6fbf64b commit 17c6a89

File tree

5 files changed

+34
-23
lines changed

5 files changed

+34
-23
lines changed

‎docs-master/keybindings/Keybindings_zh-CN.md‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
6969
| `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
7070
| `` o `` | 在浏览器中打开提交 | |
7171
| `` n `` | 从提交创建新分支 | |
72-
| `` 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). |
72+
| `` 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). |
7373
| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
7474
| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
7575
| `` <c-r> `` | 重置已拣选(复制)的提交 | |
7676
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
7777
| `` * `` | 选择当前分支的提交 | |
78-
| `` 0 `` | Focus main view | |
78+
| `` 0 `` | 聚焦主视图 | |
7979
| `` <enter> `` | 查看提交 | |
8080
| `` w `` | 查看工作区选项 | |
8181
| `` / `` | 通过文本过滤当前视图 | |
@@ -89,13 +89,13 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
8989
| `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
9090
| `` o `` | 在浏览器中打开提交 | |
9191
| `` n `` | 从提交创建新分支 | |
92-
| `` 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). |
92+
| `` 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). |
9393
| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
9494
| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
9595
| `` <c-r> `` | 重置已拣选(复制)的提交 | |
9696
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
9797
| `` * `` | 选择当前分支的提交 | |
98-
| `` 0 `` | Focus main view | |
98+
| `` 0 `` | 聚焦主视图 | |
9999
| `` <enter> `` | 查看提交的文件 | |
100100
| `` w `` | 查看工作区选项 | |
101101
| `` / `` | 开始搜索 | |
@@ -154,12 +154,12 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
154154
| `` y `` | 复制提交属性到剪贴板 | 复制提交属性到剪贴板(如hash、URL、diff、消息、作者)。 |
155155
| `` o `` | 在浏览器中打开提交 | |
156156
| `` n `` | 从提交创建新分支 | |
157-
| `` 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). |
157+
| `` 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). |
158158
| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
159159
| `` C `` | 复制提交(拣选) | 标记提交为已复制。然后，在本地提交视图中，您可以按 `V` (Cherry-Pick) 将已复制的提交粘贴到已检出的分支中。任何时候都可以按 `<esc>` 来取消选择。 |
160160
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
161161
| `` * `` | 选择当前分支的提交 | |
162-
| `` 0 `` | Focus main view | |
162+
| `` 0 `` | 聚焦主视图 | |
163163
| `` <enter> `` | 查看提交的文件 | |
164164
| `` w `` | 查看工作区选项 | |
165165
| `` / `` | 开始搜索 | |
@@ -185,10 +185,10 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
185185
| `` <space> `` | 补丁中包含的切换文件 | 切换文件是否包含在自定义补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
186186
| `` a `` | 操作所有文件 | 添加或删除所有提交中的文件到自定义的补丁中。请参阅 https://github.com/jesseduffield/lazygit#rebase-magic-custom-patches。 |
187187
| `` <enter> `` | 输入文件以将所选行添加到补丁中(或切换目录折叠) | 如果已选择一个文件，则Enter进入该文件，以便您可以向自定义补丁添加/删除单独的行。如果选择了目录，则切换目录。 |
188-
| `` ` `` | 切换文件树视图 | 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'. |
188+
| `` ` `` | 切换文件树视图 | 在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径，树布局按目录分组文件。<br><br>可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。 |
189189
| `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 |
190190
| `` = `` | 展开全部文件 | 展开文件树中的全部目录 |
191-
| `` 0 `` | Focus main view | |
191+
| `` 0 `` | 聚焦主视图 | |
192192
| `` / `` | 开始搜索 | |
193193

194194
## 文件
@@ -215,13 +215,13 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
215215
| `` d `` | 查看'放弃变更'选项 | 查看选中文件的放弃变更选项 |
216216
| `` g `` | 查看上游重置选项 | |
217217
| `` D `` | 重置 | 查看工作树的重置选项（例如：清除工作树）。 |
218-
| `` ` `` | 切换文件树视图 | 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'. |
218+
| `` ` `` | 切换文件树视图 | 在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径，树布局按目录分组文件。<br><br>可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。 |
219219
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
220220
| `` M `` | View merge conflict options | View options for resolving merge conflicts. |
221221
| `` f `` | 抓取 | 从远程获取变更 |
222222
| `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 |
223223
| `` = `` | 展开全部文件 | 展开文件树中的全部目录 |
224-
| `` 0 `` | Focus main view | |
224+
| `` 0 `` | 聚焦主视图 | |
225225
| `` / `` | 开始搜索 | |
226226

227227
## 本地分支
@@ -232,12 +232,12 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
232232
| `` i `` | 显示 git-flow 选项 | |
233233
| `` <space> `` | 检出 | 检出选中的项目 |
234234
| `` n `` | 新分支 | |
235-
| `` 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). |
235+
| `` 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). |
236236
| `` o `` | 创建拉取请求 | |
237237
| `` O `` | 创建拉取请求选项 | |
238238
| `` <c-y> `` | 复制拉取请求 URL 到剪贴板 | |
239239
| `` c `` | 按名称检出 | 按名称检出。在输入框中，您可以输入'-' 来切换到最后一个分支。 |
240-
| `` - `` | Checkout previous branch | |
240+
| `` - `` | 签出上一个分支 | |
241241
| `` F `` | 强制检出 | 强制检出所选分支。这将在检出所选分支之前放弃工作目录中的所有本地更改。 |
242242
| `` d `` | 删除 | 查看本地/远程分支的删除选项 |
243243
| `` r `` | 变基 | 将检出的分支变基到所选的分支上。 |
@@ -249,7 +249,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
249249
| `` R `` | 重命名分支 | |
250250
| `` u `` | 查看上游选项 | 查看与分支上游相关的选项，例如设置/取消设置上游和重置为上游。 |
251251
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
252-
| `` 0 `` | Focus main view | |
252+
| `` 0 `` | 聚焦主视图 | |
253253
| `` <enter> `` | 查看提交 | |
254254
| `` w `` | 查看工作区选项 | |
255255
| `` / `` | 通过文本过滤当前视图 | |
@@ -261,7 +261,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
261261
| `` <left> `` | 选择上一个区块 | |
262262
| `` <right> `` | 选择下一个区块 | |
263263
| `` v `` | 切换拖动选择 | |
264-
| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
264+
| `` a `` | 切换代码块选择 | Toggle line-by-line vs. hunk selection mode. |
265265
| `` <c-o> `` | 复制选中文本到剪贴板 | |
266266
| `` o `` | 打开文件 | 使用默认程序打开该文件 |
267267
| `` e `` | 编辑文件 | 使用外部编辑器打开文件 |
@@ -280,7 +280,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
280280
| `` P `` | 推送标签 | 推送选择的标签到远端。您将在弹窗中选择一个远端。 |
281281
| `` g `` | 重置 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
282282
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
283-
| `` 0 `` | Focus main view | |
283+
| `` 0 `` | 聚焦主视图 | |
284284
| `` <enter> `` | 查看提交 | |
285285
| `` w `` | 查看工作区选项 | |
286286
| `` / `` | 通过文本过滤当前视图 | |
@@ -316,7 +316,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
316316
| `` <left> `` | 选择上一个区块 | |
317317
| `` <right> `` | 选择下一个区块 | |
318318
| `` v `` | 切换拖动选择 | |
319-
| `` a `` | Toggle hunk selection | Toggle line-by-line vs. hunk selection mode. |
319+
| `` a `` | 切换代码块选择 | Toggle line-by-line vs. hunk selection mode. |
320320
| `` <c-o> `` | 复制选中文本到剪贴板 | |
321321
| `` <space> `` | 切换暂存状态 | 切换行暂存状态 |
322322
| `` d `` | 取消变更(git reset) | 当选择未暂存的变更时，使用git reset丢弃该变更。当选择已暂存的变更时，取消暂存该变更 |
@@ -350,7 +350,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
350350
| `` u `` | 检查更新 | |
351351
| `` <enter> `` | 切换到最近的仓库 | |
352352
| `` a `` | 显示/循环所有分支日志 | |
353-
| `` 0 `` | Focus main view | |
353+
| `` 0 `` | 聚焦主视图 | |
354354

355355
## 确认面板
356356

@@ -377,7 +377,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
377377
| `` d `` | 删除 | 从贮藏列表中删除该贮藏项 |
378378
| `` n `` | 新分支 | 从选定的贮藏项创建一个新分支。这是通过 git 检查创建贮藏项的提交，从该提交创建一个新分支，然后将贮藏项作为附加提交应用到新分支来实现的。 |
379379
| `` r `` | 重命名贮藏 | |
380-
| `` 0 `` | Focus main view | |
380+
| `` 0 `` | 聚焦主视图 | |
381381
| `` <enter> `` | 查看提交的文件 | |
382382
| `` w `` | 查看工作区选项 | |
383383
| `` / `` | 通过文本过滤当前视图 | |
@@ -408,7 +408,7 @@ _图例：`<c-b>` 意味着ctrl+b, `<a-b>意味着Alt+b, `B` 意味着shift+b_
408408
| `` s `` | 排序 | |
409409
| `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 |
410410
| `` <c-t> `` | 使用外部差异比较工具(git difftool) | |
411-
| `` 0 `` | Focus main view | |
411+
| `` 0 `` | 聚焦主视图 | |
412412
| `` <enter> `` | 查看提交 | |
413413
| `` w `` | 查看工作区选项 | |
414414
| `` / `` | 通过文本过滤当前视图 | |

‎pkg/i18n/translations/ja.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"MergingTitle": "メインパネル（マージ中）",
1414
"NormalTitle": "メインパネル（通常）",
1515
"LogTitle": "ログ",
16+
"LogXOfYTitle": "ログ（%d / %d）",
1617
"CommitSummary": "コミット概要",
1718
"CredentialsUsername": "ユーザー名",
1819
"CredentialsPassword": "パスワード",
@@ -786,7 +787,6 @@
786787
"NewWorktreePath": "新しいワークツリーのパス",
787788
"NewWorktreeBase": "新しいワークツリーのベース参照",
788789
"RemoveWorktreeTooltip": "選択したワークツリーを削除します。これはワークツリーのディレクトリとワークツリーに関するメタデータの両方を.gitディレクトリから削除します。",
789-
"BranchNameCannotBeBlank": "ブランチ名は空白にできません",
790790
"NewBranchName": "新しいブランチ名",
791791
"NewBranchNameLeaveBlank": "新しいブランチ名（{{.default}} をチェックアウトするには空白のままにしてください）",
792792
"ViewWorktreeOptions": "ワークツリーオプションを表示",

‎pkg/i18n/translations/pl.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,6 @@
645645
"NewWorktreePath": "Nowa ścieżka drzewa pracy",
646646
"NewWorktreeBase": "Nowa bazowa ref drzewa pracy",
647647
"RemoveWorktreeTooltip": "Usuń wybrane drzewo pracy. To usunie zarówno katalog drzewa pracy, jak i metadane o drzewie pracy w katalogu .git.",
648-
"BranchNameCannotBeBlank": "Nazwa brancha nie może być pusta",
649648
"NewBranchName": "Nowa nazwa brancha",
650649
"NewBranchNameLeaveBlank": "Nowa nazwa brancha (pozostaw puste, aby przełączyć {{.default}})",
651650
"ViewWorktreeOptions": "Zobacz opcje drzewa pracy",

‎pkg/i18n/translations/zh-CN.json‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"MergingTitle": "正在合并",
1414
"NormalTitle": "正常",
1515
"LogTitle": "日志",
16+
"LogXOfYTitle": "日志 (%d / %d)",
1617
"CommitSummary": "提交信息",
1718
"CredentialsUsername": "用户名",
1819
"CredentialsPassword": "密码",
@@ -43,6 +44,7 @@
4344
"ToggleStagedAll": "切换所有文件的暂存状态",
4445
"ToggleStagedAllTooltip": "切换工作区中所有文件的已暂存/未暂存状态",
4546
"ToggleTreeView": "切换文件树视图",
47+
"ToggleTreeViewTooltip": "在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径，树布局按目录分组文件。\n\n可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。",
4648
"OpenDiffTool": "使用外部差异比较工具(git difftool)",
4749
"OpenMergeTool": "打开外部合并工具(git mergetool)",
4850
"Refresh": "刷新",
@@ -120,6 +122,7 @@
120122
"ForceCheckoutTooltip": "强制检出所选分支。这将在检出所选分支之前放弃工作目录中的所有本地更改。",
121123
"CheckoutByName": "按名称检出",
122124
"CheckoutByNameTooltip": "按名称检出。在输入框中，您可以输入'-' 来切换到最后一个分支。",
125+
"CheckoutPreviousBranch": "签出上一个分支",
123126
"RemoteBranchCheckoutTitle": "检出 {{.branchName}}",
124127
"RemoteBranchCheckoutPrompt": "您希望已什么方式检出到该分支?",
125128
"CheckoutTypeNewBranch": "新建本地分支",
@@ -128,6 +131,9 @@
128131
"CheckoutTypeDetachedHeadTooltip": "将远程分支检出作为分离HEAD，如果您只想用来测试而不是正式使用，这会很有用。您之后仍可以根据它创建本地分支。",
129132
"NewBranch": "新分支",
130133
"NewBranchFromStashTooltip": "从选定的贮藏项创建一个新分支。这是通过 git 检查创建贮藏项的提交，从该提交创建一个新分支，然后将贮藏项作为附加提交应用到新分支来实现的。",
134+
"MoveCommitsToNewBranch": "移动提交至新分支",
135+
"CannotMoveCommitsFromDetachedHead": "无法从分离头移动提交",
136+
"CannotMoveCommitsNoUpstream": "无法从没有上游分支的分支中移动提交",
131137
"NoBranchesThisRepo": "此仓库中没有分支",
132138
"CommitWithoutMessageErr": "您必须编写提交消息才能进行提交",
133139
"Close": "关闭",
@@ -235,8 +241,11 @@
235241
"IgnoreFile": "添加到 .gitignore",
236242
"ExcludeFile": "添加到 .git/info/exclude",
237243
"RefreshFiles": "刷新文件",
244+
"FocusMainView": "聚焦主视图",
238245
"Merge": "合并到当前检出的分支",
239246
"MergeBranchTooltip": "Merge selected branch into currently checked out branch.",
247+
"SquashMergeUncommitted": "压缩合并并保持未提交状态",
248+
"SquashMergeCommitted": "压缩合并，然后提交",
240249
"ConfirmQuit": "您确定要退出吗？",
241250
"SwitchRepo": "切换到最近的仓库",
242251
"AllBranchesLogGraph": "显示/循环所有分支日志",
@@ -255,6 +264,7 @@
255264
"StageSelectionTooltip": "切换行暂存状态",
256265
"DiscardSelection": "取消变更(git reset)",
257266
"DiscardSelectionTooltip": "当选择未暂存的变更时，使用git reset丢弃该变更。当选择已暂存的变更时，取消暂存该变更",
267+
"ToggleSelectHunk": "切换代码块选择",
258268
"ToggleSelectionForPatch": "添加/移除 行到补丁",
259269
"EditHunk": "编辑代码块",
260270
"EditHunkTooltip": "在外部编辑器中编辑选中的代码块",
@@ -273,11 +283,13 @@
273283
"ViewMergeRebaseOptionsTooltip": "查看当前合并或变基的中止、继续、跳过选项",
274284
"ViewMergeOptions": "查看合并选项",
275285
"ViewRebaseOptions": "查看变基选项",
286+
"ViewRevertOptions": "查看撤销选项",
276287
"NotMergingOrRebasing": "您目前既不进行变基也不进行合并",
277288
"AlreadyRebasing": "在变基时无法执行此操作",
278289
"RecentRepos": "最近的仓库",
279290
"MergeOptionsTitle": "合并选项",
280291
"RebaseOptionsTitle": "变基选项",
292+
"RevertOptionsTitle": "撤销选项",
281293
"CommitSummaryTitle": "提交信息",
282294
"CommitDescriptionTitle": "提交信息说明",
283295
"CommitDescriptionSubTitle": "按 {{.togglePanelKeyBinding}} 键切换焦点, {{.commitMenuKeybinding}} 打开菜单",
@@ -308,6 +320,8 @@
308320
"FwdCommitsToPush": "此分支带有尚未推送的提交，无法快进",
309321
"PullRequestNoUpstream": "没有设置上游的分支无法执行拉取请求",
310322
"ErrorOccurred": "发生错误！请在以下位置创建 issue",
323+
"ConflictLabel": "冲突",
324+
"CommitsSectionHeader": "提交",
311325
"YouDied": "您死了！",
312326
"RewordNotSupported": "当前不支持交互式重新基准化时的重新措词提交",
313327
"ChangingThisActionIsNotAllowed": "不允许更改这类变基待办项目",
@@ -762,7 +776,6 @@
762776
"NewWorktreePath": "新建工作树路径",
763777
"NewWorktreeBase": "新建工作树基于ref",
764778
"RemoveWorktreeTooltip": "删除选定的工作树。这将删除工作树的目录以及 .git 目录中有关工作树的元数据。",
765-
"BranchNameCannotBeBlank": "分支名称不能为空",
766779
"NewBranchName": "新分支名称",
767780
"NewBranchNameLeaveBlank": "新分支名称（为空则默认检出为 {{.default}}）",
768781
"ViewWorktreeOptions": "查看工作区选项",

0 commit comments

Comments
 (0)