eb816ef79e · matheusbsbs/matheus-bagliano

@@ -1,6 +1,7 @@

1 # Chinese translations for Git package

2 # Git 软件包的简体中文翻译.

5 # This file is distributed under the same license as the Git package.

6 # Contributors:

7 # - Fangyi Zhou <me AT fangyi.io>

@@ -16,15 +17,15 @@

17 # - Zhuang Ya <zhuangya AT me.com>

18 # - Teng Long <dyroneteng AT gmail.com>

19 #

19 -# Git glossary for Chinese translators

20 +# Git glossary for Chinese translators

21 #

22 # English | Chinese

23 # ---------------------------------+--------------------------------------

23 -# 3-way merge | 三方合并

24 +# 3-way merge | 三路合并

25 # abbreviate | 简写（的 SHA-1 值）

26 # alternate object database | 备用对象库

27 # attribute source | 属性来源

27 -# amend | 修补

28 +# amend | 修订

29 # ancestor | 祖先，祖先提交

30 # annotated tag | 附注标签

31 # bare repository | 纯仓库

@@ -33,9 +34,9 @@

34 # blob object | 数据对象

35 # bloom filter | 布隆过滤器

36 # branch | 分支

36 -# bundle | 归档包

37 +# bundle | 捆绑包

38 # bypass | 绕过

38 -# cache | 索引（的别称）

39 +# cache | 缓存（索引的别称）

40 # chain | （提交）链

41 # changeset | 变更集

42 # checkout | 检出

@@ -48,7 +49,7 @@

49 # commit object | 提交对象

50 # commit-graph | 提交图

51 # commit-ish (also committish) | 提交号

51 -# cone | 锥形（稀疏检出模型）；锥（稀疏检出）

52 +# cone | 锥形模式（稀疏检出）；锥（稀疏检出）

53 # conflict | 冲突

54 # core Git | 核心 Git 工具

55 # cover letter | 附函

@@ -59,28 +60,29 @@

60 # dirty | 脏（的工作区）

61 # dumb HTTP protocol | 哑 HTTP 协议

62 # enlistment | 登记（在 scalar 中使用）

62 -# evil merge | 坏合并（合并引入了父提交没有的修改）

63 +# evil merge | 恶意合并（合并引入了额外变更，即父提交没有的修改）

64 # fast-forward | 快进

65 # fetch | 获取

66 # file system | 文件系统

67 # fork | 派生

68 # Git archive | 仓库（对于 arch 用户）

69 # gitfile | gitfile（仓库链接文件）

69 -# grafts | （提交）移植

70 +# grafts | （提交）嫁接

71 # hash | 哈希值

72 # HEAD | HEAD（头指针，亦即当前分支）

73 # head | 头、分支

74 # head ref | 分支

75 # header | 头信息

76 # hook | 钩子

76 -# hunk | 补丁片段

77 # index | 索引

78 # index entry | 索引条目

79 # loose object | 松散对象

80 # loose refs | 松散引用

81 -# magic | 神奇前缀（路径规格支持的一种前缀表达式）

82 -# master | master（默认分支名）

81 +# magic | 魔法前缀（路径规格支持的一种前缀表达式）

82 +# master | master（传统默认分支名，将被 main 替代）

83 # merge | 合并

84 +# merge-base | 合并基线

85 +# note | 注解

86 # object | 对象

87 # object database | 对象库

88 # object identifier | 对象标识符

@@ -95,11 +97,12 @@

97 # parent | 父提交

98 # partial clone | 部分克隆

99 # patch | 补丁

100 +# patch hunk | 补丁块

101 # pathspec | 路径规格

102 # pattern | 模式

103 # pickaxe | 挖掘

101 -# plumbing | 管件（Git 底层核心命令的别称）

102 -# porcelain | 瓷件（Git 上层封装命令的别称）

104 +# plumbing | 管件（Git 底层命令的别称）

105 +# porcelain | 瓷件（Git 高层命令的别称）

106 # precious-objects repo | 珍品仓库

107 # preferred pack | 首选包（多包索引中引入的首选包概念）

108 # promisor | 承诺者

@@ -130,7 +133,7 @@

133 # squash | 挤压

134 # stage | n. 暂存区（即索引）; v. 暂存

135 # stale | 过期的

133 -# stash | n. 贮藏区; v. 贮藏

136 +# stash | n. 储藏区; v. 储藏

137 # submodule | 子模组

138 # symref | 符号引用

139 # tag | n. 标签; v. 打标签

@@ -146,10 +149,22 @@

149 # unpack | 解包

150 # unreachable object | 不可达对象

151 # unstage | 取消暂存

149 -# upstream | 上游

150 -# upstream branch | 上游分支

152 +# upstream | 上游（分支/仓库）

153 # working tree | 工作区

152 -# Fangyi Zhou <me@fangyi.io>, 2021-2023.

154 +#

155 +# Preferred Chinese Terms

156 +#

157 +# - 默认 (not 缺省)

158 +# - 其他 (not 其它)

159 +# - 作为 (not 做为)

160 +# - 当作 (not 当做)

161 +# - 登录 (not 登陆)

162 +# - 账户 (not 帐户)

163 +# - 密码 (not 口令)

164 +# - 撤销 (not 撤消)

165 +# - 吗？ (not 么？) # 疑问助词

166 +# - 无法 (not 不能)：客观。客观障碍、技术限制、物理规律，非主观

167 +# - 不能 (not 无法)：主观。能力不足、规则限制、逻辑冲突、设计限制、意愿拒绝

168 #

169 msgid ""

170 msgstr ""

@@ -178,7 +193,7 @@ msgstr "嗯（%s）？"

193

194 #: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c

195 msgid "could not read index"

181 -msgstr "不能读取索引"

196 +msgstr "无法读取索引"

197

198 #: add-interactive.c

199 msgid "binary"

@@ -199,11 +214,11 @@ msgstr "更新"

214 #: add-interactive.c

215 #, c-format

216 msgid "could not stage '%s'"

202 -msgstr "不能暂存 '%s'"

217 +msgstr "无法暂存 '%s'"

218

219 #: add-interactive.c builtin/stash.c reset.c sequencer.c

220 msgid "could not write index"

206 -msgstr "不能写入索引"

221 +msgstr "无法写入索引"

222

223 #: add-interactive.c

224 #, c-format

@@ -215,7 +230,7 @@ msgstr[1] "更新了 %d 个路径\n"

230 #: add-interactive.c

231 #, c-format

232 msgid "note: %s is untracked now.\n"

218 -msgstr "说明：%s 现已成为未跟踪的。\n"

233 +msgstr "注意：%s 现在未被跟踪。\n"

234

235 #: add-interactive.c apply.c builtin/checkout.c builtin/reset.c

236 #, c-format

@@ -228,7 +243,7 @@ msgstr "还原"

243

244 #: add-interactive.c

245 msgid "Could not parse HEAD^{tree}"

231 -msgstr "不能解析 HEAD^{tree}"

246 +msgstr "无法解析 HEAD^{tree}"

247

248 #: add-interactive.c

249 #, c-format

@@ -274,7 +289,7 @@ msgstr "补丁更新"

289

290 #: add-interactive.c

291 msgid "Review diff"

277 -msgstr "检视 diff"

292 +msgstr "查看差异"

293

294 #: add-interactive.c

295 msgid "show paths with changes"

@@ -350,11 +365,11 @@ msgstr "请选择"

365

366 #: add-interactive.c

367 msgid "staged"

353 -msgstr "缓存"

368 +msgstr "已暂存"

369

370 #: add-interactive.c

371 msgid "unstaged"

357 -msgstr "未缓存"

372 +msgstr "未暂存"

373

374 #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c

375 #: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c

@@ -364,7 +379,7 @@ msgstr "路径"

379

380 #: add-interactive.c

381 msgid "could not refresh index"

367 -msgstr "不能刷新索引"

382 +msgstr "无法刷新索引"

383

384 #: add-interactive.c builtin/clean.c

385 #, c-format

@@ -379,12 +394,12 @@ msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "

394 #: add-patch.c

395 #, c-format

396 msgid "Stage deletion [y,n,q,a,d%s,?]? "

382 -msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "

397 +msgstr "暂存删除变更 [y,n,q,a,d%s,?]? "

398

399 #: add-patch.c

400 #, c-format

401 msgid "Stage addition [y,n,q,a,d%s,?]? "

387 -msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "

402 +msgstr "暂存新增变更 [y,n,q,a,d%s,?]? "

403

404 #: add-patch.c

405 #, c-format

@@ -414,28 +429,28 @@ msgstr ""

429 #: add-patch.c

430 #, c-format

431 msgid "Stash mode change [y,n,q,a,d%s,?]? "

417 -msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "

432 +msgstr "储藏模式变更 [y,n,q,a,d%s,?]? "

433

434 #: add-patch.c

435 #, c-format

436 msgid "Stash deletion [y,n,q,a,d%s,?]? "

422 -msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "

437 +msgstr "储藏删除变更 [y,n,q,a,d%s,?]? "

438

439 #: add-patch.c

440 #, c-format

441 msgid "Stash addition [y,n,q,a,d%s,?]? "

427 -msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "

442 +msgstr "储藏新增变更 [y,n,q,a,d%s,?]? "

443

444 #: add-patch.c

445 #, c-format

446 msgid "Stash this hunk [y,n,q,a,d%s,?]? "

432 -msgstr "贮藏该块 [y,n,q,a,d%s,?]? "

447 +msgstr "储藏该块 [y,n,q,a,d%s,?]? "

448

449 #: add-patch.c

450 msgid ""

451 "If the patch applies cleanly, the edited hunk will immediately be marked for "

452 "stashing."

438 -msgstr "如果补丁能正确地应用，编辑块将立即标记为贮藏。"

453 +msgstr "如果补丁能正确地应用，编辑块将立即标记为储藏。"

454

455 #: add-patch.c

456 msgid ""

@@ -445,11 +460,11 @@ msgid ""

460 "a - stash this hunk and all later hunks in the file\n"

461 "d - do not stash this hunk or any of the later hunks in the file\n"

462 msgstr ""

448 -"y - 贮藏该块\n"

449 -"n - 不要贮藏该块\n"

450 -"q - 退出。不贮藏该块及后面的全部块\n"

451 -"a - 贮藏该块和本文件中后面的全部块\n"

452 -"d - 不贮藏该块和本文件中后面的全部块\n"

463 +"y - 储藏该块\n"

464 +"n - 不要储藏该块\n"

465 +"q - 退出。不储藏该块及后面的全部块\n"

466 +"a - 储藏该块和本文件中后面的全部块\n"

467 +"d - 不储藏该块和本文件中后面的全部块\n"

468

469 #: add-patch.c

470 #, c-format

@@ -459,12 +474,12 @@ msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "

474 #: add-patch.c

475 #, c-format

476 msgid "Unstage deletion [y,n,q,a,d%s,?]? "

462 -msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "

477 +msgstr "取消暂存删除变更 [y,n,q,a,d%s,?]? "

478

479 #: add-patch.c

480 #, c-format

481 msgid "Unstage addition [y,n,q,a,d%s,?]? "

467 -msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "

482 +msgstr "取消暂存新增变更 [y,n,q,a,d%s,?]? "

483

484 #: add-patch.c

485 #, c-format

@@ -475,7 +490,7 @@ msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "

490 msgid ""

491 "If the patch applies cleanly, the edited hunk will immediately be marked for "

492 "unstaging."

478 -msgstr "如果补丁能正确地应用，编辑块将立即标记为未暂存。"

493 +msgstr "如果补丁能正确地应用，编辑块将立即标记为取消暂存。"

494

495 #: add-patch.c

496 msgid ""

@@ -539,12 +554,12 @@ msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "

554 #: add-patch.c

555 #, c-format

556 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "

542 -msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "

557 +msgstr "从工作区中丢弃删除变更 [y,n,q,a,d%s,?]? "

558

559 #: add-patch.c

560 #, c-format

561 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "

547 -msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "

562 +msgstr "从工作区中丢弃新增变更 [y,n,q,a,d%s,?]? "

563

564 #: add-patch.c

565 #, c-format

@@ -579,12 +594,12 @@ msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "

594 #: add-patch.c

595 #, c-format

596 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "

582 -msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "

597 +msgstr "从索引和工作区中丢弃删除变更 [y,n,q,a,d%s,?]? "

598

599 #: add-patch.c

600 #, c-format

601 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "

587 -msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "

602 +msgstr "从索引和工作区中丢弃新增变更 [y,n,q,a,d%s,?]? "

603

604 #: add-patch.c

605 #, c-format

@@ -680,11 +695,11 @@ msgstr "无法解析数据块头信息 '%.*s'"

695

696 #: add-patch.c

697 msgid "could not parse diff"

683 -msgstr "不能解析差异信息"

698 +msgstr "无法解析差异信息"

699

700 #: add-patch.c

701 msgid "could not parse colored diff"

687 -msgstr "不能解析彩色差异信息"

702 +msgstr "无法解析彩色差异信息"

703

704 #: add-patch.c

705 #, c-format

@@ -707,7 +722,7 @@ msgid ""

722 "expected context line #%d in\n"

723 "%.*s"

724 msgstr ""

710 -"预期上下文行 #%d 于\n"

725 +"预期上下文行 #%d 位于\n"

726 "%.*s"

727

728 #: add-patch.c

@@ -720,7 +735,7 @@ msgid ""

735 msgstr ""

736 "块不重叠：\n"

737 "%.*s\n"

723 -"\t不是结尾于：\n"

738 +"\t未以以下内容结尾：\n"

739 "%.*s"

740

741 #: add-patch.c

@@ -746,7 +761,7 @@ msgid ""

761 "edit again. If all lines of the hunk are removed, then the edit is\n"

762 "aborted and the hunk is left unchanged.\n"

763 msgstr ""

749 -"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"

764 +"如果无法干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"

765 "此次编辑被终止，该块不会被修改。\n"

766

767 #: add-patch.c

@@ -766,15 +781,15 @@ msgstr "'git apply --cached' 失败"

781 #: add-patch.c

782 msgid ""

783 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

769 -msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "

784 +msgstr "您的编辑块无法被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "

785

786 #: add-patch.c

787 msgid "The selected hunks do not apply to the index!"

773 -msgstr "选中的块不能应用到索引！"

788 +msgstr "选中的块无法应用到索引！"

789

790 #: add-patch.c

791 msgid "Apply them to the worktree anyway? "

777 -msgstr "无论如何都要应用到工作区么？"

792 +msgstr "仍要应用到工作区吗？"

793

794 #: add-patch.c

795 msgid "Nothing was applied.\n"

@@ -813,15 +828,15 @@ msgstr "预期只有一个字母，得到 '%s'"

828

829 #: add-patch.c

830 msgid "No other hunk"

816 -msgstr "没有其它块"

831 +msgstr "没有其他块"

832

833 #: add-patch.c

834 msgid "No other undecided hunk"

820 -msgstr "没有其它未决定的块"

835 +msgstr "没有其他未决定的块"

836

837 #: add-patch.c

838 msgid "No other hunks to goto"

824 -msgstr "没有其它可供跳转的块"

839 +msgstr "没有其他可供跳转的块"

840

841 #: add-patch.c

842 msgid "go to which hunk (<ret> to see more)? "

@@ -845,7 +860,7 @@ msgstr[1] "对不起，只有 %d 个可用块。"

860

861 #: add-patch.c

862 msgid "No other hunks to search"

848 -msgstr "没有其它可供查找的块"

863 +msgstr "没有其他可供查找的块"

864

865 #: add-patch.c

866 msgid "search for regex? "

@@ -862,7 +877,7 @@ msgstr "没有和给定模式相匹配的块"

877

878 #: add-patch.c

879 msgid "Sorry, cannot split this hunk"

865 -msgstr "对不起，不能拆分这个块"

880 +msgstr "对不起，无法拆分这个块"

881

882 #: add-patch.c

883 #, c-format

@@ -871,7 +886,7 @@ msgstr "拆分为 %d 块。"

886

887 #: add-patch.c

888 msgid "Sorry, cannot edit this hunk"

874 -msgstr "对不起，不能编辑这个块"

889 +msgstr "对不起，无法编辑这个块"

890

891 #: add-patch.c

892 #, c-format

@@ -922,7 +937,7 @@ msgstr "无法拉取，因为您有未合并的文件。"

937

938 #: advice.c

939 msgid "Reverting is not possible because you have unmerged files."

925 -msgstr "无法回退，因为您有未合并的文件。"

940 +msgstr "无法还原，因为您有未合并的文件。"

941

942 #: advice.c

943 msgid "Rebasing is not possible because you have unmerged files."

@@ -1049,7 +1064,7 @@ msgid ""

1064 "* Use \"git add --sparse <paths>\" to update the index\n"

1065 "* Use \"git sparse-checkout reapply\" to apply the sparsity rules"

1066 msgstr ""

1052 -"为了修正这些的路径的稀疏性，请运行下列命令：\n"

1067 +"为了修正这些路径的稀疏性，请运行下列命令：\n"

1068 "* 使用 \"git add --sparse <路径>\" 来更新索引\n"

1069 "* 使用 \"git sparse-checkout reapply\" 来应用稀疏规则"

1070

@@ -1116,7 +1131,7 @@ msgstr "regexec 返回 %d，输入为：%s"

1131 #: apply.c

1132 #, c-format

1133 msgid "unable to find filename in patch at line %d"

1119 -msgstr "不能在补丁的第 %d 行找到文件名"

1134 +msgstr "无法在补丁的第 %d 行找到文件名"

1135

1136 #: apply.c

1137 #, c-format

@@ -1225,7 +1240,7 @@ msgstr "无法读取符号链接 %s"

1240 #: apply.c

1241 #, c-format

1242 msgid "unable to open or read %s"

1228 -msgstr "不能打开或读取 %s"

1243 +msgstr "无法打开或读取 %s"

1244

1245 #: apply.c

1246 #, c-format

@@ -1250,7 +1265,7 @@ msgid ""

1265 "while searching for:\n"

1266 "%.*s"

1267 msgstr ""

1253 -"当查询：\n"

1268 +"在搜索：\n"

1269 "%.*s"

1270

1271 #: apply.c

@@ -1261,12 +1276,12 @@ msgstr "缺失 '%s' 的二进制补丁数据"

1276 #: apply.c

1277 #, c-format

1278 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

1264 -msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"

1279 +msgstr "无法反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"

1280

1281 #: apply.c

1282 #, c-format

1283 msgid "cannot apply binary patch to '%s' without full index line"

1269 -msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"

1284 +msgstr "无法在 '%s' 上应用没有完整索引行的二进制补丁"

1285

1286 #: apply.c

1287 #, c-format

@@ -1302,7 +1317,7 @@ msgstr "打补丁失败：%s:%ld"

1317 #: apply.c builtin/mv.c

1318 #, c-format

1319 msgid "cannot checkout %s"

1305 -msgstr "不能检出 %s"

1320 +msgstr "无法检出 %s"

1321

1322 #: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c

1323 #, c-format

@@ -1312,7 +1327,7 @@ msgstr "无法读取 %s"

1327 #: apply.c

1328 #, c-format

1329 msgid "reading from '%s' beyond a symbolic link"

1315 -msgstr "读取位于符号链接中的 '%s'"

1330 +msgstr "从 '%s' 读取时越过符号链接"

1331

1332 #: apply.c

1333 #, c-format

@@ -1331,12 +1346,12 @@ msgstr "%s：和索引不匹配"

1346

1347 #: apply.c

1348 msgid "repository lacks the necessary blob to perform 3-way merge."

1334 -msgstr "仓库缺乏执行三方合并所必需的数据对象。"

1349 +msgstr "仓库缺乏执行三路合并所必需的数据对象。"

1350

1351 #: apply.c

1352 #, c-format

1353 msgid "Performing three-way merge...\n"

1339 -msgstr "执行三方合并...\n"

1354 +msgstr "执行三路合并...\n"

1355

1356 #: apply.c

1357 #, c-format

@@ -1346,12 +1361,12 @@ msgstr "无法读取 '%s' 的当前内容"

1361 #: apply.c

1362 #, c-format

1363 msgid "Failed to perform three-way merge...\n"

1349 -msgstr "无法执行三方合并...\n"

1364 +msgstr "无法执行三路合并...\n"

1365

1366 #: apply.c

1367 #, c-format

1368 msgid "Applied patch to '%s' with conflicts.\n"

1354 -msgstr "应用补丁到 '%s' 存在冲突。\n"

1369 +msgstr "应用补丁到 '%s' 时发生冲突。\n"

1370

1371 #: apply.c

1372 #, c-format

@@ -1361,7 +1376,7 @@ msgstr "成功应用补丁到 '%s'。\n"

1376 #: apply.c

1377 #, c-format

1378 msgid "Falling back to direct application...\n"

1364 -msgstr "回落到直接应用...\n"

1379 +msgstr "改为直接应用...\n"

1380

1381 #: apply.c

1382 msgid "removal patch leaves file contents"

@@ -1405,7 +1420,7 @@ msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"

1420 #: apply.c

1421 #, c-format

1422 msgid "affected file '%s' is beyond a symbolic link"

1408 -msgstr "受影响的文件 '%s' 位于符号链接中"

1423 +msgstr "受影响的文件 '%s' 位于符号链接之外"

1424

1425 #: apply.c

1426 #, c-format

@@ -1435,32 +1450,32 @@ msgstr "sha1 信息缺失或无效（%s）。"

1450 #: apply.c

1451 #, c-format

1452 msgid "could not add %s to temporary index"

1438 -msgstr "不能在临时索引中添加 %s"

1453 +msgstr "无法在临时索引中添加 %s"

1454

1455 #: apply.c

1456 #, c-format

1457 msgid "could not write temporary index to %s"

1443 -msgstr "不能把临时索引写入到 %s"

1458 +msgstr "无法把临时索引写入到 %s"

1459

1460 #: apply.c

1461 #, c-format

1462 msgid "unable to remove %s from index"

1448 -msgstr "不能从索引中移除 %s"

1463 +msgstr "无法从索引中移除 %s"

1464

1465 #: apply.c

1466 #, c-format

1467 msgid "corrupt patch for submodule %s"

1453 -msgstr "子模组 %s 损坏的补丁"

1468 +msgstr "针对子模组 %s 的补丁已损坏"

1469

1470 #: apply.c

1471 #, c-format

1472 msgid "unable to stat newly created file '%s'"

1458 -msgstr "不能对新建文件 '%s' 调用 stat"

1473 +msgstr "无法对新建文件 '%s' 调用 stat"

1474

1475 #: apply.c

1476 #, c-format

1477 msgid "unable to create backing store for newly created file %s"

1463 -msgstr "不能为新建文件 %s 创建后端存储"

1478 +msgstr "无法为新建文件 %s 创建后端存储"

1479

1480 #: apply.c

1481 #, c-format

@@ -1480,7 +1495,7 @@ msgstr "关闭文件 '%s'"

1495 #: apply.c

1496 #, c-format

1497 msgid "unable to write file '%s' mode %o"

1483 -msgstr "不能写文件 '%s' 权限 %o"

1498 +msgstr "无法写文件 '%s' 权限 %o"

1499

1500 #: apply.c

1501 #, c-format

@@ -1495,37 +1510,37 @@ msgstr "内部错误"

1510 #, c-format

1511 msgid "Applying patch %%s with %d reject..."

1512 msgid_plural "Applying patch %%s with %d rejects..."

1498 -msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."

1499 -msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

1513 +msgstr[0] "应用补丁 %%s，其中 %d 个被拒绝..."

1514 +msgstr[1] "应用补丁 %%s，其中 %d 个被拒绝..."

1515

1516 #: apply.c

1517 #, c-format

1518 msgid "cannot open %s"

1504 -msgstr "不能打开 %s"

1519 +msgstr "无法打开 %s"

1520

1521 #: apply.c rerere.c

1522 #, c-format

1523 msgid "cannot unlink '%s'"

1509 -msgstr "不能删除 '%s'"

1524 +msgstr "无法删除 '%s'"

1525

1526 #: apply.c

1527 #, c-format

1528 msgid "Hunk #%d applied cleanly."

1514 -msgstr "第 #%d 个片段成功应用。"

1529 +msgstr "第 #%d 个块成功应用。"

1530

1531 #: apply.c

1532 #, c-format

1533 msgid "Rejected hunk #%d."

1519 -msgstr "拒绝第 #%d 个片段。"

1534 +msgstr "拒绝第 #%d 个块。"

1535

1536 #: apply.c

1537 #, c-format

1538 msgid "Skipped patch '%s'."

1524 -msgstr "略过补丁 '%s'。"

1539 +msgstr "跳过补丁 '%s'。"

1540

1541 #: apply.c

1542 msgid "No valid patches in input (allow with \"--allow-empty\")"

1528 -msgstr "输入中没有合法的补丁（使用 \"--allow-empty\" 来允许）"

1543 +msgstr "输入中没有合法补丁（可用 \"--allow-empty\" 允许）"

1544

1545 #: apply.c t/helper/test-cache-tree.c

1546 msgid "unable to read index file"

@@ -1534,14 +1549,14 @@ msgstr "无法读取索引文件"

1549 #: apply.c

1550 #, c-format

1551 msgid "can't open patch '%s': %s"

1537 -msgstr "不能打开补丁 '%s'：%s"

1552 +msgstr "无法打开补丁 '%s'：%s"

1553

1554 #: apply.c

1555 #, c-format

1556 msgid "squelched %d whitespace error"

1557 msgid_plural "squelched %d whitespace errors"

1543 -msgstr[0] "抑制下仍有 %d 个空白字符误用"

1544 -msgstr[1] "抑制下仍有 %d 个空白字符误用"

1558 +msgstr[0] "已抑制 %d 个空白字符错误"

1559 +msgstr[1] "已抑制 %d 个空白字符错误"

1560

1561 #: apply.c

1562 #, c-format

@@ -1563,11 +1578,11 @@ msgstr "无法写入新索引文件"

1578

1579 #: apply.c

1580 msgid "don't apply changes matching the given path"

1566 -msgstr "不要应用与给出路径向匹配的变更"

1581 +msgstr "不要应用与给定路径相匹配的变更"

1582

1583 #: apply.c

1584 msgid "apply changes matching the given path"

1570 -msgstr "应用与给出路径向匹配的变更"

1585 +msgstr "应用与给定路径相匹配的变更"

1586

1587 #: apply.c builtin/am.c

1588 msgid "num"

@@ -1579,7 +1594,7 @@ msgstr "从传统的 diff 路径中移除指定数量的前导斜线"

1594

1595 #: apply.c

1596 msgid "ignore additions made by the patch"

1582 -msgstr "忽略补丁中的添加的文件"

1597 +msgstr "忽略补丁新增的内容"

