aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fangyi Zhou <me@fangyi.io> 2021-06-07 12:59:56 +0800
committerGravatar Jiang Xin <worldhello.net@gmail.com> 2021-08-15 10:56:49 +0800
commit523ccf5dbaace10b54b5b2547b9e2d56de9282d3 (patch)
tree843dfa8c31d0571ffdcdee759bc54fb15e818d99
parentcb92e2838480f70dfab888015e28889f4ff1eadd (diff)
downloadgit-523ccf5dbaace10b54b5b2547b9e2d56de9282d3.tar.gz
git-523ccf5dbaace10b54b5b2547b9e2d56de9282d3.zip
l10n: zh_CN: Revision for git v2.32.0 l10n round 1
Signed-off-by: Fangyi Zhou <me@fangyi.io>
-rw-r--r--po/zh_CN.po8
1 files changed, 4 insertions, 4 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 668bbacf9d..df27fd4162 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1521,7 +1521,7 @@ msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
#: apply.c:5027
msgid "attempt three-way merge, fall back on normal patch if that fails"
-msgstr "尝试三路合并,如果失败则尝试正常补丁模式"
+msgstr "尝试三路合并,如果失败则回落至正常补丁模式"
#: apply.c:5029
msgid "build a temporary index based on embedded index information"
@@ -13499,13 +13499,13 @@ msgstr "您正处于一个拣选过程中 -- 无法改写说明。"
#: builtin/commit.c:1224
#, c-format
msgid "cannot combine reword option of --fixup with path '%s'"
-msgstr "不能将 --fixup 的 reword 选项和路径 '%s' 组合使用"
+msgstr "不能将 --fixup 的改写说明选项和路径 '%s' 组合使用"
#: builtin/commit.c:1226
msgid ""
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
"all/--include/--only"
-msgstr "--fixup 的 reword 选项和 --patch/--interactive/--all/--include/--only 互斥"
+msgstr "--fixup 的改写说明选项和 --patch/--interactive/--all/--include/--only 互斥"
#: builtin/commit.c:1245
msgid "Using both --reset-author and --author does not make sense"
@@ -17216,7 +17216,7 @@ msgstr "<动作>"
#: builtin/mailinfo.c:74
msgid "action when quoted CR is found"
-msgstr "找到引用的 CR 时的操作"
+msgstr "找到引号中的 CR 时的操作"
#: builtin/mailinfo.c:77
msgid "use headers in message's body"