#: apply.c:5027
msgid "attempt three-way merge, fall back on normal patch if that fails"
-msgstr "å°\9dè¯\95ä¸\89è·¯å\90\88并ï¼\8cå¦\82æ\9e\9c失败å\88\99å°\9dè¯\95正常补丁模式"
+msgstr "å°\9dè¯\95ä¸\89è·¯å\90\88并ï¼\8cå¦\82æ\9e\9c失败å\88\99å\9b\9eè\90½è\87³正常补丁模式"
#: apply.c:5029
msgid "build a temporary index based on embedded index information"
#: 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"
#: 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"