1598

1599 #: apply.c

1600 msgid "instead of applying the patch, output diffstat for the input"

@@ -1619,7 +1634,7 @@ msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"

1634

1635 #: apply.c

1636 msgid "attempt three-way merge, fall back on normal patch if that fails"

1622 -msgstr "尝试三路合并，如果失败则回落至正常补丁模式"

1637 +msgstr "尝试三路合并，如果失败则回落到普通补丁模式"

1638

1639 #: apply.c builtin/merge-file.c

1640 msgid "for conflicts, use our version"

@@ -1635,7 +1650,7 @@ msgstr "如果冲突，使用联合版本"

1650

1651 #: apply.c

1652 msgid "build a temporary index based on embedded index information"

1638 -msgstr "创建一个临时索引基于嵌入的索引信息"

1653 +msgstr "基于嵌入的索引信息创建临时索引"

1654

1655 #: apply.c builtin/checkout-index.c

1656 msgid "paths are separated with NUL character"

@@ -1652,7 +1667,7 @@ msgstr "动作"

1667

1668 #: apply.c

1669 msgid "detect new or modified lines that have whitespace errors"

1655 -msgstr "检查新增和修改的行中间的空白字符滥用"

1670 +msgstr "检测新增或修改的行是否存在空白错误"

1671

1672 #: apply.c

1673 msgid "ignore changes in whitespace when finding context"

@@ -1668,19 +1683,19 @@ msgstr "无需至少一行上下文"

1683

1684 #: apply.c

1685 msgid "leave the rejected hunks in corresponding *.rej files"

1671 -msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"

1686 +msgstr "将被拒绝的块保存在对应的 *.rej 文件中"

1687

1688 #: apply.c

1689 msgid "allow overlapping hunks"

1675 -msgstr "允许重叠的补丁片段"

1690 +msgstr "允许重叠的块"

1691

1692 #: apply.c

1693 msgid "tolerate incorrectly detected missing new-line at the end of file"

1679 -msgstr "允许不正确的文件末尾换行符"

1694 +msgstr "容忍误判的文件末尾缺失换行符"

1695

1696 #: apply.c

1697 msgid "do not trust the line counts in the hunk headers"

1683 -msgstr "不信任补丁片段的头信息中的行号"

1698 +msgstr "不信任块头信息中的行数"

1699

1700 #: apply.c builtin/am.c

1701 msgid "root"

@@ -1701,7 +1716,7 @@ msgstr "--ours、--theirs 和 --union 需要 --3way"

1716 #: archive-tar.c archive-zip.c

1717 #, c-format

1718 msgid "cannot stream blob %s"

1704 -msgstr "不能打开数据对象 %s"

1719 +msgstr "无法流式传输数据对象 %s"

1720

1721 #: archive-tar.c archive-zip.c

1722 #, c-format

@@ -1759,12 +1774,12 @@ msgstr "git archive --remote <仓库> [--exec <命令>] --list"

1774 #: archive.c builtin/fast-import.c builtin/gc.c builtin/notes.c builtin/tag.c

1775 #, c-format

1776 msgid "cannot read '%s'"

1762 -msgstr "不能读取 '%s'"

1777 +msgstr "无法读取 '%s'"

1778

1779 #: archive.c

1780 #, c-format

1781 msgid "pathspec '%s' matches files outside the current directory"

1767 -msgstr "路径规格 '%s' 匹配了当前目录外的文件'"

1782 +msgstr "路径规格 '%s' 匹配了当前目录外的文件"

1783

1784 #: archive.c builtin/add.c builtin/rm.c

1785 #, c-format

@@ -1881,7 +1896,7 @@ msgstr "仓库"

1896

1897 #: archive.c builtin/archive.c

1898 msgid "retrieve the archive from remote repository <repo>"

1884 -msgstr "从远程仓库（<仓库>）提取归档文件"

1899 +msgstr "从远程仓库 <仓库> 提取归档文件"

1900

1901 #: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c

1902 msgid "command"

@@ -1929,7 +1944,7 @@ msgstr "%.*s 不是一个有效的属性名"

1944

1945 #: attr.c

1946 msgid "unable to add additional attribute"

1932 -msgstr "不能添加额外属性"

1947 +msgstr "无法添加额外属性"

1948

1949 #: attr.c

1950 #, c-format

@@ -1946,7 +1961,7 @@ msgid ""

1961 "Negative patterns are ignored in git attributes\n"

1962 "Use '\\!' for literal leading exclamation."

1963 msgstr ""

1949 -"负值模版在 git attributes 中被忽略\n"

1964 +"否定模式在 git attributes 中被忽略\n"

1965 "当字符串确实要以感叹号开始时，使用 '\\!'。"

1966

1967 #: attr.c

@@ -1981,7 +1996,7 @@ msgstr "无法对 %s 执行 stat"

1996 #: builtin/pack-objects.c combine-diff.c object-file.c rerere.c

1997 #, c-format

1998 msgid "unable to read %s"

1984 -msgstr "不能读 %s"

1999 +msgstr "无法读取 %s"

2000

2001 #: bisect.c

2002 #, c-format

@@ -2004,7 +2019,7 @@ msgid ""

2019 "The merge base %s is bad.\n"

2020 "This means the bug has been fixed between %s and [%s].\n"

2021 msgstr ""

2007 -"合并基线 %s 是坏的。\n"

2022 +"合并基线 %s 是有问题的。\n"

2023 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"

2024

2025 #: bisect.c

@@ -2043,14 +2058,14 @@ msgid ""

2058 "So we cannot be sure the first %s commit is between %s and %s.\n"

2059 "We continue anyway."

2060 msgstr ""

2046 -"介于 %s 和 [%s] 的合并基线一定被忽略了。\n"

2061 +"介于 %s 和 [%s] 的合并基线必须被跳过。\n"

2062 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"

2048 -"我们仍旧继续。"

2063 +"我们仍然继续。"

2064

2065 #: bisect.c

2066 #, c-format

2067 msgid "Bisecting: a merge base must be tested\n"

2053 -msgstr "二分查找中：合并基线必须是经过测试的\n"

2068 +msgstr "二分查找中：合并基线必须经过测试\n"

2069

2070 #: bisect.c

2071 #, c-format

@@ -2060,17 +2075,17 @@ msgstr "需要一个 %s 版本"

2075 #: bisect.c

2076 #, c-format

2077 msgid "could not create file '%s'"

2063 -msgstr "不能创建文件 '%s'"

2078 +msgstr "无法创建文件 '%s'"

2079

2080 #: bisect.c builtin/notes.c

2081 #, c-format

2082 msgid "unable to start 'show' for object '%s'"

2068 -msgstr "不能为对象 '%s' 开始 'show'"

2083 +msgstr "无法对对象 '%s' 启动 'show'"

2084

2085 #: bisect.c builtin/merge.c

2086 #, c-format

2087 msgid "could not read file '%s'"

2073 -msgstr "不能读取文件 '%s'"

2088 +msgstr "无法读取文件 '%s'"

2089

2090 #: bisect.c

2091 msgid "reading bisect refs failed"

@@ -2134,7 +2149,7 @@ msgstr "在 %2$s 中无此路径 %1$s"

2149 #: blame.c

2150 #, c-format

2151 msgid "cannot read blob %s for path %s"

2137 -msgstr "不能为路径 %2$s 读取数据对象 %1$s"

2152 +msgstr "无法为路径 %2$s 读取数据对象 %1$s"

2153

2154 #: branch.c

2155 msgid ""

@@ -2173,7 +2188,7 @@ msgid ""

2188 "the remote tracking information by invoking:"

2189 msgstr ""

2190 "\n"

2176 -"在修复错误后，您可以通过执行以下命令来尝试修改远程跟踪分支："

2191 +"在修复错误后，您可以通过执行以下命令来尝试修复远程跟踪信息："

2192

2193 #: branch.c

2194 #, c-format

@@ -2188,7 +2203,7 @@ msgstr "要求从 '%s' 继承跟踪信息，但是没有设置合并配置"

2203 #: branch.c

2204 #, c-format

2205 msgid "not tracking: ambiguous information for ref '%s'"

2191 -msgstr "不在跟踪中：引用 '%s' 有歧义的信息"

2206 +msgstr "未跟踪：引用 '%s' 的信息含糊不清"

2207

2208 # 译者：为保证在输出中对齐，注意调整句中空格！

2209 #. #-#-#-#-# branch.c.po #-#-#-#-#

@@ -2222,11 +2237,11 @@ msgid ""

2237 "different remotes' fetch refspecs map into different\n"

2238 "tracking namespaces."

2239 msgstr ""

2225 -"有多个远程的获取引用规格映射到了追踪引用 '%s'：\n"

2240 +"有多个远程的获取引用规格映射到了跟踪引用 '%s'：\n"

2241 "%s\n"

2242 "这一般是个配置错误。\n"

2243 "\n"

2229 -"如果要支持设置追踪分支，请保证不同远程的获取引用规格映射至不同的追踪命名空"

2244 +"如果要支持设置跟踪分支，请保证不同远程的获取引用规格映射至不同的跟踪命名空"

2245 "间。"

2246

2247 #: branch.c

@@ -2302,13 +2317,13 @@ msgid ""

2317 "You may try updating the submodules using 'git checkout --no-recurse-"

2318 "submodules %s && git submodule update --init'"

2319 msgstr ""

2305 -"你可以用 'git checkout --no-recurse-submodules %s && git submodule update --"

2320 +"您可以用 'git checkout --no-recurse-submodules %s && git submodule update --"

2321 "init' 来尝试更新子模组"

2322

2323 #: branch.c

2324 #, c-format

2325 msgid "submodule '%s': cannot create branch '%s'"

2311 -msgstr "子模组 '%s'：不能创建分支 '%s'"

2326 +msgstr "子模组 '%s'：无法创建分支 '%s'"

2327

2328 #: branch.c

2329 #, c-format

@@ -2322,7 +2337,7 @@ msgstr "git add [<选项>] [--] <路径规格>..."

2337 #: builtin/add.c

2338 #, c-format

2339 msgid "cannot chmod %cx '%s'"

2325 -msgstr "不能 chmod %cx '%s'"

2340 +msgstr "无法 chmod %cx '%s'"

2341

2342 #: builtin/add.c

2343 msgid "Unstaged changes after refreshing the index:"

@@ -2330,7 +2345,7 @@ msgstr "刷新索引之后尚未被暂存的变更："

2345

2346 #: builtin/add.c

2347 msgid "could not read the index"

2333 -msgstr "不能读取索引"

2348 +msgstr "无法读取索引"

2349

2350 #: builtin/add.c

2351 msgid "editing patch failed"

@@ -2339,16 +2354,16 @@ msgstr "编辑补丁失败"

2354 #: builtin/add.c read-cache.c

2355 #, c-format

2356 msgid "could not stat '%s'"

2342 -msgstr "不能对 '%s' 调用 stat"

2357 +msgstr "无法对 '%s' 调用 stat"

2358

2359 #: builtin/add.c

2360 msgid "empty patch. aborted"

2346 -msgstr "空补丁。异常终止"

2361 +msgstr "空补丁。已中止"

2362

2363 #: builtin/add.c

2364 #, c-format

2365 msgid "could not apply '%s'"

2351 -msgstr "不能应用 '%s'"

2366 +msgstr "无法应用 '%s'"

2367

2368 #: builtin/add.c

2369 msgid "The following paths are ignored by one of your .gitignore files:\n"

@@ -2358,13 +2373,13 @@ msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"

2373 #: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c

2374 #: builtin/rm.c builtin/send-pack.c builtin/sparse-checkout.c

2375 msgid "dry run"

2361 -msgstr "演习"

2376 +msgstr "试运行"

2377

2378 #: builtin/add.c builtin/check-ignore.c builtin/commit.c

2379 #: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c

2380 #: builtin/read-tree.c builtin/refs.c

2381 msgid "be verbose"

2367 -msgstr "冗长输出"

2382 +msgstr "输出更详细"

2383

2384 #: builtin/add.c

2385 msgid "interactive picking"

@@ -2392,11 +2407,11 @@ msgstr "对已跟踪文件（暗含 -u）重新归一换行符"

2407

2408 #: builtin/add.c

2409 msgid "record only the fact that the path will be added later"

2395 -msgstr "只记录，该路径稍后再添加"

2410 +msgstr "只记录该路径稍后将被添加"

2411

2412 #: builtin/add.c

2413 msgid "add changes from all tracked and untracked files"

2399 -msgstr "添加所有改变的已跟踪文件和未跟踪文件"

2414 +msgstr "添加所有已跟踪和未跟踪文件的变更"

2415

2416 #: builtin/add.c

2417 msgid "ignore paths removed in the working tree (same as --no-all)"

@@ -2408,11 +2423,11 @@ msgstr "不添加，只刷新索引"

2423

2424 #: builtin/add.c

2425 msgid "just skip files which cannot be added because of errors"

2411 -msgstr "跳过因出错不能添加的文件"

2426 +msgstr "跳过因出错无法添加的文件"

2427

2428 #: builtin/add.c

2429 msgid "check if - even missing - files are ignored in dry run"

2415 -msgstr "检查在演习模式下文件（即使不存在）是否被忽略"

2430 +msgstr "检查试运行时文件（即使不存在）是否被忽略"

2431

2432 #: builtin/add.c builtin/mv.c builtin/rm.c

2433 msgid "allow updating entries outside of the sparse-checkout cone"

@@ -2424,7 +2439,7 @@ msgstr "覆盖列表里文件的可执行位"

2439

2440 #: builtin/add.c

2441 msgid "warn when adding an embedded repository"

2427 -msgstr "创建一个嵌入式仓库时给予警告"

2442 +msgstr "添加嵌入式仓库时给予警告"

2443

2444 #: builtin/add.c

2445 #, c-format

@@ -2443,7 +2458,7 @@ msgid ""

2458 "\n"

2459 "See \"git help submodule\" for more information."

2460 msgstr ""

2446 -"您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n"

2461 +"您在当前仓库中添加了另一个 Git 仓库。外层仓库的克隆将不包含嵌入式仓库的\n"

2462 "内容，并且不知道该如何获取它。如果您要添加一个子模组，使用：\n"

2463 "\n"

2464 "\tgit submodule add <url> %s\n"

@@ -2508,7 +2523,7 @@ msgstr "无法写新的索引文件"

2523 #: builtin/am.c builtin/mailinfo.c mailinfo.c

2524 #, c-format

2525 msgid "bad action '%s' for '%s'"

2511 -msgstr "'%2$s' 的错误动作 '%1$s'"

2526 +msgstr "用于 '%2$s' 的动作 '%1$s' 无效"

2527

2528 #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c

2529 #: builtin/pull.c builtin/revert.c diff-merges.c diff.c environment.c

@@ -2520,16 +2535,16 @@ msgstr "'%s' 的值无效：'%s'"

2535 #: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c

2536 #, c-format

2537 msgid "could not read '%s'"

2523 -msgstr "不能读取 '%s'"

2538 +msgstr "无法读取 '%s'"

2539

2540 #: builtin/am.c

2541 msgid "could not parse author script"

2527 -msgstr "不能解析作者脚本"

2542 +msgstr "无法解析作者脚本"

2543

2544 #: builtin/am.c builtin/replace.c commit.c sequencer.c

2545 #, c-format

2546 msgid "could not parse %s"

2532 -msgstr "不能解析 %s"

2547 +msgstr "无法解析 %s"

2548

2549 #: builtin/am.c

2550 #, c-format

@@ -2632,15 +2647,15 @@ msgstr "无效的身份标识：%.*s"

2647 #: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c

2648 #, c-format

2649 msgid "unable to parse commit %s"

2635 -msgstr "不能解析提交 %s"

2650 +msgstr "无法解析提交 %s"

2651

2652 #: builtin/am.c

2653 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

2639 -msgstr "仓库缺乏必要的数据对象以进行三方合并。"

2654 +msgstr "仓库缺乏必要的数据对象，无法回落到三路合并。"

2655

2656 #: builtin/am.c

2657 msgid "Using index info to reconstruct a base tree..."

2643 -msgstr "使用索引来重建一个（三方合并的）基础目录树..."

2658 +msgstr "使用索引来重建一个（三路合并的）基础目录树..."

2659

2660 #: builtin/am.c

2661 msgid ""

@@ -2652,7 +2667,7 @@ msgstr ""

2667

2668 #: builtin/am.c

2669 msgid "Falling back to patching base and 3-way merge..."

2655 -msgstr "回落到基础版本上打补丁及进行三方合并..."

2670 +msgstr "回落到在基础版本上打补丁并进行三路合并..."

2671

2672 #: builtin/am.c

2673 msgid "Failed to merge in the changes."

@@ -2695,7 +2710,7 @@ msgstr "无法写入索引文件"

2710 #: builtin/am.c

2711 #, c-format

2712 msgid "Dirty index: cannot apply patches (dirty: %s)"

2698 -msgstr "脏索引：不能应用补丁（脏文件：%s）"

2713 +msgstr "脏索引：无法应用补丁（脏文件：%s）"

2714

2715 #: builtin/am.c

2716 #, c-format

@@ -2740,7 +2755,7 @@ msgid ""

2755 "already introduced the same changes; you might want to skip this patch."

2756 msgstr ""

2757 "没有变更 —— 您是不是忘了执行 'git add'？\n"

2743 -"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"

2758 +"如果没有什么要添加到暂存区的，则很可能是其他提交已经引入了相同的变更。\n"

2759 "您也许想要跳过这个补丁。"

2760

2761 #: builtin/am.c

@@ -2751,13 +2766,13 @@ msgid ""

2766 "You might run `git rm` on a file to accept \"deleted by them\" for it."

2767 msgstr ""

2768 "在您的索引中仍存在未合并的路径。\n"

2754 -"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"

2769 +"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。\n"

2770 "您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"

2771

2772 #: builtin/am.c builtin/reset.c

2773 #, c-format

2774 msgid "Could not parse object '%s'."

2760 -msgstr "不能解析对象 '%s'。"

2775 +msgstr "无法解析对象 '%s'。"

2776

2777 #: builtin/am.c

2778 msgid "failed to clean index"

@@ -2796,7 +2811,7 @@ msgstr "老的参数 —— 无作用"

2811

2812 #: builtin/am.c

2813 msgid "allow fall back on 3way merging if needed"

2799 -msgstr "如果必要，允许使用三方合并。"

2814 +msgstr "如有需要，允许回落到三路合并"

2815

2816 #: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c

2817 #: builtin/stash.c

@@ -2859,7 +2874,7 @@ msgstr "补丁的格式"

2874

2875 #: builtin/am.c

2876 msgid "override error message when patch failure occurs"

2862 -msgstr "打补丁失败时显示的错误信息"

2877 +msgstr "覆盖打补丁失败时的错误信息"

2878

2879 #: builtin/am.c

2880 msgid "continue applying patches after resolving a conflict"

@@ -2895,7 +2910,7 @@ msgstr "把空补丁记录为空提交"

2910

2911 #: builtin/am.c

2912 msgid "lie about committer date"

2898 -msgstr "将作者日期作为提交日期"

2913 +msgstr "伪造提交者日期"

2914

2915 #: builtin/am.c

2916 msgid "use current timestamp for author date"

@@ -2904,7 +2919,7 @@ msgstr "用当前时间作为作者日期"

2919 #: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c

2920 #: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c

2921 msgid "key-id"

2907 -msgstr "key-id"

2922 +msgstr "密钥 ID"

2923

2924 #: builtin/am.c builtin/rebase.c

2925 msgid "GPG-sign commits"

@@ -2941,7 +2956,7 @@ msgid ""

2956 "Stray %s directory found.\n"

2957 "Use \"git am --abort\" to remove it."

2958 msgstr ""

2944 -"发现了错误的 %s 目录。\n"

2959 +"发现了残留的 %s 目录。\n"

2960 "使用 \"git am --abort\" 删除它。"

2961

2962 #: builtin/am.c

@@ -2958,7 +2973,7 @@ msgstr "git apply [<选项>] [<补丁>...]"

2973

2974 #: builtin/archive.c diagnose.c

2975 msgid "could not redirect output"

2961 -msgstr "不能重定向输出"

2976 +msgstr "无法重定向输出"

2977

2978 #: builtin/archive.c

2979 msgid "git archive: expected ACK/NAK, got a flush packet"

@@ -3030,17 +3045,17 @@ msgstr "git bisect run <命令> [<参数>...]"

3045 #: builtin/bisect.c

3046 #, c-format

3047 msgid "cannot open file '%s' in mode '%s'"

3033 -msgstr "不能以 '%2$s' 模式打开文件 '%1$s'"

3048 +msgstr "无法以 '%2$s' 模式打开文件 '%1$s'"

3049

3050 #: builtin/bisect.c

3051 #, c-format

3052 msgid "could not write to file '%s'"

3038 -msgstr "不能写入文件 '%s'"

3053 +msgstr "无法写入文件 '%s'"

3054

3055 #: builtin/bisect.c

3056 #, c-format

3057 msgid "cannot open file '%s' for reading"

3043 -msgstr "不能打开文件 '%s' 来读取"

3058 +msgstr "无法打开文件 '%s' 来读取"

3059

3060 #: builtin/bisect.c

3061 #, c-format

@@ -3050,12 +3065,12 @@ msgstr "'%s' 不是一个有效的术语"

3065 #: builtin/bisect.c

3066 #, c-format

3067 msgid "can't use the builtin command '%s' as a term"

3053 -msgstr "不能使用内置命令 '%s' 作为术语"

3068 +msgstr "无法使用内置命令 '%s' 作为术语"

3069

3070 #: builtin/bisect.c

3071 #, c-format

3072 msgid "can't change the meaning of the term '%s'"

3058 -msgstr "不能修改术语 '%s' 的含义"

3073 +msgstr "无法修改术语 '%s' 的含义"

3074

3075 #: builtin/bisect.c

3076 msgid "please use two different terms"

@@ -3075,12 +3090,12 @@ msgstr "'%s' 不是一个有效的提交"

3090 #, c-format

3091 msgid ""

3092 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."

3078 -msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"

3093 +msgstr "无法检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"

3094

3095 #: builtin/bisect.c

3096 #, c-format

3097 msgid "Bad bisect_write argument: %s"

3083 -msgstr "坏的 bisect_write 参数：%s"

3098 +msgstr "错误的 bisect_write 参数：%s"

3099

3100 #: builtin/bisect.c

3101 #, c-format

@@ -3128,7 +3143,7 @@ msgstr "在只有一个 %s 提交的情况下二分查找"

3143 #.

3144 #: builtin/bisect.c

3145 msgid "Are you sure [Y/n]? "

3131 -msgstr "您确认么[Y/n]？ "

3146 +msgstr "您确认吗 [Y/n]？ "

3147

3148 #: builtin/bisect.c

3149 msgid "status: waiting for both good and bad commits\n"

@@ -3186,7 +3201,7 @@ msgstr "'%s' 看起来不是一个有效的版本"

3201

3202 #: builtin/bisect.c

3203 msgid "bad HEAD - I need a HEAD"

3189 -msgstr "坏的 HEAD - 我需要一个 HEAD"

3204 +msgstr "无效的 HEAD - 需要一个 HEAD"

3205

3206 #: builtin/bisect.c

3207 #, c-format

@@ -3195,7 +3210,7 @@ msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"

3210

3211 #: builtin/bisect.c

3212 msgid "bad HEAD - strange symbolic ref"

3198 -msgstr "坏的 HEAD - 奇怪的符号引用"

3213 +msgstr "无效的 HEAD - 奇怪的符号引用"

3214

3215 #: builtin/bisect.c

3216 #, c-format

@@ -3212,7 +3227,7 @@ msgstr "您需要执行 \"git bisect start\" 来开始\n"

3227 #.

3228 #: builtin/bisect.c

3229 msgid "Do you want me to do it for you [Y/n]? "

3215 -msgstr "您想让我为您这样做么[Y/n]？ "

3230 +msgstr "您想让我为您这样做吗[Y/n]？ "

3231

3232 #: builtin/bisect.c

3233 msgid "Please call `--bisect-state` with at least one argument"

@@ -3226,12 +3241,12 @@ msgstr "'git bisect %s' 只能带一个参数。"

3241 #: builtin/bisect.c

3242 #, c-format

3243 msgid "Bad rev input: %s"

3229 -msgstr "坏的版本输入：%s"

3244 +msgstr "错误的版本输入：%s"

3245

3246 #: builtin/bisect.c

3247 #, c-format

3248 msgid "Bad rev input (not a commit): %s"

3234 -msgstr "坏的版本输入（不是提交）：%s"

3249 +msgstr "错误的版本输入（不是提交）：%s"

3250

3251 #: builtin/bisect.c

3252 msgid "We are not bisecting."

@@ -3240,12 +3255,12 @@ msgstr "我们没有在二分查找。"

3255 #: builtin/bisect.c

3256 #, c-format

3257 msgid "'%s'?? what are you talking about?"

3243 -msgstr "'%s'?? 您在说什么?"

3258 +msgstr "'%s'？？您在说什么？"

3259

3260 #: builtin/bisect.c

3261 #, c-format

3262 msgid "cannot read file '%s' for replaying"

3248 -msgstr "不能读取文件 '%s' 来重放"

3263 +msgstr "无法读取文件 '%s' 来重放"

3264

3265 #: builtin/bisect.c

3266 #, c-format

@@ -3278,7 +3293,7 @@ msgstr "无法打开文件 '%s' 进行写入"

3293

3294 #: builtin/bisect.c

3295 msgid "bisect run cannot continue any more"

3281 -msgstr "二分查找不能继续运行"

3296 +msgstr "二分查找无法继续运行"

3297

3298 #: builtin/bisect.c

3299 msgid "bisect run success"

@@ -3341,7 +3356,7 @@ msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"

3356 #: builtin/blame.c

3357 #, c-format

3358 msgid "expecting a color: %s"

3344 -msgstr "期望一个颜色：%s"

3359 +msgstr "期望是颜色：%s"

3360

3361 #: builtin/blame.c

3362 msgid "must end with a color"

@@ -3363,7 +3378,7 @@ msgstr ""

3378 #: builtin/blame.c

3379 #, c-format

3380 msgid "cannot find revision %s to ignore"

3366 -msgstr "不能找到要忽略的版本 %s"

3381 +msgstr "无法找到要忽略的版本 %s"

3382

3383 #: builtin/blame.c

3384 msgid "show blame entries as we find them, incrementally"

@@ -3405,7 +3420,7 @@ msgstr "显示为一个适合机器读取的格式"

3420

3421 #: builtin/blame.c

3422 msgid "show porcelain format with per-line commit information"

3408 -msgstr "为每一行显示机器适用的提交信息"

3423 +msgstr "以 porcelain 格式显示每行的提交信息"

