l10n: zh_CN: Revision for git v2.32.0 l10n round 1
Signed-off-by: Fangyi Zhou <me@fangyi.io>
Fangyi Zhou committed
Jun 7, 2021 at 12:59 UTC
523ccf5dbaace10b54b5b2547b9e2d56de9282d3
1 file changed
+4
-4
po/zh_CN.po
+4
-4
@@ -1521,7 +1521,7 @@ msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
1521
1522
#: apply.c:5027
1523
msgid "attempt three-way merge, fall back on normal patch if that fails"
1524
-msgstr "尝试三路合并，如果失败则尝试正常补丁模式"
1524
+msgstr "尝试三路合并，如果失败则回落至正常补丁模式"
1525
1526
#: apply.c:5029
1527
msgid "build a temporary index based on embedded index information"
@@ -13499,13 +13499,13 @@ msgstr "您正处于一个拣选过程中 -- 无法改写说明。"
13499
#: builtin/commit.c:1224
13500
#, c-format
13501
msgid "cannot combine reword option of --fixup with path '%s'"
13502
-msgstr "不能将 --fixup 的 reword 选项和路径 '%s' 组合使用"
13502
+msgstr "不能将 --fixup 的改写说明选项和路径 '%s' 组合使用"
13503
13504
#: builtin/commit.c:1226
13505
msgid ""
13506
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
13507
"all/--include/--only"
13508
-msgstr "--fixup 的 reword 选项和 --patch/--interactive/--all/--include/--only 互斥"
13508
+msgstr "--fixup 的改写说明选项和 --patch/--interactive/--all/--include/--only 互斥"
13509
13510
#: builtin/commit.c:1245
13511
msgid "Using both --reset-author and --author does not make sense"
@@ -17216,7 +17216,7 @@ msgstr "<动作>"
17216
17217
#: builtin/mailinfo.c:74
17218
msgid "action when quoted CR is found"
17219
-msgstr "找到引用的 CR 时的操作"
17219
+msgstr "找到引号中的 CR 时的操作"
17220
17221
#: builtin/mailinfo.c:77
17222
msgid "use headers in message's body"