development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-05 16:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

l10n: zh_CN: Revision for git v2.32.0 l10n round 1

Browse source 
Signed-off-by: Fangyi Zhou <me@fangyi.io>
This commit is contained in:
Fangyi Zhou 2021-06-07 12:59:56 +08:00 committed by Jiang Xin
parent cb92e28384
commit 523ccf5dba
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
po/zh_CN.po
View file

@ -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"