3424

3425 #: builtin/blame.c

3426 msgid "use the same output mode as git-annotate (Default: off)"

@@ -3453,7 +3468,7 @@ msgstr "忽略来自 <文件> 中的版本"

3468

3469 #: builtin/blame.c

3470 msgid "color redundant metadata from previous line differently"

3456 -msgstr "使用颜色间隔输出与前一行不同的重复元信息"

3471 +msgstr "用不同颜色标示与前一行重复的元信息"

3472

3473 #: builtin/blame.c

3474 msgid "color lines by age"

@@ -3469,7 +3484,7 @@ msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"

3484

3485 #: builtin/blame.c

3486 msgid "use <file>'s contents as the final image"

3472 -msgstr "使用 <文件> 的内容作为最终的镜像"

3487 +msgstr "使用 <文件> 的内容作为最终结果"

3488

3489 #: builtin/blame.c

3490 msgid "score"

@@ -3493,7 +3508,7 @@ msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数

3508

3509 #: builtin/blame.c

3510 msgid "--progress can't be used with --incremental or porcelain formats"

3496 -msgstr "--progress 不能和 --incremental 或机器内部格式一起使用"

3511 +msgstr "--progress 不能和 --incremental 或 porcelain 格式一起使用"

3512

3513 #. TRANSLATORS: This string is used to tell us the

3514 #. maximum display width for a relative timestamp in

@@ -3542,7 +3557,7 @@ msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"

3557

3558 #: builtin/branch.c

3559 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"

3545 -msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"

3560 +msgstr "git branch [<选项>] (-c | -C) [<旧分支>] <新分支>"

3561

3562 #: builtin/branch.c

3563 msgid "git branch [<options>] [-r | -a] [--points-at]"

@@ -3598,7 +3613,7 @@ msgstr "不能将 -a 和 -d 同时使用"

3613 #: builtin/branch.c

3614 #, c-format

3615 msgid "cannot delete branch '%s' used by worktree at '%s'"

3601 -msgstr "无法强制更新被工作区 '%2$s' 所使用的分支 '%1$s'"

3616 +msgstr "无法删除被工作区 '%2$s' 使用的分支 '%1$s'"

3617

3618 #: builtin/branch.c

3619 #, c-format

@@ -3617,7 +3632,7 @@ msgstr ""

3632 #: builtin/branch.c

3633 #, c-format

3634 msgid "branch '%s' not found"

3620 -msgstr "分支 '%s' 未发现"

3635 +msgstr "分支 '%s' 未找到"

3636

3637 #: builtin/branch.c

3638 #, c-format

@@ -3631,11 +3646,11 @@ msgstr "已删除分支 %s（曾为 %s）。\n"

3646

3647 #: builtin/branch.c builtin/tag.c

3648 msgid "unable to parse format string"

3634 -msgstr "不能解析格式化字符串"

3649 +msgstr "无法解析格式化字符串"

3650

3651 #: builtin/branch.c

3652 msgid "could not resolve HEAD"

3638 -msgstr "不能解析 HEAD 提交"

3653 +msgstr "无法解析 HEAD"

3654

3655 #: builtin/branch.c

3656 #, c-format

@@ -3650,12 +3665,12 @@ msgstr "分支 %s 正被变基到 %s"

3665 #: builtin/branch.c

3666 #, c-format

3667 msgid "branch %s is being bisected at %s"

3653 -msgstr "分支 %s 正被二分查找于 %s"

3668 +msgstr "分支 %s 正在 %s 处进行二分查找"

3669

3670 #: builtin/branch.c

3671 #, c-format

3672 msgid "HEAD of working tree %s is not updated"

3658 -msgstr "工作区 %s 的 HEAD 指向没有被更新"

3673 +msgstr "工作区 %s 的 HEAD 未更新"

3674

3675 #: builtin/branch.c

3676 #, c-format

@@ -3712,7 +3727,7 @@ msgid ""

3727 msgstr ""

3728 "请编辑分支的描述\n"

3729 " %s\n"

3715 -"以 '%s' 开头的行将被过滤。\n"

3730 +"以 '%s' 开头的行将被移除。\n"

3731

3732 #: builtin/branch.c

3733 msgid "Generic options"

@@ -3764,7 +3779,7 @@ msgstr "只打印不包含该提交的分支"

3779

3780 #: builtin/branch.c

3781 msgid "Specific git-branch actions:"

3767 -msgstr "具体的 git-branch 动作："

3782 +msgstr "具体的 git-branch 操作："

3783

3784 #: builtin/branch.c

3785 msgid "list both remote-tracking and local branches"

@@ -3812,7 +3827,7 @@ msgstr "创建分支的引用日志"

3827

3828 #: builtin/branch.c

3829 msgid "edit the description for the branch"

3815 -msgstr "标记分支的描述"

3830 +msgstr "编辑分支的描述"

3831

3832 #: builtin/branch.c

3833 msgid "force creation, move/rename, deletion"

@@ -3840,7 +3855,7 @@ msgstr "只打印指向该对象的分支"

3855

3856 #: builtin/branch.c builtin/for-each-ref.c builtin/tag.c

3857 msgid "sorting and filtering are case insensitive"

3843 -msgstr "排序和过滤属于大小写不敏感"

3858 +msgstr "排序和过滤不区分大小写"

3859

3860 #: builtin/branch.c builtin/ls-files.c

3861 msgid "recurse through submodules"

@@ -3857,7 +3872,7 @@ msgstr "无法将 HEAD 解析为有效引用"

3872

3873 #: builtin/branch.c builtin/clone.c

3874 msgid "HEAD not found below refs/heads!"

3860 -msgstr "HEAD 没有位于 /refs/heads 之下！"

3875 +msgstr "HEAD 没有位于 refs/heads 之下！"

3876

3877 #: builtin/branch.c

3878 msgid ""

@@ -3876,11 +3891,11 @@ msgstr "必须提供分支名"

3891

3892 #: builtin/branch.c

3893 msgid "cannot give description to detached HEAD"

3879 -msgstr "不能向分离头指针提供描述"

3894 +msgstr "无法向分离头指针提供描述"

3895

3896 #: builtin/branch.c

3897 msgid "cannot edit description of more than one branch"

3883 -msgstr "不能为一个以上的分支编辑描述"

3898 +msgstr "无法为一个以上的分支编辑描述"

3899

3900 #: builtin/branch.c

3901 msgid "cannot copy the current branch while not on any"

@@ -3924,7 +3939,7 @@ msgstr "为取消上游设置操作提供了太多的参数"

3939

3940 #: builtin/branch.c

3941 msgid "could not unset upstream of HEAD when it does not point to any branch"

3927 -msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"

3942 +msgstr "无法取消 HEAD 的上游设置，因为它没有指向任何分支"

3943

3944 #: builtin/branch.c

3945 #, c-format

@@ -3967,9 +3982,9 @@ msgid ""

3982 " [(-s | --suffix) <format> | --no-suffix]\n"

3983 " [--diagnose[=<mode>]]"

3984 msgstr ""

3970 -"git bugreport [-o | --output-directory <文件>]\n"

3985 +"git bugreport [-o | --output-directory <路径>]\n"

3986 " [(-s | --suffix) <格式> | --no-suffix]\n"

3972 -" [--diagnose[=<模式>]"

3987 +" [--diagnose[=<模式>]]"

3988

3989 #: builtin/bugreport.c

3990 msgid ""

@@ -4000,7 +4015,7 @@ msgstr ""

4015 "\n"

4016 "您所期望的与实际发生的有什么不同？\n"

4017 "\n"

4003 -"您想要补充的其它内容：\n"

4018 +"您想要补充的其他内容：\n"

4019 "\n"

4020 "请检查下面错误报告中余下的内容。\n"

4021 "您可以删除任何您不想共享的内容。\n"

@@ -4031,12 +4046,12 @@ msgstr "未知参数 `%s'"

4046 #: builtin/bugreport.c builtin/diagnose.c

4047 #, c-format

4048 msgid "could not create leading directories for '%s'"

4034 -msgstr "不能为 '%s' 创建先导目录"

4049 +msgstr "无法为 '%s' 创建上级目录"

4050

4051 #: builtin/bugreport.c builtin/diagnose.c

4052 #, c-format

4053 msgid "unable to create diagnostics archive %s"

4039 -msgstr "不能创建诊断归档包 %s"

4054 +msgstr "无法创建诊断归档包 %s"

4055

4056 #: builtin/bugreport.c

4057 msgid "System Info"

@@ -4082,11 +4097,11 @@ msgstr "需要一个 <文件> 参数"

4097

4098 #: builtin/bundle.c builtin/pack-objects.c

4099 msgid "do not show progress meter"

4085 -msgstr "不显示进度表"

4100 +msgstr "不显示进度条"

4101

4102 #: builtin/bundle.c builtin/pack-objects.c

4103 msgid "show progress meter"

4089 -msgstr "显示进度表"

4104 +msgstr "显示进度条"

4105

4106 #: builtin/bundle.c

4107 msgid "historical; same as --progress"

@@ -4098,28 +4113,28 @@ msgstr "老的参数；无作用"

4113

4114 #: builtin/bundle.c

4115 msgid "specify bundle format version"

4101 -msgstr "指定归档包的格式版本"

4116 +msgstr "指定捆绑包的格式版本"

4117

4118 #: builtin/bundle.c

4119 msgid "Need a repository to create a bundle."

4105 -msgstr "需要一个仓库来创建归档包。"

4120 +msgstr "需要一个仓库来创建捆绑包。"

4121

4122 #: builtin/bundle.c

4123 msgid "do not show bundle details"

4109 -msgstr "不显示归档包的细节"

4124 +msgstr "不显示捆绑包的细节"

4125

4126 #: builtin/bundle.c bundle.c

4127 msgid "need a repository to verify a bundle"

4113 -msgstr "需要一个仓库来校验一个归档包"

4128 +msgstr "需要一个仓库来校验一个捆绑包"

4129

4130 #: builtin/bundle.c

4131 #, c-format

4132 msgid "%s is okay\n"

4118 -msgstr "%s 可以\n"

4133 +msgstr "%s 没问题\n"

4134

4135 #: builtin/bundle.c

4136 msgid "Need a repository to unbundle."

4122 -msgstr "需要一个仓库来解开归档包。"

4137 +msgstr "需要一个仓库来解开捆绑包。"

4138

4139 #: builtin/bundle.c

4140 msgid "Unbundling objects"

@@ -4128,7 +4143,7 @@ msgstr "解包对象中"

4143 #: builtin/cat-file.c

4144 #, c-format

4145 msgid "cannot read object %s '%s'"

4131 -msgstr "不能读取对象 %s '%s'"

4146 +msgstr "无法读取对象 %s '%s'"

4147

4148 #: builtin/cat-file.c

4149 msgid "flush is only for --buffer mode"

@@ -4199,7 +4214,7 @@ msgstr "美观地打印 <对象> 的内容"

4214

4215 #: builtin/cat-file.c

4216 msgid "Emit [broken] object attributes"

4202 -msgstr "输出 [坏的] 对象属性"

4217 +msgstr "输出 [损坏的] 对象属性"

4218

4219 #: builtin/cat-file.c

4220 msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)"

@@ -4227,11 +4242,11 @@ msgstr "类似于 --batch，但不输出 <内容>"

4242

4243 #: builtin/cat-file.c

4244 msgid "stdin is NUL-terminated"

4230 -msgstr "标准输入以 NUL 字符分隔"

4245 +msgstr "标准输入以 NUL 字符终止"

4246

4247 #: builtin/cat-file.c

4248 msgid "stdin and stdout is NUL-terminated"

4234 -msgstr "标准输入和标准输出以 NUL 字符分隔"

4249 +msgstr "标准输入和标准输出以 NUL 字符终止"

4250

4251 #: builtin/cat-file.c

4252 msgid "read commands from stdin"

@@ -4277,7 +4292,7 @@ msgstr "数据对象|树"

4292

4293 #: builtin/cat-file.c

4294 msgid "use a <path> for (--textconv | --filters); Not with 'batch'"

4280 -msgstr "(--textconv | --filters) 使用 <路径>；而不是 'batch'"

4295 +msgstr "为 (--textconv | --filters) 使用 <路径>；不能与 'batch' 同用"

4296

4297 #: builtin/cat-file.c

4298 msgid "objects filter only supported in batch mode"

@@ -4442,7 +4457,7 @@ msgstr "git checkout-index [<选项>] [--] [<文件>...]"

4457

4458 #: builtin/checkout-index.c

4459 msgid "stage should be between 1 and 3 or all"

4445 -msgstr "索引值应该取值 1 到 3 或者 all"

4460 +msgstr "暂存区编号应为 1 到 3 或 all"

4461

4462 #: builtin/checkout-index.c

4463 msgid "check out all files in the index"

@@ -4458,7 +4473,7 @@ msgstr "强制覆盖现有的文件"

4473

4474 #: builtin/checkout-index.c

4475 msgid "no warning for existing files and files not in index"

4461 -msgstr "存在或不在索引中的文件都没有警告"

4476 +msgstr "对已存在文件和不在索引中的文件不发出警告"

4477

4478 #: builtin/checkout-index.c

4479 msgid "don't checkout new files"

@@ -4519,7 +4534,7 @@ msgstr "路径 '%s' 没有必需的版本"

4534 #: builtin/checkout.c

4535 #, c-format

4536 msgid "path '%s': cannot merge"

4522 -msgstr "path '%s'：无法合并"

4537 +msgstr "路径 '%s'：无法合并"

4538

4539 #: builtin/checkout.c

4540 #, c-format

@@ -4555,7 +4570,7 @@ msgstr "'%s' 不能在更新路径时使用"

4570 #: builtin/checkout.c

4571 #, c-format

4572 msgid "Cannot update paths and switch to branch '%s' at the same time."

4558 -msgstr "不能同时更新路径并切换到分支'%s'。"

4573 +msgstr "不能同时更新路径并切换到分支 '%s'。"

4574

4575 #: builtin/checkout.c

4576 #, c-format

@@ -4598,13 +4613,13 @@ msgid ""

4613 "cannot continue with staged changes in the following files:\n"

4614 "%s"

4615 msgstr ""

4601 -"不能继续，下列文件有暂存的修改：\n"

4616 +"无法继续，下列文件有暂存的修改：\n"

4617 "%s"

4618

4619 #: builtin/checkout.c

4620 #, c-format

4621 msgid "Can not do reflog for '%s': %s\n"

4607 -msgstr "不能对 '%s' 执行 reflog 操作：%s\n"

4622 +msgstr "无法对 '%s' 执行 reflog 操作：%s\n"

4623

4624 #: builtin/checkout.c

4625 msgid "HEAD is now at"

@@ -4612,7 +4627,7 @@ msgstr "HEAD 目前位于"

4627

4628 #: builtin/checkout.c builtin/clone.c

4629 msgid "unable to update HEAD"

4615 -msgstr "不能更新 HEAD"

4630 +msgstr "无法更新 HEAD"

4631

4632 #: builtin/checkout.c

4633 #, c-format

@@ -4643,7 +4658,7 @@ msgstr "切换到分支 '%s'\n"

4658 #: builtin/checkout.c

4659 #, c-format

4660 msgid " ... and %d more.\n"

4646 -msgstr " ... 及其它 %d 个。\n"

4661 +msgstr " ... 及其他 %d 个。\n"

4662

4663 #: builtin/checkout.c

4664 #, c-format

@@ -4730,8 +4745,8 @@ msgstr ""

4745 "\n"

4746 " git checkout --track origin/<名称>\n"

4747 "\n"

4733 -"如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n"

4734 -"名称，可以在配置中设置 checkout.defaultRemote=origin。"

4748 +"如果您希望在检出模糊的简短分支名 <名称> 时总是偏好某个远程（如 'origin'），\n"

4749 +"可以在配置中设置 checkout.defaultRemote=origin。"

4750

4751 #: builtin/checkout.c

4752 #, c-format

@@ -4780,7 +4795,7 @@ msgstr "期望一个分支，得到提交 '%s'"

4795 #: builtin/checkout.c

4796 msgid ""

4797 "If you want to detach HEAD at the commit, try again with the --detach option."

4783 -msgstr "如果你在本提交分离头指针，使用 --detach 选项重试。"

4798 +msgstr "如果您想在该提交处分离 HEAD，请使用 --detach 选项重试。"

4799

4800 #: builtin/checkout.c

4801 msgid ""

@@ -4853,7 +4868,7 @@ msgstr "'%s' 不带 <起始点>"

4868 #: builtin/checkout.c

4869 #, c-format

4870 msgid "Cannot switch branch to a non-commit '%s'"

4856 -msgstr "不能切换分支到一个非提交 '%s'"

4871 +msgstr "无法切换分支到一个非提交 '%s'"

4872

4873 #: builtin/checkout.c

4874 msgid "missing branch or commit argument"

@@ -4866,7 +4881,7 @@ msgstr "未知的冲突风格 '%s'"

4881

4882 #: builtin/checkout.c

4883 msgid "perform a 3-way merge with the new branch"

4869 -msgstr "和新的分支执行三方合并"

4884 +msgstr "和新的分支执行三路合并"

4885

4886 #: builtin/checkout.c builtin/log.c builtin/range-diff.c parse-options.h

4887 msgid "style"

@@ -4890,7 +4905,7 @@ msgstr "新分支"

4905

4906 #: builtin/checkout.c

4907 msgid "new unborn branch"

4893 -msgstr "新的未诞生的分支"

4908 +msgstr "新的尚未诞生分支"

4909

4910 #: builtin/checkout.c builtin/merge.c

4911 msgid "update ignored files (default)"

@@ -4910,12 +4925,12 @@ msgstr "对尚未合并的文件检出他们的版本"

4925

4926 #: builtin/checkout.c

4927 msgid "do not limit pathspecs to sparse entries only"

4913 -msgstr "对路径不做稀疏检出的限制"

4928 +msgstr "对路径规格不只限于稀疏条目"

4929

4930 #: builtin/checkout.c

4931 #, c-format

4932 msgid "options '-%c', '-%c', and '%s' cannot be used together"

4918 -msgstr "选项 '-%c'、'-%c' 和 ‘%s' 不能同时使用"

4933 +msgstr "选项 '-%c'、'-%c' 和 '%s' 不能同时使用"

4934

4935 #: builtin/checkout.c

4936 msgid "--track needs a branch name"

@@ -4938,12 +4953,12 @@ msgstr "无效的路径规格"

4953 #: builtin/checkout.c

4954 #, c-format

4955 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"

4941 -msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"

4956 +msgstr "'%s' 不是一个提交，无法基于它创建分支 '%s'"

4957

4958 #: builtin/checkout.c

4959 #, c-format

4960 msgid "git checkout: --detach does not take a path argument '%s'"

4946 -msgstr "git checkout：--detach 不能接收路径参数 '%s'"

4961 +msgstr "git checkout：--detach 不接收路径参数 '%s'"

4962

4963 #: builtin/checkout.c

4964 msgid ""

@@ -4999,7 +5014,7 @@ msgstr "丢弃本地修改"

5014

5015 #: builtin/checkout.c

5016 msgid "which tree-ish to checkout from"

5002 -msgstr "要检出哪一个树"

5017 +msgstr "要从哪个树对象检出"

5018

5019 #: builtin/checkout.c

5020 msgid "restore the index"

@@ -5022,7 +5037,7 @@ msgid ""

5037 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "

5038 "[<pathspec>...]"

5039 msgstr ""

5025 -"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径规格>..."

5040 +"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] [<路径规格>...]"

5041

5042 #: builtin/clean.c builtin/sparse-checkout.c

5043 #, c-format

@@ -5037,22 +5052,22 @@ msgstr "将删除 %s\n"

5052 #: builtin/clean.c

5053 #, c-format

5054 msgid "Skipping repository %s\n"

5040 -msgstr "忽略仓库 %s\n"

5055 +msgstr "跳过仓库 %s\n"

5056

5057 #: builtin/clean.c

5058 #, c-format

5059 msgid "Would skip repository %s\n"

5045 -msgstr "将忽略仓库 %s\n"

5060 +msgstr "将跳过仓库 %s\n"

5061

5062 #: builtin/clean.c midx.c

5063 #, c-format

5064 msgid "failed to remove %s"

5050 -msgstr "无法删除 '%s'"

5065 +msgstr "无法删除 %s"

5066

5067 #: builtin/clean.c

5068 #, c-format

5069 msgid "could not lstat %s\n"

5055 -msgstr "不能对 %s 调用 lstat\n"

5070 +msgstr "无法对 %s 调用 lstat\n"

5071

5072 #: builtin/clean.c

5073 msgid "Refusing to remove current working directory\n"

@@ -5104,7 +5119,7 @@ msgstr "嗯（%s）？\n"

5119 #: builtin/clean.c

5120 #, c-format

5121 msgid "Input ignore patterns>> "

5107 -msgstr "输入模版以排除条目>> "

5122 +msgstr "输入忽略模式>> "

5123

5124 #: builtin/clean.c

5125 #, c-format

@@ -5132,7 +5147,7 @@ msgid ""

5147 "? - help for prompt selection"

5148 msgstr ""

5149 "clean - 开始清理\n"

5135 -"filter by pattern - 通过模版排除要删除的条目\n"

5150 +"filter by pattern - 通过模式排除要删除的条目\n"

5151 "select by numbers - 通过数字选择要删除的条目\n"

5152 "ask each - 针对删除逐一询问（就像 \"rm -i\"）\n"

5153 "quit - 停止删除并退出\n"

@@ -5190,7 +5205,7 @@ msgstr "clean.requireForce 设置为 true 且未提供 -f 选项：拒绝执行

5205 #: builtin/clone.c

5206 #, c-format

5207 msgid "info: Could not add alternate for '%s': %s\n"

5193 -msgstr "info：不能为 '%s' 添加一个备用：%s\n"

5208 +msgstr "info：无法为 '%s' 添加一个备用：%s\n"

5209

5210 #: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c

5211 #, c-format

@@ -5269,7 +5284,7 @@ msgstr "远程没有发送所有必需的对象"

5284 #: builtin/clone.c

5285 #, c-format

5286 msgid "unable to update %s"

5272 -msgstr "不能更新 %s"

5287 +msgstr "无法更新 %s"

5288

5289 #: builtin/clone.c

5290 msgid "failed to initialize sparse-checkout"

@@ -5281,7 +5296,7 @@ msgstr "远程 HEAD 指向一个不存在的引用，无法检出"

5296

5297 #: builtin/clone.c

5298 msgid "unable to checkout working tree"

5284 -msgstr "不能检出工作区"

5299 +msgstr "无法检出工作区"

5300

5301 #: builtin/clone.c

5302 msgid "unable to write parameters to config file"

@@ -5341,7 +5356,7 @@ msgstr "模板目录"

5356

5357 #: builtin/clone.c builtin/init-db.c

5358 msgid "directory from which templates will be used"

5344 -msgstr "模板目录将被使用"

5359 +msgstr "将从该目录使用模板"

5360

5361 #: builtin/clone.c builtin/submodule--helper.c

5362 msgid "reference repository"

@@ -5391,7 +5406,7 @@ msgstr "引用"

5406

5407 #: builtin/clone.c builtin/fetch.c builtin/pull.c

5408 msgid "deepen history of shallow clone, excluding ref"

5394 -msgstr "深化浅克隆的历史，除了给定的引用"

5409 +msgstr "深化浅克隆的历史，不包含指定引用"

5410

5411 #: builtin/clone.c builtin/submodule--helper.c

5412 msgid "clone only one branch, HEAD or --branch"

@@ -5403,15 +5418,15 @@ msgstr "克隆标签，并在后续获取时不跟随它们"

5418

5419 #: builtin/clone.c

5420 msgid "any cloned submodules will be shallow"

5406 -msgstr "子模组将以浅下载模式克隆"

5421 +msgstr "所有被克隆的子模组都将是浅克隆"

5422

5423 #: builtin/clone.c builtin/init-db.c

5424 msgid "gitdir"

5410 -msgstr "git目录"

5425 +msgstr "git 目录"

5426

5427 #: builtin/clone.c builtin/init-db.c

5428 msgid "separate git dir from working tree"

5414 -msgstr "git目录和工作区分离"

5429 +msgstr "将 git 目录与工作区分离"

5430

5431 #: builtin/clone.c builtin/init-db.c builtin/submodule--helper.c

5432 msgid "specify the reference format to use"

@@ -5419,7 +5434,7 @@ msgstr "指定要使用的引用格式"

5434

5435 #: builtin/clone.c

5436 msgid "key=value"

5422 -msgstr "key=value"

5437 +msgstr "键=值"

5438

5439 #: builtin/clone.c

5440 msgid "set config inside the new repository"

@@ -5428,7 +5443,7 @@ msgstr "在新仓库中设置配置信息"

5443 #: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c

5444 #: builtin/push.c builtin/send-pack.c

5445 msgid "server-specific"

5431 -msgstr "server-specific"

5446 +msgstr "服务端特定"

5447

5448 #: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c

5449 #: builtin/push.c builtin/send-pack.c

@@ -5445,15 +5460,15 @@ msgstr "任何克隆的子模组将使用它们的远程跟踪分支"

5460

5461 #: builtin/clone.c

5462 msgid "initialize sparse-checkout file to include only files at root"

5448 -msgstr "初始化稀疏检出文件，只包含根目录文件"

5463 +msgstr "初始化稀疏检出文件，只包含根目录中的文件"

5464

5465 #: builtin/clone.c

5466 msgid "uri"

5452 -msgstr "uri"

5467 +msgstr "URI"

5468

5469 #: builtin/clone.c

5470 msgid "a URI for downloading bundles before fetching from origin remote"

5456 -msgstr "用于在从 origin 远程获取之前下载归档包的 URI"

5471 +msgstr "用于在从 origin 远程获取之前下载捆绑包的 URI"

5472

5473 #: builtin/clone.c

5474 msgid "git clone [<options>] [--] <repo> [<dir>]"

@@ -5501,12 +5516,12 @@ msgstr "工作区 '%s' 已经存在。"

5516 #: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c

5517 #, c-format

5518 msgid "could not create leading directories of '%s'"

5504 -msgstr "不能为 '%s' 创建先导目录"

5519 +msgstr "无法为 '%s' 创建上级目录"

5520

5521 #: builtin/clone.c

5522 #, c-format

5523 msgid "could not create work tree dir '%s'"

5509 -msgstr "不能创建工作区目录 '%s'"

5524 +msgstr "无法创建工作区目录 '%s'"

5525

5526 #: builtin/clone.c

5527 #, c-format

@@ -5559,20 +5574,20 @@ msgstr "--local 被忽略"

5574

5575 #: builtin/clone.c

5576 msgid "cannot clone from filtered bundle"

