Improve Chinese translation

1 files changed, 224 insertions, 214 deletions

diff --git a/pkg/i18n/chinese.go b/pkg/i18n/chinese.go
index 4feef785d..5a5d885cd 100644
--- a/pkg/i18n/chinese.go
+++ b/pkg/i18n/chinese.go
@@ -1,20 +1,31 @@
 package i18n
 
+// 本翻译文件中的词语的翻译参考了 https://github.com/progit/progit2-zh/blob/master/TRANSLATION_NOTES.asc。
+// 下方的术语对照表是对其的补充
+
+// Translation in this file refer to https://github.com/progit/progit2-zh/blob/master/TRANSLATION_NOTES.asc.
+// Glossary below is a supplement of that documentation.
+
+// Glossary 术语对照表
+
+// change   更改
+// fixup    修正
+// reset    重置
+
 const chineseIntroPopupMessage = `
-感谢您使用lazygit!与您分享的三件事:
+感谢您使用 lazygit！与您分享三件事：
 
- 1) 如果您想了解lazygit的功能，请观看此视频:
+ 1) 如果您想了解 lazygit 的功能，请观看此视频：
       https://youtu.be/CPLdltN7wgE
 
- 2) 请务必阅读最新的发行说明，网址为：:
+ 2) 请务必阅读最新的发行说明, 网址为：
       https://github.com/jesseduffield/lazygit/releases
 
- 3) 如果您使用的是git，那将使您成为一名程序员! 在您的帮助下，我们可以使
-    lazygit更好, 因此，请考虑成为一名贡献者并加入
+ 3) 如果您使用 git，这将使您成为一名程序员！在您的帮助下，我们可以使
+    lazygit 更好，因此请考虑成为一名贡献者：
       https://github.com/jesseduffield/lazygit
-    您也可以赞助我，并通过单击捐赠告诉我要做什么。
-    右下角的按钮.
-    甚至只是给回购交易代码加注星标，我们离20k星就不远了!
+    您也可以赞助我，并通过单击右下角的捐赠按钮，告诉我要做什么改进。
+    只是给仓库加个星星也很棒！
 `
 
 func chineseTranslationSet() TranslationSet {
@@ -24,9 +35,9 @@ func chineseTranslationSet() TranslationSet {
 		FilesTitle:                          "文件",
 		BranchesTitle:                       "分支",
 		CommitsTitle:                        "提交",
-		StashTitle:                          "封存隐藏(Stash)",
-		UnstagedChanges:                     `未暂存(Unstaged)更改`,
-		StagedChanges:                       `已暂存(Staged)更改`,
+		StashTitle:                          "贮藏",
+		UnstagedChanges:                     `未暂存更改`,
+		StagedChanges:                       `已暂存更改`,
 		MainTitle:                           "主要",
 		StagingTitle:                        "正在暂存",
 		MergingTitle:                        "合并中",
@@ -34,186 +45,186 @@ func chineseTranslationSet() TranslationSet {
 		CommitMessage:                       "提交信息",
 		CredentialsUsername:                 "用户名",
 		CredentialsPassword:                 "密码",
-		CredentialsPassphrase:               "输入SSH密钥的密码",
-		PassUnameWrong:                      "密码, 密码 和/或 用户名错误",
+		CredentialsPassphrase:               "输入 SSH 密钥的密码",
+		PassUnameWrong:                      "密码 和/或 用户名错误",
 		CommitChanges:                       "提交更改",
-		AmendLastCommit:                     "修改最后一次提交",
-		SureToAmend:                         "您确定要修改上一次提交吗？之后，您可以从提交面板更改提交消息.",
-		NoCommitToAmend:                     "没有提交的修改.",
-		CommitChangesWithEditor:             "使用git编辑器提交更改",
+		AmendLastCommit:                     "修补最后一次提交",
+		SureToAmend:                         "您确定要修补上一次提交吗？之后您可以从提交面板更改提交消息。",
+		NoCommitToAmend:                     "没有需要提交的修补。",
+		CommitChangesWithEditor:             "提交更改（使用编辑器编辑提交信息）",
 		StatusTitle:                         "状态",
 		LcNavigate:                          "导航",
 		LcMenu:                              "菜单",
 		LcExecute:                           "执行",
-		LcToggleStaged:                      "切换已暂存(staged)",
-		LcToggleStagedAll:                   "暂存(stage)/未暂存(unstage)全部",
+		LcToggleStaged:                      "切换暂存状态",
+		LcToggleStagedAll:                   "切换所有文件的暂存状态",
 		LcToggleTreeView:                    "切换文件树视图",
-		LcOpenMergeTool:                     "打开外部合并工具 (git mergetool)",
+		LcOpenMergeTool:                     "打开合并工具",
 		LcRefresh:                           "刷新",
-		LcPush:                              "推送(push)",
-		LcPull:                              "拉取(pull)",
+		LcPush:                              "推送",
+		LcPull:                              "拉取",
 		LcScroll:                            "滚动",
 		MergeConflictsTitle:                 "合并冲突",
-		LcCheckout:                          "签出(checkout)",
+		LcCheckout:                          "检出",
 		LcCommitFileFilter:                  "过滤提交文件",
-		NoChangedFiles:                      "没有更改的文件",
+		NoChangedFiles:                      "没有更改过文件",
 		NoFilesDisplay:                      "没有文件可显示",
 		NotAFile:                            "不是文件",
-		PullWait:                            "拉取中...",
-		PushWait:                            "推送中...",
-		FetchWait:                           "正在取得...",
-		FileNoMergeCons:                     "该文件没有内联合并冲突",
-		LcSoftReset:                         "软复位",
-		AlreadyCheckedOutBranch:             "您已经签出了这个分支",
-		SureForceCheckout:                   "您确定要强制签出吗? 您将丢失所有本地更改",
-		ForceCheckoutBranch:                 "强制签出分支",
+		PullWait:                            "拉取中……",
+		PushWait:                            "推送中……",
+		FetchWait:                           "正在抓取……",
+		FileNoMergeCons:                     "该文件没有合并冲突",
+		LcSoftReset:                         "软重置",
+		AlreadyCheckedOutBranch:             "您已经检出了这个分支",
+		SureForceCheckout:                   "您确定要强制检出吗？您将丢失所有本地更改",
+		ForceCheckoutBranch:                 "强制检出分支",
 		BranchName:                          "分支名称",
-		NewBranchNameBranchOff:              "新分支名称 (分支不属于 {{.branchName}})",
-		CantDeleteCheckOutBranch:            "您不能删除已签出的分支!",
+		NewBranchNameBranchOff:              "新分支名称（基于 {{.branchName}}）",
+		CantDeleteCheckOutBranch:            "您不能删除已检出的分支！",
 		DeleteBranch:                        "删除分支",
-		DeleteBranchMessage:                 "您确定要删除分支 {{.selectedBranchName}}?",
-		ForceDeleteBranchMessage:            "{{.selectedBranchName}} 没有完全合并. 你确定你要删除它?",
-		LcRebaseBranch:                      "将已签出的分支重新部署到该分支",
-		CantRebaseOntoSelf:                  "您不能将分支建立在其自身之上",
-		CantMergeBranchIntoItself:           "您不能将分支合并到自身中",
-		LcForceCheckout:                     "强制签出",
-		LcCheckoutByName:                    "按名称签出",
+		DeleteBranchMessage:                 "您确定要删除分支 {{.selectedBranchName}} 吗？",
+		ForceDeleteBranchMessage:            "{{.selectedBranchName}} 还没有被完全合并。您确定要删除它吗？",
+		LcRebaseBranch:                      "将已检出的分支变基到该分支",
+		CantRebaseOntoSelf:                  "您不能将分支变基到其自身",
+		CantMergeBranchIntoItself:           "您不能将分支合并到其自身",
+		LcForceCheckout:                     "强制检出",
+		LcCheckoutByName:                    "按名称检出",
 		LcNewBranch:                         "新分支",
 		LcDeleteBranch:                      "删除分支",
-		NoBranchesThisRepo:                  "此仓库没有分支",
-		CommitMessageConfirm:                "{{.keyBindClose}}: 关闭, {{.keyBindNewLine}}: 新行, {{.keyBindConfirm}}: 确认",
-		CommitWithoutMessageErr:             "没有提交消息就无法提交",
-		CloseConfirm:                        "{{.keyBindClose}}: 关闭, {{.keyBindConfirm}}: 确认",
+		NoBranchesThisRepo:                  "此仓库中没有分支",
+		CommitMessageConfirm:                "{{.keyBindClose}}：关闭，{{.keyBindNewLine}}：新行，{{.keyBindConfirm}}：确认",
+		CommitWithoutMessageErr:             "您必须编写提交消息才能进行提交",
+		CloseConfirm:                        "{{.keyBindClose}}：关闭，{{.keyBindConfirm}}：确认",
 		LcClose:                             "关闭",
 		LcQuit:                              "退出",
-		LcSquashDown:                        "向下聚合(squash down)",
+		LcSquashDown:                        "向下压缩",
 		LcResetToThisCommit:                 "重置为此提交",
-		LcFixupCommit:                       "修正提交",
+		LcFixupCommit:                       "修正提交（fixup）",
 		NoCommitsThisBranch:                 "该分支没有提交",
-		OnlySquashTopmostCommit:             "只能压缩最高提交",
-		YouNoCommitsToSquash:                "您没有提交来压缩",
-		Fixup:                               "修正",
-		SureFixupThisCommit:                 "您确定要'修复'此提交吗？? 它将合并到下面的提交中",
-		SureSquashThisCommit:                "您确定要将这个提交压缩到下面的提交中吗?",
+		OnlySquashTopmostCommit:             "只能压缩最顶层的提交",
+		YouNoCommitsToSquash:                "您没有提交可以压缩",
+		Fixup:                               "修正（fixup）",
+		SureFixupThisCommit:                 "您确定要“修正”此提交吗？它将合并到下面的提交中",
+		SureSquashThisCommit:                "您确定要将这个提交压缩到下面的提交中吗？",
 		Squash:                              "压缩",
-		LcPickCommit:                        "选择提交 (mid-rebase时)",
+		LcPickCommit:                        "选择提交（变基过程中）",
 		LcRevertCommit:                      "还原提交",
-		OnlyRenameTopCommit:                 "只能从lazygit内部重写最高的提交。请使用shift-R",
+		OnlyRenameTopCommit:                 "只能从 lazygit 内部重写最高的提交。请使用 shift-R",
 		LcRenameCommit:                      "改写提交",
 		LcDeleteCommit:                      "删除提交",
 		LcMoveDownCommit:                    "下移提交",
 		LcMoveUpCommit:                      "上移提交",
 		LcEditCommit:                        "编辑提交",
-		LcAmendToCommit:                     "用staged的修改来修改提交",
+		LcAmendToCommit:                     "用已暂存的更改来修补提交",
 		LcRenameCommitEditor:                "使用编辑器重命名提交",
 		Error:                               "错误",
-		LcSelectHunk:                        "选择块",
-		LcNavigateConflicts:                 "解决冲突",
-		LcPickHunk:                          "选择块",
-		LcPickAllHunks:                      "pick all hunks",
+		LcSelectHunk:                        "切换区块",
+		LcNavigateConflicts:                 "浏览冲突",
+		LcPickHunk:                          "选中区块",
+		LcPickAllHunks:                      "选中所有区块",
 		LcUndo:                              "撤销",
-		LcUndoReflog:                        "撤销 (via reflog) (实验性)",
-		LcRedoReflog:                        "重做 (via reflog) (实验性)",
-		LcPop:                               "pop",
+		LcUndoReflog:                        "（通过 reflog）撤销「实验功能」",
+		LcRedoReflog:                        "（通过 reflog）重做「实验功能」",
+		LcPop:                               "应用并删除",
 		LcDrop:                              "删除",
-		LcApply:                             "恢复",
-		NoStashEntries:                      "没有封存隐藏(stach)的条目",
-		StashDrop:                           "Stash删除",
-		SureDropStashEntry:                  "您确定要删除此隐藏(stach)条目?",
-		StashPop:                            "Stash pop(恢复)",
-		SurePopStashEntry:                   "您确定要弹出此隐藏条stash目吗？",
-		StashApply:                          "Stash apply(恢复)",
-		SureApplyStashEntry:                 "您确定要应用此隐藏stash条目?",
-		NoStashTo:                           "没有stash到 {{.method}}",
-		NoTrackedStagedFilesStash:           "您没有要存储的跟踪/暂存文件到stash",
-		StashChanges:                        "Stash更改",
+		LcApply:                             "应用",
+		NoStashEntries:                      "没有贮藏条目",
+		StashDrop:                           "删除贮藏",
+		SureDropStashEntry:                  "您确定要删除此贮藏条目吗？",
+		StashPop:                            "应用并删除贮藏",
+		SurePopStashEntry:                   "您确定要应用并删除此贮藏条目吗？",
+		StashApply:                          "应用贮藏",
+		SureApplyStashEntry:                 "您确定要应用此贮藏条目？",
+		NoStashTo:                           "没有贮藏条目可以 {{.method}}",
+		NoTrackedStagedFilesStash:           "没有可以贮藏的已跟踪/暂存文件",
+		StashChanges:                        "贮藏更改",
 		MergeAborted:                        "合并中止",
 		OpenConfig:                          "打开配置文件",
 		EditConfig:                          "编辑配置文件",
 		ForcePush:                           "强制推送",
-		ForcePushPrompt:                     "您的分支已与远程分支不同. 按 'esc' 取消, 或 'enter' 强制推送.",
-		ForcePushDisabled:                   "您的分支已与远程分支不同并且你已经禁用了强行推送",
+		ForcePushPrompt:                     "您的分支已与远程分支不同。按‘esc’取消，或‘enter’强制推送.",
+		ForcePushDisabled:                   "您的分支已与远程分支不同, 并且您已经禁用了强行推送",
 		UpdatesRejectedAndForcePushDisabled: "更新被拒绝，您已禁用强制推送",
 		LcCheckForUpdate:                    "检查更新",
-		CheckingForUpdates:                  "检查更新...",
-		OnLatestVersionErr:                  "您已经有最新版本",
+		CheckingForUpdates:                  "检查更新中……",
+		OnLatestVersionErr:                  "您的软件已经是最新版本",
 		MajorVersionErr:                     "新版本 ({{.newVersion}}) 与当前版本相比，具有向后兼容的更改 ({{.currentVersion}})",
-		CouldNotFindBinaryErr:               "在{{.url}处找不到任何二进制文件}",
+		CouldNotFindBinaryErr:               "在 {{.url}} 处找不到任何二进制文件",
 		MergeToolTitle:                      "合并工具",
 		MergeToolPrompt:                     "确定要打开 `git mergetool` 吗?",
 		IntroPopupMessage:                   chineseIntroPopupMessage,
-		GitconfigParseErr:                   `由于存在未加引号的'\'字符，因此Gogit无法解析您的gitconfig文件。删除这些应该可以解决问题.`,
+		GitconfigParseErr:                   `由于存在未加引号的'\'字符，因此 Gogit 无法解析您的 gitconfig 文件。删除它们应该可以解决问题。`,
 		LcEditFile:                          `编辑文件`,
 		LcOpenFile:                          `打开文件`,
 		LcIgnoreFile:                        `添加到 .gitignore`,
 		LcRefreshFiles:                      `刷新文件`,
-		LcMergeIntoCurrentBranch:            `合并到当前签出的分支`,
-		ConfirmQuit:                         `你确定你要退出吗?`,
+		LcMergeIntoCurrentBranch:            `合并到当前检出的分支`,
+		ConfirmQuit:                         `您确定要退出吗？`,
 		SwitchRepo:                          `切换到最近的仓库`,
-		LcAllBranchesLogGraph:               `显示所有分支日志`,
-		UnsupportedGitService:               `不支持的git服务`,
-		LcCreatePullRequest:                 `创建pull请求`,
-		LcCopyPullRequestURL:                `将拉取请求URL复制到剪贴板`,
-		NoBranchOnRemote:                    `该分支在远程上不存在。您需要先将其推送到远程.`,
-		LcFetch:                             `fetch`,
-		NoAutomaticGitFetchTitle:            `没有自动git fetch`,
-		NoAutomaticGitFetchBody:             `Lazygit不能在私人仓库中使用"git fetch"; 在文件面板中使用'f'手动运行"git fetch"`,
+		LcAllBranchesLogGraph:               `显示所有分支的日志`,
+		UnsupportedGitService:               `不支持的 git 服务`,
+		LcCreatePullRequest:                 `创建抓取请求`,
+		LcCopyPullRequestURL:                `将抓取请求 URL 复制到剪贴板`,
+		NoBranchOnRemote:                    `该分支在远程上不存在. 您需要先将其推送到远程.`,
+		LcFetch:                             `抓取`,
+		NoAutomaticGitFetchTitle:            `无法自动进行 "git fetch"`,
+		NoAutomaticGitFetchBody:             `Lazygit 不能在私人仓库中使用 "git fetch"; 请在文件面板中使用 'f' 手动运行 "git fetch"`,
 		FileEnter:                           `暂存单个 块/行 用于文件, 或 折叠/展开 目录`,
 		FileStagingRequirements:             `只能暂存跟踪文件的单独行`,
-		StageSelection:                      `切换行 已暂存/未暂存`,
-		ResetSelection:                      `删除变更 (git reset)`,
+		StageSelection:                      `切换行暂存状态`,
+		ResetSelection:                      `取消变更 (git reset)`,
 		ToggleDragSelect:                    `切换拖动选择`,
-		ToggleSelectHunk:                    `切换选择块`,
-		ToggleSelectionForPatch:             `添加/移除 行到patch`,
+		ToggleSelectHunk:                    `切换选择区块`,
+		ToggleSelectionForPatch:             `添加/移除 行到补丁`,
 		TogglePanel:                         `切换到其他面板`,
 		ReturnToFilesPanel:                  `返回文件面板`,
-		FastForward:                         `从上游快速前进此分支`,
-		Fetching:                            "抓取和快进{{.from}} -> {{.to}} ...",
-		FoundConflicts:                      "冲突！要中止，请按 'esc', 否则按'enter'",
+		FastForward:                         `从上游快进此分支`,
+		Fetching:                            "抓取并快进 {{.from}} -> {{.to}} ...",
+		FoundConflicts:                      "冲突！需要中止操作请按‘esc’, 否则按‘enter’",
 		FoundConflictsTitle:                 "自动合并失败",
-		PickHunk:                            "pick hunk",
-		PickAllHunks:                        "pick all hunks",
+		PickHunk:                            "选中区块",
+		PickAllHunks:                        "选中所有区块",
 		ViewMergeRebaseOptions:              "查看 合并/变基 选项",
-		NotMergingOrRebasing:                "您目前既不进行基础调整也不进行合并",
+		NotMergingOrRebasing:                "您目前既不进行变基也不进行合并",
 		RecentRepos:                         "最近的仓库",
 		MergeOptionsTitle:                   "合并选项",
 		RebaseOptionsTitle:                  "变基选项",
 		CommitMessageTitle:                  "提交讯息",
 		LocalBranchesTitle:                  "分支标签",
 		SearchTitle:                         "搜索",
-		TagsTitle:                           "Tags Tab",
+		TagsTitle:                           "标签页面",
 		MenuTitle:                           "菜单",
-		RemotesTitle:                        "远程标签",
+		RemotesTitle:                        "远程页面",
 		CredentialsTitle:                    "证书",
-		RemoteBranchesTitle:                 "远程分支 (在远程选项卡中)",
-		PatchBuildingTitle:                  "补丁构建中",
+		RemoteBranchesTitle:                 "远程分支（在远程页面中）",
+		PatchBuildingTitle:                  "构建补丁中",
 		InformationTitle:                    "信息",
 		SecondaryTitle:                      "次要",
-		ReflogCommitsTitle:                  "Reflog标签",
+		ReflogCommitsTitle:                  "Reflog",
 		GlobalTitle:                         "全局键绑定",
-		ConflictsResolved:                   "解决所有合并冲突。继续？",
+		ConflictsResolved:                   "已解决所有冲突。是否继续？",
 		RebasingTitle:                       "变基",
-		ConfirmRebase:                       "您确定要重新设定基准 {{.checkedOutBranch}} onto {{.selectedBranch}} 吗?",
-		ConfirmMerge:                        "您确定要合并 {{.selectedBranch}} into {{.checkedOutBranch}} 吗?",
+		ConfirmRebase:                       "您确定要将分支 {{.checkedOutBranch}} 变基到 {{.selectedBranch}} 吗？",
+		ConfirmMerge:                        "您确定要将分支 {{.selectedBranch}} 合并到 {{.checkedOutBranch}} 吗？",
 		FwdNoUpstream:                       "无法快进没有上游的分支",
 		FwdCommitsToPush:                    "无法快进并提交推送的分支",
-		ErrorOccurred:                       "发生错误! 请在以下位置创建问题",
+		ErrorOccurred:                       "发生错误！请在以下位置创建 issue",
 		NoRoom:                              "没有足够的空间",
-		YouAreHere:                          "你在这里",
+		YouAreHere:                          "您在这里",
 		LcRewordNotSupported:                "当前不支持交互式重新基准化时的重新措词提交",
-		LcCherryPickCopy:                    "复制提交 (cherry-pick)",
-		LcCherryPickCopyRange:               "复制提交范围 (cherry-pick)",
-		LcPasteCommits:                      "粘贴提交 (cherry-pick)",
-		SureCherryPick:                      "您确定要对复制的提交进行cherry-pick吗?",
-		CherryPick:                          "Cherry-Pick",
+		LcCherryPickCopy:                    "复制提交（拣选）",
+		LcCherryPickCopyRange:               "复制提交范围（拣选）",
+		LcPasteCommits:                      "粘贴提交（拣选）",
+		SureCherryPick:                      "您确定要将选中的提交进行拣选到这个分支吗？",
+		CherryPick:                          "拣选",
 		CannotRebaseOntoFirstCommit:         "您不能以交互方式基于第一次提交",
-		CannotSquashOntoSecondCommit:        "您不能 聚合(squash)/修正(fixup)第二个提交",
+		CannotSquashOntoSecondCommit:        "您不能 压缩/修正(fixup)第二个提交",
 		Donate:                              "捐助",
 		AskQuestion:                         "问题咨询",
 		PrevLine:                            "选择上一行",
 		NextLine:                            "选择下一行",
-		PrevHunk:                            "选择上一个块",
-		NextHunk:                            "选择下一个块",
+		PrevHunk:                            "选择上一个区块",
+		NextHunk:                            "选择下一个区块",
 		PrevConflict:                        "选择上一个冲突",
 		NextConflict:                        "选择下一个冲突",
 		SelectPrevHunk:                      "选择顶部块",
@@ -223,145 +234,144 @@ func chineseTranslationSet() TranslationSet {
 		LcScrollUpMainPanel:                 "向上滚动主面板",
 		LcScrollDownMainPanel:               "向下滚动主面板",
 		AmendCommitTitle:                    "修改提交",
-		AmendCommitPrompt:                   "您确定要使用暂存文件来修改此提交吗?",
+		AmendCommitPrompt:                   "您确定要使用暂存文件来修改此提交吗？",
 		DeleteCommitTitle:                   "删除提交",
-		DeleteCommitPrompt:                  "您确定要删除此提交吗?",
-		SquashingStatus:                     "正在聚合(squashing)",
-		FixingStatus:                        "fixing up",
+		DeleteCommitPrompt:                  "您确定要删除此提交吗？",
+		SquashingStatus:                     "正在压缩",
+		FixingStatus:                        "正在修正",
 		DeletingStatus:                      "正在删除",
 		MovingStatus:                        "正在移动",
 		RebasingStatus:                      "变基",
 		AmendingStatus:                      "修改",
-		CherryPickingStatus:                 "cherry-picking",
+		CherryPickingStatus:                 "拣选中",
 		UndoingStatus:                       "正在撤销",
 		RedoingStatus:                       "正在重做",
-		CheckingOutStatus:                   "签出",
+		CheckingOutStatus:                   "检出",
 		CommittingStatus:                    "正在提交",
 		CommitFiles:                         "提交文件",
 		LcViewCommitFiles:                   "查看提交的文件",
 		CommitFilesTitle:                    "提交文件",
-		LcCheckoutCommitFile:                "签出文件",
+		LcCheckoutCommitFile:                "检出文件",
 		LcDiscardOldFileChange:              "放弃对此文件的提交更改",
 		DiscardFileChangesTitle:             "放弃文件更改",
-		DiscardFileChangesPrompt:            "您确定要舍弃此提交对该文件的更改吗？? 如果此文件是在此提交中创建的，它将被删除",
-		DisabledForGPG:                      "该功能不适用于使用GPG的用户",
-		CreateRepo:                          "不在git仓库中. 创建一个新的git仓库吗? (y/n): ",
-		AutoStashTitle:                      "自动存储?",
-		AutoStashPrompt:                     "您必须隐藏并弹出更改以使更改生效。自动执行? (enter/esc)",
+		DiscardFileChangesPrompt:            "您确定要舍弃此提交对该文件的更改吗？如果此文件是在此提交中创建的，它将被删除",
+		DisabledForGPG:                      "该功能不适用于使用 GPG 的用户",
+		CreateRepo:                          "不在 git 仓库中。创建一个新的 git 仓库吗？(y/n): ",
+		AutoStashTitle:                      "自动存储？",
+		AutoStashPrompt:                     "您必须隐藏并弹出更改以使更改生效。自动执行？(enter/esc)",
 		StashPrefix:                         "自动隐藏更改 ",
 		LcViewDiscardOptions:                "查看'放弃更改‘选项",
 		LcCancel:                            "取消",
 		LcDiscardAllChanges:                 "放弃所有更改",
 		LcDiscardUnstagedChanges:            "放弃未进行的变更",
-		LcDiscardAllChangesToAllFiles:       "nuke 工作树",
-		LcDiscardAnyUnstagedChanges:         "放弃未进行的变更",
+		LcDiscardAllChangesToAllFiles:       "清空工作区",
+		LcDiscardAnyUnstagedChanges:         "丢弃未暂存的变更",
 		LcDiscardUntrackedFiles:             "丢弃未跟踪的文件",
 		LcHardReset:                         "硬重置",
 		LcViewResetOptions:                  `查看重置选项`,
-		LcCreateFixupCommit:                 `为此提交创建fixup提交`,
-		LcSquashAboveCommits:                `聚合所有的'fixup!'高于所选提交的提交 (自动聚合)`,
-		SquashAboveCommits:                  `聚合所有的'fixup!'高于所选提交的提交 (自动聚合)`,
-		SureSquashAboveCommits:              `您确定要聚合所有修正程序吗! 在{{.commit}}上面提交吗?`,
+		LcCreateFixupCommit:                 `为此提交创建修正`,
+		LcSquashAboveCommits:                `压缩在所选提交之上的所有“fixup!”提交（自动压缩）`,
+		SquashAboveCommits:                  `压缩在所选提交之上的所有“fixup!”提交（自动压缩）`,
+		SureSquashAboveCommits:              `您确定要压缩在 {{.commit}} 之上的所有“fixup!”提交吗?`,
 		CreateFixupCommit:                   `创建修正提交`,
-		SureCreateFixupCommit:               `您确定要创建修正程序吗! 提交{{.commit}}?`,
+		SureCreateFixupCommit:               `您确定要对 {{.commit}} 创建修正提交吗？`,
 		LcExecuteCustomCommand:              "执行自定义命令",
-		CustomCommand:                       "自定义命令:",
+		CustomCommand:                       "自定义命令：",
 		LcCommitChangesWithoutHook:          "提交更改而无需预先提交钩子",
-		SkipHookPrefixNotConfigured:         "您尚未配置用于跳过钩子的提交消息前缀. 在您的配置中设置`git.skipHookPrefix ='WIP'`",
+		SkipHookPrefixNotConfigured:         "您尚未配置用于跳过钩子的提交消息前缀。请在您的配置中设置 `git.skipHookPrefix ='WIP'`",
 		LcResetTo:                           `重置为`,
-		PressEnterToReturn:                  "按Enter键返回lazygit",
+		PressEnterToReturn:                  "按下 Enter 键返回 lazygit",
 		LcViewStashOptions:                  "查看隐藏选项",
-		LcStashAllChanges:                   "stash更改",
-		LcStashStagedChanges:                "stash的staged更改",
-		LcStashOptions:                      "Stash选项",
-		NotARepository:                      "错误: 必须在git仓库中运行",
+		LcStashAllChanges:                   "将所有更改加入贮藏",
+		LcStashStagedChanges:                "将已暂存的更改加入贮藏",
+		LcStashOptions:                      "贮藏选项",
+		NotARepository:                      "错误：必须在 git 仓库中运行",
 		LcJump:                              "跳到面板",
 		DiscardPatch:                        "丢弃补丁",
-		DiscardPatchConfirm:                 "您一次只能通过一个commit/stash-entry构建补丁. 放弃当前补丁吗?",
+		DiscardPatchConfirm:                 "您一次只能通过一个提交或贮藏条目构建补丁。需要放弃当前补丁吗？",
 		CantPatchWhileRebasingError:         "处于合并或变基状态时，您无法构建修补程序或运行修补程序命令",
 		LcToggleAddToPatch:                  "补丁中包含的切换文件",
 		ViewPatchOptions:                    "查看自定义补丁选项",
 		PatchOptionsTitle:                   "补丁选项",
-		NoPatchError:                        "尚未创建补丁. 开始构建补丁, 在提交文件上使用'空格‘或输入以添加特定行",
-		LcEnterFile:                         "输入文件以将所选行添加到补丁中(或切换目录折叠)",
+		NoPatchError:                        "尚未创建补丁。你可以在提交中的文件上按下“空格”或使用“回车”添加其中的特定行以开始构建补丁",
+		LcEnterFile:                         "输入文件以将所选行添加到补丁中（或切换目录折叠）",
 		ExitLineByLineMode:                  `退出逐行模式`,
-		EnterUpstream:                       `输入上游作为 '<remote> <branchname>'`,
-		ReturnToRemotesList:                 `返回远程列表`,
-		LcAddNewRemote:                      `添加新的远程`,
-		LcNewRemoteName:                     `新的远程名称:`,
-		LcNewRemoteUrl:                      `新的远程URL:`,
-		LcEditRemoteName:                    `输入{{.remoteName}}更新远程名称:`,
-		LcEditRemoteUrl:                     `输入{{.remoteName}}更新远程URL:`,
+		EnterUpstream:                       `以这种形式输入上游：“<远程仓库> <分支名称>”`,
+		ReturnToRemotesList:                 `返回远程仓库列表`,
+		LcAddNewRemote:                      `添加新的远程仓库`,
+		LcNewRemoteName:                     `新的远程仓库名称:`,
+		LcNewRemoteUrl:                      `新的远程仓库 URL:`,
+		LcEditRemoteName:                    `输入远程仓库 {{.remoteName}} 的新名称：`,
+		LcEditRemoteUrl:                     `输入远程仓库 {{.remoteName}} 的新 URL：`,
 		LcRemoveRemote:                      `删除远程`,
-		LcRemoveRemotePrompt:                "您确定要删除远程",
+		LcRemoveRemotePrompt:                "您确定要删除远程仓库吗？",
 		DeleteRemoteBranch:                  "删除远程分支",
-		DeleteRemoteBranchMessage:           "确定要删除远程分支",
+		DeleteRemoteBranchMessage:           "您确定要删除远程分支吗？",
 		LcSetUpstream:                       "设置为检出分支的上游",
 		SetUpstreamTitle:                    "设置上游分支",
-		SetUpstreamMessage:                  "您确定要将'{{.checkedOut}}‘的上游分支设置为'{{.selected}}'吗？",
-		LcEditRemote:                        "编辑远程",
+		SetUpstreamMessage:                  "您确定要将 {{.checkedOut}} 的上游分支设置为 {{.selected}} 吗？",
+		LcEditRemote:                        "编辑远程仓库",
 		LcTagCommit:                         "标签提交",
-		TagNameTitle:                        "标签名:",
+		TagNameTitle:                        "标签名：",
 		LcDeleteTag:                         "删除标签",
 		DeleteTagTitle:                      "删除标签",
-		DeleteTagPrompt:                     "您确定要删除标签'{{.tagName}}'吗?",
-		PushTagTitle:                        "远程将标签'{{.tagName}}'推送到:",
+		DeleteTagPrompt:                     "您确定要删除标签 {{.tagName}} 吗？",
+		PushTagTitle:                        "将 {{.tagName}} 推送到远程仓库：",
 		LcPushTag:                           "推送标签",
 		LcCreateTag:                         "创建标签",
-		CreateTagTitle:                      "标签名:",
-		LcFetchRemote:                       "获取远程",
-		FetchingRemoteStatus:                "获取远程",
-		LcCheckoutCommit:                    "签出提交",
-		SureCheckoutThisCommit:              "您确定要签出此提交吗？?",
-		LcGitFlowOptions:                    "显示git-flow选项",
-		NotAGitFlowBranch:                   "这似乎不是git flow分支",
-		NewGitFlowBranchPrompt:              "新的{{.branchType}}名称:",
+		CreateTagTitle:                      "标签名：",
+		LcFetchRemote:                       "抓取远程仓库",
+		FetchingRemoteStatus:                "抓取远程仓库中",
+		LcCheckoutCommit:                    "检出提交",
+		SureCheckoutThisCommit:              "您确定要检出此提交吗?",
+		LcGitFlowOptions:                    "显示 git-flow 选项",
+		NotAGitFlowBranch:                   "这似乎不是 git flow 分支",
+		NewGitFlowBranchPrompt:              "新的 {{.branchType}} 名称：",
 		IgnoreTracked:                       "忽略跟踪文件",
-		IgnoreTrackedPrompt:                 "您确定要忽略跟踪的文件吗？",
+		IgnoreTrackedPrompt:                 "您确定要忽略已跟踪的文件吗？",
 		LcViewResetToUpstreamOptions:        "查看上游重置选项",
 		LcNextScreenMode:                    "下一屏模式（正常/半屏/全屏）",
 		LcPrevScreenMode:                    "上一屏模式",
 		LcStartSearch:                       "开始搜索",
 		Panel:                               "面板",
-		Keybindings:                         "键绑定",
+		Keybindings:                         "按键绑定",
 		LcRenameBranch:                      "重命名分支",
-		NewBranchNamePrompt:                 "输入分支的新分支名称",
-		RenameBranchWarning:                 "该分支正在跟踪远程服务器。此操作将仅重命名本地分支名称，而不重命名远程分支的名称。继续？",
+		NewBranchNamePrompt:                 "输入分支的新名称",
+		RenameBranchWarning:                 "该分支正在跟踪远程仓库。此操作将仅会重命名本地分支名称，而不会重命名远程分支的名称。确定继续？",
 		LcOpenMenu:                          "打开菜单",
 		LcCloseMenu:                         "关闭菜单",
-		LcResetCherryPick:                   "重置 cherry-picked(复制)提交选择",
+		LcResetCherryPick:                   "重置已拣选（复制）的提交",
 		LcNextTab:                           "下一个标签",
 		LcPrevTab:                           "上一个标签",
 		LcCantUndoWhileRebasing:             "进行基础调整时无法撤消",
 		LcCantRedoWhileRebasing:             "变基时无法重做",
 		MustStashWarning:                    "将补丁拉出到索引中需要存储和取消存储所做的更改。如果出现问题，您将可以从存储中访问文件。继续？",
-		MustStashTitle:                      "必须stash",
+		MustStashTitle:                      "必须保存进度",
 		ConfirmationTitle:                   "确认面板",
 		LcPrevPage:                          "上一页",
 		LcNextPage:                          "下一页",
 		LcGotoTop:                           "滚动到顶部",
 		LcGotoBottom:                        "滚动到底部",
 		LcFilteringBy:                       "过滤依据",
-		ResetInParentheses:                  "(重置)",
+		ResetInParentheses:                  "（重置）",
 		LcOpenFilteringMenu:                 "查看按路径过滤选项",
 		LcFilterBy:                          "过滤",
 		LcExitFilterMode:                    "停止按路径过滤",
 		LcFilterPathOption:                  "输入要过滤的路径",
-		LcEnterFileName:                     "输入路径:",
+		LcEnterFileName:                     "输入路径：",
 		FilteringMenuTitle:                  "正在过滤",
 		MustExitFilterModeTitle:             "命令不可用",
 		MustExitFilterModePrompt:            "命令在过滤模式下不可用。退出过滤模式？",
-		LcDiff:                              "差异(diff)",
-		LcEnterRefToDiff:                    "输入ref到diff",
-		LcEnteRefName:                       "输入ref:",
+		LcDiff:                              "差异",
+		LcEnterRefToDiff:                    "输入 ref 以 diff", // TODO
+		LcEnteRefName:                       "输入 ref：",
 		LcExitDiffMode:                      "退出差异模式",
-		DiffingMenuTitle:                    "差异化",
-		LcSwapDiff:                          "反向差异方向",
-		LcOpenDiffingMenu:                   "打开差异菜单",
-		// 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
+		DiffingMenuTitle:                    "diff 中", // TODO
+		LcSwapDiff:                          "反向 diff",
+		LcOpenDiffingMenu:                   "打开 diff 菜单",
 		LcOpenExtrasMenu:                    "打开命令日志菜单",
-		LcShowingGitDiff:                    "显示输出:",
-		LcCopyCommitShaToClipboard:          "将提交SHA复制到剪贴板",
+		LcShowingGitDiff:                    "显示输出：", // TODO
+		LcCopyCommitShaToClipboard:          "将提交的 SHA 复制到剪贴板",
 		LcCopyCommitMessageToClipboard:      "将提交消息复制到剪贴板",
 		LcCopyBranchNameToClipboard:         "将分支名称复制到剪贴板",
 		LcCopyFileNameToClipboard:           "将文件名复制到剪贴板",
@@ -370,39 +380,39 @@ func chineseTranslationSet() TranslationSet {
 		NoFilesStagedTitle:                  "没有暂存文件",
 		NoFilesStagedPrompt:                 "您尚未暂存任何文件。提交所有文件？",
 		BranchNotFoundTitle:                 "找不到分支",
-		BranchNotFoundPrompt:                "找不到分支。创建一个新分支命名为",
-		UnstageLinesTitle:                   "Unstage行",
-		UnstageLinesPrompt:                  "您确定要删除所选的行(git reset)吗？这是不可逆的。\n要禁用此对话框，请将'gui.skipUnstageLineWarning'的配置键设置为true",
+		BranchNotFoundPrompt:                "找不到分支。创建一个新分支命名为：",
+		UnstageLinesTitle:                   "未暂存的行",
+		UnstageLinesPrompt:                  "您确定要删除所选的行（git reset）吗？这是不可逆的。\n要禁用此对话框，请将 'gui.skipUnstageLineWarning' 的配置键设置为 true",
 		LcCreateNewBranchFromCommit:         "从提交创建新分支",
-		LcViewStashFiles:                    "查看stash条目的文件",
-		LcBuildingPatch:                     "构建补丁",
+		LcViewStashFiles:                    "查看贮藏条目中的文件",
+		LcBuildingPatch:                     "正在构建补丁",
 		LcViewCommits:                       "查看提交",
-		MinGitVersionError:                  "Git版本必须至少为2.0(即从2014年开始)。请升级您的git版本。或者在https://github.com/jesseduffield/lazygit/issues上提出一个问题,以使lazygit更加向后兼容。",
-		LcRunningCustomCommandStatus:        "运行自定义命令",
+		MinGitVersionError:                  "Git 版本必须至少为 2.0（即从 2014 年开始）。请升级您的 git 版本。或者在 https://github.com/jesseduffield/lazygit/issues 上提出一个问题，以使 lazygit 更加向后兼容。",
+		LcRunningCustomCommandStatus:        "正在运行自定义命令",
 		LcSubmoduleStashAndReset:            "存放未提交的子模块更改和更新",
 		LcAndResetSubmodules:                "和重置子模块",
 		LcEnterSubmodule:                    "输入子模块",
 		LcCopySubmoduleNameToClipboard:      "将子模块名称复制到剪贴板",
 		RemoveSubmodule:                     "删除子模块",
 		LcRemoveSubmodule:                   "删除子模块",
-		RemoveSubmodulePrompt:               "您确定要删除子模块'%s'及其对应的目录吗？这是不可逆的。",
-		LcResettingSubmoduleStatus:          "重置子模块",
-		LcNewSubmoduleName:                  "新的子模块名称:",
-		LcNewSubmoduleUrl:                   "新的子模块网址:",
-		LcNewSubmodulePath: