|
89 | 89 | "MergeConflictPressEnterToResolve": "按%s键解决。", |
90 | 90 | "MergeConflictKeepFile": "保留文件", |
91 | 91 | "MergeConflictDeleteFile": "删除文件", |
| 92 | + "MergeConflictTakeCurrentCommit": "接受当前提交", |
| 93 | + "MergeConflictTakeIncomingCommit": "接受传入提交", |
92 | 94 | "Checkout": "检出", |
93 | 95 | "CheckoutTooltip": "检出选中的项目", |
94 | 96 | "CantCheckoutBranchWhilePulling": "当前分支在拉取远端时,无法检出到其他分支。", |
|
239 | 241 | "UpdateFailedErr": "更新失败: {{.errMessage}}", |
240 | 242 | "ConfirmQuitDuringUpdateTitle": "当前正在更新中...", |
241 | 243 | "ConfirmQuitDuringUpdate": "当前正在更新中,您确定要退出吗?", |
| 244 | + "IntroPopupMessage": "\n感谢使用 lazygit!你太棒了。有三件事想与你分享:\n\n 1) 如果您想了解 lazygit 的功能,请观看这个视频:\n https://youtu.be/CPLdltN7wgE\n\n 2) 务必阅读以下链接的最新发布说明:\n https://github.com/jesseduffield/lazygit/releases\n\n 3) 如果 lazygit 让您的生活更轻松,你可以通过点击右下角的\n 捐赠按钮来表达感谢。捐赠不会获得优先支持,\n 但我们对此深表感激。\n\n按下 {{confirmationKey}} 开始。\n", |
242 | 245 | "NonReloadableConfigWarningTitle": "配置已更改", |
243 | 246 | "NonReloadableConfigWarning": "以下配置设置已更改,但更改不会立即生效。请退出并重新启动lazygit以使更改生效:\n\n{{configs}}", |
244 | 247 | "GitconfigParseErr": "由于存在未加引号的'\\'字符,因此 Gogit 无法解析您的 gitconfig 文件。删除它们应该可以解决问题。", |
|
349 | 352 | "FwdNoLocalUpstream": "此分支的远程未在本地注册,无法快进", |
350 | 353 | "FwdCommitsToPush": "此分支带有尚未推送的提交,无法快进", |
351 | 354 | "PullRequestNoUpstream": "没有设置上游的分支无法执行拉取请求", |
| 355 | + "PullRequestChecksError": "错误", |
352 | 356 | "ErrorOccurred": "发生错误!请在以下位置创建 issue", |
353 | 357 | "ConflictLabel": "冲突", |
354 | 358 | "PendingRebaseTodosSectionHeader": "待处理变基任务", |
355 | 359 | "PendingCherryPicksSectionHeader": "待处理拣选", |
356 | 360 | "PendingRevertsSectionHeader": "待处理还原", |
357 | 361 | "CommitsSectionHeader": "提交", |
| 362 | + "MoveCommitsHere": "拖放到此", |
| 363 | + "MovingCommitsHere": "在此处移动提交", |
358 | 364 | "YouDied": "您死了!", |
359 | 365 | "RewordNotSupported": "当前不支持交互式重新基准化时的重新措词提交", |
360 | 366 | "ChangingThisActionIsNotAllowed": "不允许更改这类变基待办项目", |
|
409 | 415 | "UndoingStatus": "正在撤销", |
410 | 416 | "RedoingStatus": "正在重做", |
411 | 417 | "CheckingOutStatus": "正在检出", |
| 418 | + "CreatingBranchStatus": "创建分支", |
412 | 419 | "CommittingStatus": "正在提交", |
413 | 420 | "RewordingStatus": "修改提交信息", |
414 | 421 | "RevertingStatus": "还原中...", |
| 422 | + "ResettingStatus": "重置中", |
415 | 423 | "CreatingFixupCommitStatus": "正在创建一个修复提交", |
416 | 424 | "MovingCommitsToNewBranchStatus": "正在将提交移动到新分支", |
417 | 425 | "CommitFiles": "提交文件", |
|
431 | 439 | "DiscardFileChangesPromptResetPatch": "确定要从此提交中丢弃所选文件的更改吗?\n\n此操作将启动变基,还原这些文件更改。请注意,如果后续提交依赖于这些更改,您可能需要解决冲突。\n\n注意:这将重置活动的自定义补丁!", |
432 | 440 | "DisabledForGPG": "使用GPG的用户无法使用此功能。\n\n如果您正在使用密码代理(如gpg-agent)以避免每次签名时输入密码,可以通过在lazygit配置文件中添加\n\ngit:\n overrideGpg: true\n\n来启用此功能。", |
433 | 441 | "CreateRepo": "不在 git 仓库中。创建一个新的 git 仓库吗?(y/N): ", |
434 | | - "BareRepo": "您已经尝试在空仓库中打开Lazygit,但是Lazygit还不支持空仓库。打开最近的仓库吗?(y / n) ", |
| 442 | + "BareRepoNotSupported": "Lazygit 不支持裸仓库。", |
435 | 443 | "InitialBranch": "分支名称? (git的默认值为空): ", |
436 | 444 | "NoRecentRepositories": "必须在git存储库中打开lazygit。没有有效的最近存储库。即将退出...", |
437 | 445 | "IncorrectNotARepository": "'notARepository'的值不正确。它应该是“prompt”,“create”,“skip”或“quit”中的一个。", |
|
590 | 598 | "ViewResetToUpstreamOptions": "查看上游重置选项", |
591 | 599 | "NextScreenMode": "下一屏模式(正常/半屏/全屏)", |
592 | 600 | "PrevScreenMode": "上一屏模式", |
| 601 | + "DefaultDiffRendererName": "(默认)", |
| 602 | + "ExternalDiffDiffRendererName": "(外部差异)", |
593 | 603 | "StartSearch": "开始搜索", |
594 | 604 | "StartFilter": "通过文本过滤当前视图", |
595 | 605 | "SelectRemoteRepository": "为拉取请求选择基础仓库", |
|
598 | 608 | "KeybindingsMenuSectionLocal": "本地", |
599 | 609 | "KeybindingsMenuSectionGlobal": "全局", |
600 | 610 | "KeybindingsMenuSectionNavigation": "导航", |
| 611 | + "KeybindingsTooltip": "键绑定: ", |
601 | 612 | "RenameBranch": "重命名分支", |
602 | 613 | "Upstream": "上游", |
603 | 614 | "BranchUpstreamOptionsTitle": "上游选项", |
|
740 | 751 | "ErrStageDirWithInlineMergeConflicts": "无法 暂存/取消暂存 包含具有内联合并冲突的文件的目录。请先解决合并冲突", |
741 | 752 | "ErrRepositoryMovedOrDeleted": "找不到仓库。它可能已被移动或删除 ¯\\_(ツ)_/¯", |
742 | 753 | "ErrWorktreeMovedOrRemoved": "找不到工作树,它可能被删除或者移走了。 ¯\\\\_(ツ)_/¯", |
| 754 | + "CantSwitchWhileOperationInProgress": "操作进行时无法切换仓库", |
743 | 755 | "CommandLog": "命令日志", |
744 | 756 | "ToggleShowCommandLog": "切换 显示/隐藏 命令日志", |
745 | 757 | "FocusCommandLog": "焦点命令日志", |
|
832 | 844 | "SearchKeybindings": "%s: 下一个匹配项, %s: 上一个匹配项, %s: 退出搜索模式", |
833 | 845 | "SearchPrefix": "搜索: ", |
834 | 846 | "FilterPrefix": "过滤: ", |
835 | | - "FilterPrefixMenu": "筛选(在筛选快捷键前添加 '@'):", |
836 | 847 | "ExitSearchMode": "%s:退出搜索模式", |
837 | 848 | "ExitTextFilterMode": "%s:退出过滤模式", |
838 | 849 | "Switch": "切换", |
|
862 | 873 | "NewWorktreePath": "新建工作树路径", |
863 | 874 | "RemoveWorktreeTooltip": "删除选定的工作树。这将删除工作树的目录以及 .git 目录中有关工作树的元数据。", |
864 | 875 | "NewBranchName": "新分支名称", |
| 876 | + "NewWorktreeName": "新工作树名", |
| 877 | + "WorktreeLocationTitle": "工作区位置", |
| 878 | + "WorktreeLocationOther": "其他…", |
865 | 879 | "LcWorktree": "工作区", |
866 | 880 | "ChangingDirectoryTo": "将目录更改为 {{.path}}", |
867 | 881 | "Name": "名称", |
|
0 commit comments