5562 -msgstr "无法从经过过滤的归档包克隆"

5577 +msgstr "无法从经过过滤的捆绑包克隆"

5578

5579 #: builtin/clone.c

5580 msgid "failed to initialize the repo, skipping bundle URI"

5566 -msgstr "无法初始化仓库，跳过归档包 URI"

5581 +msgstr "无法初始化仓库，跳过捆绑包 URI"

5582

5583 #: builtin/clone.c

5584 #, c-format

5585 msgid "failed to fetch objects from bundle URI '%s'"

5571 -msgstr "无法从归档包 URI '%s' 获取对象"

5586 +msgstr "无法从捆绑包 URI '%s' 获取对象"

5587

5588 #: builtin/clone.c

5589 msgid "failed to fetch advertised bundles"

5575 -msgstr "无法获取公布的归档包"

5590 +msgstr "无法获取公布的捆绑包"

5591

5592 #: builtin/clone.c

5593 msgid "remote transport reported error"

@@ -5581,7 +5596,7 @@ msgstr "远程传输报告错误"

5596 #: builtin/clone.c

5597 #, c-format

5598 msgid "Remote branch %s not found in upstream %s"

5584 -msgstr "远程分支 %s 在上游 %s 未发现"

5599 +msgstr "远程分支 %s 在上游 %s 未找到"

5600

5601 #: builtin/clone.c

5602 #, c-format

@@ -5646,7 +5661,7 @@ msgid ""

5661 msgstr ""

5662 "git commit-graph write [--object-dir <目录>] [--append]\n"

5663 " [--split[=<策略>]] [--reachable | --stdin-packs | --"

5649 -"stdin-commits] \n"

5664 +"stdin-commits]\n"

5665 " [--changed-paths] [--[no-]max-new-filters <n>] [--"

5666 "[no-]progress]\n"

5667 " <切分选项>"

@@ -5662,7 +5677,7 @@ msgstr "保存图形的对象目录"

5677

5678 #: builtin/commit-graph.c

5679 msgid "if the commit-graph is split, only verify the tip file"

5665 -msgstr "如果提交图被拆分，只验证头一个文件"

5680 +msgstr "如果提交图被拆分，只验证顶端文件"

5681

5682 #: builtin/commit-graph.c

5683 #, c-format

@@ -5708,7 +5723,7 @@ msgstr "从标准输入中的提交开始扫描"

5723

5724 #: builtin/commit-graph.c

5725 msgid "include all commits already in the commit-graph file"

5711 -msgstr "包含 commit-graph 文件中已有所有提交"

5726 +msgstr "包含 commit-graph 文件中已有的所有提交"

5727

5728 #: builtin/commit-graph.c

5729 msgid "enable computation for changed paths"

@@ -5751,7 +5766,7 @@ msgid ""

5766 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"

5767 " [(-F <file>)...] <tree>"

5768 msgstr ""

5754 -"git commit-tree [(-p <父提交>)...] [-S[<私钥 ID>]] [(-m <消息>)...]\n"

5769 +"git commit-tree [(-p <父提交>)...] [-S[<密钥 ID>]] [(-m <消息>)...]\n"

5770 " [(-F <文件>)...] <树>"

5771

5772 #: builtin/commit-tree.c

@@ -5798,7 +5813,7 @@ msgstr "从文件中读取提交说明"

5813 #: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c

5814 #: builtin/revert.c

5815 msgid "GPG sign commit"

5801 -msgstr "GPG 提交签名"

5816 +msgstr "GPG 签名提交"

5817

5818 #: builtin/commit-tree.c

5819 msgid "must give exactly one tree"

@@ -5827,7 +5842,7 @@ msgstr ""

5842 " [--allow-empty-message] [--no-verify] [-e] [--author=<作者>]\n"

5843 " [--date=<日期>] [--cleanup=<模式>] [--[no-]status]\n"

5844 " [-i | -o] [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"

5830 -" [(--trailer <键>[(=|:)<值>])...] [-S[<私钥 ID>]]\n"

5845 +" [(--trailer <键>[(=|:)<值>])...] [-S[<密钥 ID>]]\n"

5846 " [--] [<路径规格>...]"

5847

5848 #: builtin/commit.c

@@ -5840,8 +5855,8 @@ msgid ""

5855 "it empty. You can repeat your command with --allow-empty, or you can\n"

5856 "remove the commit entirely with \"git reset HEAD^\".\n"

5857 msgstr ""

5843 -"您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"

5844 -"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"

5858 +"您要修订最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"

5859 +"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 彻底删除该提交。\n"

5860

5861 #: builtin/commit.c

5862 msgid ""

@@ -5896,11 +5911,11 @@ msgstr "无法解包 HEAD 树对象"

5911

5912 #: builtin/commit.c

5913 msgid "No paths with --include/--only does not make sense."

5899 -msgstr "参数 --include/--only 不跟路径没有意义。"

5914 +msgstr "在未指定路径时使用 --include/--only 没有意义。"

5915

5916 #: builtin/commit.c

5917 msgid "unable to create temporary index"

5903 -msgstr "不能创建临时索引"

5918 +msgstr "无法创建临时索引"

5919

5920 #: builtin/commit.c

5921 msgid "interactive add failed"

@@ -5912,7 +5927,7 @@ msgstr "无法更新临时索引"

5927

5928 #: builtin/commit.c

5929 msgid "Failed to update main cache tree"

5915 -msgstr "不能更新树的主缓存"

5930 +msgstr "无法更新主缓存树"

5931

5932 #: builtin/commit.c

5933 msgid "cannot do a partial commit during a merge."

@@ -5962,7 +5977,7 @@ msgstr "无法选择一个未被当前提交说明使用的注释字符"

5977 #: builtin/commit.c

5978 #, c-format

5979 msgid "could not lookup commit '%s'"

5965 -msgstr "不能查询提交 '%s'"

5980 +msgstr "无法查询提交 '%s'"

5981

5982 #: builtin/commit.c builtin/shortlog.c

5983 #, c-format

@@ -5971,12 +5986,12 @@ msgstr "（正从标准输入中读取日志信息）\n"

5986

5987 #: builtin/commit.c

5988 msgid "could not read log from standard input"

5974 -msgstr "不能从标准输入中读取日志信息"

5989 +msgstr "无法从标准输入中读取日志信息"

5990

5991 #: builtin/commit.c

5992 #, c-format

5993 msgid "could not read log file '%s'"

5979 -msgstr "不能读取日志文件 '%s'"

5994 +msgstr "无法读取日志文件 '%s'"

5995

5996 #: builtin/commit.c

5997 #, c-format

@@ -5985,11 +6000,11 @@ msgstr "选项 '%s' 和 '%s:%s' 不能同时使用"

6000

6001 #: builtin/commit.c

6002 msgid "could not read SQUASH_MSG"

5988 -msgstr "不能读取 SQUASH_MSG"

6003 +msgstr "无法读取 SQUASH_MSG"

6004

6005 #: builtin/commit.c

6006 msgid "could not read MERGE_MSG"

5992 -msgstr "不能读取 MERGE_MSG"

6007 +msgstr "无法读取 MERGE_MSG"

6008

6009 #: builtin/commit.c bundle.c rerere.c sequencer.c

6010 #, c-format

@@ -5998,7 +6013,7 @@ msgstr "无法打开 '%s'"

6013

6014 #: builtin/commit.c

6015 msgid "could not write commit template"

6001 -msgstr "不能写提交模版"

6016 +msgstr "无法写提交模板"

6017

6018 #: builtin/commit.c

6019 #, c-format

@@ -6113,11 +6128,11 @@ msgstr "无效的未跟踪文件参数 '%s'"

6128

6129 #: builtin/commit.c

6130 msgid "You are in the middle of a merge -- cannot reword."

6116 -msgstr "您正处于一个合并过程中 -- 无法改写说明。"

6131 +msgstr "您正处于一个合并过程中 -- 不能改写说明。"

6132

6133 #: builtin/commit.c

6134 msgid "You are in the middle of a cherry-pick -- cannot reword."

6120 -msgstr "您正处于一个拣选过程中 -- 无法改写说明。"

6135 +msgstr "您正处于一个拣选过程中 -- 不能改写说明。"

6136

6137 #: builtin/commit.c

6138 #, c-format

@@ -6131,19 +6146,19 @@ msgstr "改写说明选项 '%s' 和 '%s' 不能同时使用"

6146

6147 #: builtin/commit.c

6148 msgid "You have nothing to amend."

6134 -msgstr "您没有可修补的提交。"

6149 +msgstr "您没有可修订的提交。"

6150

6151 #: builtin/commit.c

6152 msgid "You are in the middle of a merge -- cannot amend."

6138 -msgstr "您正处于一个合并过程中 -- 无法修补提交。"

6153 +msgstr "您正处于一个合并过程中 -- 不能修订提交。"

6154

6155 #: builtin/commit.c

6156 msgid "You are in the middle of a cherry-pick -- cannot amend."

6142 -msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

6157 +msgstr "您正处于一个拣选过程中 -- 不能修订提交。"

6158

6159 #: builtin/commit.c

6160 msgid "You are in the middle of a rebase -- cannot amend."

6146 -msgstr "您正处于一个变基过程中 -- 无法修补提交。"

6161 +msgstr "您正处于一个变基过程中 -- 不能修订提交。"

6162

6163 #: builtin/commit.c

6164 msgid "--reset-author can be used only with -C, -c or --amend."

@@ -6157,7 +6172,7 @@ msgstr "未知选项：--fixup=%s:%s"

6172 #: builtin/commit.c

6173 #, c-format

6174 msgid "paths '%s ...' with -a does not make sense"

6160 -msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"

6175 +msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"

6176

6177 #: builtin/commit.c

6178 msgid "show status concisely"

@@ -6169,7 +6184,7 @@ msgstr "显示分支信息"

6184

6185 #: builtin/commit.c

6186 msgid "show stash information"

6172 -msgstr "显示贮藏区信息"

6187 +msgstr "显示储藏信息"

6188

6189 #: builtin/commit.c

6190 msgid "compute full ahead/behind values"

@@ -6223,7 +6238,7 @@ msgstr "不检测重命名"

6238

6239 #: builtin/commit.c

6240 msgid "detect renames, optionally set similarity index"

6226 -msgstr "检测重命名，可以设置索引相似度"

6241 +msgstr "检测重命名，可设置相似度索引"

6242

6243 #: builtin/commit.c

6244 msgid "Unsupported combination of ignored and untracked-files arguments"

@@ -6283,7 +6298,7 @@ msgstr "[(amend|reword):]提交"

6298 #: builtin/commit.c

6299 msgid ""

6300 "use autosquash formatted message to fixup or amend/reword specified commit"

6286 -msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明"

6301 +msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修订或改写说明"

6302

6303 #: builtin/commit.c

6304 msgid "use autosquash formatted message to squash specified commit"

@@ -6360,7 +6375,7 @@ msgstr "绕过 post-rewrite 钩子"

6375

6376 #: builtin/commit.c

6377 msgid "ok to record an empty change"

6363 -msgstr "允许一个空提交"

6378 +msgstr "允许记录空变更"

6379

6380 #: builtin/commit.c

6381 msgid "ok to record a change with an empty message"

@@ -6368,7 +6383,7 @@ msgstr "允许空的提交说明"

6383

6384 #: builtin/commit.c sequencer.c

6385 msgid "could not parse HEAD commit"

6371 -msgstr "不能解析 HEAD 提交"

6386 +msgstr "无法解析 HEAD 提交"

6387

6388 #: builtin/commit.c

6389 #, c-format

@@ -6377,22 +6392,22 @@ msgstr "损坏的 MERGE_HEAD 文件（%s）"

6392

6393 #: builtin/commit.c

6394 msgid "could not read MERGE_MODE"

6380 -msgstr "不能读取 MERGE_MODE"

6395 +msgstr "无法读取 MERGE_MODE"

6396

6397 #: builtin/commit.c

6398 #, c-format

6399 msgid "could not read commit message: %s"

6385 -msgstr "不能读取提交说明：%s"

6400 +msgstr "无法读取提交说明：%s"

6401

6402 #: builtin/commit.c

6403 #, c-format

6404 msgid "Aborting commit due to empty commit message.\n"

6390 -msgstr "终止提交因为提交说明为空。\n"

6405 +msgstr "由于提交说明为空，终止提交。\n"

6406

6407 #: builtin/commit.c

6408 #, c-format

6409 msgid "Aborting commit; you did not edit the message.\n"

6395 -msgstr "终止提交；您未更改来自模版的提交说明。\n"

6410 +msgstr "终止提交；您未更改来自模板的提交说明。\n"

6411

6412 #: builtin/commit.c

6413 #, c-format

@@ -6543,7 +6558,7 @@ msgstr "显示选项"

6558

6559 #: builtin/config.c

6560 msgid "terminate values with NUL byte"

6546 -msgstr "终止值是 NUL 字节"

6561 +msgstr "以 NUL 字节终止值"

6562

6563 #: builtin/config.c

6564 msgid "show variable names only"

@@ -6568,7 +6583,7 @@ msgstr "未能识别的 --type 参数，%s"

6583

6584 #: builtin/config.c

6585 msgid "only one type at a time"

6571 -msgstr "一次只能一个类型"

6586 +msgstr "一次只能指定一个类型"

6587

6588 #: builtin/config.c

6589 #, c-format

@@ -6578,7 +6593,7 @@ msgstr "错误的参数个数，应该为 %d 个"

6593 #: builtin/config.c

6594 #, c-format

6595 msgid "wrong number of arguments, should be from %d to %d"

6581 -msgstr "错误的参数个数，应该为从 %d 个到 %d 个"

6596 +msgstr "错误的参数个数，应为 %d 到 %d 个"

6597

6598 #: builtin/config.c

6599 #, c-format

@@ -6606,7 +6621,7 @@ msgstr "无法解析默认颜色值"

6621

6622 #: builtin/config.c

6623 msgid "not in a git directory"

6609 -msgstr "不在 git 仓库中"

6624 +msgstr "不在 git 目录中"

6625

6626 #: builtin/config.c

6627 msgid "writing to stdin is not supported"

@@ -6625,9 +6640,9 @@ msgid ""

6640 "#\tname = %s\n"

6641 "#\temail = %s\n"

6642 msgstr ""

6628 -"# This is Git's per-user configuration file.\n"

6643 +"# 这是 Git 的用户级配置文件。\n"

6644 "[user]\n"

6630 -"# Please adapt and uncomment the following lines:\n"

6645 +"# 请根据需要修改并取消注释以下行：\n"

6646 "#\tname = %s\n"

6647 "#\temail = %s\n"

6648

@@ -6662,7 +6677,7 @@ msgstr ""

6677

6678 #: builtin/config.c

6679 msgid "Other"

6665 -msgstr "其它"

6680 +msgstr "其他"

6681

6682 #: builtin/config.c

6683 msgid "respect include directives on lookup"

@@ -6715,7 +6730,7 @@ msgstr "缺少条目时使用默认值"

6730

6731 #: builtin/config.c

6732 msgid "--fixed-value only applies with 'value-pattern'"

6718 -msgstr "--fixed-value 仅适用于有 '值模式'"

6733 +msgstr "--fixed-value 仅适用于 '值模式'"

6734

6735 #: builtin/config.c

6736 msgid "--default= cannot be used with --all or --url="

@@ -6782,7 +6797,7 @@ msgstr "不支持编辑数据对象"

6797 #: builtin/config.c

6798 #, c-format

6799 msgid "cannot create configuration file %s"

6785 -msgstr "不能创建配置文件 %s"

6800 +msgstr "无法创建配置文件 %s"

6801

6802 #: builtin/config.c

6803 msgid "Action"

@@ -6885,7 +6900,7 @@ msgstr ""

6900

6901 #: builtin/count-objects.c

6902 msgid "print sizes in human readable format"

6888 -msgstr "以用户可读的格式显示大小"

6903 +msgstr "以人类可读的格式显示大小"

6904

6905 #: builtin/credential-cache--daemon.c

6906 #, c-format

@@ -6948,7 +6963,7 @@ msgstr "附注的"

6963 #: builtin/describe.c

6964 #, c-format

6965 msgid "annotated tag %s not available"

6951 -msgstr "附注标签 %s 无效"

6966 +msgstr "附注标签 %s 不可用"

6967

6968 #: builtin/describe.c

6969 #, c-format

@@ -6968,7 +6983,7 @@ msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n"

6983 #: builtin/describe.c

6984 #, c-format

6985 msgid "finished search at %s\n"

6971 -msgstr "完成搜索 %s\n"

6986 +msgstr "在 %s 处完成搜索\n"

6987

6988 #: builtin/describe.c

6989 #, c-format

@@ -7037,7 +7052,7 @@ msgstr "使用任意引用"

7052

7053 #: builtin/describe.c

7054 msgid "use any tag, even unannotated"

7040 -msgstr "使用任意标签，即使未附带注释"

7055 +msgstr "使用任意标签，即使未附注"

7056

7057 #: builtin/describe.c

7058 msgid "always use long format"

@@ -7111,12 +7126,12 @@ msgstr "指定诊断信息归档包的内容"

7126 #: builtin/diff-pairs.c

7127 #, c-format

7128 msgid "unable to parse mode: %s"

7114 -msgstr "不能解析模式：%s"

7129 +msgstr "无法解析模式：%s"

7130

7131 #: builtin/diff-pairs.c

7132 #, c-format

7133 msgid "unable to parse object id: %s"

7119 -msgstr "不能解析对象 ID：%s"

7134 +msgstr "无法解析对象 ID：%s"

7135

7136 #: builtin/diff-pairs.c

7137 msgid "git diff-pairs -z [<diff-options>]"

@@ -7215,7 +7230,7 @@ msgstr "无法处理的对象 '%s'。"

7230 #: builtin/diff.c

7231 #, c-format

7232 msgid "%s...%s: multiple merge bases, using %s"

7218 -msgstr "%s...%s：多条合并基线，使用 %s"

7233 +msgstr "%s...%s：多个合并基线，使用 %s"

7234

7235 #: builtin/difftool.c

7236 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"

@@ -7251,12 +7266,12 @@ msgstr "两个文件都被修改：'%s' 和 '%s'。"

7266

7267 #: builtin/difftool.c

7268 msgid "working tree file has been left."

7254 -msgstr "工作区文件被留了下来。"

7269 +msgstr "工作区文件已保留。"

7270

7271 #: builtin/difftool.c sequencer.c

7272 #, c-format

7273 msgid "could not copy '%s' to '%s'"

7259 -msgstr "不能拷贝 '%s' 至 '%s'"

7274 +msgstr "无法拷贝 '%s' 至 '%s'"

7275

7276 #: builtin/difftool.c

7277 #, c-format

@@ -7384,8 +7399,7 @@ msgstr "无法在提交 %s 中找到提交者"

7399 msgid ""

7400 "encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|"

7401 "no] to handle it"

7387 -msgstr ""

7388 -"在提交 %3$s 中遇到提交特定编码 %2$.*1$s；使用 --reencode=[yes|no] 来处理"

7402 +msgstr "遇到提交特定编码 %.*s 的提交为 %s；使用 --reencode=[yes|no] 来处理"

7403

7404 #: builtin/fast-export.c

7405 #, c-format

@@ -7542,7 +7556,7 @@ msgstr "如果文件存在，从该文件导入标记"

7556

7557 #: builtin/fast-export.c

7558 msgid "fake a tagger when tags lack one"

7545 -msgstr "当标签缺少标记人字段时，假装提供一个"

7559 +msgstr "当标签缺少打标签者时，伪造一个"

7560

7561 #: builtin/fast-export.c

7562 msgid "output full tree for each commit"

@@ -7570,7 +7584,7 @@ msgstr "匿名输出"

7584

7585 #: builtin/fast-export.c

7586 msgid "from:to"

7573 -msgstr "from:to"

7587 +msgstr "从:到"

7588

7589 #: builtin/fast-export.c

7590 msgid "convert <from> to <to> in anonymized output"

@@ -7578,7 +7592,7 @@ msgstr "在匿名输出中将 <from> 转换为 <to>"

7592

7593 #: builtin/fast-export.c

7594 msgid "reference parents which are not in fast-export stream by object id"

7581 -msgstr "引用父对象 ID 不在 fast-export 流中"

7595 +msgstr "通过对象 ID 引用不在 fast-export 流中的父对象"

7596

7597 #: builtin/fast-export.c

7598 msgid "show original object ids of blobs/commits"

@@ -7586,7 +7600,7 @@ msgstr "显示数据对象/提交的原始对象 ID"

7600

7601 #: builtin/fast-export.c

7602 msgid "label tags with mark ids"

7589 -msgstr "对带有标记 ID 的标签做标记"

7603 +msgstr "用标记 ID 标注标签"

7604

7605 #: builtin/fast-import.c

7606 #, c-format

@@ -7703,7 +7717,7 @@ msgstr "未更新 %s（新的分支顶端 %s 不包含 %s）"

7717 #: sequencer.c

7718 #, c-format

7719 msgid "unable to create leading directories of %s"

7706 -msgstr "不能为 %s 创建先导目录"

7720 +msgstr "无法为 %s 创建上级目录"

7721

7722 #: builtin/fast-import.c

7723 #, c-format

@@ -7852,7 +7866,7 @@ msgstr "目录不能指定为 'inline'：%s"

7866 #: builtin/fast-import.c

7867 #, c-format

7868 msgid "%s not found: %s"

7855 -msgstr "未找到%s：%s"

7869 +msgstr "未找到 %s：%s"

7870

7871 #: builtin/fast-import.c

7872 msgid "tree"

@@ -7870,7 +7884,7 @@ msgstr "路径 %s 不在分支中"

7884

7885 #: builtin/fast-import.c

7886 msgid "can't add a note on empty branch."

7873 -msgstr "不能在空分支上添加注释。"

7887 +msgstr "无法在空分支上添加注解。"

7888

7889 #: builtin/fast-import.c

7890 #, c-format

@@ -7970,7 +7984,7 @@ msgstr ""

7984

7985 #: builtin/fast-import.c

7986 msgid "expected committer but didn't get one"

7973 -msgstr "预期提交者但未获取"

7987 +msgstr "预期提交者但未获得"

7988

7989 #: builtin/fast-import.c

7990 msgid "encountered signed commit; use --signed-commits=<mode> to handle it"

@@ -8193,7 +8207,7 @@ msgstr "流过早结束"

8207 #: builtin/fetch-pack.c

8208 #, c-format

8209 msgid "Lockfile created but not reported: %s"

8196 -msgstr "Lockfile 已创建但未报告：%s"

8210 +msgstr "锁文件已创建但未报告：%s"

8211

8212 #: builtin/fetch.c

8213 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

@@ -8227,7 +8241,7 @@ msgstr "来自 %.*s\n"

8241 #: builtin/fetch.c

8242 #, c-format

8243 msgid "object %s not found"

8230 -msgstr "对象 %s 未发现"

8244 +msgstr "对象 %s 未找到"

8245

8246 #: builtin/fetch.c

8247 msgid "[up to date]"

@@ -8247,11 +8261,11 @@ msgstr "[标签更新]"

8261

8262 #: builtin/fetch.c

8263 msgid "unable to update local ref"

8250 -msgstr "不能更新本地引用"

8264 +msgstr "无法更新本地引用"

8265

8266 #: builtin/fetch.c

8267 msgid "would clobber existing tag"

8254 -msgstr "会破坏现有的标签"

8268 +msgstr "会覆盖现有的标签"

8269

8270 #: builtin/fetch.c

8271 msgid "[new tag]"

@@ -8276,7 +8290,7 @@ msgstr "非快进"

8290 #: builtin/fetch.c builtin/grep.c sequencer.c

8291 #, c-format

8292 msgid "cannot open '%s'"

8279 -msgstr "不能打开 '%s'"

8293 +msgstr "无法打开 '%s'"

8294

8295 #: builtin/fetch.c

8296 msgid ""

@@ -8330,7 +8344,7 @@ msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

8344 #: builtin/fetch.c

8345 #, c-format

8346 msgid "option \"%s\" is ignored for %s"

8333 -msgstr "选项 \"%s\" 为 %s 所忽略"

8347 +msgstr "选项 \"%s\" 对 %s 将被忽略"

8348

8349 #: builtin/fetch.c odb.c

8350 #, c-format

@@ -8353,7 +8367,7 @@ msgid ""

8367 msgstr ""

8368 "运行 'git remote set-head %s %s' 同步变更，或通过配置选项\n"

8369 "'remote.%s.followRemoteHEAD' 设置为其他值以屏蔽此提示。具体可通过\n"

8356 -"运行命令 'git config remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"

8370 +"运行命令 'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"

8371 "以禁用该警告，直到远程将 HEAD 更改为其他内容。"

8372

8373 #: builtin/fetch.c

@@ -8388,7 +8402,7 @@ msgid ""

8402 "some local refs could not be updated; try running\n"

8403 " 'git remote prune %s' to remove any old, conflicting branches"

8404 msgstr ""

8391 -"一些本地引用不能被更新；尝试运行\n"

8405 +"一些本地引用无法被更新；尝试运行\n"

8406 " 'git remote prune %s' 来删除旧的、有冲突的分支"

8407

8408 #: builtin/fetch.c

@@ -8435,7 +8449,7 @@ msgstr "正在获取 %s\n"

8449 #: builtin/fetch.c

8450 #, c-format

8451 msgid "could not fetch %s"

8438 -msgstr "不能获取 %s"

8452 +msgstr "无法获取 %s"

8453

8454 #: builtin/fetch.c

8455 #, c-format

@@ -8498,11 +8512,11 @@ msgstr "修改引用规格以将所有引用放入 refs/prefetch/"

8512

8513 #: builtin/fetch.c builtin/pull.c

8514 msgid "prune remote-tracking branches no longer on remote"

8501 -msgstr "清除远程已经不存在的分支的跟踪分支"

8515 +msgstr "清除远程已不存在的远程跟踪分支"

8516

8517 #: builtin/fetch.c

8518 msgid "prune local tags no longer on remote and clobber changed tags"

8505 -msgstr "清除远程不存在的本地标签，并且替换变更标签"

8519 +msgstr "清除远程已不存在的本地标签，并覆盖已变更的标签"

8520

8521 # 译者：可选值，不能翻译

8522 #: builtin/fetch.c builtin/pull.c

@@ -8549,7 +8563,7 @@ msgstr "在子模组路径输出的前面加上此目录"

8563 msgid ""

8564 "default for recursive fetching of submodules (lower priority than config "

8565 "files)"

8552 -msgstr "递归获取子模组的缺省值（比配置文件优先级低）"

8566 +msgstr "递归获取子模组的默认值（比配置文件优先级低）"

8567

8568 #: builtin/fetch.c builtin/pull.c

