Skip to content

Commit 523ccf5

Browse files
fangyi-zhoujiangxin
authored andcommitted
l10n: zh_CN: Revision for git v2.32.0 l10n round 1
Signed-off-by: Fangyi Zhou <[email protected]>
1 parent cb92e28 commit 523ccf5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

po/zh_CN.po

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,7 +1521,7 @@ msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
15211521

15221522
#: apply.c:5027
15231523
msgid "attempt three-way merge, fall back on normal patch if that fails"
1524-
msgstr "尝试三路合并,如果失败则尝试正常补丁模式"
1524+
msgstr "尝试三路合并,如果失败则回落至正常补丁模式"
15251525

15261526
#: apply.c:5029
15271527
msgid "build a temporary index based on embedded index information"
@@ -13499,13 +13499,13 @@ msgstr "您正处于一个拣选过程中 -- 无法改写说明。"
1349913499
#: builtin/commit.c:1224
1350013500
#, c-format
1350113501
msgid "cannot combine reword option of --fixup with path '%s'"
13502-
msgstr "不能将 --fixup 的 reword 选项和路径 '%s' 组合使用"
13502+
msgstr "不能将 --fixup 的改写说明选项和路径 '%s' 组合使用"
1350313503

1350413504
#: builtin/commit.c:1226
1350513505
msgid ""
1350613506
"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
1350713507
"all/--include/--only"
13508-
msgstr "--fixup 的 reword 选项和 --patch/--interactive/--all/--include/--only 互斥"
13508+
msgstr "--fixup 的改写说明选项和 --patch/--interactive/--all/--include/--only 互斥"
1350913509

1351013510
#: builtin/commit.c:1245
1351113511
msgid "Using both --reset-author and --author does not make sense"
@@ -17216,7 +17216,7 @@ msgstr "<动作>"
1721617216

1721717217
#: builtin/mailinfo.c:74
1721817218
msgid "action when quoted CR is found"
17219-
msgstr "找到引用的 CR 时的操作"
17219+
msgstr "找到引号中的 CR 时的操作"
1722017220

1722117221
#: builtin/mailinfo.c:77
1722217222
msgid "use headers in message's body"

0 commit comments

Comments
 (0)