8569 msgid "accept refs that update .git/shallow"

@@ -8606,7 +8620,7 @@ msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"

8620 #: builtin/fetch.c

8621 #, c-format

8622 msgid "failed to fetch bundles from '%s'"

8609 -msgstr "无法从 '%s' 获取归档包"

8623 +msgstr "无法从 '%s' 获取捆绑包"

8624

8625 #: builtin/fetch.c

8626 msgid "fetch --all does not take a repository argument"

@@ -8678,19 +8692,19 @@ msgstr "从文件中读取"

8692

8693 #: builtin/for-each-ref.c

8694 msgid "quote placeholders suitably for shells"

8681 -msgstr "引用占位符适用于 shells"

8695 +msgstr "为 shell 适当引用占位符"

8696

8697 #: builtin/for-each-ref.c

8698 msgid "quote placeholders suitably for perl"

8685 -msgstr "引用占位符适用于 perl"

8699 +msgstr "为 perl 适当引用占位符"

8700

8701 #: builtin/for-each-ref.c

8702 msgid "quote placeholders suitably for python"

8689 -msgstr "引用占位符适用于 python"

8703 +msgstr "为 python 适当引用占位符"

8704

8705 #: builtin/for-each-ref.c

8706 msgid "quote placeholders suitably for Tcl"

8693 -msgstr "引用占位符适用于 Tcl"

8707 +msgstr "为 Tcl 适当引用占位符"

8708

8709 #: builtin/for-each-ref.c

8710 msgid "show only <n> matched refs"

@@ -8828,18 +8842,18 @@ msgstr "悬空 %s %s"

8842

8843 #: builtin/fsck.c

8844 msgid "could not create lost-found"

8831 -msgstr "不能创建 lost-found"

8845 +msgstr "无法创建 lost-found"

8846

8847 #: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c

8848 #: sequencer.c

8849 #, c-format

8850 msgid "could not write '%s'"

8837 -msgstr "不能写入 '%s'"

8851 +msgstr "无法写入 '%s'"

8852

8853 #: builtin/fsck.c

8854 #, c-format

8855 msgid "could not finish '%s'"

8842 -msgstr "不能完成 '%s'"

8856 +msgstr "无法完成 '%s'"

8857

8858 #: builtin/fsck.c

8859 #, c-format

@@ -8917,7 +8931,7 @@ msgstr "%s：对象损坏或丢失：%s"

8931 #: builtin/fsck.c

8932 #, c-format

8933 msgid "%s: object could not be parsed: %s"

8920 -msgstr "%s：不能解析对象：%s"

8934 +msgstr "%s：无法解析对象：%s"

8935

8936 #: builtin/fsck.c

8937 #, c-format

@@ -9095,7 +9109,7 @@ msgstr "无法初始化健康检查线程"

9109 #: builtin/fsmonitor--daemon.c

9110 #, c-format

9111 msgid "could not cd home '%s'"

9098 -msgstr "不能切换至家目录 '%s'"

9112 +msgstr "无法切换至家目录 '%s'"

9113

9114 #: builtin/fsmonitor--daemon.c

9115 #, c-format

@@ -9167,7 +9181,7 @@ msgstr "无法解析 '%s' 值 '%s'"

9181 #: builtin/gc.c setup.c

9182 #, c-format

9183 msgid "cannot stat '%s'"

9170 -msgstr "不能对 '%s' 调用 stat"

9184 +msgstr "无法对 '%s' 调用 stat"

9185

9186 #: builtin/gc.c

9187 #, c-format

@@ -9213,7 +9227,7 @@ msgstr "强制执行 gc 即使另外一个 gc 正在执行"

9227

9228 #: builtin/gc.c

9229 msgid "repack all other packs except the largest pack"

9216 -msgstr "除了最大的包之外，对所有其它包文件重新打包"

9230 +msgstr "除了最大的包之外，对所有其他包文件重新打包"

9231

9232 #: builtin/gc.c builtin/repack.c

9233 msgid "pack prefix to store a pack containing pruned objects"

@@ -9335,7 +9349,7 @@ msgstr "'%s' 不是一个有效的任务"

9349 #: builtin/gc.c

9350 #, c-format

9351 msgid "task '%s' cannot be selected multiple times"

9338 -msgstr "任务 '%s' 不能被多次选择"

9352 +msgstr "任务 '%s' 无法被多次选择"

9353

9354 #: builtin/gc.c

9355 msgid "run tasks based on the state of the repository"

@@ -9343,7 +9357,7 @@ msgstr "基于仓库状态来运行任务"

9357

9358 #: builtin/gc.c

9359 msgid "perform maintenance in the background"

9346 -msgstr "在后台执行运维"

9360 +msgstr "在后台执行维护"

9361

9362 #: builtin/gc.c

9363 msgid "frequency"

@@ -9355,7 +9369,7 @@ msgstr "基于频率运行任务"

9369

9370 #: builtin/gc.c

9371 msgid "do not report progress or other information over stderr"

9358 -msgstr "不通过标准错误报告进度或其它信息"

9372 +msgstr "不通过标准错误报告进度或其他信息"

9373

9374 #: builtin/gc.c

9375 msgid "task"

@@ -9584,7 +9598,7 @@ msgstr "只在单词边界匹配模式"

9598

9599 #: builtin/grep.c

9600 msgid "process binary files as text"

9587 -msgstr "把二进制文件当做文本处理"

9601 +msgstr "把二进制文件当作文本处理"

9602

9603 #: builtin/grep.c

9604 msgid "don't match patterns in binary files"

@@ -9692,7 +9706,7 @@ msgstr "使用 <n> 个工作线程"

9706

9707 #: builtin/grep.c

9708 msgid "shortcut for -C NUM"

9695 -msgstr "快捷键 -C 数字"

9709 +msgstr "-C NUM 的快捷方式"

9710

9711 #: builtin/grep.c

9712 msgid "show a line with the function name before matches"

@@ -9724,7 +9738,7 @@ msgstr "只显示匹配所有模式的文件中的匹配"

9738

9739 #: builtin/grep.c

9740 msgid "pager"

9727 -msgstr "分页"

9741 +msgstr "分页器"

9742

9743 #: builtin/grep.c

9744 msgid "show matching files in the pager"

@@ -9749,7 +9763,7 @@ msgstr "--no-index 或 --untracked 不能和版本同时使用"

9763 #: builtin/grep.c

9764 #, c-format

9765 msgid "unable to resolve revision: %s"

9752 -msgstr "不能解析版本：%s"

9766 +msgstr "无法解析版本：%s"

9767

9768 #: builtin/grep.c

9769 msgid "--untracked not supported with --recurse-submodules"

@@ -9831,7 +9845,7 @@ msgstr "在 --all 中显示别名"

9845

9846 #: builtin/help.c

9847 msgid "exclude guides"

9834 -msgstr "排除向导"

9848 +msgstr "排除指南"

9849

9850 #: builtin/help.c

9851 msgid "show man page"

@@ -10032,7 +10046,7 @@ msgstr "解压缩返回 %d"

10046

10047 #: builtin/index-pack.c

10048 msgid "offset value overflow for delta base object"

10035 -msgstr "偏移值覆盖了 delta 基准对象"

10049 +msgstr "delta 基准对象的偏移值溢出"

10050

10051 #: builtin/index-pack.c

10052 msgid "delta base offset is out of bound"

@@ -10066,12 +10080,12 @@ msgstr "发现 %s 出现 SHA1 冲突！"

10080 #: builtin/index-pack.c

10081 #, c-format

10082 msgid "cannot read existing object info %s"

10069 -msgstr "不能读取现存对象信息 %s"

10083 +msgstr "无法读取现存对象信息 %s"

10084

10085 #: builtin/index-pack.c

10086 #, c-format

10087 msgid "cannot read existing object %s"

10074 -msgstr "不能读取现存对象 %s"

10088 +msgstr "无法读取现存对象 %s"

10089

10090 #: builtin/index-pack.c

10091 #, c-format

@@ -10106,11 +10120,11 @@ msgstr "索引对象中"

10120

10121 #: builtin/index-pack.c

10122 msgid "pack is corrupted (SHA1 mismatch)"

10109 -msgstr "包冲突（SHA1 不匹配）"

10123 +msgstr "包已损坏（SHA1 不匹配）"

10124

10125 #: builtin/index-pack.c

10126 msgid "cannot fstat packfile"

10113 -msgstr "不能对包文件调用 fstat"

10127 +msgstr "无法对包文件调用 fstat"

10128

10129 #: builtin/index-pack.c

10130 msgid "pack has junk at the end"

@@ -10127,7 +10141,7 @@ msgstr "处理 delta 中"

10141 #: builtin/index-pack.c builtin/pack-objects.c

10142 #, c-format

10143 msgid "unable to create thread: %s"

10130 -msgstr "不能创建线程：%s"

10144 +msgstr "无法创建线程：%s"

10145

10146 #: builtin/index-pack.c

10147 msgid "confusion beyond insanity"

@@ -10155,7 +10169,7 @@ msgstr[1] "包有 %d 个未解决的 delta"

10169 #: builtin/index-pack.c

10170 #, c-format

10171 msgid "unable to deflate appended object (%d)"

10158 -msgstr "不能压缩附加对象（%d）"

10172 +msgstr "无法压缩附加对象（%d）"

10173

10174 #: builtin/index-pack.c

10175 #, c-format

@@ -10180,7 +10194,7 @@ msgstr "无法关闭已写入的 %s 文件 '%s'"

10194 #: builtin/index-pack.c

10195 #, c-format

10196 msgid "unable to rename temporary '*.%s' file to '%s'"

10183 -msgstr "不能重命名临时文件 '*.%s' 为 '%s'"

10197 +msgstr "无法重命名临时文件 '*.%s' 为 '%s'"

10198

10199 #: builtin/index-pack.c

10200 msgid "error while closing pack file"

@@ -10244,7 +10258,7 @@ msgstr "错误的 --pack_header：%s"

10258 #: builtin/index-pack.c

10259 #, c-format

10260 msgid "bad %s"

10247 -msgstr "错误选项 %s"

10261 +msgstr "错误的 %s"

10262

10263 #: builtin/index-pack.c builtin/init-db.c setup.c

10264 #, c-format

@@ -10253,7 +10267,7 @@ msgstr "未知的哈希算法 '%s'"

10267

10268 #: builtin/index-pack.c

10269 msgid "--promisor cannot be used with a pack name"

10256 -msgstr "--promisor 无法与包名称一起使用"

10270 +msgstr "--promisor 不能与包名称一起使用"

10271

10272 #: builtin/index-pack.c

10273 msgid "--stdin requires a git repository"

@@ -10299,7 +10313,7 @@ msgstr "覆盖初始分支名称"

10313

10314 #: builtin/init-db.c builtin/verify-pack.c

10315 msgid "hash"

10302 -msgstr "hash"

10316 +msgstr "哈希"

10317

10318 #: builtin/init-db.c builtin/show-index.c builtin/verify-pack.c

10319 msgid "specify the hash algorithm to use"

@@ -10308,12 +10322,12 @@ msgstr "指定要使用的哈希算法"

10322 #: builtin/init-db.c

10323 #, c-format

10324 msgid "cannot mkdir %s"

10311 -msgstr "不能创建目录 %s"

10325 +msgstr "无法创建目录 %s"

10326

10327 #: builtin/init-db.c

10328 #, c-format

10329 msgid "cannot chdir to %s"

10316 -msgstr "不能切换目录到 %s"

10330 +msgstr "无法切换目录到 %s"

10331

10332 #: builtin/init-db.c

10333 #, c-format

@@ -10325,11 +10339,11 @@ msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git

10339 #: builtin/init-db.c

10340 #, c-format

10341 msgid "Cannot access work tree '%s'"

10328 -msgstr "不能访问工作区 '%s'"

10342 +msgstr "无法访问工作区 '%s'"

10343

10344 #: builtin/init-db.c

10345 msgid "--separate-git-dir incompatible with bare repository"

10332 -msgstr "--separate-git-dir 不能用于纯仓库"

10346 +msgstr "--separate-git-dir 和纯仓库不兼容"

10347

10348 #: builtin/interpret-trailers.c

10349 msgid ""

@@ -10344,7 +10358,7 @@ msgstr ""

10358 #: builtin/interpret-trailers.c wrapper.c

10359 #, c-format

10360 msgid "could not stat %s"

10347 -msgstr "不能对 %s 调用 stat"

10361 +msgstr "无法对 %s 调用 stat"

10362

10363 #: builtin/interpret-trailers.c

10364 #, c-format

@@ -10358,21 +10372,21 @@ msgstr "文件 %s 用户不可写"

10372

10373 #: builtin/interpret-trailers.c

10374 msgid "could not open temporary file"

10361 -msgstr "不能打开临时文件"

10375 +msgstr "无法打开临时文件"

10376

10377 #: builtin/interpret-trailers.c

10378 #, c-format

10379 msgid "could not read input file '%s'"

10366 -msgstr "不能读取输入文件 '%s'"

10380 +msgstr "无法读取输入文件 '%s'"

10381

10382 #: builtin/interpret-trailers.c builtin/mktag.c imap-send.c

10383 msgid "could not read from stdin"

10370 -msgstr "不能自标准输入读取"

10384 +msgstr "无法自标准输入读取"

10385

10386 #: builtin/interpret-trailers.c

10387 #, c-format

10388 msgid "could not rename temporary file to %s"

10375 -msgstr "不能重命名临时文件为 %s"

10389 +msgstr "无法重命名临时文件为 %s"

10390

10391 #: builtin/interpret-trailers.c

10392 msgid "edit files in place"

@@ -10503,7 +10517,7 @@ msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数

10517

10518 #: builtin/log.c

10519 msgid "-L<range>:<file> cannot be used with pathspec"

10506 -msgstr "-L<范围>:<文件> 不能和路径表达式共用"

10520 +msgstr "-L<范围>:<文件> 不能和路径规格共用"

10521

10522 #: builtin/log.c

10523 msgid ""

@@ -10596,7 +10610,7 @@ msgstr "无法将 '%s' 解析为一个有效引用"

10610

10611 #: builtin/log.c

10612 msgid "could not find exact merge base"

10599 -msgstr "不能找到准确的合并基线"

10613 +msgstr "无法找到准确的合并基线"

10614

10615 #: builtin/log.c

10616 msgid ""

@@ -10622,7 +10636,7 @@ msgstr "基线提交不应该出现在版本列表中"

10636

10637 #: builtin/log.c

10638 msgid "cannot get patch id"

10625 -msgstr "无法得到补丁 id"

10639 +msgstr "无法得到补丁 ID"

10640

10641 #: builtin/log.c

10642 msgid "failed to infer range-diff origin of current series"

@@ -10667,7 +10681,7 @@ msgstr "补丁以 <n> 开始编号，而不是1"

10681

10682 #: builtin/log.c

10683 msgid "reroll-count"

10670 -msgstr "重制-计数"

10684 +msgstr "重制次数"

10685

10686 #: builtin/log.c

10687 msgid "mark the series as Nth re-roll"

@@ -10723,7 +10737,7 @@ msgstr "不包含已在上游提交中的补丁"

10737

10738 #: builtin/log.c

10739 msgid "show patch format instead of default (patch + stat)"

10726 -msgstr "显示纯补丁格式而非默认的（补丁+状态）"

10740 +msgstr "显示纯补丁格式而非默认的（补丁+统计）"

10741

10742 #: builtin/log.c

10743 msgid "Messaging"

@@ -10731,7 +10745,7 @@ msgstr "邮件发送"

10745

10746 #: builtin/log.c

10747 msgid "header"

10734 -msgstr "header"

10748 +msgstr "头信息"

10749

10750 #: builtin/log.c

10751 msgid "add email header"

@@ -10755,7 +10769,7 @@ msgstr "标识"

10769

10770 #: builtin/log.c

10771 msgid "set From address to <ident> (or committer ident if absent)"

10758 -msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"

10772 +msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 作为地址）"

10773

10774 #: builtin/log.c

10775 msgid "message-id"

@@ -10849,7 +10863,7 @@ msgstr "--remerge-diff 无意义"

10863 #: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c

10864 #, c-format

10865 msgid "could not create directory '%s'"

10852 -msgstr "不能创建目录 '%s'"

10866 +msgstr "无法创建目录 '%s'"

10867

10868 #: builtin/log.c

10869 msgid "--interdiff requires --cover-letter or single patch"

@@ -10898,7 +10912,7 @@ msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"

10912 #, c-format

10913 msgid ""

10914 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

10901 -msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"

10915 +msgstr "无法找到跟踪的远程分支，请手工指定 <上游>。\n"

10916

10917 #: builtin/ls-files.c builtin/ls-tree.c

10918 #, c-format

@@ -10939,7 +10953,7 @@ msgstr "显示已修改的文件"

10953

10954 #: builtin/ls-files.c

10955 msgid "show other files in the output"

10942 -msgstr "显示其它文件"

10956 +msgstr "显示其他文件"

10957

10958 #: builtin/ls-files.c

10959 msgid "show ignored files in the output"

@@ -11041,7 +11055,7 @@ msgstr "不打印远程 URL"

11055

11056 #: builtin/ls-remote.c builtin/rebase.c

11057 msgid "exec"

11044 -msgstr "exec"

11058 +msgstr "可执行命令"

11059

11060 #: builtin/ls-remote.c

11061 msgid "path of git-upload-pack on the remote host"

@@ -11069,7 +11083,7 @@ msgstr "参考 url.<base>.insteadOf 设置"

11083

11084 #: builtin/ls-remote.c

11085 msgid "exit with exit code 2 if no matching refs are found"

11072 -msgstr "若未找到匹配的引用则以退出码2退出"

11086 +msgstr "若未找到匹配的引用则以退出码 2 退出"

11087

11088 #: builtin/ls-remote.c

11089 msgid "show underlying ref in addition to the object pointed by it"

@@ -11203,11 +11217,11 @@ msgstr "查找一个多路合并的祖先提交"

11217

11218 #: builtin/merge-base.c

11219 msgid "list revs not reachable from others"

11206 -msgstr "显示不能被其他访问到的版本"

11220 +msgstr "显示无法被其他访问到的版本"

11221

11222 #: builtin/merge-base.c

11223 msgid "is the first one ancestor of the other?"

11210 -msgstr "第一个是其他的祖先提交么？"

11224 +msgstr "第一个是其他的祖先提交吗？"

11225

11226 #: builtin/merge-base.c

11227 msgid "find where <commit> forked from reflog of <ref>"

@@ -11256,12 +11270,12 @@ msgstr "对象 '%s' 不存在"

11270

11271 #: builtin/merge-file.c

11272 msgid "Could not write object file"

11259 -msgstr "不能写入对象文件"

11273 +msgstr "无法写入对象文件"

11274

11275 #: builtin/merge-recursive.c

11276 #, c-format

11277 msgid "could not parse object '%s'"

11264 -msgstr "不能解析对象 '%s'"

11278 +msgstr "无法解析对象 '%s'"

11279

11280 #: builtin/merge-recursive.c

11281 #, c-format

@@ -11272,7 +11286,7 @@ msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"

11286

11287 #: builtin/merge-recursive.c

11288 msgid "not handling anything other than two heads merge."

11275 -msgstr "不能处理两个头合并之外的任何操作。"

11289 +msgstr "无法处理两个头合并之外的任何操作。"

11290

11291 #: builtin/merge-recursive.c

11292 #, c-format

@@ -11343,7 +11357,7 @@ msgstr "指定用于合并的合并基线"

11357

11358 #: builtin/merge-tree.c builtin/merge.c builtin/pull.c

11359 msgid "option=value"

11346 -msgstr "option=value"

11360 +msgstr "选项=值"

11361

11362 #: builtin/merge-tree.c builtin/merge.c builtin/pull.c

11363 msgid "option for selected merge strategy"

@@ -11379,7 +11393,7 @@ msgstr "选项 `%s' 需要一个值"

11393 #: builtin/merge.c

11394 #, c-format

11395 msgid "Could not find merge strategy '%s'.\n"

11382 -msgstr "不能找到合并策略 '%s'。\n"

11396 +msgstr "无法找到合并策略 '%s'。\n"

11397

11398 #: builtin/merge.c

11399 #, c-format

@@ -11429,7 +11443,7 @@ msgstr "允许快进（默认）"

11443

11444 #: builtin/merge.c builtin/pull.c

11445 msgid "abort if fast-forward is not possible"

11432 -msgstr "如果不能快进就放弃合并"

11446 +msgstr "如果无法快进就放弃合并"

11447

11448 #: builtin/merge.c builtin/pull.c

11449 msgid "verify that the named commit has a valid GPG signature"

@@ -11471,11 +11485,11 @@ msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"

11485

11486 #: builtin/merge.c

11487 msgid "could not run stash."

11474 -msgstr "不能运行贮藏。"

11488 +msgstr "无法运行储藏。"

11489

11490 #: builtin/merge.c

11491 msgid "stash failed"

11478 -msgstr "贮藏失败"

11492 +msgstr "储藏失败"

11493

11494 #: builtin/merge.c

11495 msgid "read-tree failed"

@@ -11511,7 +11525,7 @@ msgstr "坏的 branch.%s.mergeoptions 字符串：%s"

11525

11526 #: builtin/merge.c merge-ort-wrappers.c

11527 msgid "Unable to write index."

11514 -msgstr "不能写入索引。"

11528 +msgstr "无法写入索引。"

11529

11530 #: builtin/merge.c

11531 msgid "Not handling anything other than two heads merge."

@@ -11520,12 +11534,12 @@ msgstr "未处理两个头合并之外的任何操作。"

11534 #: builtin/merge.c builtin/sparse-checkout.c

11535 #, c-format

11536 msgid "unable to write %s"

11523 -msgstr "不能写 %s"

11537 +msgstr "无法写 %s"

11538

11539 #: builtin/merge.c

11540 #, c-format

11541 msgid "Could not read from '%s'"

11528 -msgstr "不能从 '%s' 读取"

11542 +msgstr "无法从 '%s' 读取"

11543

11544 #: builtin/merge.c

11545 #, c-format

@@ -11592,12 +11606,12 @@ msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"

11606 #: builtin/merge.c editor.c read-cache.c wrapper.c

11607 #, c-format

11608 msgid "could not close '%s'"

11595 -msgstr "不能关闭 '%s'"

11609 +msgstr "无法关闭 '%s'"

11610

11611 #: builtin/merge.c

11612 #, c-format

11613 msgid "not something we can merge in %s: %s"

11600 -msgstr "不能在 %s 中合并：%s"

11614 +msgstr "无法在 %s 中合并：%s"

11615

11616 #: builtin/merge.c

11617 msgid "--abort expects no arguments"

@@ -11654,7 +11668,7 @@ msgstr "到空分支的非快进式提交没有意义"

11668 #: builtin/merge.c

11669 #, c-format

11670 msgid "%s - not something we can merge"

11657 -msgstr "%s - 不能被合并"

11671 +msgstr "%s - 无法被合并"

11672

11673 #: builtin/merge.c

11674 msgid "Can merge only exactly one commit into empty head"

@@ -11682,7 +11696,7 @@ msgstr "尝试非常小的索引内合并...\n"

11696 #: builtin/merge.c

11697 #, c-format

11698 msgid "Nope.\n"

11685 -msgstr "无。\n"

11699 +msgstr "不行。\n"

11700

11701 #: builtin/merge.c

11702 #, c-format

@@ -11717,7 +11731,7 @@ msgstr "自动合并进展顺利，按要求在提交前停止\n"

11731 #: builtin/merge.c

11732 #, c-format

11733 msgid "When finished, apply stashed changes with `git stash pop`\n"

11720 -msgstr "在完成后，使用 `git stash pop` 应用贮藏的变更\n"

11734 +msgstr "在完成后，使用 `git stash pop` 应用储藏的变更\n"

11735

11736 #: builtin/mktag.c

11737 #, c-format

@@ -11732,7 +11746,7 @@ msgstr "错误：标签输入未通过 fsck：%s"

11746 #: builtin/mktag.c

11747 #, c-format

11748 msgid "could not read tagged object '%s'"

11735 -msgstr "不能读取被标记的对象 '%s'"

11749 +msgstr "无法读取被标记的对象 '%s'"

11750

11751 #: builtin/mktag.c

11752 #, c-format

@@ -11836,7 +11850,7 @@ msgstr "目录 %s 在索引中并且不是子模组？"

11850

11851 #: builtin/mv.c

11852 msgid "Please stage your changes to .gitmodules or stash them to proceed"

11839 -msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"

11853 +msgstr "请将您的修改暂存到 .gitmodules 中或储藏后再继续"

11854

11855 #: builtin/mv.c

11856 #, c-format

@@ -11845,7 +11859,7 @@ msgstr "%.*s 在索引中"

11859

11860 #: builtin/mv.c

11861 msgid "force move/rename even if target exists"

11848 -msgstr "强制移动/重命令，即使目标存在"

11862 +msgstr "强制移动/重命名，即使目标存在"

11863

11864 #: builtin/mv.c

11865 msgid "skip move/rename errors"

@@ -11863,7 +11877,7 @@ msgstr "检查 '%s' 到 '%s' 的重命名\n"

11877

11878 #: builtin/mv.c

11879 msgid "bad source"

11866 -msgstr "坏的源"

11880 +msgstr "错误的源"

11881

11882 #: builtin/mv.c

11883 msgid "destination exists"

@@ -11871,7 +11885,7 @@ msgstr "目标已存在"

11885

11886 #: builtin/mv.c

11887 msgid "can not move directory into itself"

11874 -msgstr "不能将目录移动到自身"

11888 +msgstr "无法将目录移动到自身"

11889

11890 #: builtin/mv.c

11891 msgid "destination already exists"

@@ -11896,7 +11910,7 @@ msgstr "覆盖 '%s'"

11910

11911 #: builtin/mv.c

11912 msgid "Cannot overwrite"

11899 -msgstr "不能覆盖"

11913 +msgstr "无法覆盖"

11914

11915 #: builtin/mv.c

11916 msgid "multiple sources for the same target"

@@ -11972,7 +11986,7 @@ msgstr "标注标准输入的文字"

11986

11987 #: builtin/name-rev.c

11988 msgid "allow to print `undefined` names (default)"

11975 -msgstr "允许打印 `未定义` 的名称（默认）"

11989 +msgstr "允许打印 `undefined` 的名称（默认）"

11990

11991 #: builtin/name-rev.c

11992 msgid "dereference tags in the input (internal use)"

@@ -12017,7 +12031,7 @@ msgstr "git notes [--ref <注解引用>] show [<对象>]"

12031 #: builtin/notes.c

12032 msgid ""

12033 "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"

12020 -msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"

12034 +msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略>] <注解引用>"

12035

12036 #: builtin/notes.c

12037 msgid "git notes [--ref <notes-ref>] remove [<object>...]"

@@ -12085,7 +12099,7 @@ msgstr "为下面的对象写/编辑说明："

12099

12100 #: builtin/notes.c

12101 msgid "could not read 'show' output"

12088 -msgstr "不能读取 'show' 的输出"

12102 +msgstr "无法读取 'show' 的输出"

12103

12104 #: builtin/notes.c

12105 #, c-format

@@ -12098,7 +12112,7 @@ msgstr "请通过 -m 或 -F 选项为注解提供内容"

12112

12113 #: builtin/notes.c

12114 msgid "unable to write note object"

12101 -msgstr "不能写注解对象"

12115 +msgstr "无法写注解对象"

12116

12117 #: builtin/notes.c

12118 #, c-format

@@ -12108,7 +12122,7 @@ msgstr "注解内容被留在 %s 中"

12122 #: builtin/notes.c builtin/tag.c

12123 #, c-format

12124 msgid "could not open or read '%s'"

12111 -msgstr "不能打开或读取 '%s'"

12125 +msgstr "无法打开或读取 '%s'"

12126

12127 #: builtin/notes.c

12128 #, c-format

@@ -12123,7 +12137,7 @@ msgstr "无法读取对象 '%s'。"

12137 #: builtin/notes.c

12138 #, c-format

12139 msgid "cannot read note data from non-blob object '%s'."

12126 -msgstr "不能从非数据对象 '%s' 中读取注解数据。"

12140 +msgstr "无法从非数据对象 '%s' 中读取注解数据。"

12141

12142 #: builtin/notes.c

12143 #, c-format

@@ -12136,7 +12150,7 @@ msgstr "无法把注解从 '%s' 拷贝到 '%s'"

12150 #: builtin/notes.c

12151 #, c-format

12152 msgid "refusing to %s notes in %s (outside of refs/notes/)"

12139 -msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解"

12153 +msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s 注解"

12154

12155 #: builtin/notes.c

12156 #, c-format

@@ -12149,7 +12163,7 @@ msgstr "注解内容作为一个字符串"

12163

12164 #: builtin/notes.c

12165 msgid "note contents in a file"

12152 -msgstr "注解内容到一个文件中"

12166 +msgstr "注解内容在一个文件中"

12167

12168 #: builtin/notes.c

12169 msgid "reuse and edit specified note object"

@@ -12157,7 +12171,7 @@ msgstr "重用和编辑指定的注解对象"

12171

12172 #: builtin/notes.c

12173 msgid "edit note message in editor"

12160 -msgstr "在编辑器中编辑注释说明"

12174 +msgstr "在编辑器中编辑注解说明"

12175

12176 #: builtin/notes.c

12177 msgid "reuse specified note object"

@@ -12165,7 +12179,7 @@ msgstr "重用指定的注解对象"

12179

12180 #: builtin/notes.c

12181 msgid "allow storing empty note"

12168 -msgstr "允许保存空白注释"

12182 +msgstr "允许保存空注解"

12183

12184 #: builtin/notes.c

12185 msgid "replace existing notes"

@@ -12177,7 +12191,7 @@ msgstr "<分段符>"

12191

12192 #: builtin/notes.c

12193 msgid "insert <paragraph-break> between paragraphs"

12180 -msgstr "在段落之间插入<分段符>"

12194 +msgstr "在段落之间插入 <分段符>"

12195

12196 #: builtin/notes.c

12197 msgid "remove unnecessary whitespace"

@@ -12188,7 +12202,7 @@ msgstr "删除不必要的空白字符"

12202 msgid ""

12203 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "

12204 "existing notes"

12191 -msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

12205 +msgstr "无法添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

12206

12207 #: builtin/notes.c

12208 #, c-format

@@ -12217,12 +12231,12 @@ msgstr "参数太少"

12231 msgid ""

12232 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "

12233 "existing notes"

12220 -msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

12234 +msgstr "无法拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

12235

12236 #: builtin/notes.c

12237 #, c-format

12238 msgid "missing notes on source object %s. Cannot copy."

12225 -msgstr "源对象 %s 缺少注解。不能拷贝。"

12239 +msgstr "源对象 %s 缺少注解。无法拷贝。"

12240

12241 #: builtin/notes.c

12242 #, c-format

@@ -12294,7 +12308,7 @@ msgstr "通过提交未合并的注解来完成注解合并"

12308

12309 #: builtin/notes.c

12310 msgid "Aborting notes merge resolution"

12297 -msgstr "中止注解合并的方案"

12311 +msgstr "中止注解合并的解决过程"

12312

12313 #: builtin/notes.c

12314 msgid "abort notes merge"

@@ -12330,7 +12344,7 @@ msgid ""

12344 "'git notes merge --commit', or abort the merge with 'git notes merge --"

12345 "abort'.\n"

12346 msgstr ""

12333 -"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"

12347 +"自动注解合并失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"

12348 "交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"

12349

12350 #: builtin/notes.c builtin/tag.c

@@ -12391,7 +12405,7 @@ msgstr ""

12405 " [--revs [--unpacked | --all]] [--keep-pack=<包名>]\n"

12406 " [--cruft] [--cruft-expiration=<时间>]\n"

12407 " [--stdout [--filter=<过滤规格>] | <基线名称>]\n"

12394 -" [--shallow] [--keep-true-parents] [--[no-]sparse]\"\n"

12408 +" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"

12409 " [--name-hash-version=<n>] [--path-walk] < <对象列表>"

12410

12411 #: builtin/pack-objects.c

@@ -12470,7 +12484,7 @@ msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"

12484 #: builtin/pack-objects.c

12485 #, c-format

12486 msgid "delta base offset overflow in pack for %s"

12473 -msgstr "%s 压缩中 delta 基准偏移越界"

12487 +msgstr "包 %s 中 delta 基准偏移溢出"

12488

12489 #: builtin/pack-objects.c

12490 #, c-format

@@ -12572,7 +12586,7 @@ msgstr "包文件 %s 是承诺者，但已给出 --exclude-promisor-objects"

12586 #: builtin/pack-objects.c

12587 #, c-format

12588 msgid "could not find pack '%s'"

12575 -msgstr "不能找到包 '%s'"

12589 +msgstr "无法找到包 '%s'"

12590

12591 #: builtin/pack-objects.c

12592 #, c-format

@@ -12611,7 +12625,7 @@ msgstr ""

12625

12626 #: builtin/pack-objects.c reachable.c

12627 msgid "could not load cruft pack .mtimes"

12614 -msgstr "不能载入废弃包 .mtimes"

12628 +msgstr "无法载入废弃包 .mtimes"

12629

12630 #: builtin/pack-objects.c

12631 msgid "cannot open pack index"

@@ -12638,7 +12652,7 @@ msgstr "不是一个版本 '%s'"

12652 #: builtin/pack-objects.c builtin/rev-parse.c

12653 #, c-format

12654 msgid "bad revision '%s'"

12641 -msgstr "坏的版本 '%s'"

12655 +msgstr "错误的版本 '%s'"

12656

12657 #: builtin/pack-objects.c

12658 msgid "unable to add recent objects"

@@ -12788,7 +12802,7 @@ msgstr "忽略配有 .keep 文件的包"

12802

12803 #: builtin/pack-objects.c

12804 msgid "ignore this pack"

12791 -msgstr "忽略该 pack"

12805 +msgstr "忽略该包"

12806

12807 #: builtin/pack-objects.c

12808 msgid "pack compression level"

@@ -12796,7 +12810,7 @@ msgstr "打包压缩级别"

12810

12811 #: builtin/pack-objects.c

12812 msgid "do not hide commits by grafts"

12799 -msgstr "显示被移植隐藏的提交"

12813 +msgstr "显示被嫁接隐藏的提交"

12814

12815 #: builtin/pack-objects.c

12816 msgid "use a bitmap index if available to speed up counting objects"

@@ -12889,7 +12903,7 @@ msgid ""

12903 "reused %<PRIu32> (from %<PRIuMAX>)"

12904 msgstr ""

12905 "总共 %<PRIu32>（差异 %<PRIu32>），复用 %<PRIu32>（差异 %<PRIu32>），包复用 "

12892 -"%<PRIu32>（来自 %<PRIuMAX> 个包）"

12906 +"%<PRIu32>（来自 %<PRIuMAX> 个包）"

12907

12908 #: builtin/pack-refs.c

12909 msgid "git pack-refs "

@@ -13042,8 +13056,8 @@ msgstr ""

13056 " git config pull.ff only # 仅快进\n"

13057 "\n"

13058 "您可以将 \"git config\" 替换为 \"git config --global\" 以便为所有仓库设置\n"

13045 -"缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase，\n"

13046 -"或者 --ff-only 参数覆盖缺省设置。\n"

13059 +"默认的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase，\n"

13060 +"或者 --ff-only 参数覆盖默认设置。\n"

13061

13062 #: builtin/pull.c

13063 msgid "control for recursive fetching of submodules"

@@ -13059,7 +13073,7 @@ msgstr "使用变基操作取代合并操作以合入修改"

13073

13074 #: builtin/pull.c builtin/revert.c

13075 msgid "allow fast-forward"

13062 -msgstr "允许快进式"

13076 +msgstr "允许快进"

13077

13078 #: builtin/pull.c

13079 msgid "control use of pre-merge-commit and commit-msg hooks"

@@ -13067,7 +13081,7 @@ msgstr "控制 pre-merge-commit 和 commit-msg 钩子的使用"

13081

13082 #: builtin/pull.c parse-options.h

13083 msgid "automatically stash/stash pop before and after"

13070 -msgstr "在操作前后执行自动贮藏和弹出贮藏"

13084 +msgstr "在操作前后执行自动储藏和弹出储藏"

13085

13086 #: builtin/pull.c

13087 msgid "Options related to fetching"

@@ -13099,7 +13113,7 @@ msgstr "变基式拉取"

13113

13114 #: builtin/pull.c builtin/rebase.c

13115 msgid "Please commit or stash them."

13102 -msgstr "请提交或贮藏修改。"

13116 +msgstr "请提交或储藏修改。"

13117

13118 #: builtin/pull.c

13119 #, c-format

@@ -13146,7 +13160,7 @@ msgstr "需要指定如何调和偏离的分支。"

13160

13161 #: builtin/pull.c

13162 msgid "cannot rebase with locally recorded submodule modifications"

13149 -msgstr "本地子模组中有修改，无法变基"

13163 +msgstr "本地子模组中有修改，不能变基"

13164

13165 #: builtin/push.c

13166 msgid "git push [<options>] [<repository> [<refspec>...]]"

@@ -13361,7 +13375,7 @@ msgstr "删除引用"

13375

13376 #: builtin/push.c

13377 msgid "push tags (can't be used with --all or --branches or --mirror)"

13364 -msgstr "推送标签（不能使用 --all or --branches or --mirror）"

13378 +msgstr "推送标签（不能与 --all、--branches 或 --mirror 同时使用）"

13379

13380 #: builtin/push.c builtin/send-pack.c

13381 msgid "force updates"

@@ -13422,7 +13436,7 @@ msgstr "--delete 未接任何引用没有意义"

13436 #: builtin/push.c t/helper/test-bundle-uri.c

13437 #, c-format

13438 msgid "bad repository '%s'"

13425 -msgstr "坏的仓库 '%s'"

13439 +msgstr "错误的仓库 '%s'"

13440

13441 #: builtin/push.c

13442 msgid ""

@@ -13550,11 +13564,11 @@ msgstr "读取之余再执行一个合并"

13564

13565 #: builtin/read-tree.c

13566 msgid "3-way merge if no file level merging required"

13553 -msgstr "如果没有文件级合并需要，执行三方合并"

13567 +msgstr "如果没有文件级合并需要，执行三路合并"

13568

13569 #: builtin/read-tree.c

13570 msgid "3-way merge in presence of adds and removes"

13557 -msgstr "存在添加和删除时，也执行三方合并"

13571 +msgstr "存在添加和删除时，也执行三路合并"

13572

13573 #: builtin/read-tree.c

13574 msgid "same as -m, but discard unmerged entries"

@@ -13578,7 +13592,7 @@ msgstr "gitignore"

13592

13593 #: builtin/read-tree.c

13594 msgid "allow explicitly ignored files to be overwritten"

13581 -msgstr "允许忽略文件中设定的文件可以被覆盖"

13595 +msgstr "允许显式忽略的文件被覆盖"

13596

13597 #: builtin/read-tree.c

13598 msgid "don't check the working tree after merging"

@@ -13621,7 +13635,7 @@ msgstr ""

13635 #: builtin/rebase.c sequencer.c

13636 #, c-format

13637 msgid "could not read '%s'."

13624 -msgstr "不能读取 '%s'。"

13638 +msgstr "无法读取 '%s'。"

13639

13640 #: builtin/rebase.c

13641 #, c-format

@@ -13762,7 +13776,7 @@ msgstr "变基到给定的分支而非上游"

13776

13777 #: builtin/rebase.c

13778 msgid "use the merge-base of upstream and branch as the current base"

13765 -msgstr "使用上游和分支的合并基线做为当前基线"

13779 +msgstr "使用上游和分支的合并基线作为当前基线"

13780

13781 #: builtin/rebase.c

13782 msgid "allow pre-rebase hook to run"

@@ -13938,7 +13952,7 @@ msgstr "动作 --edit-todo 只能用在交互式变基过程中。"

13952

13953 #: builtin/rebase.c

13954 msgid "Cannot read HEAD"

13941 -msgstr "不能读取 HEAD"

13955 +msgstr "无法读取 HEAD"

13956

13957 #: builtin/rebase.c

13958 msgid ""

@@ -14008,7 +14022,7 @@ msgstr "无效的上游 '%s'"

14022

14023 #: builtin/rebase.c

14024 msgid "Could not create new root commit"

14011 -msgstr "不能创建新的根提交"

14025 +msgstr "无法创建新的根提交"

14026

14027 #: builtin/rebase.c

14028 #, c-format

@@ -14022,7 +14036,7 @@ msgstr "没有这样的引用：%s"

14036

14037 #: builtin/rebase.c

14038 msgid "Could not resolve HEAD to a commit"

14025 -msgstr "不能解析 HEAD 至一个提交"

14039 +msgstr "无法解析 HEAD 至一个提交"

14040

14041 #: builtin/rebase.c

14042 #, c-format

@@ -14156,7 +14170,7 @@ msgstr "git reflog exists <引用>"

14170

14171 #: builtin/reflog.c

14172 msgid "git reflog write <ref> <old-oid> <new-oid> <message>"

14159 -msgstr "git reflog write <引用> <旧oid> <新oid> <消息>"

14173 +msgstr "git reflog write <引用> <旧OID> <新OID> <消息>"

14174

14175 #: builtin/reflog.c

14176 msgid ""

@@ -14294,7 +14308,7 @@ msgstr "新对象 '%s' 不存在"

14308 #: builtin/reflog.c

14309 #, c-format

14310 msgid "cannot start transaction: %s"

14297 -msgstr "不能启动事务：%s"

14311 +msgstr "无法启动事务：%s"

14312

14313 #: builtin/reflog.c

14314 #, c-format

@@ -14316,7 +14330,7 @@ msgstr "git refs verify [--strict] [--verbose]"

14330

14331 #: builtin/refs.c

14332 msgid "git refs exists <ref>"

14319 -msgstr "git reflog exists <引用>"

14333 +msgstr "git refs exists <引用>"

14334

14335 #: builtin/refs.c

14336 msgid "git refs optimize "

@@ -14353,7 +14367,7 @@ msgstr "'git refs verify' 不接受任何参数"

14367

14368 #: builtin/refs.c

14369 msgid "git refs list "

14356 -msgstr "git reflog list"

14370 +msgstr "git refs list "

14371

14372 #: builtin/refs.c

14373 msgid "'git refs exists' requires a reference"

@@ -14452,7 +14466,7 @@ msgstr "更新 %s 中"

14466 #: builtin/remote.c

14467 #, c-format

14468 msgid "Could not fetch %s"

14455 -msgstr "不能获取 %s"

14469 +msgstr "无法获取 %s"

14470

14471 #: builtin/remote.c

14472 msgid ""

@@ -14543,12 +14557,12 @@ msgstr "（删除）"

14557 #: builtin/remote.c

14558 #, c-format

14559 msgid "could not set '%s'"

14546 -msgstr "不能设置 '%s'"

14560 +msgstr "无法设置 '%s'"

14561

14562 #: builtin/remote.c config.c

14563 #, c-format

14564 msgid "could not unset '%s'"

14551 -msgstr "不能取消设置 '%s'"

14565 +msgstr "无法取消设置 '%s'"

14566

14567 #: builtin/remote.c

14568 #, c-format

@@ -14559,7 +14573,7 @@ msgid ""

14573 msgstr ""

14574 "配置（%s）remote.pushDefault 位于：\n"

14575 "\t%s:%d\n"

14562 -"现在在为不存在的远程名 '%s' 命名"

14576 +"现在指向不存在的远程名 '%s'"

14577

14578 #: builtin/remote.c

14579 msgid ""

@@ -14585,7 +14599,7 @@ msgstr "没有此远程仓库：'%s'"

14599 #: builtin/remote.c

14600 #, c-format

14601 msgid "Could not rename config section '%s' to '%s'"

14588 -msgstr "不能重命名配置小节 '%s' 到 '%s'"

14602 +msgstr "无法重命名配置小节 '%s' 到 '%s'"

14603

14604 #: builtin/remote.c

14605 msgid "Renaming remote references"

@@ -14625,7 +14639,7 @@ msgstr[1] "注意：refs/remotes/ 层级之外的一些分支未被移除。要

14639 #: builtin/remote.c

14640 #, c-format

14641 msgid "Could not remove config section '%s'"

14628 -msgstr "不能移除配置小节 '%s'"

14642 +msgstr "无法移除配置小节 '%s'"

14643

14644 #: builtin/remote.c

14645 #, c-format

@@ -14651,7 +14665,7 @@ msgstr " ???"

14665 #: builtin/remote.c

14666 #, c-format

14667 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"

14654 -msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"

14668 +msgstr "无效的 branch.%s.merge，无法变基到一个以上的分支"

14669

14670 #: builtin/remote.c

14671 #, c-format

@@ -14681,7 +14695,7 @@ msgstr "与远程 %s 合并"

14695 #: builtin/remote.c

14696 #, c-format

14697 msgid "%-*s and with remote %s\n"

14684 -msgstr "%-*s 以及和远程 %s\n"

14698 +msgstr "%-*s 以及与远程 %s\n"

14699

14700 #: builtin/remote.c

14701 msgid "create"

@@ -14854,7 +14868,7 @@ msgstr "不是一个有效引用：%s"

14868 #: builtin/remote.c

14869 #, c-format

14870 msgid "Could not set up %s"

14857 -msgstr "不能设置 %s"

14871 +msgstr "无法设置 %s"

14872

14873 #: builtin/remote.c

14874 #, c-format

@@ -14903,7 +14917,7 @@ msgstr "返回所有 URL 地址"

14917

14918 #: builtin/remote.c

14919 msgid "manipulate push URLs"

14906 -msgstr "操作推送 URLS"

14920 +msgstr "管理推送 URL"

14921

14922 #: builtin/remote.c

14923 msgid "add URL"

@@ -14911,7 +14925,7 @@ msgstr "添加 URL"

14925

14926 #: builtin/remote.c

14927 msgid "delete URLs"

14914 -msgstr "删除 URLS"

14928 +msgstr "删除 URL"

14929

14930 #: builtin/remote.c

14931 msgid "--add --delete doesn't make sense"

@@ -14920,7 +14934,7 @@ msgstr "--add --delete 无意义"

14934 #: builtin/remote.c

14935 #, c-format

14936 msgid "Invalid old URL pattern: %s"

14923 -msgstr "无效的旧 URL 匹配模版：%s"

14937 +msgstr "无效的旧 URL 匹配模板：%s"

14938

14939 #: builtin/remote.c

14940 #, c-format

@@ -15016,7 +15030,7 @@ msgstr "向 git-pack-objects 传递参数 --delta-islands"

15030

15031 #: builtin/repack.c

15032 msgid "with -A, do not loosen objects older than this"

15019 -msgstr "使用 -A，不要将早于给定时间的对象过期"

15033 +msgstr "使用 -A，不要将早于给定时间的对象变为松散对象"

15034

15035 #: builtin/repack.c

15036 msgid "with -a, repack unreachable objects"

@@ -15056,7 +15070,7 @@ msgstr "不要对该包文件重新打包"

15070

15071 #: builtin/repack.c

15072 msgid "find a geometric progression with factor <N>"

15059 -msgstr "使用因子 <n> 查找几何级数"

15073 +msgstr "使用因子 <N> 查找几何级数"

15074

15075 #: builtin/repack.c

15076 msgid "write a multi-pack index of the resulting packs"

@@ -15226,12 +15240,12 @@ msgstr "在替换的提交中签名将被移除！"

15240 #: builtin/replace.c

15241 #, c-format

15242 msgid "could not write replacement commit for: '%s'"

15229 -msgstr "不能为 '%s' 写替换提交"

15243 +msgstr "无法为 '%s' 写替换提交"

15244

15245 #: builtin/replace.c

15246 #, c-format

15247 msgid "graft for '%s' unnecessary"

15234 -msgstr "对 '%s' 移植没有必要"

15248 +msgstr "对 '%s' 嫁接没有必要"

15249

15250 #: builtin/replace.c

15251 #, c-format

@@ -15244,7 +15258,7 @@ msgid ""

15258 "could not convert the following graft(s):\n"

15259 "%s"

15260 msgstr ""

15247 -"不能转换下列移植：\n"

15261 +"无法转换下列嫁接：\n"

15262 "%s"

15263

15264 #: builtin/replace.c

@@ -15265,7 +15279,7 @@ msgstr "修改一个提交的父提交"

15279

15280 #: builtin/replace.c

15281 msgid "convert existing graft file"

15268 -msgstr "转换现存的移植文件"

15282 +msgstr "转换现存的嫁接文件"

15283

15284 #: builtin/replace.c

15285 msgid "replace the ref if it exists"

@@ -15336,7 +15350,7 @@ msgstr "--advance 的参数必须是引用"

15350 msgid ""

15351 "cannot advance target with multiple sources because ordering would be ill-"

15352 "defined"

15339 -msgstr "不能使用多个源推进目标，因为无法明确如何排序"

15353 +msgstr "无法使用多个源推进目标，因为无法明确如何排序"

15354

15355 #: builtin/replay.c

15356 #, c-format

@@ -15394,7 +15408,7 @@ msgstr "目前还不支持从根提交向下重放！"

15408

15409 #: builtin/replay.c

15410 msgid "replaying merge commits is not supported yet!"

15397 -msgstr "目前还不支持重放到合并提交！"

15411 +msgstr "目前还不支持重放合并提交！"

15412

15413 #: builtin/replay.c

15414 #, c-format

@@ -15458,7 +15472,7 @@ msgstr "远程"

15472

15473 #: builtin/repo.c

15474 msgid "Others"

15461 -msgstr "其它"

15475 +msgstr "其他"

15476

15477 #: builtin/repo.c

15478 msgid "Reachable objects"

@@ -15522,7 +15536,7 @@ msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]

15536

15537 #: builtin/reset.c

15538 msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."

15525 -msgstr "git reset [-q] [<树对象>] [--] <路径表达式>..."

15539 +msgstr "git reset [-q] [<树对象>] [--] <路径规格>..."

15540

15541 #: builtin/reset.c

15542 msgid ""

@@ -15531,7 +15545,7 @@ msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<树对象>

15545

15546 #: builtin/reset.c

15547 msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"

15534 -msgstr "git reset --patch [<树对象>] [--] [<路径表达式>...]"

15548 +msgstr "git reset --patch [<树对象>] [--] [<路径规格>...]"

15549

15550 #: builtin/reset.c

15551 msgid "mixed"

@@ -15623,13 +15637,13 @@ msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"

15637 #: builtin/reset.c

15638 #, c-format

15639 msgid "Cannot do %s reset with paths."

15626 -msgstr "不能带路径进行%s重置。"

15640 +msgstr "无法带路径进行%s重置。"

15641

15642 # 译者：汉字之间无空格，故删除%s前后空格

15643 #: builtin/reset.c

15644 #, c-format

15645 msgid "%s reset is not allowed in a bare repository"

15632 -msgstr "不能对纯仓库进行%s重置"

15646 +msgstr "不允许对纯仓库进行%s重置"

15647

15648 #: builtin/reset.c

15649 msgid "Unstaged changes after reset:"

@@ -15645,11 +15659,11 @@ msgstr "在重置后花了 %.2f 秒来刷新索引。使用 '--no-refresh' 以

15659 #: builtin/reset.c

15660 #, c-format

15661 msgid "Could not reset index file to revision '%s'."

15648 -msgstr "不能重置索引文件至版本 '%s'。"

15662 +msgstr "无法重置索引文件至版本 '%s'。"

15663

15664 #: builtin/reset.c

15665 msgid "Could not write new index file."

15652 -msgstr "不能写入新的索引文件。"

15666 +msgstr "无法写入新的索引文件。"

15667

15668 #: builtin/rev-list.c

15669 #, c-format

@@ -15727,7 +15741,7 @@ msgstr "--resolve-git-dir 需要一个参数"

15741 #: builtin/rev-parse.c

15742 #, c-format

15743 msgid "not a gitdir '%s'"

15730 -msgstr "不是一个git目录 '%s'"

15744 +msgstr "不是一个 git 目录 '%s'"

15745

15746 #: builtin/rev-parse.c

15747 msgid "--git-path requires an argument"

@@ -15774,7 +15788,7 @@ msgstr "该操作必须在一个工作区中运行"

15788

15789 #: builtin/rev-parse.c

15790 msgid "Could not read the index"

15777 -msgstr "不能读取索引"

15791 +msgstr "无法读取索引"

15792

15793 #: builtin/rev-parse.c

15794 #, c-format

@@ -15816,15 +15830,15 @@ msgstr "%s：%s 不能和 %s 同时使用"

15830

15831 #: builtin/revert.c

15832 msgid "end revert or cherry-pick sequence"

15819 -msgstr "终止反转或拣选操作"

15833 +msgstr "结束还原或拣选操作"

15834

15835 #: builtin/revert.c

15836 msgid "resume revert or cherry-pick sequence"

15823 -msgstr "继续反转或拣选操作"

15837 +msgstr "继续还原或拣选操作"

15838

15839 #: builtin/revert.c

15840 msgid "cancel revert or cherry-pick sequence"

15827 -msgstr "取消反转或拣选操作"

15841 +msgstr "取消还原或拣选操作"

15842

15843 #: builtin/revert.c

15844 msgid "skip current commit and continue"

@@ -15956,7 +15970,7 @@ msgstr "没有提供路径规格。我应该删除哪些文件？"

15970

15971 #: builtin/rm.c

15972 msgid "please stage your changes to .gitmodules or stash them to proceed"

15959 -msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"

15973 +msgstr "请将您的修改暂存到 .gitmodules 中或储藏后再继续"

15974

15975 #: builtin/rm.c

15976 #, c-format

@@ -15966,7 +15980,7 @@ msgstr "未提供 -r 选项不会递归删除 '%s'"

15980 #: builtin/rm.c

15981 #, c-format

15982 msgid "git rm: unable to remove %s"

15969 -msgstr "git rm：不能删除 %s"

15983 +msgstr "git rm：无法删除 %s"

15984

15985 #: builtin/send-pack.c

15986 msgid ""

@@ -16124,11 +16138,11 @@ msgstr "以对象名字命名提交"

16138

16139 #: builtin/show-branch.c

16140 msgid "show possible merge bases"

16127 -msgstr "显示可能合并的基线"

16141 +msgstr "显示可能的合并基线"

16142

16143 #: builtin/show-branch.c

16144 msgid "show refs unreachable from any other ref"

16131 -msgstr "显示没有任何引用的的引用"

16145 +msgstr "显示任何其他引用都不可达的引用"

16146

16147 #: builtin/show-branch.c

16148 msgid "show commits in topological order"

@@ -16178,8 +16192,8 @@ msgstr "无此引用 %s"

16192 #, c-format

16193 msgid "cannot handle more than %d rev."

16194 msgid_plural "cannot handle more than %d revs."

16181 -msgstr[0] "不能处理 %d 个以上的版本。"

16182 -msgstr[1] "不能处理 %d 个以上的版本。"

16195 +msgstr[0] "无法处理 %d 个以上的版本。"

16196 +msgstr[1] "无法处理 %d 个以上的版本。"

16197

16198 #: builtin/show-branch.c

16199 #, c-format

@@ -16189,7 +16203,7 @@ msgstr "'%s' 不是一个有效的引用。"

16203 #: builtin/show-branch.c

16204 #, c-format

16205 msgid "cannot find commit %s (%s)"

16192 -msgstr "不能找到提交 %s（%s）"

16206 +msgstr "无法找到提交 %s（%s）"

16207

16208 #: builtin/show-index.c

16209 msgid "hash-algorithm"

@@ -16249,7 +16263,7 @@ msgstr "显示 HEAD 引用，即使被过滤掉"

16263

16264 #: builtin/show-ref.c

16265 msgid "dereference tags into object IDs"

16252 -msgstr "转换标签到对象 ID"

16266 +msgstr "将标签解引用为对象 ID"

16267

16268 #: builtin/show-ref.c

16269 msgid "only show SHA1 hash using <n> digits"

@@ -16298,7 +16312,7 @@ msgstr "无法为稀疏检出文件创建目录"

16312 #: builtin/sparse-checkout.c

16313 #, c-format

16314 msgid "unable to fdopen %s"

16301 -msgstr "不能 fdopen %s"

16315 +msgstr "无法 fdopen %s"

16316

16317 #: builtin/sparse-checkout.c

16318 msgid "failed to initialize worktree config"

@@ -16454,11 +16468,11 @@ msgstr "输入和输出的文件使用 NUL 字符终结"

16468

16469 #: builtin/sparse-checkout.c

16470 msgid "when used with --rules-file interpret patterns as cone mode patterns"

16457 -msgstr "通过 --rules-file 选项传递的模型将被作为锥形（稀疏检出模型）进行解析"

16471 +msgstr "通过 --rules-file 选项传递的模式将被作为锥形模式（稀疏检出）进行解析"

16472

16473 #: builtin/sparse-checkout.c

16474 msgid "use patterns in <file> instead of the current ones."

16461 -msgstr "从 <文件> 参数中读取模式，而不是从标准输入"

16475 +msgstr "使用 <文件> 中的模式替代当前模式。"

16476

16477 #: builtin/stash.c

16478 msgid "git stash list [<log-options>]"

@@ -16470,23 +16484,23 @@ msgid ""

16484 "options>] [<stash>]"

16485 msgstr ""

16486 "git stash show [-u | --include-untracked | --only-untracked] [<差异选项>] [<"

16473 -"贮存>]"

16487 +"储藏>]"

16488

16489 #: builtin/stash.c

16490 msgid "git stash drop [-q | --quiet] [<stash>]"

16477 -msgstr "git stash drop [-q | --quiet] [<贮存>]"

16491 +msgstr "git stash drop [-q | --quiet] [<储藏>]"

16492

16493 #: builtin/stash.c

16494 msgid "git stash pop [--index] [-q | --quiet] [<stash>]"

16481 -msgstr "git stash pop [--index] [-q | --quiet] [<贮存>]"

16495 +msgstr "git stash pop [--index] [-q | --quiet] [<储藏>]"

16496

16497 #: builtin/stash.c

16498 msgid "git stash apply [--index] [-q | --quiet] [<stash>]"

16485 -msgstr "git stash apply [--index] [-q | --quiet] [<贮存>]"

16499 +msgstr "git stash apply [--index] [-q | --quiet] [<储藏>]"

16500

16501 #: builtin/stash.c

16502 msgid "git stash branch <branchname> [<stash>]"

16489 -msgstr "git stash branch <分支名> [<stash>]"

16503 +msgstr "git stash branch <分支名> [<储藏>]"

16504

16505 #: builtin/stash.c

16506 msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>"

@@ -16503,7 +16517,7 @@ msgid ""

16517 msgstr ""

16518 "git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "

16519 "| --quiet]\n"

16506 -" [-u | --include-untracked] [-a | --all] [(-m | --message <消息>]\n"

16520 +" [-u | --include-untracked] [-a | --all] [(-m | --message) <消息>]\n"

16521 " [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"

16522 " [--] [<路径规格>...]]"

16523

@@ -16523,7 +16537,7 @@ msgstr "git stash create [<消息>]"

16537

16538 #: builtin/stash.c

16539 msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"

16526 -msgstr "git stash export (--print | --to-ref <引用>) [<贮藏>...]"

16540 +msgstr "git stash export (--print | --to-ref <引用>) [<储藏>...]"

16541

16542 #: builtin/stash.c

16543 msgid "git stash import <commit>"

@@ -16532,11 +16546,11 @@ msgstr "git stash import <提交>"

16546 #: builtin/stash.c

16547 #, c-format

16548 msgid "'%s' is not a stash-like commit"

16535 -msgstr "'%s' 不像是一个贮藏提交"

16549 +msgstr "'%s' 不像是一个储藏提交"

16550

16551 #: builtin/stash.c

16552 msgid "No stash entries found."

16539 -msgstr "未发现贮藏条目。"

16553 +msgstr "未发现储藏条目。"

16554

16555 #: builtin/stash.c

16556 #, c-format

@@ -16565,7 +16579,7 @@ msgstr ""

16579

16580 #: builtin/stash.c

16581 msgid "cannot apply a stash in the middle of a merge"

16568 -msgstr "无法在合并过程中应用贮藏"

16582 +msgstr "无法在合并过程中应用储藏"

16583

16584 #: builtin/stash.c

16585 #, c-format

@@ -16578,7 +16592,7 @@ msgstr "索引中有冲突。尝试不用 --index。"

16592

16593 #: builtin/stash.c

16594 msgid "could not save index tree"

16581 -msgstr "不能保存索引树"

16595 +msgstr "无法保存索引树"

16596

16597 #: builtin/stash.c

16598 #, c-format

@@ -16587,11 +16601,11 @@ msgstr "正在合并 %s 和 %s"

16601

16602 #: builtin/stash.c

16603 msgid "Index was not unstashed."

16590 -msgstr "索引未从贮藏中恢复。"

16604 +msgstr "索引未从储藏中恢复。"

16605

16606 #: builtin/stash.c

16607 msgid "could not restore untracked files from stash"

16594 -msgstr "无法从贮藏条目中恢复未跟踪文件"

16608 +msgstr "无法从储藏条目中恢复未跟踪文件"

16609

16610 #: builtin/stash.c

16611 msgid "attempt to recreate the index"

@@ -16605,16 +16619,16 @@ msgstr "丢弃了 %s（%s）"

16619 #: builtin/stash.c

16620 #, c-format

16621 msgid "%s: Could not drop stash entry"

16608 -msgstr "%s：无法丢弃贮藏条目"

16622 +msgstr "%s：无法丢弃储藏条目"

16623

16624 #: builtin/stash.c

16625 #, c-format

16626 msgid "'%s' is not a stash reference"

16613 -msgstr "'%s' 不是一个贮藏引用"

16627 +msgstr "'%s' 不是一个储藏引用"

16628

16629 #: builtin/stash.c

16630 msgid "The stash entry is kept in case you need it again."

16617 -msgstr "贮藏条目被保留以备您再次需要。"

16631 +msgstr "储藏条目被保留以备您再次需要。"

16632

16633 #: builtin/stash.c

16634 msgid "No branch name specified"

@@ -16630,11 +16644,11 @@ msgstr "无法解包目录树"

16644

16645 #: builtin/stash.c

16646 msgid "include untracked files in the stash"

16633 -msgstr "在贮藏中包含未跟踪文件"

16647 +msgstr "在储藏中包含未跟踪文件"

16648

16649 #: builtin/stash.c

16650 msgid "only show untracked files in the stash"

16637 -msgstr "仅显示贮藏中的未跟踪文件"

16651 +msgstr "仅显示储藏中的未跟踪文件"

16652

16653 #: builtin/stash.c

16654 #, c-format

@@ -16643,7 +16657,7 @@ msgstr "无法用 %2$s 更新 %1$s"

16657

16658 #: builtin/stash.c

16659 msgid "stash message"

16646 -msgstr "贮藏说明"

16660 +msgstr "储藏说明"

16661

16662 #: builtin/stash.c

16663 msgid "\"git stash store\" requires one <commit> argument"

@@ -16679,7 +16693,7 @@ msgstr "无法保存当前暂存状态"

16693

16694 #: builtin/stash.c

16695 msgid "Cannot record working tree state"

16682 -msgstr "不能记录工作区状态"

16696 +msgstr "无法记录工作区状态"

16697

16698 #: builtin/stash.c

16699 msgid "Can't use --patch and --include-untracked or --all at the same time"

@@ -16699,7 +16713,7 @@ msgstr "没有要保存的本地修改"

16713

16714 #: builtin/stash.c

16715 msgid "Cannot initialize stash"

16702 -msgstr "无法初始化贮藏"

16716 +msgstr "无法初始化储藏"

16717

16718 #: builtin/stash.c

16719 msgid "Cannot save the current status"

@@ -16720,11 +16734,11 @@ msgstr "保持索引"

16734

16735 #: builtin/stash.c

16736 msgid "stash staged changes only"

16723 -msgstr "只贮藏暂存的变更"

16737 +msgstr "只储藏暂存的变更"

16738

16739 #: builtin/stash.c

16740 msgid "stash in patch mode"

16727 -msgstr "以补丁模式贮藏"

16741 +msgstr "以补丁模式储藏"

16742

16743 #: builtin/stash.c

16744 msgid "quiet mode"

@@ -16732,7 +16746,7 @@ msgstr "静默模式"

16746

16747 #: builtin/stash.c

16748 msgid "include untracked files in stash"

16735 -msgstr "贮藏中包含未跟踪文件"

16749 +msgstr "储藏中包含未跟踪文件"

16750

16751 #: builtin/stash.c

16752 msgid "include ignore files"

@@ -16741,7 +16755,7 @@ msgstr "包含忽略的文件"

16755 #: builtin/stash.c

16756 #, c-format

16757 msgid "cannot parse commit %s"

16744 -msgstr "不能解析提交 %s"

16758 +msgstr "无法解析提交 %s"

16759

16760 #: builtin/stash.c

16761 #, c-format

@@ -16765,7 +16779,7 @@ msgstr "不是提交：%s"

16779 #: builtin/stash.c

16780 #, c-format

16781 msgid "%s is not a valid exported stash commit"

16768 -msgstr "%s 不是一个有效的且已导出的贮藏提交"

16782 +msgstr "%s 不是一个有效的且已导出的储藏提交"

16783

16784 #: builtin/stash.c

16785 #, c-format

@@ -16775,7 +16789,7 @@ msgstr "发现根提交 %s 包含无效数据"

16789 #: builtin/stash.c

16790 #, c-format

16791 msgid "found stash commit %s without expected prefix"

16778 -msgstr "发现贮藏提交 %s 缺少预期前缀"

16792 +msgstr "发现储藏提交 %s 缺少预期前缀"

16793

16794 #: builtin/stash.c

16795 #, c-format

@@ -16785,7 +16799,7 @@ msgstr "无法解析该提交的父提交：%s"

16799 #: builtin/stash.c

16800 #, c-format

16801 msgid "%s does not look like a stash commit"

16788 -msgstr "%s 看起来不像是一个贮藏提交"

16802 +msgstr "%s 看起来不像是一个储藏提交"

16803

16804 #: builtin/stash.c

16805 #, c-format

@@ -16795,7 +16809,7 @@ msgstr "无法读取提交的缓冲区：%s"

16809 #: builtin/stash.c

16810 #, c-format

16811 msgid "cannot save the stash for %s"

16798 -msgstr "无法保存 %s 的贮藏"

16812 +msgstr "无法保存 %s 的储藏"

16813

16814 #: builtin/stash.c

16815 msgid "unable to write base commit"

@@ -16804,7 +16818,7 @@ msgstr "无法写入基线提交"

16818 #: builtin/stash.c

16819 #, c-format

16820 msgid "unable to find stash entry %s"

16807 -msgstr "无法找到贮藏条目 %s"

16821 +msgstr "无法找到储藏条目 %s"

16822

16823 #: builtin/stash.c

16824 msgid "print the object ID instead of writing it to a ref"

@@ -16954,7 +16968,7 @@ msgstr "%s"

16968 #: builtin/submodule--helper.c

16969 #, c-format

16970 msgid "couldn't hash object from '%s'"

16957 -msgstr "不能从 '%s' 创建哈希对象"

16971 +msgstr "无法从 '%s' 创建哈希对象"

16972

16973 #: builtin/submodule--helper.c

16974 #, c-format

@@ -16983,7 +16997,7 @@ msgstr "git submodule summary [<选项>] [<提交>] [--] [<路径>]"

16997

16998 #: builtin/submodule--helper.c

16999 msgid "could not fetch a revision for HEAD"

16986 -msgstr "不能为 HEAD 获取一个版本"

17000 +msgstr "无法为 HEAD 获取一个版本"

17001

17002 #: builtin/submodule--helper.c

17003 #, c-format

@@ -17037,7 +17051,7 @@ msgstr "无法移除子模组工作区 '%s'\n"

17051 #: builtin/submodule--helper.c

17052 #, c-format

17053 msgid "could not create empty submodule directory %s"

17040 -msgstr "不能创建空的子模组目录 %s"

17054 +msgstr "无法创建空的子模组目录 %s"

17055

17056 #: builtin/submodule--helper.c

17057 #, c-format

@@ -17082,17 +17096,17 @@ msgstr "无法获得 git 目录 '%s' 的仓库句柄"

17096 #: builtin/submodule--helper.c

17097 #, c-format

17098 msgid "submodule '%s' cannot add alternate: %s"

17085 -msgstr "子模组 '%s' 不能添加仓库备选：%s"

17099 +msgstr "子模组 '%s' 无法添加仓库备选：%s"

17100

17101 #: builtin/submodule--helper.c

17102 #, c-format

17103 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"

17090 -msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"

17104 +msgstr "无法识别 submodule.alternateErrorStrategy 的取值 '%s'"

17105

17106 #: builtin/submodule--helper.c

17107 #, c-format

17108 msgid "Value '%s' for submodule.alternateLocation is not recognized"

17095 -msgstr "不能识别 submodule.alternateLocation 的取值 '%s'"

17109 +msgstr "无法识别 submodule.alternateLocation 的取值 '%s'"

17110

17111 #: builtin/submodule--helper.c submodule.c

17112 #, c-format

@@ -17641,7 +17655,7 @@ msgstr ""

17655

17656 #: builtin/tag.c

17657 msgid "bad object type."

17644 -msgstr "坏的对象类型。"

17658 +msgstr "错误的对象类型。"

17659

17660 #: builtin/tag.c

17661 msgid "no tag message?"

@@ -18004,7 +18018,7 @@ msgstr ""

18018

18019 #: builtin/update-index.c

18020 msgid "Untracked cache disabled"

18007 -msgstr "缓存未跟踪文件被禁用"

18021 +msgstr "未跟踪文件缓存已禁用"

18022

18023 #: builtin/update-index.c

18024 msgid ""

@@ -18017,7 +18031,7 @@ msgstr ""

18031 #: builtin/update-index.c

18032 #, c-format

18033 msgid "Untracked cache enabled for '%s'"

18020 -msgstr "缓存未跟踪文件在 '%s' 启用"

18034 +msgstr "已为 '%s' 启用未跟踪文件缓存"

18035

18036 #: builtin/update-index.c

18037 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"

@@ -18257,7 +18271,7 @@ msgstr "无法在 '%2$s' 中取消配置 '%1$s'"

18271 #: builtin/worktree.c

18272 #, c-format

18273 msgid "could not create directory of '%s'"

18260 -msgstr "不能创建目录 '%s'"

18274 +msgstr "无法创建目录 '%s'"

18275

18276 #: builtin/worktree.c

18277 msgid "initializing"

@@ -18295,7 +18309,7 @@ msgid ""

18309 "HEAD path: '%s'\n"

18310 "HEAD contents: '%s'"

18311 msgstr ""

18298 -"HEAD 指向了一个无用的（或孤立的）引用。\n"

18312 +"HEAD 指向了一个无效的（或孤立的）引用。\n"

18313 "HEAD 路径： '%s'\n"

18314 "HEAD 内容： '%s'"

18315

@@ -18309,7 +18323,7 @@ msgstr ""

18323

18324 #: builtin/worktree.c

18325 msgid "checkout <branch> even if already checked out in other worktree"

18312 -msgstr "检出 <分支>，即使已经被检出到其它工作区"

18326 +msgstr "检出 <分支>，即使已经被检出到其他工作区"

18327

18328 #: builtin/worktree.c

18329 msgid "create a new branch"

@@ -18371,7 +18385,7 @@ msgstr "显示扩展的注释和原因（如果有）"

18385

18386 #: builtin/worktree.c

18387 msgid "add 'prunable' annotation to worktrees older than <time>"

18374 -msgstr "向早于 <时间> 的工作区添添加“可修剪”注释"

18388 +msgstr "向早于 <时间> 的工作区添加“可修剪”注释"

18389

18390 #: builtin/worktree.c

18391 msgid "terminate records with a NUL character"

@@ -18403,7 +18417,7 @@ msgstr "'%s' 未被锁定"

18417

18418 #: builtin/worktree.c

18419 msgid "working trees containing submodules cannot be moved or removed"

18406 -msgstr "不能移动或删除包含子模组的工作区"

18420 +msgstr "无法移动或删除包含子模组的工作区"

18421

18422 #: builtin/worktree.c

18423 msgid "force move even if worktree is dirty or locked"

@@ -18516,17 +18530,17 @@ msgstr "只对调试有用"

18530 #: bundle-uri.c

18531 #, c-format

18532 msgid "could not parse bundle list key %s with value '%s'"

18519 -msgstr "不能解析归档包列表键 %s 的值 '%s'"

18533 +msgstr "无法解析捆绑包列表键 %s 的值 '%s'"

18534

18535 #: bundle-uri.c

18536 #, c-format

18537 msgid "bundle list at '%s' has no mode"

18524 -msgstr "在 '%s' 的归档包列表没有模式"

18538 +msgstr "在 '%s' 的捆绑包列表没有模式"

18539

18540 #: bundle-uri.c

18541 #, c-format

18542 msgid "bundle list at '%s': bundle '%s' has no uri"

18529 -msgstr "在 '%s' 的归档包列表中，归档包 '%s' 没有 URI"

18543 +msgstr "在 '%s' 的捆绑包列表中，捆绑包 '%s' 没有 URI"

18544

18545 #: bundle-uri.c

18546 msgid "failed to create temporary file"

@@ -18534,12 +18548,12 @@ msgstr "无法创建临时文件"

18548

18549 #: bundle-uri.c

18550 msgid "insufficient capabilities"

18537 -msgstr "缺乏能力"

18551 +msgstr "能力不足"

18552

18553 #: bundle-uri.c

18554 #, c-format

18555 msgid "file downloaded from '%s' is not a bundle"

18542 -msgstr "下载自 '%s' 的文件不是归档包"

18556 +msgstr "下载自 '%s' 的文件不是捆绑包"

18557

18558 #: bundle-uri.c

18559 msgid "failed to store maximum creation token"

@@ -18548,7 +18562,7 @@ msgstr "无法储存最大的创建令牌"

18562 #: bundle-uri.c

18563 #, c-format

18564 msgid "unrecognized bundle mode from URI '%s'"

18551 -msgstr "不可辨认的归档包模式来自 URI '%s'"

18565 +msgstr "不可辨认的捆绑包模式来自 URI '%s'"

18566

18567 #: bundle-uri.c

18568 #, c-format

@@ -18558,17 +18572,17 @@ msgstr "超过了 URI 递归限制 (%d)"

18572 #: bundle-uri.c

18573 #, c-format

18574 msgid "bundle '%s' has no uri"

18561 -msgstr "归档包 '%s' 没有 URI"

18575 +msgstr "捆绑包 '%s' 没有 URI"

18576

18577 #: bundle-uri.c

18578 #, c-format

18579 msgid "failed to download bundle from URI '%s'"

18566 -msgstr "无法从 URI '%s' 下载归档包"

18580 +msgstr "无法从 URI '%s' 下载捆绑包"

18581

18582 #: bundle-uri.c

18583 #, c-format

18584 msgid "file at URI '%s' is not a bundle or bundle list"

18571 -msgstr "位于 URI '%s' 的文件不是归档包或归档包列表"

18585 +msgstr "位于 URI '%s' 的文件不是捆绑包或捆绑包列表"

18586

18587 #: bundle-uri.c

18588 #, c-format

@@ -18585,7 +18599,7 @@ msgstr "bundle-uri：获得了空行"

18599

18600 #: bundle-uri.c

18601 msgid "bundle-uri: line is not of the form 'key=value'"

18588 -msgstr "bundle-uri：行不是以 'key=value' 格式"

18602 +msgstr "bundle-uri：行不是 'key=value' 格式"

18603

18604 #: bundle-uri.c

18605 msgid "bundle-uri: line has empty key or value"

@@ -18594,7 +18608,7 @@ msgstr "bundle-uri：行有空的键或值"

18608 #: bundle.c

18609 #, c-format

18610 msgid "unrecognized bundle hash algorithm: %s"

18597 -msgstr "未能识别的归档包哈希算法：%s"

18611 +msgstr "未能识别的捆绑包哈希算法：%s"

18612

18613 #: bundle.c

18614 #, c-format

@@ -18604,7 +18618,7 @@ msgstr "未知能力 '%s'"

18618 #: bundle.c

18619 #, c-format

18620 msgid "'%s' does not look like a v2 or v3 bundle file"

18607 -msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件"

18621 +msgstr "'%s' 不像是一个 v2 或 v3 版本的捆绑包文件"

18622

18623 #: bundle.c

18624 #, c-format

@@ -18625,37 +18639,37 @@ msgstr "一些前置提交存在于对象储存中，但未连接于本仓库的

18639 #, c-format

18640 msgid "The bundle contains this ref:"

18641 msgid_plural "The bundle contains these %<PRIuMAX> refs:"

18628 -msgstr[0] "这个归档包中含有这个引用："

18629 -msgstr[1] "这个归档包中含有 %<PRIuMAX> 个引用："

18642 +msgstr[0] "这个捆绑包中含有这个引用："

18643 +msgstr[1] "这个捆绑包中含有 %<PRIuMAX> 个引用："

18644

18645 #: bundle.c

18646 msgid "The bundle records a complete history."

18633 -msgstr "这个归档包记录一个完整历史。"

18647 +msgstr "这个捆绑包记录一个完整历史。"

18648

18649 #: bundle.c

18650 #, c-format

18651 msgid "The bundle requires this ref:"

18652 msgid_plural "The bundle requires these %<PRIuMAX> refs:"

18639 -msgstr[0] "这个归档包需要这个引用："

18640 -msgstr[1] "这个归档包需要 %<PRIuMAX> 个引用："

18653 +msgstr[0] "这个捆绑包需要这个引用："

18654 +msgstr[1] "这个捆绑包需要 %<PRIuMAX> 个引用："

18655

18656 #: bundle.c

18657 #, c-format

18658 msgid "The bundle uses this hash algorithm: %s"

18645 -msgstr "该归档包使用的哈希算法：%s"

18659 +msgstr "该捆绑包使用的哈希算法：%s"

18660

18661 #: bundle.c

18662 #, c-format

18663 msgid "The bundle uses this filter: %s"

18650 -msgstr "归档包使用了过滤器：%s"

18664 +msgstr "捆绑包使用了过滤器：%s"

18665

18666 #: bundle.c

18667 msgid "unable to dup bundle descriptor"

18654 -msgstr "无法复制归档包描述符"

18668 +msgstr "无法复制捆绑包描述符"

18669

18670 #: bundle.c

18671 msgid "Could not spawn pack-objects"

18658 -msgstr "不能生成 pack-objects 进程"

18672 +msgstr "无法生成 pack-objects 进程"

18673

18674 #: bundle.c

18675 msgid "pack-objects died"

@@ -18669,21 +18683,21 @@ msgstr "引用 '%s' 被 rev-list 选项排除"

18683 #: bundle.c

18684 #, c-format

18685 msgid "unsupported bundle version %d"

18672 -msgstr "不支持的归档包版本 %d"

18686 +msgstr "不支持的捆绑包版本 %d"

18687

18688 #: bundle.c

18689 #, c-format

18690 msgid "cannot write bundle version %d with algorithm %s"

18677 -msgstr "不能写入，归档包版本 %d 不支持算法 %s"

18691 +msgstr "无法写入，捆绑包版本 %d 不支持算法 %s"

18692

18693 #: bundle.c

18694 msgid "Refusing to create empty bundle."

18681 -msgstr "不能创建空的归档包。"

18695 +msgstr "无法创建空的捆绑包。"

18696

18697 #: bundle.c

18698 #, c-format

18699 msgid "cannot create '%s'"

18686 -msgstr "不能创建 '%s'"

18700 +msgstr "无法创建 '%s'"

18701

18702 #: bundle.c

18703 msgid "index-pack died"

@@ -18820,7 +18834,7 @@ msgstr "切换分支或恢复工作区文件"

18834

18835 #: command-list.h

18836 msgid "Copy files from the index to the working tree"

18823 -msgstr "从索引拷贝文件到工作区"

18837 +msgstr "从索引复制文件到工作区"

18838

18839 #: command-list.h

18840 msgid "Find commits yet to be applied to upstream"

@@ -18952,7 +18966,7 @@ msgstr "生成一个合并提交信息"

18966

18967 #: command-list.h

18968 msgid "Output information on each ref"

18955 -msgstr "对每一个引用输出信息 "

18969 +msgstr "对每一个引用输出信息"

18970

18971 #: command-list.h

18972 msgid "Run a Git command on a list of repositories"

@@ -19004,11 +19018,11 @@ msgstr "通过 HTTP 从远程 Git 仓库下载"

19018

19019 #: command-list.h

19020 msgid "Push objects over HTTP/DAV to another repository"

19007 -msgstr "通过 HTTP/DAV 推送对象另一个仓库"

19021 +msgstr "通过 HTTP/DAV 推送对象到另一个仓库"

19022

19023 #: command-list.h

19024 msgid "Send a collection of patches from stdin to an IMAP folder"

19011 -msgstr "从标准输入将一组补丁发送到IMAP文件夹"

19025 +msgstr "从标准输入将一组补丁发送到 IMAP 文件夹"

19026

19027 #: command-list.h

19028 msgid "Build pack index file for an existing packed archive"

@@ -19076,7 +19090,7 @@ msgstr "对于需要合并的文件执行合并"

19090

19091 #: command-list.h

19092 msgid "The standard helper program to use with git-merge-index"

19079 -msgstr "与 git-merge-index 一起使用的标准向导程序"

19093 +msgstr "与 git-merge-index 一起使用的标准辅助程序"

19094

19095 #: command-list.h

19096 msgid "Perform merge without touching index or working tree"

@@ -19109,7 +19123,7 @@ msgstr "查找给定版本的符号名称"

19123

19124 #: command-list.h

19125 msgid "Add or inspect object notes"

19112 -msgstr "添加或检查对象注释"

19126 +msgstr "添加或检查对象注解"

19127

19128 #: command-list.h

19129 msgid "Import from and submit to Perforce repositories"

@@ -19125,7 +19139,7 @@ msgstr "查找冗余的包文件"

19139

19140 #: command-list.h

19141 msgid "Pack heads and tags for efficient repository access"

19128 -msgstr "打包头和标签以实现高效的仓库访问"

19142 +msgstr "打包分支和标签以实现高效的仓库访问"

19143

19144 #: command-list.h

19145 msgid "Compute unique ID for a patch"

@@ -19149,7 +19163,7 @@ msgstr "更新远程引用和相关的对象"

19163

19164 #: command-list.h

19165 msgid "Applies a quilt patchset onto the current branch"

19152 -msgstr "将一个 quilt 补丁集应用到当前分支。"

19166 +msgstr "将一个 quilt 补丁集应用到当前分支"

19167

19168 #: command-list.h

19169 msgid "Compare two commit ranges (e.g. two versions of a branch)"

@@ -19177,7 +19191,7 @@ msgstr "对引用的低级访问"

19191

19192 #: command-list.h

19193 msgid "Manage set of tracked repositories"

19180 -msgstr "管理已跟踪仓库"

19194 +msgstr "管理已跟踪的仓库集合"

19195

19196 #: command-list.h

19197 msgid "Pack unpacked objects in a repository"

@@ -19189,7 +19203,7 @@ msgstr "创建、列出、删除对象替换引用"

19203

19204 #: command-list.h

19205 msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too"

19192 -msgstr "试验中：基于一个新基线重放提交，同样适用于纯仓库"

19206 +msgstr "试验中：在新基线上重放提交，也适用于纯仓库"

19207

19208 #: command-list.h

19209 msgid "Retrieve information about the repository"

@@ -19197,11 +19211,11 @@ msgstr "检索仓库信息"

19211

19212 #: command-list.h

19213 msgid "Generates a summary of pending changes"

19200 -msgstr "生成待定更改的摘要"

19214 +msgstr "生成待处理变更的摘要"

19215

19216 #: command-list.h

19217 msgid "Reuse recorded resolution of conflicted merges"

19204 -msgstr "重用冲突合并的解决方案记录"

19218 +msgstr "重用已记录的冲突合并解决方案"

19219

19220 #: command-list.h

19221 msgid "Set `HEAD` or the index to a known state"

@@ -19213,7 +19227,7 @@ msgstr "恢复工作区文件"

19227

19228 #: command-list.h

19229 msgid "Lists commit objects in reverse chronological order"

19216 -msgstr "按时间顺序列出提交对象"

19230 +msgstr "按时间逆序列出提交对象"

19231

19232 #: command-list.h

19233 msgid "Pick out and massage parameters"

@@ -19221,7 +19235,7 @@ msgstr "选出并处理参数"

19235

19236 #: command-list.h

19237 msgid "Revert some existing commits"

19224 -msgstr "回退一些现存提交"

19238 +msgstr "还原一些现有提交"

19239

19240 #: command-list.h

19241 msgid "Remove files from the working tree and from the index"

@@ -19245,11 +19259,11 @@ msgstr "常用的 Git shell 脚本设置代码"

19259

19260 #: command-list.h

19261 msgid "Restricted login shell for Git-only SSH access"

19248 -msgstr "只允许 Git SSH 访问的受限登录shell"

19262 +msgstr "只允许 Git SSH 访问的受限登录 shell"

19263

19264 #: command-list.h

19265 msgid "Summarize 'git log' output"

19252 -msgstr "'git log' 输出摘要"

19266 +msgstr "汇总 'git log' 输出"

19267

19268 #: command-list.h

19269 msgid "Show various types of objects"

@@ -19278,7 +19292,7 @@ msgstr "将文件内容添加到暂存区"

19292

19293 #: command-list.h

19294 msgid "Stash the changes in a dirty working directory away"

19281 -msgstr "贮藏脏工作区中的修改"

19295 +msgstr "储藏脏工作区中的修改"

19296

19297 #: command-list.h

19298 msgid "Show the working tree status"

@@ -19294,7 +19308,7 @@ msgstr "初始化、更新或检查子模组"

19308

19309 #: command-list.h

19310 msgid "Bidirectional operation between a Subversion repository and Git"

19297 -msgstr "Subersion 仓库和 Git 之间的双向操作"

19311 +msgstr "Subversion 仓库和 Git 之间的双向操作"

19312

19313 #: command-list.h

19314 msgid "Switch branches"

@@ -19326,7 +19340,7 @@ msgstr "安全地更新存储于引用中的对象名称"

19340

19341 #: command-list.h

19342 msgid "Update auxiliary info file to help dumb servers"

19329 -msgstr "更新辅助信息文件以帮助哑协议服务"

19343 +msgstr "更新辅助信息文件以帮助哑协议服务器"

19344

19345 #: command-list.h

19346 msgid "Send archive back to git-archive"

@@ -19338,15 +19352,15 @@ msgstr "将对象压缩包发送回 git-fetch-pack"

19352

19353 #: command-list.h

19354 msgid "Show a Git logical variable"

19341 -msgstr "显示一个Git逻辑变量"

19355 +msgstr "显示一个 Git 逻辑变量"

19356

19357 #: command-list.h

19358 msgid "Check the GPG signature of commits"

19345 -msgstr "检查 GPG 提交签名"

19359 +msgstr "检查提交的 GPG 签名"

19360

19361 #: command-list.h

19362 msgid "Validate packed Git archive files"

19349 -msgstr "校验打包的Git存仓文件"

19363 +msgstr "校验打包的 Git 归档文件"

19364

19365 #: command-list.h

19366 msgid "Check the GPG signature of tags"

@@ -19382,7 +19396,7 @@ msgstr "面向开发人员的 Git 核心教程"

19396

19397 #: command-list.h

19398 msgid "Providing usernames and passwords to Git"

19385 -msgstr "为 Git 提供用户名和口令"

19399 +msgstr "为 Git 提供用户名和密码"

19400

19401 #: command-list.h

19402 msgid "Git for CVS users"

@@ -19394,7 +19408,7 @@ msgstr "调整差异输出"

19408

19409 #: command-list.h

19410 msgid "A useful minimum set of commands for Everyday Git"

19397 -msgstr "每一天 Git 的一组有用的最小命令集合"

19411 +msgstr "日常 Git 的一组有用的最小命令集合"

19412

19413 #: command-list.h

19414 msgid "Frequently asked questions about using Git"

@@ -19402,7 +19416,7 @@ msgstr "关于使用 Git 的常见问题"

19416

19417 #: command-list.h

19418 msgid "The bundle file format"

19405 -msgstr "归档包文件格式"

19419 +msgstr "捆绑包文件格式"

19420

19421 #: command-list.h

19422 msgid "Chunk-based file formats"

@@ -19450,11 +19464,11 @@ msgstr "定义子模组属性"

19464

19465 #: command-list.h

19466 msgid "Git namespaces"

19453 -msgstr "Git 名字空间"

19467 +msgstr "Git 命名空间"

19468

19469 #: command-list.h

19470 msgid "Protocol v0 and v1 capabilities"

19457 -msgstr "协议 v0 和 v1 能力"

19471 +msgstr "协议 v0 和 v1 功能"

19472

19473 #: command-list.h

19474 msgid "Things common to various protocols"

@@ -19466,15 +19480,15 @@ msgstr "Git 基于 HTTP 的协议"

19480

19481 #: command-list.h

19482 msgid "How packs are transferred over-the-wire"

19469 -msgstr "包在线路中传输的方式"

19483 +msgstr "包在网络上传输的方式"

19484

19485 #: command-list.h

19486 msgid "Git Wire Protocol, Version 2"

19473 -msgstr "Git 传输协议，第二版"

19487 +msgstr "Git 传输协议，第 2 版"

19488

19489 #: command-list.h

19490 msgid "Helper programs to interact with remote repositories"

19477 -msgstr "与远程仓库交互的助手程序"

19491 +msgstr "与远程仓库交互的辅助程序"

19492

19493 #: command-list.h

19494 msgid "Git Repository Layout"

@@ -19482,11 +19496,11 @@ msgstr "Git 仓库布局"

19496

19497 #: command-list.h

19498 msgid "Specifying revisions and ranges for Git"

19485 -msgstr "指定 Git 的版本和版本范围"

19499 +msgstr "指定 Git 的版本和范围"

19500

19501 #: command-list.h

19502 msgid "Mounting one repository inside another"

19489 -msgstr "将一个仓库安装到另外一个仓库中"

19503 +msgstr "将一个仓库挂载到另一个仓库中"

19504

19505 #: command-list.h

19506 msgid "A tutorial introduction to Git"

@@ -19498,7 +19512,7 @@ msgstr "Git 入门教程：第二部分"

19512

19513 #: command-list.h

19514 msgid "Git web interface (web frontend to Git repositories)"

19501 -msgstr "Git web 界面（Git 仓库的 web 前端）"

19515 +msgstr "Git Web 界面（Git 仓库的 Web 前端）"

19516

19517 #: command-list.h

19518 msgid "An overview of recommended workflows with Git"

@@ -19541,7 +19555,7 @@ msgstr "提交图的变更路径的索引块太小"

19555 msgid ""

19556 "ignoring too-small changed-path chunk (%<PRIuMAX> < %<PRIuMAX>) in commit-"

19557 "graph file"

19544 -msgstr "忽略提交图文件中过小的更改路径块（%<PRIuMAX> < %<PRIuMAX>）"

19558 +msgstr "忽略提交图文件中过小的变更路径块（%<PRIuMAX> < %<PRIuMAX>）"

19559

19560 #: commit-graph.c

19561 #, c-format

@@ -19655,7 +19669,7 @@ msgstr "正在计算提交图世代数字"

19669

19670 #: commit-graph.c

19671 msgid "Computing commit changed paths Bloom filters"

19658 -msgstr "计算提交变更路径的布隆过滤器"

19672 +msgstr "正在计算提交变更路径的布隆过滤器"

19673

19674 #: commit-graph.c

19675 msgid "Collecting referenced commits"

@@ -19680,7 +19694,7 @@ msgstr "为 %s 打开索引出错"

19694

19695 #: commit-graph.c

19696 msgid "Finding commits for commit graph among packed objects"

19683 -msgstr "正在打包对象中查找提交图的提交"

19697 +msgstr "正在已打包对象中查找提交图的提交"

19698

19699 #: commit-graph.c

19700 msgid "Finding extra edges in commit graph"

@@ -19703,8 +19717,8 @@ msgstr "无法为 '%s' 调整共享权限"

19717 #, c-format

19718 msgid "Writing out commit graph in %d pass"

19719 msgid_plural "Writing out commit graph in %d passes"

19706 -msgstr[0] "正在用 %d 步写出提交图"

19707 -msgstr[1] "正在用 %d 步写出提交图"

19720 +msgstr[0] "正在用 %d 次写出提交图"

19721 +msgstr[1] "正在用 %d 次写出提交图"

19722

19723 #: commit-graph.c

19724 msgid "unable to open commit-graph chain file"

@@ -19726,7 +19740,7 @@ msgstr "无法合并提交图，其提交数分别为 %<PRIuMAX> 和 %<PRIuMAX>"

19740 #: commit-graph.c

19741 #, c-format

19742 msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"

19729 -msgstr "无法合并提交图 %s, 提交过多：%<PRIuMAX>"

19743 +msgstr "无法合并提交图 %s，提交过多：%<PRIuMAX>"

19744

19745 #: commit-graph.c

19746 msgid "Scanning merged commits"

@@ -19738,7 +19752,7 @@ msgstr "正在合并提交图"

19752

19753 #: commit-graph.c

19754 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

19741 -msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"

19755 +msgstr "正在尝试写入提交图，但 'core.commitGraph' 被禁用"

19756

19757 #: commit-graph.c

19758 #, c-format

@@ -19749,7 +19763,7 @@ msgstr "尝试写入提交图，但不支持 'commitGraph.changedPathsVersion' (

19763

19764 #: commit-graph.c

19765 msgid "too many commits to write graph"

19752 -msgstr "提交太多不能画图"

19766 +msgstr "提交太多，无法写入提交图"

19767

19768 #: commit-graph.c

19769 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

@@ -19819,7 +19833,7 @@ msgstr "正在校验提交图中的提交"

19833 #: commit-reach.c sequencer.c

19834 #, c-format

19835 msgid "could not parse commit %s"

19822 -msgstr "不能解析提交 %s"

19836 +msgstr "无法解析提交 %s"

19837

19838 #: commit.c

19839 #, c-format

@@ -19838,10 +19852,10 @@ msgid ""

19852 "\"git config set advice.graftFileDeprecated false\""

19853 msgstr ""

19854 "对 <GIT_DIR>/info/grafts 的支持已过时，并将在\n"

19841 -"未来的Git版本中被移除。\n"

19855 +"未来的 Git 版本中被移除。\n"

19856 "\n"

19857 "请使用 \"git replace --convert-graft-file\" 将\n"

19844 -"（提交）移植转换为替换引用。\n"

19858 +"嫁接转换为替换引用。\n"

19859 "\n"

19860 "运行 \"git config set advice.graftFileDeprecated false\"\n"

19861 "可关闭本消息"

@@ -19869,7 +19883,7 @@ msgstr "提交 %s 没有 GPG 签名。"

19883 #: commit.c

19884 #, c-format

19885 msgid "Commit %s has a good GPG signature by %s\n"

19872 -msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"

19886 +msgstr "提交 %s 有一个来自 %s 的有效 GPG 签名。\n"

19887

19888 #: commit.c

19889 msgid ""

@@ -19878,7 +19892,7 @@ msgid ""

19892 "variable i18n.commitEncoding to the encoding your project uses.\n"

19893 msgstr ""

19894 "警告：提交说明不符合 UTF-8 字符编码。\n"

19881 -"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitEncoding\n"

19895 +"您可以通过修订提交来改正提交说明，或者将配置变量 i18n.commitEncoding\n"

19896 "设置为您项目所用的字符编码。\n"

19897

19898 #: compat/compiler.h

@@ -19892,7 +19906,7 @@ msgstr "libc 信息不可用\n"

19906 #: compat/disk.h

19907 #, c-format

19908 msgid "could not determine free disk size for '%s'"

19895 -msgstr "不能确定 '%s' 的空余磁盘空间"

19909 +msgstr "无法确定 '%s' 的空余磁盘空间"

19910

19911 #: compat/disk.h

19912 #, c-format

@@ -19902,7 +19916,7 @@ msgstr "无法获得 '%s' 的信息"

19916 #: compat/fsmonitor/fsm-health-win32.c

19917 #, c-format

19918 msgid "[GLE %ld] health thread could not open '%ls'"

19905 -msgstr "[GLE %ld] 健康监测线程不能打开 '%ls'"

19919 +msgstr "[GLE %ld] 健康监测线程无法打开 '%ls'"

19920

19921 #: compat/fsmonitor/fsm-health-win32.c

19922 #, c-format

@@ -19912,7 +19926,7 @@ msgstr "[GLE %ld] 健康监测线程正在获取 '%ls' 的 BHFI"

19926 #: compat/fsmonitor/fsm-health-win32.c compat/fsmonitor/fsm-listen-win32.c

19927 #, c-format

19928 msgid "could not convert to wide characters: '%s'"

19915 -msgstr "不能转换至宽字符：'%s'"

19929 +msgstr "无法转换至宽字符：'%s'"

19930

19931 #: compat/fsmonitor/fsm-health-win32.c

19932 #, c-format

@@ -19932,7 +19946,7 @@ msgstr "健康监测线程等待失败 [GLE %ld]"

19946 #: compat/fsmonitor/fsm-ipc-darwin.c

19947 #, c-format

19948 msgid "Invalid path: %s"

19935 -msgstr "无效路径： %s"

19949 +msgstr "无效路径：%s"

19950

19951 #: compat/fsmonitor/fsm-listen-darwin.c

19952 msgid "Unable to create FSEventStream."

@@ -19965,7 +19979,7 @@ msgstr "ReadDirectoryChangedW 失败于 '%s' [GLE %ld]"

19979 #: compat/fsmonitor/fsm-listen-win32.c

19980 #, c-format

19981 msgid "GetOverlappedResult failed on '%s' [GLE %ld]"

19968 -msgstr "GetOverlappedResult 失败于 '%s' [GLE %ld]"

19982 +msgstr "GetOverlappedResult 在 '%s' 上失败 [GLE %ld]"

19983

19984 #: compat/fsmonitor/fsm-listen-win32.c

19985 #, c-format

@@ -20000,12 +20014,12 @@ msgstr "[GLE %ld] 无法打开要读取的 '%ls'"

20014 #: compat/fsmonitor/fsm-path-utils-win32.c

20015 #, c-format

20016 msgid "[GLE %ld] unable to get protocol information for '%ls'"

20003 -msgstr "[GLE %ld] 无法获取 '%ls' 的协议信息 "

20017 +msgstr "[GLE %ld] 无法获取 '%ls' 的协议信息"

20018

20019 #: compat/mingw.c

20020 #, c-format

20021 msgid "failed to copy SID (%ld)"

20008 -msgstr "无法拷贝 SID (%ld)"

20022 +msgstr "无法复制 SID (%ld)"

20023

20024 #: compat/mingw.c

20025 #, c-format

@@ -20042,7 +20056,7 @@ msgstr "末尾的反斜杠"

20056

20057 #: compat/regex/regcomp.c

20058 msgid "Invalid back reference"

20045 -msgstr "无效的反向索引"

20059 +msgstr "无效的反向引用"

20060

20061 #: compat/regex/regcomp.c

20062 msgid "Unmatched [ or [^"

@@ -20167,7 +20181,7 @@ msgid ""

20181 "remote URLs cannot be configured in file directly or indirectly included by "

20182 "includeIf.hasconfig:remote.*.url"

20183 msgstr ""

20170 -"远程 URL 不能在文件中配置，不管直接地还是通过 "

20184 +"远程 URL 无法在文件中配置，不管直接地还是通过 "

20185 "includeIf.hasconfig:remote.*.url 间接地包含"

20186

20187 #: config.c

@@ -20183,7 +20197,7 @@ msgstr "配置 '%.*s' 缺少环境变量名称"

20197 #: config.c

20198 #, c-format

20199 msgid "missing environment variable '%s' for configuration '%.*s'"

20186 -msgstr "缺少环境变量 '%s' 于配置 '%.*s' "

20200 +msgstr "配置 '%3$.*2$s' 缺少环境变量 '%1$s'"

20201

20202 #: config.c

20203 #, c-format

@@ -20212,7 +20226,7 @@ msgstr "空的配置键名"

20226 #: config.c

20227 #, c-format

20228 msgid "bogus config parameter: %s"

20215 -msgstr "伪配置参数：%s"

20229 +msgstr "无效的配置参数：%s"

20230

20231 #: config.c

20232 #, c-format

@@ -20222,7 +20236,7 @@ msgstr "%s 中格式错误"

20236 #: config.c

20237 #, c-format

20238 msgid "bogus count in %s"

20225 -msgstr "%s 中错误计数"

20239 +msgstr "%s 中计数错误"

20240

20241 #: config.c

20242 #, c-format

@@ -20315,7 +20329,7 @@ msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"

20329 #: config.c

20330 #, c-format

20331 msgid "bad boolean config value '%s' for '%s'"

20318 -msgstr "'%2$s' 的错误的布尔取值 '%1$s'"

20332 +msgstr "配置变量 '%2$s' 的布尔值 '%1$s' 无效"

20333

20334 #: config.c

20335 #, c-format

@@ -20340,7 +20354,7 @@ msgstr "引用 '%s' 没有指向一个数据对象"

20354 #: config.c

20355 #, c-format

20356 msgid "unable to resolve config blob '%s'"

20343 -msgstr "不能解析配置对象 '%s'"

20357 +msgstr "无法解析配置对象 '%s'"

20358

20359 #: config.c

20360 msgid "unable to parse command-line config"

@@ -20435,7 +20449,7 @@ msgstr "不允许多行注释：'%s'"

20449 #: config.c

20450 #, c-format

20451 msgid "could not lock config file %s"

20438 -msgstr "不能锁定配置文件 %s"

20452 +msgstr "无法锁定配置文件 %s"

20453

20454 #: config.c

20455 #, c-format

@@ -20455,7 +20469,7 @@ msgstr "对 %s 调用 fstat 失败"

20469 #: config.c

20470 #, c-format

20471 msgid "unable to mmap '%s'%s"

20458 -msgstr "不能 mmap '%s'%s"

20472 +msgstr "无法 mmap '%s'%s"

20473

20474 #: config.c

20475 #, c-format

@@ -20465,12 +20479,12 @@ msgstr "对 %s 调用 chmod 失败"

20479 #: config.c

20480 #, c-format

20481 msgid "could not write config file %s"

20468 -msgstr "不能写入配置文件 %s"

20482 +msgstr "无法写入配置文件 %s"

20483

20484 #: config.c

20485 #, c-format

20486 msgid "could not set '%s' to '%s'"

20473 -msgstr "不能设置 '%s' 为 '%s'"

20487 +msgstr "无法设置 '%s' 为 '%s'"

20488

20489 #: config.c

20490 #, c-format

@@ -20480,7 +20494,7 @@ msgstr "无效的小节名称：%s"

20494 #: config.c

20495 #, c-format

20496 msgid "refusing to work with overly long line in '%s' on line %<PRIuMAX>"

20483 -msgstr "拒绝支持内容过长的行，位于文件 '%s' 中的第 %<PRIuMAX> 行"

20497 +msgstr "拒绝处理内容过长的行，位于文件 '%s' 中的第 %<PRIuMAX> 行"

20498

20499 #: config.c

20500 #, c-format

@@ -20551,7 +20565,7 @@ msgstr "服务器给出未知的对象格式 '%s'"

20565 #: connect.c

20566 #, c-format

20567 msgid "error on bundle-uri response line %d: %s"

20554 -msgstr "于 bundle-uri 响应行 %d 发生错误：%s"

20568 +msgstr "在 bundle-uri 响应行 %d 发生错误：%s"

20569

20570 #: connect.c

20571 msgid "expected flush after bundle-uri listing"

@@ -20636,11 +20650,11 @@ msgstr "已阻止奇怪的端口号 '%s'"

20650 #: connect.c

20651 #, c-format

20652 msgid "cannot start proxy %s"

20639 -msgstr "不能启动代理 %s"

20653 +msgstr "无法启动代理 %s"

20654

20655 #: connect.c

20656 msgid "no path specified; see 'git help pull' for valid url syntax"

20643 -msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"

20657 +msgstr "未指定路径，执行 'git help pull' 查看有效的 URL 语法"

20658

20659 #: connect.c

20660 msgid "newline is forbidden in git:// hosts and repo paths"

@@ -20669,7 +20683,7 @@ msgstr "无法 fork"

20683

20684 #: connected.c

20685 msgid "Could not run 'git rev-list'"

20672 -msgstr "不能执行 'git rev-list'"

20686 +msgstr "无法执行 'git rev-list'"

20687

20688 #: connected.c

20689 msgid "failed write to rev-list"

@@ -20694,7 +20708,7 @@ msgstr "%s 中的 CRLF 将被 LF 替换"

20708 msgid ""

20709 "in the working copy of '%s', CRLF will be replaced by LF the next time Git "

20710 "touches it"

20697 -msgstr "在 '%s' 的工作拷贝中，下次 Git 接触时 CRLF 将被 LF 替换"

20711 +msgstr "在 '%s' 的工作拷贝中，下次 Git 处理时 CRLF 将被 LF 替换"

20712

20713 #: convert.c

20714 #, c-format

@@ -20706,7 +20720,7 @@ msgstr "文件 %s 中的 LF 将被 CRLF 替换"

20720 msgid ""

20721 "in the working copy of '%s', LF will be replaced by CRLF the next time Git "

20722 "touches it"

20709 -msgstr "在 '%s' 的工作拷贝中，下次 Git 接触时 LF 将被 CRLF 替换"

20723 +msgstr "在 '%s' 的工作拷贝中，下次 Git 处理时 LF 将被 CRLF 替换"

20724

20725 #: convert.c

20726 #, c-format

@@ -20732,7 +20746,7 @@ msgid ""

20746 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

20747 "%sLE (depending on the byte order) as working-tree-encoding."

20748 msgstr ""

20735 -"文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字"

20749 +"文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE 或 UTF-%sLE（取决于字"

20750 "节序）作为工作区编码。"

20751

20752 #: convert.c

@@ -20743,22 +20757,22 @@ msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"

20757 #: convert.c

20758 #, c-format

l10n: zh_CN: standardize glossary terms