6c94aba5fa · matheusbsbs/matheus-bagliano

@@ -12,8 +12,8 @@ msgid ""

12 msgstr ""

13 "Project-Id-Version: Git\n"

14 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

15 -"POT-Creation-Date: 2014-02-01 08:06+0800\n"

16 -"PO-Revision-Date: 2014-02-03 10:53+0800\n"

15 +"POT-Creation-Date: 2014-04-23 12:50+0800\n"

16 +"PO-Revision-Date: 2014-04-23 12:53+0800\n"

17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"

18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"

19 "Language: zh_CN\n"

@@ -22,16 +22,12 @@ msgstr ""

22 "Content-Transfer-Encoding: 8bit\n"

23 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

24

25 -#: advice.c:57

25 +#: advice.c:55

26 #, c-format

27 msgid "hint: %.*s\n"

28 msgstr "提示：%.*s\n"

29

30 -#.

31 -#. * Message used both when 'git commit' fails and when

32 -#. * other commands doing a merge do.

33 -#.

34 -#: advice.c:87

30 +#: advice.c:85

31 msgid ""

32 "Fix them up in the work tree,\n"

33 "and then use 'git add/rm <file>' as\n"

@@ -60,76 +56,76 @@ msgstr ""

56 msgid "git archive --remote <repo> [--exec <cmd>] --list"

57 msgstr "git archive --remote <版本库> [--exec <命令>] --list"

58

63 -#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328

59 +#: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328

60 #, c-format

61 msgid "pathspec '%s' did not match any files"

62 msgstr "路径规则 '%s' 未匹配任何文件"

63

68 -#: archive.c:327

64 +#: archive.c:328

65 msgid "fmt"

66 msgstr "格式"

67

72 -#: archive.c:327

68 +#: archive.c:328

69 msgid "archive format"

70 msgstr "归档格式"

71

76 -#: archive.c:328 builtin/log.c:1193

72 +#: archive.c:329 builtin/log.c:1193

73 msgid "prefix"

74 msgstr "前缀"

75

80 -#: archive.c:329

76 +#: archive.c:330

77 msgid "prepend prefix to each pathname in the archive"

78 msgstr "为归档中每个路径名加上前缀"

79

84 -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265

85 -#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680

86 -#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77

87 -#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408

88 -#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154

80 +#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2265

81 +#: builtin/blame.c:2266 builtin/config.c:57 builtin/fast-export.c:680

82 +#: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77

83 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412

84 +#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151

85 msgid "file"

86 msgstr "文件"

87

92 -#: archive.c:331 builtin/archive.c:89

88 +#: archive.c:332 builtin/archive.c:89

89 msgid "write the archive to this file"

90 msgstr "归档写入此文件"

91

96 -#: archive.c:333

92 +#: archive.c:334

93 msgid "read .gitattributes in working directory"

94 msgstr "读取工作区中的 .gitattributes"

95

100 -#: archive.c:334

96 +#: archive.c:335

97 msgid "report archived files on stderr"

98 msgstr "在标准错误上报告归档文件"

99

104 -#: archive.c:335

100 +#: archive.c:336

101 msgid "store only"

102 msgstr "只存储"

103

108 -#: archive.c:336

104 +#: archive.c:337

105 msgid "compress faster"

106 msgstr "压缩速度更快"

107

112 -#: archive.c:344

108 +#: archive.c:345

109 msgid "compress better"

110 msgstr "压缩效果更好"

111

116 -#: archive.c:347

112 +#: archive.c:348

113 msgid "list supported archive formats"

114 msgstr "列出支持的归档格式"

115

120 -#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84

116 +#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84

117 msgid "repo"

118 msgstr "版本库"

119

124 -#: archive.c:350 builtin/archive.c:91

120 +#: archive.c:351 builtin/archive.c:91

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

122 msgstr "从远程版本库（<版本库>）提取归档文件"

123

128 -#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487

124 +#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491

125 msgid "command"

126 msgstr "命令"

127

132 -#: archive.c:352 builtin/archive.c:93

128 +#: archive.c:353 builtin/archive.c:93

129 msgid "path to the remote git-upload-archive command"

130 msgstr "远程 git-upload-archive 命令的路径"

131

@@ -146,81 +142,76 @@ msgstr ""

142 msgid "Not setting branch %s as its own upstream."

143 msgstr "未设置分支 %s 作为它自己的上游。"

144

149 -#: branch.c:82

145 +#: branch.c:83

146 #, c-format

147 msgid "Branch %s set up to track remote branch %s from %s by rebasing."

148 msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"

149

154 -#: branch.c:83

150 +#: branch.c:84

151 #, c-format

152 msgid "Branch %s set up to track remote branch %s from %s."

153 msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"

154

159 -#: branch.c:87

155 +#: branch.c:88

156 #, c-format

157 msgid "Branch %s set up to track local branch %s by rebasing."

158 msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"

159

164 -#: branch.c:88

160 +#: branch.c:89

161 #, c-format

162 msgid "Branch %s set up to track local branch %s."

163 msgstr "分支 %s 设置为跟踪本地分支 %s。"

164

169 -#: branch.c:92

165 +#: branch.c:94

166 #, c-format

167 msgid "Branch %s set up to track remote ref %s by rebasing."

168 msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"

169

174 -#: branch.c:93

170 +#: branch.c:95

171 #, c-format

172 msgid "Branch %s set up to track remote ref %s."

173 msgstr "分支 %s 设置为跟踪远程引用 %s。"

174

179 -#: branch.c:97

175 +#: branch.c:99

176 #, c-format

177 msgid "Branch %s set up to track local ref %s by rebasing."

178 msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"

179

184 -#: branch.c:98

180 +#: branch.c:100

181 #, c-format

182 msgid "Branch %s set up to track local ref %s."

183 msgstr "分支 %s 设置为跟踪本地引用 %s。"

184

189 -#: branch.c:118

190 -#, c-format

191 -msgid "Tracking not set up: name too long: %s"

192 -msgstr "跟踪未设置：名字太长：%s"

193 -

194 -#: branch.c:137

185 +#: branch.c:133

186 #, c-format

187 msgid "Not tracking: ambiguous information for ref %s"

188 msgstr "未跟踪：引用 %s 有歧义"

189

199 -#: branch.c:182

190 +#: branch.c:178

191 #, c-format

192 msgid "'%s' is not a valid branch name."

193 msgstr "'%s' 不是一个有效的分支名称。"

194

204 -#: branch.c:187

195 +#: branch.c:183

196 #, c-format

197 msgid "A branch named '%s' already exists."

198 msgstr "一个分支名 '%s' 已经存在。"

199

209 -#: branch.c:195

200 +#: branch.c:191

201 msgid "Cannot force update the current branch."

202 msgstr "无法强制更新当前分支。"

203

213 -#: branch.c:215

204 +#: branch.c:211

205 #, c-format

206 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

207 msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"

208

218 -#: branch.c:217

209 +#: branch.c:213

210 #, c-format

211 msgid "the requested upstream branch '%s' does not exist"

212 msgstr "请求的上游分支 '%s' 不存在"

213

223 -#: branch.c:219

214 +#: branch.c:215

215 msgid ""

216 "\n"

217 "If you are planning on basing your work on an upstream\n"

@@ -238,113 +229,113 @@ msgstr ""

229 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"

230 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"

231

241 -#: branch.c:264

232 +#: branch.c:260

233 #, c-format

234 msgid "Not a valid object name: '%s'."

235 msgstr "不是一个有效的对象名：'%s'。"

236

246 -#: branch.c:284

237 +#: branch.c:280

238 #, c-format

239 msgid "Ambiguous object name: '%s'."

240 msgstr "歧义的对象名：'%s'。"

241

251 -#: branch.c:289

242 +#: branch.c:285

243 #, c-format

244 msgid "Not a valid branch point: '%s'."

245 msgstr "无效的分支点：'%s'。"

246

256 -#: branch.c:295

247 +#: branch.c:291

248 msgid "Failed to lock ref for update"

249 msgstr "无法为更新锁定引用"

250

260 -#: branch.c:313

251 +#: branch.c:309

252 msgid "Failed to write ref"

253 msgstr "不能写引用"

254

264 -#: bundle.c:37

255 +#: bundle.c:33

256 #, c-format

257 msgid "'%s' does not look like a v2 bundle file"

258 msgstr "'%s' 不像是一个 v2 版本的包文件"

259

269 -#: bundle.c:64

260 +#: bundle.c:60

261 #, c-format

262 msgid "unrecognized header: %s%s (%d)"

263 msgstr "未能识别的包头：%s%s (%d)"

264

274 -#: bundle.c:90 builtin/commit.c:706

265 +#: bundle.c:86 builtin/commit.c:706

266 #, c-format

267 msgid "could not open '%s'"

268 msgstr "不能打开 '%s'"

269

279 -#: bundle.c:141

270 +#: bundle.c:138

271 msgid "Repository lacks these prerequisite commits:"

272 msgstr "版本库缺少这些必备的提交："

273

283 -#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332

274 +#: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332

275 #: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357

276 #: builtin/shortlog.c:158

277 msgid "revision walk setup failed"

278 msgstr "版本遍历设置失败"

279

289 -#: bundle.c:187

280 +#: bundle.c:184

281 #, c-format

282 msgid "The bundle contains this ref:"

283 msgid_plural "The bundle contains these %d refs:"

284 msgstr[0] "这个包中含有这个引用："

285 msgstr[1] "这个包中含有 %d 个引用："

286

296 -#: bundle.c:194

287 +#: bundle.c:191

288 msgid "The bundle records a complete history."

289 msgstr "这个包记录一个完整历史。"

290

300 -#: bundle.c:196

291 +#: bundle.c:193

292 #, c-format

293 msgid "The bundle requires this ref:"

294 msgid_plural "The bundle requires these %d refs:"

295 msgstr[0] "这个包需要这个引用："

296 msgstr[1] "这个包需要 %d 个引用："

297

307 -#: bundle.c:296

298 +#: bundle.c:293

299 msgid "rev-list died"

300 msgstr "rev-list 终止"

301

311 -#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261

302 +#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261

303 #, c-format

304 msgid "unrecognized argument: %s"

305 msgstr "未能识别的参数：%s"

306

316 -#: bundle.c:337

307 +#: bundle.c:334

308 #, c-format

309 msgid "ref '%s' is excluded by the rev-list options"

310 msgstr "引用 '%s' 被 rev-list 选项排除"

311

321 -#: bundle.c:382

312 +#: bundle.c:379

313 msgid "Refusing to create empty bundle."

314 msgstr "不能创建空包。"

315

325 -#: bundle.c:398

316 +#: bundle.c:395

317 msgid "Could not spawn pack-objects"

318 msgstr "不能生成 pack-objects 进程"

319

329 -#: bundle.c:416

320 +#: bundle.c:413

321 msgid "pack-objects died"

322 msgstr "pack-objects 终止"

323

333 -#: bundle.c:419

324 +#: bundle.c:416

325 #, c-format

326 msgid "cannot create '%s'"

327 msgstr "不能创建 '%s'"

328

338 -#: bundle.c:441

329 +#: bundle.c:438

330 msgid "index-pack died"

331 msgstr "index-pack 终止"

332

342 -#: commit.c:53

333 +#: commit.c:54

334 #, c-format

335 msgid "could not parse %s"

336 msgstr "不能解析 %s"

337

347 -#: commit.c:55

338 +#: commit.c:56

339 #, c-format

340 msgid "%s %s is not a commit!"

341 msgstr "%s %s 不是一个提交!"

@@ -375,43 +366,43 @@ msgstr "在将来"

366 #, c-format

367 msgid "%lu second ago"

368 msgid_plural "%lu seconds ago"

378 -msgstr[0] "%lu 秒钟之前"

379 -msgstr[1] "%lu 秒钟之前"

369 +msgstr[0] "%lu 秒钟前"

370 +msgstr[1] "%lu 秒钟前"

371

372 #: date.c:108

373 #, c-format

374 msgid "%lu minute ago"

375 msgid_plural "%lu minutes ago"

385 -msgstr[0] "%lu 分钟之前"

386 -msgstr[1] "%lu 分钟之前"

376 +msgstr[0] "%lu 分钟前"

377 +msgstr[1] "%lu 分钟前"

378

379 #: date.c:115

380 #, c-format

381 msgid "%lu hour ago"

382 msgid_plural "%lu hours ago"

392 -msgstr[0] "%lu 小时之前"

393 -msgstr[1] "%lu 小时之前"

383 +msgstr[0] "%lu 小时前"

384 +msgstr[1] "%lu 小时前"

385

386 #: date.c:122

387 #, c-format

388 msgid "%lu day ago"

389 msgid_plural "%lu days ago"

399 -msgstr[0] "%lu 天之前"

400 -msgstr[1] "%lu 天之前"

390 +msgstr[0] "%lu 天前"

391 +msgstr[1] "%lu 天前"

392

393 #: date.c:128

394 #, c-format

395 msgid "%lu week ago"

396 msgid_plural "%lu weeks ago"

406 -msgstr[0] "%lu 周之前"

407 -msgstr[1] "%lu 周之前"

397 +msgstr[0] "%lu 周前"

398 +msgstr[1] "%lu 周前"

399

400 #: date.c:135

401 #, c-format

402 msgid "%lu month ago"

403 msgid_plural "%lu months ago"

413 -msgstr[0] "%lu 个月之前"

414 -msgstr[1] "%lu 个月之前"

404 +msgstr[0] "%lu 个月前"

405 +msgstr[1] "%lu 个月前"

406

407 #: date.c:146

408 #, c-format

@@ -420,12 +411,13 @@ msgid_plural "%lu years"

411 msgstr[0] "%lu 年"

412 msgstr[1] "%lu 年"

413

414 +#. TRANSLATORS: "%s" is "<n> years"

415 #: date.c:149

416 #, c-format

417 msgid "%s, %lu month ago"

418 msgid_plural "%s, %lu months ago"

427 -msgstr[0] "%s，%lu 个月之前"

428 -msgstr[1] "%s，%lu 个月之前"

419 +msgstr[0] "%s %lu 个月前"

420 +msgstr[1] "%s %lu 个月前"

421

422 #: date.c:154 date.c:159

423 #, c-format

@@ -439,6 +431,10 @@ msgstr[1] "%lu 年前"

431 msgid "failed to read orderfile '%s'"

432 msgstr "无法读取排序文件 '%s'"

433

434 +#: diffcore-rename.c:517

435 +msgid "Performing inexact rename detection"

436 +msgstr "正在进行非精确的重命名检测"

437 +

438 # 译者：注意保持前导空格

439 #: diff.c:113

440 #, c-format

@@ -465,7 +461,7 @@ msgstr ""

461 "发现配置变量 'diff.dirstat' 中的错误：\n"

462 "%s"

463

468 -#: diff.c:3509

464 +#: diff.c:3495

465 #, c-format

466 msgid ""

467 "Failed to parse --dirstat/-X option parameter:\n"

@@ -474,7 +470,7 @@ msgstr ""

470 "无法解析 --dirstat/-X 选项的参数：\n"

471 "%s"

472

477 -#: diff.c:3523

473 +#: diff.c:3509

474 #, c-format

475 msgid "Failed to parse --submodule option parameter: '%s'"

476 msgstr "无法解析 --submodule 选项的参数：'%s'"

@@ -501,35 +497,35 @@ msgstr "不能创建临时文件 '%s'：%s"

497 msgid "failed writing detached signature to '%s': %s"

498 msgstr "无法将分离式签名写入 '%s'：%s"

499

504 -#: grep.c:1695

500 +#: grep.c:1698

501 #, c-format

502 msgid "'%s': unable to read %s"

503 msgstr "'%s'：无法读取 %s"

504

509 -#: grep.c:1712

505 +#: grep.c:1715

506 #, c-format

507 msgid "'%s': %s"

508 msgstr "'%s'：%s"

509

514 -#: grep.c:1723

510 +#: grep.c:1726

511 #, c-format

512 msgid "'%s': short read %s"

513 msgstr "'%s'：读取不完整 %s"

514

519 -#: help.c:210

515 +#: help.c:209

516 #, c-format

517 msgid "available git commands in '%s'"

518 msgstr "在 '%s' 下可用的 git 命令"

519

524 -#: help.c:217

520 +#: help.c:216

521 msgid "git commands available from elsewhere on your $PATH"

522 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"

523

528 -#: help.c:233

524 +#: help.c:232

525 msgid "The most commonly used git commands are:"

526 msgstr "最常用的 git 命令有："

527

532 -#: help.c:290

528 +#: help.c:289

529 #, c-format

530 msgid ""

531 "'%s' appears to be a git command, but we were not\n"

@@ -538,11 +534,11 @@ msgstr ""

534 "'%s' 像是一个 git 命令，但却无法运行。\n"

535 "可能是 git-%s 受损？"

536

541 -#: help.c:347

537 +#: help.c:346

538 msgid "Uh oh. Your system reports no Git commands at all."

539 msgstr "唉呀，您的系统中未发现 Git 命令。"

540

545 -#: help.c:369

541 +#: help.c:368

542 #, c-format

543 msgid ""

544 "WARNING: You called a Git command named '%s', which does not exist.\n"

@@ -551,17 +547,17 @@ msgstr ""

547 "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"

548 "是 '%s'"

549

554 -#: help.c:374

550 +#: help.c:373

551 #, c-format

552 msgid "in %0.1f seconds automatically..."

553 msgstr "在 %0.1f 秒钟后自动运行..."

554

559 -#: help.c:381

555 +#: help.c:380

556 #, c-format

557 msgid "git: '%s' is not a git command. See 'git --help'."

558 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"

559

564 -#: help.c:385 help.c:444

560 +#: help.c:384 help.c:443

561 msgid ""

562 "\n"

563 "Did you mean this?"

@@ -575,7 +571,7 @@ msgstr[1] ""

571 "\n"

572 "您指的是这其中的某一个么？"

573

578 -#: help.c:440

574 +#: help.c:439

575 #, c-format

576 msgid "%s: %s - %s"

577 msgstr "%s：%s - %s"

@@ -584,7 +580,7 @@ msgstr "%s：%s - %s"

580 msgid "failed to read the cache"

581 msgstr "无法读取缓存"

582

587 -#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559

583 +#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558

584 #: builtin/clone.c:661

585 msgid "unable to write new index file"

586 msgstr "无法写新的索引文件"

@@ -594,75 +590,73 @@ msgstr "无法写新的索引文件"

590 msgid "(bad commit)\n"

591 msgstr "（坏提交）\n"

592

597 -#: merge-recursive.c:206

593 +#: merge-recursive.c:208

594 #, c-format

595 msgid "addinfo_cache failed for path '%s'"

596 msgstr "为路径 '%s' addinfo_cache 失败"

597

602 -#: merge-recursive.c:269

598 +#: merge-recursive.c:271

599 msgid "error building trees"

600 msgstr "无法创建树"

601

606 -#: merge-recursive.c:673

602 +#: merge-recursive.c:675

603 #, c-format

604 msgid "failed to create path '%s'%s"

605 msgstr "无法创建路径 '%s'%s"

606

611 -#: merge-recursive.c:684

607 +#: merge-recursive.c:686

608 #, c-format

609 msgid "Removing %s to make room for subdirectory\n"

610 msgstr "删除 %s 以便为子目录留出空间\n"

611

616 -#. something else exists

617 -#. .. but not some other error (who really cares what?)

618 -#: merge-recursive.c:698 merge-recursive.c:719

612 +#: merge-recursive.c:700 merge-recursive.c:721

613 msgid ": perhaps a D/F conflict?"

614 msgstr "：可能是一个目录/文件冲突？"

615

622 -#: merge-recursive.c:709

616 +#: merge-recursive.c:711

617 #, c-format

618 msgid "refusing to lose untracked file at '%s'"

619 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"

620

627 -#: merge-recursive.c:749

621 +#: merge-recursive.c:751

622 #, c-format

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

624 msgstr "不能读取对象 %s '%s'"

625

632 -#: merge-recursive.c:751

626 +#: merge-recursive.c:753

627 #, c-format

628 msgid "blob expected for %s '%s'"

629 msgstr "%s '%s' 应为数据（blob）对象"

630

637 -#: merge-recursive.c:774 builtin/clone.c:317

631 +#: merge-recursive.c:776 builtin/clone.c:317

632 #, c-format

633 msgid "failed to open '%s'"

634 msgstr "无法打开 '%s'"

635

642 -#: merge-recursive.c:782

636 +#: merge-recursive.c:784

637 #, c-format

638 msgid "failed to symlink '%s'"

639 msgstr "无法创建符号链接 '%s'"

640

647 -#: merge-recursive.c:785

641 +#: merge-recursive.c:787

642 #, c-format

643 msgid "do not know what to do with %06o %s '%s'"

644 msgstr "不知道如何处理 %06o %s '%s'"

645

652 -#: merge-recursive.c:923

646 +#: merge-recursive.c:925

647 msgid "Failed to execute internal merge"

648 msgstr "无法执行内部合并"

649

656 -#: merge-recursive.c:927

650 +#: merge-recursive.c:929

651 #, c-format

652 msgid "Unable to add %s to database"

653 msgstr "不能添加 %s 至对象库"

654

661 -#: merge-recursive.c:943

655 +#: merge-recursive.c:945

656 msgid "unsupported object type in the tree"

657 msgstr "在树中有不支持的对象类型"

658

665 -#: merge-recursive.c:1022 merge-recursive.c:1036

659 +#: merge-recursive.c:1024 merge-recursive.c:1038

660 #, c-format

661 msgid ""

662 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -671,7 +665,7 @@ msgstr ""

665 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

666 "的版本被保留。"

667

674 -#: merge-recursive.c:1028 merge-recursive.c:1041

668 +#: merge-recursive.c:1030 merge-recursive.c:1043

669 #, c-format

670 msgid ""

671 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -680,20 +674,20 @@ msgstr ""

674 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

675 "的版本保留于 %8$s 中。"

676

683 -#: merge-recursive.c:1082

677 +#: merge-recursive.c:1084

678 msgid "rename"

679 msgstr "重命名"

680

687 -#: merge-recursive.c:1082 wt-status.c:283

681 +#: merge-recursive.c:1084

682 msgid "renamed"

683 msgstr "重命名"

684

691 -#: merge-recursive.c:1138

685 +#: merge-recursive.c:1140

686 #, c-format

687 msgid "%s is a directory in %s adding as %s instead"

688 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"

689

696 -#: merge-recursive.c:1160

690 +#: merge-recursive.c:1162

691 #, c-format

692 msgid ""

693 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -702,144 +696,144 @@ msgstr ""

696 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "

697 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"

698

705 -#: merge-recursive.c:1165

699 +#: merge-recursive.c:1167

700 msgid " (left unresolved)"

701 msgstr "（留下未解决）"

702

709 -#: merge-recursive.c:1219

703 +#: merge-recursive.c:1221

704 #, c-format

705 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

706 msgstr ""

707 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"

708 "%5$s"

709

716 -#: merge-recursive.c:1249

710 +#: merge-recursive.c:1251

711 #, c-format

712 msgid "Renaming %s to %s and %s to %s instead"

713 msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"

714

721 -#: merge-recursive.c:1448

715 +#: merge-recursive.c:1450

716 #, c-format

717 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

718 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"

719

726 -#: merge-recursive.c:1458

720 +#: merge-recursive.c:1460

721 #, c-format

722 msgid "Adding merged %s"

723 msgstr "添加合并后的 %s"

724

731 -#: merge-recursive.c:1463 merge-recursive.c:1661

725 +#: merge-recursive.c:1465 merge-recursive.c:1663

726 #, c-format

727 msgid "Adding as %s instead"

728 msgstr "而是以 %s 为名添加"

729

736 -#: merge-recursive.c:1514

730 +#: merge-recursive.c:1516

731 #, c-format

732 msgid "cannot read object %s"

733 msgstr "不能读取对象 %s"

734

741 -#: merge-recursive.c:1517

735 +#: merge-recursive.c:1519

736 #, c-format

737 msgid "object %s is not a blob"

738 msgstr "对象 %s 不是一个数据（blob）对象"

739

746 -#: merge-recursive.c:1565

740 +#: merge-recursive.c:1567

741 msgid "modify"

742 msgstr "修改"

743

750 -#: merge-recursive.c:1565 wt-status.c:281

744 +#: merge-recursive.c:1567

745 msgid "modified"

746 msgstr "修改"

747

754 -#: merge-recursive.c:1575

748 +#: merge-recursive.c:1577

749 msgid "content"

750 msgstr "内容"

751

758 -#: merge-recursive.c:1582

752 +#: merge-recursive.c:1584

753 msgid "add/add"

754 msgstr "添加/添加"

755

762 -#: merge-recursive.c:1616

756 +#: merge-recursive.c:1618

757 #, c-format

758 msgid "Skipped %s (merged same as existing)"

759 msgstr "略过 %s（已经做过相同合并）"

760

767 -#: merge-recursive.c:1630

761 +#: merge-recursive.c:1632

762 #, c-format

763 msgid "Auto-merging %s"

764 msgstr "自动合并 %s"

765

772 -#: merge-recursive.c:1634 git-submodule.sh:1148

766 +#: merge-recursive.c:1636 git-submodule.sh:1149

767 msgid "submodule"

768 msgstr "子模组"

769

776 -#: merge-recursive.c:1635

770 +#: merge-recursive.c:1637

771 #, c-format

772 msgid "CONFLICT (%s): Merge conflict in %s"

773 msgstr "冲突（%s）：合并冲突于 %s"

774

781 -#: merge-recursive.c:1725

775 +#: merge-recursive.c:1727

776 #, c-format

777 msgid "Removing %s"

778 msgstr "删除 %s"

779

786 -#: merge-recursive.c:1750

780 +#: merge-recursive.c:1752

781 msgid "file/directory"

782 msgstr "文件/目录"

783

790 -#: merge-recursive.c:1756

784 +#: merge-recursive.c:1758

785 msgid "directory/file"

786 msgstr "目录/文件"

787

794 -#: merge-recursive.c:1761

788 +#: merge-recursive.c:1763

789 #, c-format

790 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

791 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"

792

799 -#: merge-recursive.c:1771

793 +#: merge-recursive.c:1773

794 #, c-format

795 msgid "Adding %s"

796 msgstr "添加 %s"

797

804 -#: merge-recursive.c:1788

798 +#: merge-recursive.c:1790

799 msgid "Fatal merge failure, shouldn't happen."

800 msgstr "严重的合并错误，不应发生。"

801

808 -#: merge-recursive.c:1807

802 +#: merge-recursive.c:1809

803 msgid "Already up-to-date!"

804 msgstr "已经是最新的！"

805

812 -#: merge-recursive.c:1816

806 +#: merge-recursive.c:1818

807 #, c-format

808 msgid "merging of trees %s and %s failed"

809 msgstr "无法合并树 %s 和 %s"

810

817 -#: merge-recursive.c:1846

811 +#: merge-recursive.c:1848

812 #, c-format

813 msgid "Unprocessed path??? %s"

814 msgstr "未处理的路径??? %s"

815

822 -#: merge-recursive.c:1891

816 +#: merge-recursive.c:1893

817 msgid "Merging:"

818 msgstr "合并："

819

826 -#: merge-recursive.c:1904

820 +#: merge-recursive.c:1906

821 #, c-format

822 msgid "found %u common ancestor:"

823 msgid_plural "found %u common ancestors:"

824 msgstr[0] "发现 %u 个共同祖先："

825 msgstr[1] "发现 %u 个共同祖先："

826

833 -#: merge-recursive.c:1941

827 +#: merge-recursive.c:1943

828 msgid "merge returned no commit"

829 msgstr "合并未返回提交"

830

837 -#: merge-recursive.c:1998

831 +#: merge-recursive.c:2000

832 #, c-format

833 msgid "Could not parse object '%s'"

834 msgstr "不能解析对象 '%s'"

835

842 -#: merge-recursive.c:2010 builtin/merge.c:665

836 +#: merge-recursive.c:2012 builtin/merge.c:668

837 msgid "Unable to write index."

838 msgstr "不能写入索引。"

839

@@ -864,34 +858,34 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

858 msgid "Bad %s value: '%s'"

859 msgstr "坏的 %s 值：'%s'"

860

867 -#: object.c:202

861 +#: object.c:229

862 #, c-format

863 msgid "unable to parse object: %s"

864 msgstr "不能解析对象：%s"

865

872 -#: parse-options.c:537

866 +#: parse-options.c:532

867 msgid "..."

868 msgstr "..."

869

876 -#: parse-options.c:555

870 +#: parse-options.c:550

871 #, c-format

872 msgid "usage: %s"

873 msgstr "用法：%s"

874

875 #. TRANSLATORS: the colon here should align with the

876 #. one in "usage: %s" translation

883 -#: parse-options.c:559

877 +#: parse-options.c:554

878 #, c-format

879 msgid " or: %s"

880 msgstr " 或：%s"

881

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

889 -#: parse-options.c:562

883 +#: parse-options.c:557

884 #, c-format

885 msgid " %s"

886 msgstr " %s"

887

894 -#: parse-options.c:596

888 +#: parse-options.c:591

889 msgid "-NUM"

890 msgstr "-数字"

891

@@ -939,11 +933,6 @@ msgstr "%s：'%s' 在版本库之外"

933 msgid "Pathspec '%s' is in submodule '%.*s'"

934 msgstr "路径规则 '%s' 在子模组 '%.*s' 中"

935

942 -#.

943 -#. * We may want to substitute "this command" with a command

944 -#. * name. E.g. when add--interactive dies when running

945 -#. * "checkout -p"

946 -#.

936 #: pathspec.c:353

937 #, c-format

938 msgid "%s: pathspec magic not supported by this command: %s"

@@ -962,56 +951,73 @@ msgstr ""

951 "没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"

952 "添加 ':/' 或 '.' ？"

953

965 -#: remote.c:753

954 +#: progress.c:224

955 +msgid "done"

956 +msgstr "完成"

957 +

958 +#: read-cache.c:1238

959 +#, c-format

960 +msgid ""

961 +"index.version set, but the value is invalid.\n"

962 +"Using version %i"

963 +msgstr ""

964 +"设置了 index.version，但是取值无效。\n"

965 +"使用版本 %i"

966 +

967 +#: read-cache.c:1248

968 +#, c-format

969 +msgid ""

970 +"GIT_INDEX_VERSION set, but the value is invalid.\n"

971 +"Using version %i"

972 +msgstr ""

973 +"设置了 GIT_INDEX_VERSION，但是取值无效。\n"

974 +"使用版本 %i"

975 +

976 +#: remote.c:758

977 #, c-format

978 msgid "Cannot fetch both %s and %s to %s"

979 msgstr "不能同时获取 %s 和 %s 至 %s"

980

970 -#: remote.c:757

981 +#: remote.c:762

982 #, c-format

983 msgid "%s usually tracks %s, not %s"

984 msgstr "%s 通常跟踪 %s，而非 %s"

985

975 -#: remote.c:761

986 +#: remote.c:766

987 #, c-format

988 msgid "%s tracks both %s and %s"

989 msgstr "%s 同时跟踪 %s 和 %s"

990

980 -#.

981 -#. * This last possibility doesn't occur because

982 -#. * FETCH_HEAD_IGNORE entries always appear at

983 -#. * the end of the list.

984 -#.

985 -#: remote.c:769

991 +#: remote.c:774

992 msgid "Internal error"

993 msgstr "内部错误"

994

989 -#: remote.c:1871

995 +#: remote.c:1948

996 #, c-format

997 msgid "Your branch is based on '%s', but the upstream is gone.\n"

998 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"

999

994 -#: remote.c:1875

1000 +#: remote.c:1952

1001 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

1002 msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"

1003

998 -#: remote.c:1878

1004 +#: remote.c:1955

1005 #, c-format

1006 msgid "Your branch is up-to-date with '%s'.\n"

1007 msgstr "您的分支与上游分支 '%s' 一致。\n"

1008

1003 -#: remote.c:1882

1009 +#: remote.c:1959

1010 #, c-format

1011 msgid "Your branch is ahead of '%s' by %d commit.\n"

1012 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

1013 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"

1014 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"

1015

1010 -#: remote.c:1888

1016 +#: remote.c:1965

1017 msgid " (use \"git push\" to publish your local commits)\n"

1018 msgstr " （使用 \"git push\" 来发布您的本地提交）\n"

1019

1014 -#: remote.c:1891

1020 +#: remote.c:1968

1021 #, c-format

1022 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

1023 msgid_plural ""

@@ -1020,11 +1026,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

1026 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

1027

1028 # 译者：注意保持前导空格

1023 -#: remote.c:1899

1029 +#: remote.c:1976

1030 msgid " (use \"git pull\" to update your local branch)\n"

1031 msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"

1032

1027 -#: remote.c:1902

1033 +#: remote.c:1979

1034 #, c-format

1035 msgid ""

1036 "Your branch and '%s' have diverged,\n"

@@ -1040,7 +1046,7 @@ msgstr[1] ""

1046 "并且分别有 %d 和 %d 处不同的提交。\n"

1047

1048 # 译者：注意保持前导空格

1043 -#: remote.c:1912

1049 +#: remote.c:1989

1050 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

1051 msgstr " （使用 \"git pull\" 来合并远程分支）\n"

1052

@@ -1053,14 +1059,14 @@ msgstr "不能打开 /dev/null"

1059 msgid "dup2(%d,%d) failed"

1060 msgstr "不能调用 dup2(%d,%d)"

1061

1056 -#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896

1057 -#: builtin/merge.c:1006 builtin/merge.c:1016

1062 +#: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899

1063 +#: builtin/merge.c:1009 builtin/merge.c:1019

1064 #, c-format

1065 msgid "Could not open '%s' for writing"

1066 msgstr "不能为写入打开 '%s'"

1067

1062 -#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786

1063 -#: builtin/merge.c:1008 builtin/merge.c:1021

1068 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789

1069 +#: builtin/merge.c:1011 builtin/merge.c:1024

1070 #, c-format

1071 msgid "Could not write to '%s'"

1072 msgstr "不能写入 '%s'"

@@ -1082,7 +1088,7 @@ msgstr ""

1088 "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n"

1089 "对修正后的文件做标记，然后用 'git commit' 提交"

1090

1085 -#: sequencer.c:245 sequencer.c:870 sequencer.c:953

1091 +#: sequencer.c:245 sequencer.c:879 sequencer.c:962

1092 #, c-format

1093 msgid "Could not write to %s"

1094 msgstr "不能写入 %s"

@@ -1118,184 +1124,184 @@ msgstr "不能解析 HEAD 提交\n"

1124 msgid "Unable to update cache tree\n"

1125 msgstr "不能更新缓存\n"

1126

1121 -#: sequencer.c:423

1127 +#: sequencer.c:430

1128 #, c-format

1129 msgid "Could not parse commit %s\n"

1130 msgstr "不能解析提交 %s\n"

1131

1126 -#: sequencer.c:428

1132 +#: sequencer.c:435

1133 #, c-format

1134 msgid "Could not parse parent commit %s\n"

1135 msgstr "不能解析父提交 %s\n"

1136

1131 -#: sequencer.c:494

1137 +#: sequencer.c:501

1138 msgid "Your index file is unmerged."

1139 msgstr "您的索引文件未完成合并。"

1140

1135 -#: sequencer.c:513

1141 +#: sequencer.c:520

1142 #, c-format

1143 msgid "Commit %s is a merge but no -m option was given."

1144 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"

1145

1140 -#: sequencer.c:521

1146 +#: sequencer.c:528

1147 #, c-format

1148 msgid "Commit %s does not have parent %d"

1149 msgstr "提交 %s 没有父提交 %d"

1150

1145 -#: sequencer.c:525

1151 +#: sequencer.c:532

1152 #, c-format

1153 msgid "Mainline was specified but commit %s is not a merge."

1154 msgstr "指定了主线但提交 %s 不是一个合并。"

1155

1156 #. TRANSLATORS: The first %s will be "revert" or

1157 #. "cherry-pick", the second %s a SHA1

1152 -#: sequencer.c:538

1158 +#: sequencer.c:545

1159 #, c-format

1160 msgid "%s: cannot parse parent commit %s"

1161 msgstr "%s：不能解析父提交 %s"

1162

1157 -#: sequencer.c:542

1163 +#: sequencer.c:549

1164 #, c-format

1165 msgid "Cannot get commit message for %s"

1166 msgstr "不能得到 %s 的提交说明"

1167

1162 -#: sequencer.c:628

1168 +#: sequencer.c:635

1169 #, c-format

1170 msgid "could not revert %s... %s"

1171 msgstr "不能还原 %s... %s"

1172

1167 -#: sequencer.c:629

1173 +#: sequencer.c:636

1174 #, c-format

1175 msgid "could not apply %s... %s"

1176 msgstr "不能应用 %s... %s"

1177

1172 -#: sequencer.c:665

1178 +#: sequencer.c:672

1179 msgid "empty commit set passed"

1180 msgstr "提供了空的提交集"

1181

1176 -#: sequencer.c:673

1182 +#: sequencer.c:680

1183 #, c-format

1184 msgid "git %s: failed to read the index"

1185 msgstr "git %s：无法读取索引"

1186

1181 -#: sequencer.c:678

1187 +#: sequencer.c:685

1188 #, c-format

1189 msgid "git %s: failed to refresh the index"

1190 msgstr "git %s：无法刷新索引"

1191

1186 -#: sequencer.c:736

1192 +#: sequencer.c:743

1193 #, c-format

1194 msgid "Cannot %s during a %s"

1195 msgstr "无法 %s 在一个 %s 过程中"

1196

1191 -#: sequencer.c:758

1197 +#: sequencer.c:765

1198 #, c-format

1199 msgid "Could not parse line %d."

1200 msgstr "不能解析第 %d 行。"

1201

1196 -#: sequencer.c:763

1202 +#: sequencer.c:770

1203 msgid "No commits parsed."

1204 msgstr "没有提交被解析。"

1205

1200 -#: sequencer.c:776

1206 +#: sequencer.c:783

1207 #, c-format

1208 msgid "Could not open %s"

1209 msgstr "不能打开 %s"

1210

1205 -#: sequencer.c:780

1211 +#: sequencer.c:787

1212 #, c-format

1213 msgid "Could not read %s."

1214 msgstr "不能读取 %s。"

1215

1210 -#: sequencer.c:787

1216 +#: sequencer.c:794

1217 #, c-format

1218 msgid "Unusable instruction sheet: %s"

1219 msgstr "无用的指令表单：%s"

1220

1215 -#: sequencer.c:815

1221 +#: sequencer.c:824

1222 #, c-format

1223 msgid "Invalid key: %s"

1224 msgstr "无效键名：%s"

1225

1220 -#: sequencer.c:818

1226 +#: sequencer.c:827

1227 #, c-format

1228 msgid "Invalid value for %s: %s"

1229 msgstr "%s 的值无效：%s"

1230

1225 -#: sequencer.c:830

1231 +#: sequencer.c:839

1232 #, c-format

1233 msgid "Malformed options sheet: %s"

1234 msgstr "非法的选项表单：%s"

1235

1230 -#: sequencer.c:851

1236 +#: sequencer.c:860

1237 msgid "a cherry-pick or revert is already in progress"

1238 msgstr "一个拣选或还原操作已在进行"

1239

1234 -#: sequencer.c:852

1240 +#: sequencer.c:861

1241 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

1242 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""

1243

1238 -#: sequencer.c:856

1244 +#: sequencer.c:865

1245 #, c-format

1246 msgid "Could not create sequencer directory %s"

1247 msgstr "不能创建序列目录 %s"

1248

1243 -#: sequencer.c:872 sequencer.c:957

1249 +#: sequencer.c:881 sequencer.c:966

1250 #, c-format

1251 msgid "Error wrapping up %s."

1252 msgstr "错误收尾 %s。"

1253

1248 -#: sequencer.c:891 sequencer.c:1025

1254 +#: sequencer.c:900 sequencer.c:1036

1255 msgid "no cherry-pick or revert in progress"

1256 msgstr "拣选或还原操作并未进行"

1257

1252 -#: sequencer.c:893

1258 +#: sequencer.c:902

1259 msgid "cannot resolve HEAD"

1260 msgstr "不能解析 HEAD"

1261

1256 -#: sequencer.c:895

1262 +#: sequencer.c:904

1263 msgid "cannot abort from a branch yet to be born"

1264 msgstr "不能从尚未建立的分支终止"

1265

1260 -#: sequencer.c:917 builtin/apply.c:4061

1266 +#: sequencer.c:926 builtin/apply.c:4061

1267 #, c-format

1268 msgid "cannot open %s: %s"

1269 msgstr "不能打开 %s：%s"

1270

1265 -#: sequencer.c:920

1271 +#: sequencer.c:929

1272 #, c-format

1273 msgid "cannot read %s: %s"

1274 msgstr "不能读取 %s：%s"

1275

1270 -#: sequencer.c:921

1276 +#: sequencer.c:930

1277 msgid "unexpected end of file"

1278 msgstr "意外的文件结束"

1279

1274 -#: sequencer.c:927

1280 +#: sequencer.c:936

1281 #, c-format

1282 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

1283 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"

1284

1279 -#: sequencer.c:950

1285 +#: sequencer.c:959

1286 #, c-format

1287 msgid "Could not format %s."

1288 msgstr "不能格式化 %s。"

1289

1284 -#: sequencer.c:1093

1290 +#: sequencer.c:1104

1291 #, c-format

1292 msgid "%s: can't cherry-pick a %s"

1293 msgstr "%s：不能拣选一个%s"

1294

1289 -#: sequencer.c:1096

1295 +#: sequencer.c:1107

1296 #, c-format

1297 msgid "%s: bad revision"

1298 msgstr "%s：错误的版本"

1299

1294 -#: sequencer.c:1130

1300 +#: sequencer.c:1141

1301 msgid "Can't revert as initial commit"

1302 msgstr "不能作为初始提交还原"

1303

1298 -#: sequencer.c:1131

1304 +#: sequencer.c:1142

1305 msgid "Can't cherry-pick into empty head"

1306 msgstr "不能拣选到空分支"

1307

@@ -1320,21 +1326,21 @@ msgstr ""

1326 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"

1327 "命令关闭本消息通知。"

1328

1323 -#: sha1_name.c:1070

1329 +#: sha1_name.c:1072

1330 msgid "HEAD does not point to a branch"

1331 msgstr "HEAD 没有指向一个分支"

1332

1327 -#: sha1_name.c:1073

1333 +#: sha1_name.c:1075

1334 #, c-format

1335 msgid "No such branch: '%s'"

1336 msgstr "没有此分支：'%s'"

1337

1332 -#: sha1_name.c:1075

1338 +#: sha1_name.c:1077

1339 #, c-format

1340 msgid "No upstream configured for branch '%s'"

1341 msgstr "尚未给分支 '%s' 设置上游"

1342

1337 -#: sha1_name.c:1079

1343 +#: sha1_name.c:1081

1344 #, c-format

1345 msgid "Upstream branch '%s' not stored as a remote-tracking branch"

1346 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

@@ -1348,52 +1354,34 @@ msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"

1354 msgid "Could not find section in .gitmodules where path=%s"

1355 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"

1356

1351 -#. Maybe the user already did that, don't error out here

1357 #: submodule.c:76

1358 #, c-format

1359 msgid "Could not update .gitmodules entry %s"

1360 msgstr "不能更新 .gitmodules 条目 %s"

1361

1357 -#. Maybe the user already did that, don't error out here

1362 #: submodule.c:109

1363 #, c-format

1364 msgid "Could not remove .gitmodules entry for %s"

1365 msgstr "无法移除 %s 的 .gitmodules 条目"

1366

1363 -#: submodule.c:127

1364 -msgid "could not find .gitmodules in index"

1365 -msgstr "无法在索引中找到 .gitmodules"

1366 -

1367 -#: submodule.c:133

1368 -msgid "reading updated .gitmodules failed"

1369 -msgstr "读取更新后的 .gitmodules 失败"

1370 -

1371 -#: submodule.c:135

1372 -msgid "unable to stat updated .gitmodules"

1373 -msgstr "不能枚举更新后的 .gitmodules"

1374 -

1375 -#: submodule.c:139

1376 -msgid "unable to remove .gitmodules from index"

1377 -msgstr "不能从索引中移除 .gitmodules"

1378 -

1379 -#: submodule.c:141

1380 -msgid "adding updated .gitmodules failed"

1381 -msgstr "添加更新后的 .gitmodules 失败"

1382 -

1383 -#: submodule.c:143

1367 +#: submodule.c:120

1368 msgid "staging updated .gitmodules failed"

1369 msgstr "将更新后 .gitmodules 添加暂存区失败"

1370

1387 -#: submodule.c:1144 builtin/init-db.c:363

1371 +#: submodule.c:1121 builtin/init-db.c:363

1372 #, c-format

1373 msgid "Could not create git link %s"

1374 msgstr "不能创建 git link %s"

1375

1392 -#: submodule.c:1155

1376 +#: submodule.c:1132

1377 #, c-format

1378 msgid "Could not set core.worktree in %s"

1379 msgstr "不能在 %s 中设置 core.worktree"

1380

1381 +#: unpack-trees.c:206

1382 +msgid "Checking out files"

1383 +msgstr "正在检出文件"

1384 +

1385 #: urlmatch.c:120

1386 msgid "invalid URL scheme name or missing '://' suffix"

1387 msgstr "无效的 URL 方案名称或丢失 '://' 后缀"

@@ -1507,94 +1495,100 @@ msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"

1495 msgid " (use \"git %s <file>...\" to include in what will be committed)"

1496 msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）"

1497

1510 -#: wt-status.c:254

1511 -msgid "bug"

1512 -msgstr "bug"

1513 -

1514 -#: wt-status.c:259

1498 +#: wt-status.c:252

1499 msgid "both deleted:"

1500 msgstr "双方删除："

1501

1518 -#: wt-status.c:260

1502 +#: wt-status.c:254

1503 msgid "added by us:"

1504 msgstr "由我们添加："

1505

1522 -#: wt-status.c:261

1506 +#: wt-status.c:256

1507 msgid "deleted by them:"

1508 msgstr "由他们删除："

1509

1526 -#: wt-status.c:262

1510 +#: wt-status.c:258

1511 msgid "added by them:"

1512 msgstr "由他们添加："

1513

1530 -#: wt-status.c:263

1514 +#: wt-status.c:260

1515 msgid "deleted by us:"

1516 msgstr "由我们删除："

1517

1534 -#: wt-status.c:264

1518 +#: wt-status.c:262

1519 msgid "both added:"

1520 msgstr "双方添加："

1521

1538 -#: wt-status.c:265

1522 +#: wt-status.c:264

1523 msgid "both modified:"

1524 msgstr "双方修改："

1525

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

1543 -#: wt-status.c:275

1544 -msgid "new file"

1545 -msgstr "新文件"

1526 +#: wt-status.c:266

1527 +#, c-format

1528 +msgid "bug: unhandled unmerged status %x"

1529 +msgstr "bug：无法处理的未合并状态 %x"

1530

1547 -#: wt-status.c:277

1548 -msgid "copied"

1549 -msgstr "拷贝"

1531 +#: wt-status.c:274

1532 +msgid "new file:"

1533 +msgstr "新文件："

1534

1551 -#: wt-status.c:279

1552 -msgid "deleted"

1553 -msgstr "删除"

1535 +#: wt-status.c:276

1536 +msgid "copied:"

1537 +msgstr "拷贝："

1538

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

1556 -#: wt-status.c:285

1557 -msgid "typechange"

1558 -msgstr "类型变更"

1539 +#: wt-status.c:278

1540 +msgid "deleted:"

1541 +msgstr "删除："

1542

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

1561 -#: wt-status.c:287

1562 -msgid "unknown"

1563 -msgstr "未知"

1543 +#: wt-status.c:280

1544 +msgid "modified:"

1545 +msgstr "修改："

1546 +

1547 +#: wt-status.c:282

1548 +msgid "renamed:"

1549 +msgstr "重命名："

1550 +

1551 +#: wt-status.c:284

1552 +msgid "typechange:"

1553 +msgstr "类型变更："

1554 +

1555 +#: wt-status.c:286

1556 +msgid "unknown:"

1557 +msgstr "未知："

1558

1565 -#: wt-status.c:289

1566 -msgid "unmerged"

1567 -msgstr "未合并"

1559 +#: wt-status.c:288

1560 +msgid "unmerged:"

1561 +msgstr "未合并："

1562

1563 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

1570 -#: wt-status.c:336

1564 +#: wt-status.c:370

1565 msgid "new commits, "

1566 msgstr "新提交, "

1567

1568 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

1575 -#: wt-status.c:338

1569 +#: wt-status.c:372

1570 msgid "modified content, "

1571 msgstr "修改的内容, "

1572

1573 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

1580 -#: wt-status.c:340

1574 +#: wt-status.c:374

1575 msgid "untracked content, "

1576 msgstr "未跟踪的内容, "

1577

1584 -#: wt-status.c:357

1578 +#: wt-status.c:391

1579 #, c-format

1580 msgid "bug: unhandled diff status %c"

1587 -msgstr "bug：未处理的差异状态 %c"

1581 +msgstr "bug：无法处理的差异状态 %c"

1582

1589 -#: wt-status.c:732

1583 +#: wt-status.c:765

1584 msgid "Submodules changed but not updated:"

1585 msgstr "子模组已修改但尚未更新："

1586

1593 -#: wt-status.c:734

1587 +#: wt-status.c:767

1588 msgid "Submodule changes to be committed:"

1589 msgstr "要提交的子模组变更："

1590

1597 -#: wt-status.c:836

1591 +#: wt-status.c:846

1592 msgid ""

1593 "Do not touch the line above.\n"

1594 "Everything below will be removed."

@@ -1602,198 +1596,198 @@ msgstr ""

1596 "不要改动上面的一行。\n"

1597 "下面的所有内容均将被删除。"

1598

1605 -#: wt-status.c:899

1599 +#: wt-status.c:937

1600 msgid "You have unmerged paths."

1601 msgstr "您有尚未合并的路径。"

1602

1603 # 译者：注意保持前导空格

1610 -#: wt-status.c:902

1604 +#: wt-status.c:940

1605 msgid " (fix conflicts and run \"git commit\")"

1606 msgstr " （解决冲突并运行 \"git commit\"）"

1607

1614 -#: wt-status.c:905

1608 +#: wt-status.c:943

1609 msgid "All conflicts fixed but you are still merging."

1610 msgstr "所有冲突已解决但您仍处于合并中。"

1611

1612 # 译者：注意保持前导空格

1619 -#: wt-status.c:908

1613 +#: wt-status.c:946

1614 msgid " (use \"git commit\" to conclude merge)"

1615 msgstr " （使用 \"git commit\" 结束合并）"

1616

1623 -#: wt-status.c:918

1617 +#: wt-status.c:956

1618 msgid "You are in the middle of an am session."

1619 msgstr "您正处于 am 操作过程中。"

1620

1627 -#: wt-status.c:921

1621 +#: wt-status.c:959

1622 msgid "The current patch is empty."

1623 msgstr "当前的补丁为空。"

1624

1625 # 译者：注意保持前导空格

1632 -#: wt-status.c:925

1626 +#: wt-status.c:963

1627 msgid " (fix conflicts and then run \"git am --continue\")"

1628 msgstr " （解决冲突，然后运行 \"git am --continue\"）"

1629

1630 # 译者：注意保持前导空格

1637 -#: wt-status.c:927

1631 +#: wt-status.c:965

1632 msgid " (use \"git am --skip\" to skip this patch)"

1633 msgstr " （使用 \"git am --skip\" 跳过此补丁）"

1634

1635 # 译者：注意保持前导空格

1642 -#: wt-status.c:929

1636 +#: wt-status.c:967

1637 msgid " (use \"git am --abort\" to restore the original branch)"

1638 msgstr " （使用 \"git am --abort\" 恢复原有分支）"

1639

1646 -#: wt-status.c:989 wt-status.c:1006

1640 +#: wt-status.c:1027 wt-status.c:1044

1641 #, c-format

1642 msgid "You are currently rebasing branch '%s' on '%s'."

1643 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"

1644

1651 -#: wt-status.c:994 wt-status.c:1011

1645 +#: wt-status.c:1032 wt-status.c:1049

1646 msgid "You are currently rebasing."

1647 msgstr "您在执行变基操作。"

1648

1649 # 译者：注意保持前导空格

1656 -#: wt-status.c:997

1650 +#: wt-status.c:1035

1651 msgid " (fix conflicts and then run \"git rebase --continue\")"

1652 msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"

1653

1654 # 译者：注意保持前导空格

1661 -#: wt-status.c:999

1655 +#: wt-status.c:1037

1656 msgid " (use \"git rebase --skip\" to skip this patch)"

1657 msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"

1658

1659 # 译者：注意保持前导空格

1666 -#: wt-status.c:1001

1660 +#: wt-status.c:1039

1661 msgid " (use \"git rebase --abort\" to check out the original branch)"

1662 msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"

1663

1664 # 译者：注意保持前导空格

1671 -#: wt-status.c:1014

1665 +#: wt-status.c:1052

1666 msgid " (all conflicts fixed: run \"git rebase --continue\")"

1667 msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"

1668

1675 -#: wt-status.c:1018

1669 +#: wt-status.c:1056

1670 #, c-format

1671 msgid ""

1672 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

1673 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"

1674

1681 -#: wt-status.c:1023

1675 +#: wt-status.c:1061

1676 msgid "You are currently splitting a commit during a rebase."

1677 msgstr "您在执行变基操作时拆分提交。"

1678

1679 # 译者：注意保持前导空格

1686 -#: wt-status.c:1026

1680 +#: wt-status.c:1064

1681 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

1682 msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"

1683

1690 -#: wt-status.c:1030

1684 +#: wt-status.c:1068

1685 #, c-format

1686 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

1687 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"

1688

1695 -#: wt-status.c:1035

1689 +#: wt-status.c:1073

1690 msgid "You are currently editing a commit during a rebase."

1691 msgstr "您在执行变基操作时编辑提交。"

1692

1693 # 译者：注意保持前导空格

1700 -#: wt-status.c:1038

1694 +#: wt-status.c:1076

1695 msgid " (use \"git commit --amend\" to amend the current commit)"

1696 msgstr " （使用 \"git commit --amend\" 修补当前提交）"

1697

1698 # 译者：注意保持前导空格

1705 -#: wt-status.c:1040

1699 +#: wt-status.c:1078

1700 msgid ""

1701 " (use \"git rebase --continue\" once you are satisfied with your changes)"

1702 msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"

1703

1710 -#: wt-status.c:1050

1704 +#: wt-status.c:1088

1705 #, c-format

1706 msgid "You are currently cherry-picking commit %s."

1707 msgstr "您在执行拣选提交 %s 的操作。"

1708

1709 # 译者：注意保持前导空格

1716 -#: wt-status.c:1055

1710 +#: wt-status.c:1093

1711 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

1712 msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"

1713

1714 # 译者：注意保持前导空格

1721 -#: wt-status.c:1058

1715 +#: wt-status.c:1096

1716 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

1717 msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"

1718

1719 # 译者：注意保持前导空格

1726 -#: wt-status.c:1060

1720 +#: wt-status.c:1098

1721 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

1722 msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"

1723

1730 -#: wt-status.c:1069

1724 +#: wt-status.c:1107

1725 #, c-format

1726 msgid "You are currently reverting commit %s."

1727 msgstr "您在执行反转提交 %s 的操作。"

1728

1729 # 译者：注意保持前导空格

1736 -#: wt-status.c:1074

1730 +#: wt-status.c:1112

1731 msgid " (fix conflicts and run \"git revert --continue\")"

1732 msgstr " （解决冲突并运行 \"git revert --continue\"）"

1733

1734 # 译者：注意保持前导空格

1741 -#: wt-status.c:1077

1735 +#: wt-status.c:1115

1736 msgid " (all conflicts fixed: run \"git revert --continue\")"

1737 msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"

1738

1739 # 译者：注意保持前导空格

1746 -#: wt-status.c:1079

1740 +#: wt-status.c:1117

1741 msgid " (use \"git revert --abort\" to cancel the revert operation)"

1742 msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"

1743

1750 -#: wt-status.c:1090

1744 +#: wt-status.c:1128

1745 #, c-format

1746 msgid "You are currently bisecting, started from branch '%s'."

1747 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"

1748

1755 -#: wt-status.c:1094

1749 +#: wt-status.c:1132

1750 msgid "You are currently bisecting."

1751 msgstr "您在执行二分查找操作。"

1752

1753 # 译者：注意保持前导空格

1760 -#: wt-status.c:1097

1754 +#: wt-status.c:1135

1755 msgid " (use \"git bisect reset\" to get back to the original branch)"

1756 msgstr " （使用 \"git bisect reset\" 以回到原有分支）"

1757

1764 -#: wt-status.c:1272

1758 +#: wt-status.c:1310

1759 msgid "On branch "

1760 msgstr "位于分支 "

1761

1768 -#: wt-status.c:1279

1762 +#: wt-status.c:1317

1763 msgid "rebase in progress; onto "

1764 msgstr "变基操作正在进行中；至 "

1765

1772 -#: wt-status.c:1286

1766 +#: wt-status.c:1324

1767 msgid "HEAD detached at "

1768 msgstr "头指针分离于 "

1769

1776 -#: wt-status.c:1288

1770 +#: wt-status.c:1326

1771 msgid "HEAD detached from "

1772 msgstr "头指针分离自 "

1773

1780 -#: wt-status.c:1291

1774 +#: wt-status.c:1329

1775 msgid "Not currently on any branch."

1776 msgstr "当前不在任何分支上。"

1777

1784 -#: wt-status.c:1308

1778 +#: wt-status.c:1346

1779 msgid "Initial commit"

1780 msgstr "初始提交"

1781

1788 -#: wt-status.c:1322

1782 +#: wt-status.c:1360

1783 msgid "Untracked files"

1784 msgstr "未跟踪的文件"

1785

1792 -#: wt-status.c:1324

1786 +#: wt-status.c:1362

1787 msgid "Ignored files"

1788 msgstr "忽略的文件"

1789

1796 -#: wt-status.c:1328

1790 +#: wt-status.c:1366

1791 #, c-format

1792 msgid ""

1793 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -1803,316 +1797,234 @@ msgstr ""

1797 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"

1798 "但您需要小心不要忘了添加新文件（参见 'git help status'）。"

1799

1806 -#: wt-status.c:1334

1800 +#: wt-status.c:1372

1801 #, c-format

1802 msgid "Untracked files not listed%s"

1803 msgstr "未跟踪的文件没有列出%s"

1804

1805 # 译者：中文字符串拼接，可删除前导空格

1812 -#: wt-status.c:1336

1806 +#: wt-status.c:1374

1807 msgid " (use -u option to show untracked files)"

1808 msgstr "（使用 -u 参数显示未跟踪的文件）"

1809

1816 -#: wt-status.c:1342

1810 +#: wt-status.c:1380

1811 msgid "No changes"

1812 msgstr "没有修改"

1813

1820 -#: wt-status.c:1347

1814 +#: wt-status.c:1385

1815 #, c-format

1816 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

1817 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"

1818

1825 -#: wt-status.c:1350

1819 +#: wt-status.c:1388

1820 #, c-format

1821 msgid "no changes added to commit\n"

1822 msgstr "修改尚未加入提交\n"

1823

1830 -#: wt-status.c:1353

1824 +#: wt-status.c:1391

1825 #, c-format

1826 msgid ""

1827 "nothing added to commit but untracked files present (use \"git add\" to "

1828 "track)\n"

1829 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"

1830

1837 -#: wt-status.c:1356

1831 +#: wt-status.c:1394

1832 #, c-format

1833 msgid "nothing added to commit but untracked files present\n"

1834 msgstr "提交为空，但是存在尚未跟踪的文件\n"

1835

1836 # 译者：中文字符串拼接，可删除前导空格

1843 -#: wt-status.c:1359

1837 +#: wt-status.c:1397

1838 #, c-format

1839 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

1840 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"

1841

1848 -#: wt-status.c:1362 wt-status.c:1367

1842 +#: wt-status.c:1400 wt-status.c:1405

1843 #, c-format

1844 msgid "nothing to commit\n"

1845 msgstr "无文件要提交\n"

1846

1847 # 译者：中文字符串拼接，可删除前导空格

1854 -#: wt-status.c:1365

1848 +#: wt-status.c:1403

1849 #, c-format

1850 msgid "nothing to commit (use -u to show untracked files)\n"

1851 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"

1852

1853 # 译者：中文字符串拼接，可删除前导空格

1860 -#: wt-status.c:1369

1854 +#: wt-status.c:1407

1855 #, c-format

1856 msgid "nothing to commit, working directory clean\n"

1857 msgstr "无文件要提交，干净的工作区\n"

1858

1865 -#: wt-status.c:1478

1859 +#: wt-status.c:1516

1860 msgid "HEAD (no branch)"

1861 msgstr "HEAD（非分支）"

1862

1863 # 译者：注意保持句尾空格

1870 -#: wt-status.c:1484

1864 +#: wt-status.c:1522

1865 msgid "Initial commit on "

1866 msgstr "初始提交于 "

1867

1874 -#: wt-status.c:1514

1868 +#: wt-status.c:1554

1869 msgid "gone"

1870 msgstr "丢失"

1871

1872 # 译者：注意保持句尾空格

1879 -#: wt-status.c:1516

1873 +#: wt-status.c:1556 wt-status.c:1564

1874 msgid "behind "

1875 msgstr "落后 "

1876

1883 -# 译者：注意保持句尾空格

1884 -#: wt-status.c:1519 wt-status.c:1522

1885 -msgid "ahead "

1886 -msgstr "领先 "

1887 -

1888 -# 译者：注意保持句尾空格

1889 -#: wt-status.c:1524

1890 -msgid ", behind "

1891 -msgstr "，落后 "

1892 -

1877 #: compat/precompose_utf8.c:55 builtin/clone.c:356

1878 #, c-format

1879 msgid "failed to unlink '%s'"

1880 msgstr "无法删除 '%s'"

1881

1898 -#: builtin/add.c:20

1882 +#: builtin/add.c:21

1883 msgid "git add [options] [--] <pathspec>..."

1884 msgstr "git add [选项] [--] <路径规则>..."

1885

1902 -# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短

1903 -#.

1904 -#. * To be consistent with "git add -p" and most Git

1905 -#. * commands, we should default to being tree-wide, but

1906 -#. * this is not the original behavior and can't be

1907 -#. * changed until users trained themselves not to type

1908 -#. * "git add -u" or "git add -A". For now, we warn and

1909 -#. * keep the old behavior. Later, the behavior can be changed

1910 -#. * to tree-wide, keeping the warning for a while, and

1911 -#. * eventually we can drop the warning.

1912 -#.

1913 -#: builtin/add.c:58

1914 -#, c-format

1915 -msgid ""

1916 -"The behavior of 'git add %s (or %s)' with no path argument from a\n"

1917 -"subdirectory of the tree will change in Git 2.0 and should not be used "

1918 -"anymore.\n"

1919 -"To add content for the whole tree, run:\n"

1920 -"\n"

1921 -" git add %s :/\n"

1922 -" (or git add %s :/)\n"

1923 -"\n"

1924 -"To restrict the command to the current directory, run:\n"

1925 -"\n"

1926 -" git add %s .\n"

1927 -" (or git add %s .)\n"

1928 -"\n"

1929 -"With the current Git version, the command is restricted to the current "

1930 -"directory.\n"

1931 -msgstr ""

1932 -"在 Git 2.0 版本，位于一个子目录下不带任何路径参数地执行命令\n"

1933 -"'git add %s (或 %s)' 的行为将被改变，不要再继续使用了。\n"

1934 -"如果要添加整个目录树的内容，执行：\n"

1935 -"\n"

1936 -" git add %s :/\n"

1937 -" (或 git add %s :/)\n"

1938 -"\n"

1939 -"如果要限制该命令只作用于当前目录，执行：\n"

1940 -"\n"

1941 -" git add %s .\n"

1942 -" (或 git add %s .)\n"

1943 -"\n"

1944 -"对于当前版本的 Git，这条命令只作用于当前目录。\n"

1945 -

1946 -#: builtin/add.c:100

1947 -#, c-format

1948 -msgid ""

1949 -"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"

1950 -"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"

1951 -"Paths like '%s' that are\n"

1952 -"removed from your working tree are ignored with this version of Git.\n"

1953 -"\n"

1954 -"* 'git add --ignore-removal <pathspec>', which is the current default,\n"

1955 -" ignores paths you removed from your working tree.\n"

1956 -"\n"

1957 -"* 'git add --all <pathspec>' will let you also record the removals.\n"

1958 -"\n"

1959 -"Run 'git status' to check the paths you removed from your working tree.\n"

1960 -msgstr ""

1961 -"您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal'，\n"

1962 -"针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"

1963 -"像本地工作区移除的路径 '%s'\n"

1964 -"在此版本的 Git 中被忽略。\n"

1965 -"\n"

1966 -"* 'git add --ignore-removal <路径规则>'，是当前版本的默认操作，\n"

1967 -" 忽略您本地工作区中移除的文件。\n"

1968 -"\n"

1969 -"* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"

1970 -"\n"

1971 -"运行 'git status' 来检查您本地工作区中移除的路径。\n"

1972 -

1973 -#: builtin/add.c:144

1886 +#: builtin/add.c:64

1887 #, c-format

1888 msgid "unexpected diff status %c"

1889 msgstr "意外的差异状态 %c"

1890

1978 -#: builtin/add.c:149 builtin/commit.c:260

1891 +#: builtin/add.c:69 builtin/commit.c:261

1892 msgid "updating files failed"

1893 msgstr "更新文件失败"

1894

1982 -#: builtin/add.c:163

1895 +#: builtin/add.c:79

1896 #, c-format

1897 msgid "remove '%s'\n"

1898 msgstr "删除 '%s'\n"

1899

1987 -#: builtin/add.c:237

1900 +#: builtin/add.c:133

1901 msgid "Unstaged changes after refreshing the index:"

1902 msgstr "刷新索引之后尚未被暂存的变更："

1903

1991 -#: builtin/add.c:299

1904 +#: builtin/add.c:193

1905 msgid "Could not read the index"

1906 msgstr "不能读取索引"

1907

1995 -#: builtin/add.c:310

1908 +#: builtin/add.c:204

1909 #, c-format

1910 msgid "Could not open '%s' for writing."

1911 msgstr "不能打开 '%s' 以写入。"

1912

2000 -#: builtin/add.c:314

1913 +#: builtin/add.c:208

1914 msgid "Could not write patch"

1915 msgstr "不能生成补丁"

1916

2004 -#: builtin/add.c:319

1917 +#: builtin/add.c:213

1918 #, c-format

1919 msgid "Could not stat '%s'"

1920 msgstr "不能查看文件状态 '%s'"

1921

2009 -#: builtin/add.c:321

1922 +#: builtin/add.c:215

1923 msgid "Empty patch. Aborted."

1924 msgstr "空补丁。异常终止。"

1925

2013 -#: builtin/add.c:327

1926 +#: builtin/add.c:221

1927 #, c-format

1928 msgid "Could not apply '%s'"

1929 msgstr "不能应用 '%s'"

1930

2018 -#: builtin/add.c:337

1931 +#: builtin/add.c:231

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

1933 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"

1934

2022 -#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70

2023 -#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344

1935 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70

1936 +#: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344

1937 #: builtin/rm.c:269

1938 msgid "dry run"

1939 msgstr "演习"

1940

2028 -#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19

2029 -#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612

1941 +#: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19

1942 +#: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612

1943 #: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113

1944 msgid "be verbose"

1945 msgstr "冗长输出"

1946

2034 -#: builtin/add.c:357

1947 +#: builtin/add.c:251

1948 msgid "interactive picking"

1949 msgstr "交互式拣选"

1950

2038 -#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272

1951 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283

1952 msgid "select hunks interactively"

1953 msgstr "交互式挑选数据块"

1954

2042 -#: builtin/add.c:359

1955 +#: builtin/add.c:253

1956 msgid "edit current diff and apply"

1957 msgstr "编辑当前差异并应用"

1958

2046 -#: builtin/add.c:360

1959 +#: builtin/add.c:254

1960 msgid "allow adding otherwise ignored files"

1961 msgstr "允许添加忽略的文件"

1962

2050 -#: builtin/add.c:361

1963 +#: builtin/add.c:255

1964 msgid "update tracked files"

1965 msgstr "更新已跟踪的文件"

1966

2054 -#: builtin/add.c:362

1967 +#: builtin/add.c:256

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

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

1970

2058 -#: builtin/add.c:363

1971 +#: builtin/add.c:257

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

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

1974

2062 -#. takes no arguments

2063 -#: builtin/add.c:366

1975 +#: builtin/add.c:260

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

1977 msgstr "忽略工作区中移除的路径（和 --no-all 相同）"

1978

2067 -#: builtin/add.c:368

1979 +#: builtin/add.c:262

1980 msgid "don't add, only refresh the index"

1981 msgstr "不添加，只刷新索引"

1982

2071 -#: builtin/add.c:369

1983 +#: builtin/add.c:263

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

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

1986

2075 -#: builtin/add.c:370

1987 +#: builtin/add.c:264

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

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

1990

2079 -#: builtin/add.c:392

1991 +#: builtin/add.c:286

1992 #, c-format

1993 msgid "Use -f if you really want to add them.\n"

1994 msgstr "使用 -f 参数如果您确实要添加它们。\n"

1995

2084 -#: builtin/add.c:393

1996 +#: builtin/add.c:287

1997 msgid "no files added"

1998 msgstr "没有文件被添加"

1999

2088 -#: builtin/add.c:399

2000 +#: builtin/add.c:293

2001 msgid "adding files failed"

2002 msgstr "添加文件失败"

2003

2092 -#: builtin/add.c:438

2004 +#: builtin/add.c:330

2005 msgid "-A and -u are mutually incompatible"

2006 msgstr "-A 和 -u 选项互斥"

2007

2096 -#: builtin/add.c:456

2008 +#: builtin/add.c:337

2009 msgid "Option --ignore-missing can only be used together with --dry-run"

2010 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"

2011

2100 -#: builtin/add.c:486

2012 +#: builtin/add.c:358

2013 #, c-format

2014 msgid "Nothing specified, nothing added.\n"

2015 msgstr "没有指定文件，也没有文件被添加。\n"

2016

2105 -#: builtin/add.c:487

2017 +#: builtin/add.c:359

2018 #, c-format

2019 msgid "Maybe you wanted to say 'git add .'?\n"

2020 msgstr "也许您想要执行 'git add .'？\n"

2021

2110 -#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919

2111 -#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299

2022 +#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:920

2023 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

2024 msgid "index file corrupt"

2025 msgstr "索引文件损坏"

2026

2115 -#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432

2027 +#: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432

2028 msgid "Unable to write new index file"

2029 msgstr "无法写入新索引文件"

2030

@@ -2219,7 +2131,6 @@ msgstr "** 警告：文件 %s 成为空文件但并未删除"

2131 msgid "corrupt binary patch at line %d: %.*s"

2132 msgstr "二进制补丁在第 %d 行损坏：%.*s"

2133

2222 -#. there has to be one hunk (forward hunk)

2134 #: builtin/apply.c:1900

2135 #, c-format

2136 msgid "unrecognized binary patch at line %d"

@@ -2360,7 +2271,7 @@ msgstr "%s：补丁未应用"

2271 msgid "Checking patch %s..."

2272 msgstr "检查补丁 %s..."

2273

2363 -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127

2274 +#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134

2275 #, c-format

2276 msgid "make_cache_entry failed for path '%s'"

2277 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"

@@ -2409,7 +2320,6 @@ msgstr "成功应用补丁 %s。"

2320 msgid "internal error"

2321 msgstr "内部错误"

2322

2412 -#. Say this even without --verbose

2323 #: builtin/apply.c:4043

2324 #, c-format

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

@@ -2501,7 +2411,7 @@ msgstr "如果一个补丁不能应用则尝试三路合并"

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

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

2413

2504 -#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452

2414 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455

2415 msgid "paths are separated with NUL character"

2416 msgstr "路径以 NUL 字符分隔"

2417

@@ -2731,6 +2641,16 @@ msgstr "n,m"

2641 msgid "Process only line range n,m, counting from 1"

2642 msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"

2643

2644 +#. TRANSLATORS: This string is used to tell us the maximum

2645 +#. display width for a relative timestamp in "git blame"

2646 +#. output. For C locale, "4 years, 11 months ago", which

2647 +#. takes 22 places, is the longest among various forms of

2648 +#. relative timestamps, but your language may need more or

2649 +#. fewer display columns.

2650 +#: builtin/blame.c:2347

2651 +msgid "4 years, 11 months ago"

2652 +msgstr "4 年 11 个月前"

2653 +

2654 #: builtin/branch.c:24

2655 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"

2656 msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"

@@ -2971,8 +2891,9 @@ msgid "act on remote-tracking branches"

2891 msgstr "作用于远程跟踪分支"

2892

2893 #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

2974 -#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461

2975 -#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468

2894 +#: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495

2895 +#: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527

2896 +#: builtin/tag.c:533

2897 msgid "commit"

2898 msgstr "提交"

2899

@@ -3153,43 +3074,43 @@ msgstr "需要一个版本库来创建包。"

3074 msgid "Need a repository to unbundle."

3075 msgstr "需要一个版本库来解包。"

3076

3156 -#: builtin/cat-file.c:328

3077 +#: builtin/cat-file.c:331

3078 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"

3079 msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"

3080

3160 -#: builtin/cat-file.c:329

3081 +#: builtin/cat-file.c:332

3082 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"

3083 msgstr "git cat-file (--batch|--batch-check) < <对象列表>"

3084

3164 -#: builtin/cat-file.c:366

3085 +#: builtin/cat-file.c:369

3086 msgid "<type> can be one of: blob, tree, commit, tag"

3087 msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"

3088

3168 -#: builtin/cat-file.c:367

3089 +#: builtin/cat-file.c:370

3090 msgid "show object type"

3091 msgstr "显示对象类型"

3092

3172 -#: builtin/cat-file.c:368

3093 +#: builtin/cat-file.c:371

3094 msgid "show object size"

3095 msgstr "显示对象大小"

3096

3176 -#: builtin/cat-file.c:370

3097 +#: builtin/cat-file.c:373

3098 msgid "exit with zero when there's no error"

3099 msgstr "当没有错误时退出并返回零"

3100

3180 -#: builtin/cat-file.c:371

3101 +#: builtin/cat-file.c:374

3102 msgid "pretty-print object's content"

3103 msgstr "美观地打印对象的内容"

3104

3184 -#: builtin/cat-file.c:373

3105 +#: builtin/cat-file.c:376

3106 msgid "for blob objects, run textconv on object's content"

3107 msgstr "对于数据（blob）对象，对其内容执行 textconv"

3108

3188 -#: builtin/cat-file.c:375

3109 +#: builtin/cat-file.c:378

3110 msgid "show info and content of objects fed from the standard input"

3111 msgstr "显示从标准输入提供的对象的信息和内容"

3112

3192 -#: builtin/cat-file.c:378

3113 +#: builtin/cat-file.c:381

3114 msgid "show info about objects fed from the standard input"

3115 msgstr "显示从标准输入提供的对象的信息"

3116

@@ -3217,7 +3138,7 @@ msgstr "从标准输入读出文件名"

3138 msgid "terminate input and output records by a NUL character"

3139 msgstr "输入和输出的记录使用 NUL 字符终结"

3140

3220 -#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260

3141 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271

3142 msgid "suppress progress reporting"

3143 msgstr "不显示进度报告"

3144

@@ -3368,61 +3289,60 @@ msgstr "'%s' 不能和 %s 同时使用"

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

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

3291

3371 -#: builtin/checkout.c:261 builtin/checkout.c:451

3292 +#: builtin/checkout.c:261 builtin/checkout.c:450

3293 msgid "corrupt index file"

3294 msgstr "损坏的索引文件"

3295

3375 -#: builtin/checkout.c:322 builtin/checkout.c:329

3296 +#: builtin/checkout.c:321 builtin/checkout.c:328

3297 #, c-format

3298 msgid "path '%s' is unmerged"

3299 msgstr "路径 '%s' 未合并"

3300

3380 -#: builtin/checkout.c:473

3301 +#: builtin/checkout.c:472

3302 msgid "you need to resolve your current index first"

3303 msgstr "您需要先解决当前索引的冲突"

3304

3384 -#: builtin/checkout.c:594

3305 +#: builtin/checkout.c:593

3306 #, c-format

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

3308 msgstr "不能对 '%s' 执行 reflog 操作\n"

3309

3389 -#: builtin/checkout.c:632

3310 +#: builtin/checkout.c:631

3311 msgid "HEAD is now at"

3312 msgstr "HEAD 目前位于"

3313

3393 -#: builtin/checkout.c:639

3314 +#: builtin/checkout.c:638

3315 #, c-format

3316 msgid "Reset branch '%s'\n"

3317 msgstr "重置分支 '%s'\n"

3318

3398 -#: builtin/checkout.c:642

3319 +#: builtin/checkout.c:641

3320 #, c-format

3321 msgid "Already on '%s'\n"

3322 msgstr "已经位于 '%s'\n"

3323

3403 -#: builtin/checkout.c:646

3324 +#: builtin/checkout.c:645

3325 #, c-format

3326 msgid "Switched to and reset branch '%s'\n"

3327 msgstr "切换并重置分支 '%s'\n"

3328

3408 -#: builtin/checkout.c:648 builtin/checkout.c:1033

3329 +#: builtin/checkout.c:647 builtin/checkout.c:1032

3330 #, c-format

3331 msgid "Switched to a new branch '%s'\n"

3332 msgstr "切换到一个新分支 '%s'\n"

3333

3413 -#: builtin/checkout.c:650

3334 +#: builtin/checkout.c:649

3335 #, c-format

3336 msgid "Switched to branch '%s'\n"

3337 msgstr "切换到分支 '%s'\n"

3338

3339 # 译者：注意保持前导空格

3419 -#: builtin/checkout.c:706

3340 +#: builtin/checkout.c:705

3341 #, c-format

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

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

3344

3424 -#. The singular version

3425 -#: builtin/checkout.c:712

3345 +#: builtin/checkout.c:711

3346 #, c-format

3347 msgid ""

3348 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3443,7 +3363,7 @@ msgstr[1] ""

3363 "\n"

3364 "%s\n"

3365

3446 -#: builtin/checkout.c:730

3366 +#: builtin/checkout.c:729

3367 #, c-format

3368 msgid ""

3369 "If you want to keep them by creating a new branch, this may be a good time\n"

@@ -3458,140 +3378,139 @@ msgstr ""

3378 " git branch new_branch_name %s\n"

3379 "\n"

3380

3461 -#: builtin/checkout.c:760

3381 +#: builtin/checkout.c:759

3382 msgid "internal error in revision walk"

3383 msgstr "在版本遍历时遇到内部错误"

3384

3465 -#: builtin/checkout.c:764

3385 +#: builtin/checkout.c:763

3386 msgid "Previous HEAD position was"

3387 msgstr "之前的 HEAD 位置是"

3388

3469 -#: builtin/checkout.c:791 builtin/checkout.c:1028

3389 +#: builtin/checkout.c:790 builtin/checkout.c:1027

3390 msgid "You are on a branch yet to be born"

3391 msgstr "您位于一个尚未初始化的分支"

3392

3473 -#: builtin/checkout.c:935

3393 +#: builtin/checkout.c:934

3394 #, c-format

3395 msgid "only one reference expected, %d given."

3396 msgstr "只要一个引用，却给出了 %d 个"

3397

3478 -#: builtin/checkout.c:974

3398 +#: builtin/checkout.c:973

3399 #, c-format

3400 msgid "invalid reference: %s"

3401 msgstr "无效引用：%s"

3402

3483 -#. case (1): want a tree

3484 -#: builtin/checkout.c:1003

3403 +#: builtin/checkout.c:1002

3404 #, c-format

3405 msgid "reference is not a tree: %s"

3406 msgstr "引用不是一个树：%s"

3407

3489 -#: builtin/checkout.c:1042

3408 +#: builtin/checkout.c:1041

3409 msgid "paths cannot be used with switching branches"

3410 msgstr "路径不能和切换分支同时使用"

3411

3493 -#: builtin/checkout.c:1045 builtin/checkout.c:1049

3412 +#: builtin/checkout.c:1044 builtin/checkout.c:1048

3413 #, c-format

3414 msgid "'%s' cannot be used with switching branches"

3415 msgstr "'%s' 不能和切换分支同时使用"

3416

3498 -#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061

3499 -#: builtin/checkout.c:1064

3417 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060

3418 +#: builtin/checkout.c:1063

3419 #, c-format

3420 msgid "'%s' cannot be used with '%s'"

3421 msgstr "'%s' 不能和 '%s' 同时使用"

3422

3504 -#: builtin/checkout.c:1069

3423 +#: builtin/checkout.c:1068

3424 #, c-format

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

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

3427

3509 -#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88

3428 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:88

3429 #: builtin/remote.c:159 builtin/remote.c:161

3430 msgid "branch"

3431 msgstr "分支"

3432

3514 -#: builtin/checkout.c:1092

3433 +#: builtin/checkout.c:1091

3434 msgid "create and checkout a new branch"

3435 msgstr "创建并检出一个新的分支"

3436

3518 -#: builtin/checkout.c:1094

3437 +#: builtin/checkout.c:1093

3438 msgid "create/reset and checkout a branch"

3439 msgstr "创建/重置并检出一个分支"

3440

3522 -#: builtin/checkout.c:1095

3441 +#: builtin/checkout.c:1094

3442 msgid "create reflog for new branch"

3443 msgstr "为新的分支创建引用日志"

3444

3526 -#: builtin/checkout.c:1096

3445 +#: builtin/checkout.c:1095

3446 msgid "detach the HEAD at named commit"

3447 msgstr "成为指向该提交的分离头指针"

3448

3530 -#: builtin/checkout.c:1097

3449 +#: builtin/checkout.c:1096

3450 msgid "set upstream info for new branch"

3451 msgstr "为新的分支设置上游信息"

3452

3534 -#: builtin/checkout.c:1099

3535 -msgid "new branch"

3453 +#: builtin/checkout.c:1098

3454 +msgid "new-branch"

3455 msgstr "新分支"

3456

3538 -#: builtin/checkout.c:1099

3457 +#: builtin/checkout.c:1098

3458 msgid "new unparented branch"

3459 msgstr "新的没有父提交的分支"

3460

3542 -#: builtin/checkout.c:1100

3461 +#: builtin/checkout.c:1099

3462 msgid "checkout our version for unmerged files"

3463 msgstr "对尚未合并的文件检出我们的版本"

3464

3546 -#: builtin/checkout.c:1102

3465 +#: builtin/checkout.c:1101

3466 msgid "checkout their version for unmerged files"

3467 msgstr "对尚未合并的文件检出他们的版本"

3468

3550 -#: builtin/checkout.c:1104

3469 +#: builtin/checkout.c:1103

3470 msgid "force checkout (throw away local modifications)"

3471 msgstr "强制检出（丢弃本地修改）"

3472

3554 -#: builtin/checkout.c:1105

3473 +#: builtin/checkout.c:1104

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

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

3476

3558 -#: builtin/checkout.c:1106 builtin/merge.c:225

3477 +#: builtin/checkout.c:1105 builtin/merge.c:225

3478 msgid "update ignored files (default)"

3479 msgstr "更新忽略的文件（默认）"

3480

3562 -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248

3481 +#: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245

3482 msgid "style"

3483 msgstr "风格"

3484

3566 -#: builtin/checkout.c:1108

3485 +#: builtin/checkout.c:1107

3486 msgid "conflict style (merge or diff3)"

3487 msgstr "冲突输出风格（merge 或 diff3）"

3488

3570 -#: builtin/checkout.c:1111

3489 +#: builtin/checkout.c:1110

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

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

3492

3574 -#: builtin/checkout.c:1113

3493 +#: builtin/checkout.c:1112

3494 msgid "second guess 'git checkout no-such-branch'"

3495 msgstr "再者猜测'git checkout no-such-branch'"

3496

3578 -#: builtin/checkout.c:1136

3497 +#: builtin/checkout.c:1135

3498 msgid "-b, -B and --orphan are mutually exclusive"

3499 msgstr "-b、-B 和 --orphan 是互斥的"

3500

3582 -#: builtin/checkout.c:1153

3501 +#: builtin/checkout.c:1152

3502 msgid "--track needs a branch name"

3503 msgstr "--track 需要一个分支名"

3504

3586 -#: builtin/checkout.c:1160

3505 +#: builtin/checkout.c:1159

3506 msgid "Missing branch name; try -b"

3507 msgstr "缺少分支名；尝试 -b"

3508

3590 -#: builtin/checkout.c:1197

3509 +#: builtin/checkout.c:1196

3510 msgid "invalid path specification"

3511 msgstr "无效的路径规格"

3512

3594 -#: builtin/checkout.c:1204

3513 +#: builtin/checkout.c:1203

3514 #, c-format

3515 msgid ""

3516 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3600,12 +3519,12 @@ msgstr ""

3519 "不能同时更新路径并切换到分支'%s'。\n"

3520 "您是想要检出 '%s' 但其未能解析为提交么？"

3521

3603 -#: builtin/checkout.c:1209

3522 +#: builtin/checkout.c:1208

3523 #, c-format

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

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

3526

3608 -#: builtin/checkout.c:1213

3527 +#: builtin/checkout.c:1212

3528 msgid ""

3529 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3530 "checking out of the index."

@@ -3643,7 +3562,7 @@ msgstr "将忽略版本库 %s\n"

3562 msgid "failed to remove %s"

3563 msgstr "无法删除 %s"

3564

3646 -#: builtin/clean.c:294

3565 +#: builtin/clean.c:295

3566 msgid ""

3567 "Prompt help:\n"

3568 "1 - select a numbered item\n"

@@ -3655,7 +3574,7 @@ msgstr ""

3574 "foo - 通过标题选择一个选项\n"

3575 " - （空）什么也不选择"

3576

3658 -#: builtin/clean.c:298

3577 +#: builtin/clean.c:299

3578 msgid ""

3579 "Prompt help:\n"

3580 "1 - select a single item\n"

@@ -3675,35 +3594,35 @@ msgstr ""

3594 "* - 选择所有选项\n"

3595 " - （空）结束选择"

3596

3678 -#: builtin/clean.c:516

3597 +#: builtin/clean.c:517

3598 #, c-format

3599 msgid "Huh (%s)?"

3600 msgstr "嗯（%s）？"

3601

3683 -#: builtin/clean.c:659

3602 +#: builtin/clean.c:660

3603 #, c-format

3604 msgid "Input ignore patterns>> "

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

3606

3688 -#: builtin/clean.c:696

3607 +#: builtin/clean.c:697

3608 #, c-format

3609 msgid "WARNING: Cannot find items matched by: %s"

3610 msgstr "警告：无法找到和 %s 匹配的条目"

3611

3693 -#: builtin/clean.c:717

3612 +#: builtin/clean.c:718

3613 msgid "Select items to delete"

3614 msgstr "选择要删除的条目"

3615

3697 -#: builtin/clean.c:757

3616 +#: builtin/clean.c:758

3617 #, c-format

3618 msgid "remove %s? "

3619 msgstr "删除 %s？"

3620

3702 -#: builtin/clean.c:782

3621 +#: builtin/clean.c:783

3622 msgid "Bye."

3623 msgstr "再见。"

3624

3706 -#: builtin/clean.c:790

3625 +#: builtin/clean.c:791

3626 msgid ""

3627 "clean - start cleaning\n"

3628 "filter by pattern - exclude items from deletion\n"

@@ -3721,71 +3640,71 @@ msgstr ""

3640 "help - 显示本帮助\n"

3641 "? - 显示如何在提示符下选择的帮助"

3642

3724 -#: builtin/clean.c:817

3643 +#: builtin/clean.c:818

3644 msgid "*** Commands ***"

3645 msgstr "*** 命令 ***"

3646

3728 -#: builtin/clean.c:818

3647 +#: builtin/clean.c:819

3648 msgid "What now"

3649 msgstr "请选择"

3650

3732 -#: builtin/clean.c:826

3651 +#: builtin/clean.c:827

3652 msgid "Would remove the following item:"

3653 msgid_plural "Would remove the following items:"

3654 msgstr[0] "将删除如下条目："

3655 msgstr[1] "将删除如下条目："

3656

3738 -#: builtin/clean.c:843

3657 +#: builtin/clean.c:844

3658 msgid "No more files to clean, exiting."

3659 msgstr "没有要清理的文件，退出。"

3660

3742 -#: builtin/clean.c:874

3661 +#: builtin/clean.c:875

3662 msgid "do not print names of files removed"

3663 msgstr "不打印删除文件的名称"

3664

3746 -#: builtin/clean.c:876

3665 +#: builtin/clean.c:877

3666 msgid "force"

3667 msgstr "强制"

3668

3750 -#: builtin/clean.c:877

3669 +#: builtin/clean.c:878

3670 msgid "interactive cleaning"

3671 msgstr "交互式清除"

3672

3754 -#: builtin/clean.c:879

3673 +#: builtin/clean.c:880

3674 msgid "remove whole directories"

3675 msgstr "删除整个目录"

3676

3758 -#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718

3759 -#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185

3677 +#: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716

3678 +#: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185

3679 msgid "pattern"

3680 msgstr "模式"

3681

3763 -#: builtin/clean.c:881

3682 +#: builtin/clean.c:882

3683 msgid "add <pattern> to ignore rules"

3684 msgstr "添加<模式>到忽略规则"

3685

3767 -#: builtin/clean.c:882

3686 +#: builtin/clean.c:883

3687 msgid "remove ignored files, too"

3688 msgstr "也删除忽略的文件"

3689

3771 -#: builtin/clean.c:884

3690 +#: builtin/clean.c:885

3691 msgid "remove only ignored files"

3692 msgstr "只删除忽略的文件"

3693

3775 -#: builtin/clean.c:902

3694 +#: builtin/clean.c:903

3695 msgid "-x and -X cannot be used together"

3696 msgstr "-x 和 -X 不能同时使用"

3697

3779 -#: builtin/clean.c:906

3698 +#: builtin/clean.c:907

3699 msgid ""

3781 -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to "

3700 +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

3701 "clean"

3702 msgstr ""

3703 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"

3704

3786 -#: builtin/clean.c:909

3705 +#: builtin/clean.c:910

3706 msgid ""

3788 -"clean.requireForce defaults to true and neither -i, -n nor -f given; "

3707 +"clean.requireForce defaults to true and neither -i, -n, nor -f given; "

3708 "refusing to clean"

3709 msgstr ""

3710 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"

@@ -3795,7 +3714,7 @@ msgid "git clone [options] [--] <repo> [<dir>]"

3714 msgstr "git clone [选项] [--] <版本库> [<路径>]"

3715

3716 #: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222

3798 -#: builtin/push.c:521

3717 +#: builtin/push.c:504

3718 msgid "force progress reporting"

3719 msgstr "强制显示进度报告"

3720

@@ -3803,7 +3722,7 @@ msgstr "强制显示进度报告"

3722 msgid "don't create a checkout"

3723 msgstr "不创建一个检出"

3724

3806 -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488

3725 +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486

3726 msgid "create a bare repository"

3727 msgstr "创建一个裸版本库"

3728

@@ -3827,11 +3746,11 @@ msgstr "设置为共享版本库"

3746 msgid "initialize submodules in the clone"

3747 msgstr "在克隆时初始化子模组"

3748

3830 -#: builtin/clone.c:82 builtin/init-db.c:485

3749 +#: builtin/clone.c:82 builtin/init-db.c:483

3750 msgid "template-directory"

3751 msgstr "模板目录"

3752

3834 -#: builtin/clone.c:83 builtin/init-db.c:486

3753 +#: builtin/clone.c:83 builtin/init-db.c:484

3754 msgid "directory from which templates will be used"

3755 msgstr "模板目录将被使用"

3756

@@ -3855,7 +3774,7 @@ msgstr "检出<分支>而不是远程HEAD"

3774 msgid "path to git-upload-pack on the remote"

3775 msgstr "远程 git-upload-pack 路径"

3776

3858 -#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663

3777 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661

3778 msgid "depth"

3779 msgstr "深度"

3780

@@ -3867,11 +3786,11 @@ msgstr "创建一个指定深度的浅克隆"

3786 msgid "clone only one branch, HEAD or --branch"

3787 msgstr "只克隆一个分支、HEAD 或 --branch"

3788

3870 -#: builtin/clone.c:96 builtin/init-db.c:494

3789 +#: builtin/clone.c:96 builtin/init-db.c:492

3790 msgid "gitdir"

3791 msgstr "git目录"

3792

3874 -#: builtin/clone.c:97 builtin/init-db.c:495

3793 +#: builtin/clone.c:97 builtin/init-db.c:493

3794 msgid "separate git dir from working tree"

3795 msgstr "git目录和工作区分离"

3796

@@ -4154,67 +4073,67 @@ msgstr ""

4073 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"

4074 "操作。\n"

4075

4157 -#: builtin/commit.c:287

4076 +#: builtin/commit.c:288

4077 msgid "failed to unpack HEAD tree object"

4078 msgstr "无法解包 HEAD 树对象"

4079

4161 -#: builtin/commit.c:329

4080 +#: builtin/commit.c:330

4081 msgid "unable to create temporary index"

4082 msgstr "不能创建临时索引"

4083

4165 -#: builtin/commit.c:335

4084 +#: builtin/commit.c:336

4085 msgid "interactive add failed"

4086 msgstr "交互式添加失败"

4087

4169 -#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439

4088 +#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440

4089 msgid "unable to write new_index file"

4090 msgstr "无法写 new_index 文件"

4091

4173 -#: builtin/commit.c:420

4092 +#: builtin/commit.c:421

4093 msgid "cannot do a partial commit during a merge."

4094 msgstr "在合并过程中不能做部分提交。"

4095

4177 -#: builtin/commit.c:422

4096 +#: builtin/commit.c:423

4097 msgid "cannot do a partial commit during a cherry-pick."

4098 msgstr "在拣选过程中不能做部分提交。"

4099

4181 -#: builtin/commit.c:432

4100 +#: builtin/commit.c:433

4101 msgid "cannot read the index"

4102 msgstr "无法读取索引"

4103

4185 -#: builtin/commit.c:452

4104 +#: builtin/commit.c:453

4105 msgid "unable to write temporary index file"

4106 msgstr "无法写临时索引文件"

4107

4189 -#: builtin/commit.c:543 builtin/commit.c:549

4108 +#: builtin/commit.c:544 builtin/commit.c:550

4109 #, c-format

4110 msgid "invalid commit: %s"

4111 msgstr "无效的提交：%s"

4112

4194 -#: builtin/commit.c:571

4113 +#: builtin/commit.c:572

4114 msgid "malformed --author parameter"

4115 msgstr "非法的 --author 参数"

4116

4198 -#: builtin/commit.c:591

4117 +#: builtin/commit.c:592

4118 #, c-format

4119 msgid "Malformed ident string: '%s'"

4120 msgstr "非法的身份字符串：'%s'"

4121

4203 -#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007

4122 +#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014

4123 #, c-format

4124 msgid "could not lookup commit %s"

4125 msgstr "不能查询提交 %s"

4126

4208 -#: builtin/commit.c:642 builtin/shortlog.c:273

4127 +#: builtin/commit.c:641 builtin/shortlog.c:273

4128 #, c-format

4129 msgid "(reading log message from standard input)\n"

4130 msgstr "（正从标准输入中读取日志信息）\n"

4131

4213 -#: builtin/commit.c:644

4132 +#: builtin/commit.c:643

4133 msgid "could not read log from standard input"

4134 msgstr "不能从标准输入中读取日志信息"

4135

4217 -#: builtin/commit.c:648

4136 +#: builtin/commit.c:647

4137 #, c-format

4138 msgid "could not read log file '%s'"

4139 msgstr "不能读取日志文件 '%s'"

@@ -4240,7 +4159,7 @@ msgstr "不能读取 '%s'"

4159 msgid "could not write commit template"

4160 msgstr "不能写提交模版"

4161

4243 -#: builtin/commit.c:760

4162 +#: builtin/commit.c:764

4163 #, c-format

4164 msgid ""

4165 "\n"

@@ -4254,7 +4173,7 @@ msgstr ""

4173 "\t%s\n"

4174 "然后重试。\n"

4175

4257 -#: builtin/commit.c:765

4176 +#: builtin/commit.c:769

4177 #, c-format

4178 msgid ""

4179 "\n"

@@ -4268,7 +4187,7 @@ msgstr ""

4187 "\t%s\n"

4188 "然后重试。\n"

4189

4271 -#: builtin/commit.c:777

4190 +#: builtin/commit.c:782

4191 #, c-format

4192 msgid ""

4193 "Please enter the commit message for your changes. Lines starting\n"

@@ -4277,7 +4196,7 @@ msgstr ""

4196 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"

4197 "说明将会终止提交。\n"

4198

4280 -#: builtin/commit.c:782

4199 +#: builtin/commit.c:789

4200 #, c-format

4201 msgid ""

4202 "Please enter the commit message for your changes. Lines starting\n"

@@ -4288,355 +4207,355 @@ msgstr ""

4207 "也可以删除它们。一个空的提交说明将会终止提交。\n"

4208

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

4291 -#: builtin/commit.c:795

4210 +#: builtin/commit.c:802

4211 #, c-format

4212 msgid "%sAuthor: %s"

4213 msgstr "%s作者： %s"

4214

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

4297 -#: builtin/commit.c:802

4216 +#: builtin/commit.c:809

4217 #, c-format

4218 msgid "%sCommitter: %s"

4219 msgstr "%s提交者： %s"

4220

4302 -#: builtin/commit.c:822

4221 +#: builtin/commit.c:829

4222 msgid "Cannot read index"

4223 msgstr "无法读取索引"

4224

4306 -#: builtin/commit.c:865

4225 +#: builtin/commit.c:872

4226 msgid "Error building trees"

4227 msgstr "无法创建树对象"

4228

4310 -#: builtin/commit.c:880 builtin/tag.c:359

4229 +#: builtin/commit.c:887 builtin/tag.c:391

4230 #, c-format

4231 msgid "Please supply the message using either -m or -F option.\n"

4232 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"

4233

4315 -#: builtin/commit.c:982

4234 +#: builtin/commit.c:989

4235 #, c-format

4236 msgid "No existing author found with '%s'"

4237 msgstr "没有找到匹配 '%s' 的作者"

4238

4320 -#: builtin/commit.c:997 builtin/commit.c:1237

4239 +#: builtin/commit.c:1004 builtin/commit.c:1244

4240 #, c-format

4241 msgid "Invalid untracked files mode '%s'"

4242 msgstr "无效的未追踪文件参数 '%s'"

4243

4325 -#: builtin/commit.c:1034

4244 +#: builtin/commit.c:1041

4245 msgid "--long and -z are incompatible"

4246 msgstr "--long 和 -z 选项不兼容"

4247

4329 -#: builtin/commit.c:1064

4248 +#: builtin/commit.c:1071

4249 msgid "Using both --reset-author and --author does not make sense"

4250 msgstr "同时使用 --reset-author 和 --author 没有意义"

4251

4333 -#: builtin/commit.c:1075

4252 +#: builtin/commit.c:1080

4253 msgid "You have nothing to amend."

4254 msgstr "您没有可修补的提交。"

4255

4337 -#: builtin/commit.c:1078

4256 +#: builtin/commit.c:1083

4257 msgid "You are in the middle of a merge -- cannot amend."

4258 msgstr "您正处于一个合并过程中 -- 无法修补提交。"

4259

4341 -#: builtin/commit.c:1080

4260 +#: builtin/commit.c:1085

4261 msgid "You are in the middle of a cherry-pick -- cannot amend."

4262 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

4263

4345 -#: builtin/commit.c:1083

4264 +#: builtin/commit.c:1088

4265 msgid "Options --squash and --fixup cannot be used together"

4266 msgstr "选项 --squash 和 --fixup 不能同时使用"

4267

4349 -#: builtin/commit.c:1093

4268 +#: builtin/commit.c:1098

4269 msgid "Only one of -c/-C/-F/--fixup can be used."

4270 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

4271

4353 -#: builtin/commit.c:1095

4272 +#: builtin/commit.c:1100

4273 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

4274 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"

4275

4357 -#: builtin/commit.c:1103

4276 +#: builtin/commit.c:1108

4277 msgid "--reset-author can be used only with -C, -c or --amend."

4278 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"

4279

4361 -#: builtin/commit.c:1120

4280 +#: builtin/commit.c:1125

4281 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

4282 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

4283

4365 -#: builtin/commit.c:1122

4284 +#: builtin/commit.c:1127

4285 msgid "No paths with --include/--only does not make sense."

4286 msgstr "参数 --include/--only 不跟路径没有意义。"

4287

4369 -#: builtin/commit.c:1124

4288 +#: builtin/commit.c:1129

4289 msgid "Clever... amending the last one with dirty index."

4290 msgstr "聪明... 在索引不干净下修补最后的提交。"

4291

4373 -#: builtin/commit.c:1126

4374 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

4375 -msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."

4292 +#: builtin/commit.c:1131

4293 +msgid "Explicit paths specified without -i or -o; assuming --only paths..."

4294 +msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."

4295

4377 -#: builtin/commit.c:1136 builtin/tag.c:572

4296 +#: builtin/commit.c:1143 builtin/tag.c:639

4297 #, c-format

4298 msgid "Invalid cleanup mode %s"

4299 msgstr "无效的清理模式 %s"

4300

4382 -#: builtin/commit.c:1141

4301 +#: builtin/commit.c:1148

4302 msgid "Paths with -a does not make sense."

4303 msgstr "路径和 -a 选项同时使用没有意义。"

4304

4386 -#: builtin/commit.c:1251 builtin/commit.c:1482

4305 +#: builtin/commit.c:1258 builtin/commit.c:1516

4306 msgid "show status concisely"

4307 msgstr "以简洁的格式显示状态"

4308

4390 -#: builtin/commit.c:1253 builtin/commit.c:1484

4309 +#: builtin/commit.c:1260 builtin/commit.c:1518

4310 msgid "show branch information"

4311 msgstr "显示分支信息"

4312

4394 -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507

4313 +#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490

4314 msgid "machine-readable output"

4315 msgstr "机器可读的输出"

4316

4398 -#: builtin/commit.c:1258 builtin/commit.c:1488

4317 +#: builtin/commit.c:1265 builtin/commit.c:1522

4318 msgid "show status in long format (default)"

4319 msgstr "以长格式显示状态（默认）"

4320

4402 -#: builtin/commit.c:1261 builtin/commit.c:1491

4321 +#: builtin/commit.c:1268 builtin/commit.c:1525

4322 msgid "terminate entries with NUL"

4323 msgstr "条目以NUL字符结尾"

4324

4406 -#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674

4407 -#: builtin/fast-export.c:677 builtin/tag.c:459

4325 +#: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674

4326 +#: builtin/fast-export.c:677 builtin/tag.c:514

4327 msgid "mode"

4328 msgstr "模式"

4329

4411 -#: builtin/commit.c:1264 builtin/commit.c:1494

4330 +#: builtin/commit.c:1271 builtin/commit.c:1528

4331 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4332 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"

4333

4415 -#: builtin/commit.c:1267

4334 +#: builtin/commit.c:1274

4335 msgid "show ignored files"

4336 msgstr "显示忽略的文件"

4337

4419 -#: builtin/commit.c:1268 parse-options.h:156

4338 +#: builtin/commit.c:1275 parse-options.h:153

4339 msgid "when"

4340 msgstr "何时"

4341

4423 -#: builtin/commit.c:1269

4342 +#: builtin/commit.c:1276

4343 msgid ""

4344 "ignore changes to submodules, optional when: all, dirty, untracked. "

4345 "(Default: all)"

4346 msgstr ""

4347 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"

4348

4430 -#: builtin/commit.c:1271

4349 +#: builtin/commit.c:1278

4350 msgid "list untracked files in columns"

4351 msgstr "以列的方式显示未跟踪的文件"

4352

4434 -#: builtin/commit.c:1340

4353 +#: builtin/commit.c:1347

4354 msgid "couldn't look up newly created commit"

4355 msgstr "无法找到新创建的提交"

4356

4438 -#: builtin/commit.c:1342

4357 +#: builtin/commit.c:1349

4358 msgid "could not parse newly created commit"

4359 msgstr "不能解析新创建的提交"

4360

4442 -#: builtin/commit.c:1383

4361 +#: builtin/commit.c:1390

4362 msgid "detached HEAD"

4363 msgstr "分离头指针"

4364

4365 # 译者：中文字符串拼接，可删除前导空格

4447 -#: builtin/commit.c:1385

4366 +#: builtin/commit.c:1392

4367 msgid " (root-commit)"

4368 msgstr "（根提交）"

4369

4451 -#: builtin/commit.c:1452

4370 +#: builtin/commit.c:1486

4371 msgid "suppress summary after successful commit"

4372 msgstr "提交成功后不显示概述信息"

4373

4455 -#: builtin/commit.c:1453

4374 +#: builtin/commit.c:1487

4375 msgid "show diff in commit message template"

4376 msgstr "在提交说明模板里显示差异"

4377

4459 -#: builtin/commit.c:1455

4378 +#: builtin/commit.c:1489

4379 msgid "Commit message options"

4380 msgstr "提交说明选项"

4381

4463 -#: builtin/commit.c:1456 builtin/tag.c:457

4382 +#: builtin/commit.c:1490 builtin/tag.c:512

4383 msgid "read message from file"

4384 msgstr "从文件中读取提交说明"

4385

4467 -#: builtin/commit.c:1457

4386 +#: builtin/commit.c:1491

4387 msgid "author"

4388 msgstr "作者"

4389

4471 -#: builtin/commit.c:1457

4390 +#: builtin/commit.c:1491

4391 msgid "override author for commit"

4392 msgstr "提交时覆盖作者"

4393

4475 -#: builtin/commit.c:1458 builtin/gc.c:261

4394 +#: builtin/commit.c:1492 builtin/gc.c:272

4395 msgid "date"

4396 msgstr "日期"

4397

4479 -#: builtin/commit.c:1458

4398 +#: builtin/commit.c:1492

4399 msgid "override date for commit"

4400 msgstr "提交时覆盖日期"

4401

4483 -#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405

4484 -#: builtin/notes.c:562 builtin/tag.c:455

4402 +#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409

4403 +#: builtin/notes.c:566 builtin/tag.c:510

4404 msgid "message"

4405 msgstr "说明"

4406

4488 -#: builtin/commit.c:1459

4407 +#: builtin/commit.c:1493

4408 msgid "commit message"

4409 msgstr "提交说明"

4410

4492 -#: builtin/commit.c:1460

4411 +#: builtin/commit.c:1494

4412 msgid "reuse and edit message from specified commit"

4413 msgstr "重用并编辑指定提交的提交说明"

4414

4496 -#: builtin/commit.c:1461

4415 +#: builtin/commit.c:1495

4416 msgid "reuse message from specified commit"

4417 msgstr "重用指定提交的提交说明"

4418

4500 -#: builtin/commit.c:1462

4419 +#: builtin/commit.c:1496

4420 msgid "use autosquash formatted message to fixup specified commit"

4421 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"

4422

4504 -#: builtin/commit.c:1463

4423 +#: builtin/commit.c:1497

4424 msgid "use autosquash formatted message to squash specified commit"

4425 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

4426

4508 -#: builtin/commit.c:1464

4427 +#: builtin/commit.c:1498

4428 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4429 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

4430

4512 -#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86

4431 +#: builtin/commit.c:1499 builtin/log.c:1180 builtin/revert.c:86

4432 msgid "add Signed-off-by:"

4433 msgstr "添加 Signed-off-by: 签名"

4434

4516 -#: builtin/commit.c:1466

4435 +#: builtin/commit.c:1500

4436 msgid "use specified template file"

4437 msgstr "使用指定的模板文件"

4438

4520 -#: builtin/commit.c:1467

4439 +#: builtin/commit.c:1501

4440 msgid "force edit of commit"

4441 msgstr "强制编辑提交"

4442

4443 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）

4525 -#: builtin/commit.c:1468

4444 +#: builtin/commit.c:1502

4445 msgid "default"

4446 msgstr "default"

4447

4529 -#: builtin/commit.c:1468 builtin/tag.c:460

4448 +#: builtin/commit.c:1502 builtin/tag.c:515

4449 msgid "how to strip spaces and #comments from message"

4450 msgstr "设置如何删除提交说明里的空格和#注释"

4451

4533 -#: builtin/commit.c:1469

4452 +#: builtin/commit.c:1503

4453 msgid "include status in commit message template"

4454 msgstr "在提交说明模板里包含状态信息"

4455

4537 -#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461

4538 -msgid "key id"

4539 -msgstr "key id"

4456 +#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92

4457 +#: builtin/tag.c:516

4458 +msgid "key-id"

4459 +msgstr "key-id"

4460

4541 -#: builtin/commit.c:1471 builtin/merge.c:224

4461 +#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93

4462 msgid "GPG sign commit"

4463 msgstr "GPG 提交签名"

4464

4545 -#. end commit message options

4546 -#: builtin/commit.c:1474

4465 +#: builtin/commit.c:1508

4466 msgid "Commit contents options"

4467 msgstr "提交内容选项"

4468

4550 -#: builtin/commit.c:1475

4469 +#: builtin/commit.c:1509

4470 msgid "commit all changed files"

4471 msgstr "提交所有改动的文件"

4472

4554 -#: builtin/commit.c:1476

4473 +#: builtin/commit.c:1510

4474 msgid "add specified files to index for commit"

4475 msgstr "添加指定的文件到索引区等待提交"

4476

4558 -#: builtin/commit.c:1477

4477 +#: builtin/commit.c:1511

4478 msgid "interactively add files"

4479 msgstr "交互式添加文件"

4480

4562 -#: builtin/commit.c:1478

4481 +#: builtin/commit.c:1512

4482 msgid "interactively add changes"

4483 msgstr "交互式添加变更"

4484

4566 -#: builtin/commit.c:1479

4485 +#: builtin/commit.c:1513

4486 msgid "commit only specified files"

4487 msgstr "只提交指定的文件"

4488

4570 -#: builtin/commit.c:1480

4489 +#: builtin/commit.c:1514

4490 msgid "bypass pre-commit hook"

4491 msgstr "绕过 pre-commit 钩子"

4492

4574 -#: builtin/commit.c:1481

4493 +#: builtin/commit.c:1515

4494 msgid "show what would be committed"

4495 msgstr "显示将要提交的内容"

4496

4578 -#: builtin/commit.c:1492

4497 +#: builtin/commit.c:1526

4498 msgid "amend previous commit"

4499 msgstr "修改先前的提交"

4500

4582 -#: builtin/commit.c:1493

4501 +#: builtin/commit.c:1527

4502 msgid "bypass post-rewrite hook"

4503 msgstr "绕过 post-rewrite 钩子"

4504

4586 -#: builtin/commit.c:1498

4505 +#: builtin/commit.c:1532

4506 msgid "ok to record an empty change"

4507 msgstr "允许一个空提交"

4508

4590 -#: builtin/commit.c:1500

4509 +#: builtin/commit.c:1534

4510 msgid "ok to record a change with an empty message"

4511 msgstr "允许空的提交说明"

4512

4594 -#: builtin/commit.c:1529

4513 +#: builtin/commit.c:1562

4514 msgid "could not parse HEAD commit"

4515 msgstr "不能解析 HEAD 提交"

4516

4598 -#: builtin/commit.c:1567 builtin/merge.c:518

4517 +#: builtin/commit.c:1601 builtin/merge.c:518

4518 #, c-format

4519 msgid "could not open '%s' for reading"

4520 msgstr "不能为读入打开 '%s'"

4521

4603 -#: builtin/commit.c:1574

4522 +#: builtin/commit.c:1608

4523 #, c-format

4524 msgid "Corrupt MERGE_HEAD file (%s)"

4525 msgstr "损坏的 MERGE_HEAD 文件（%s）"

4526

4608 -#: builtin/commit.c:1581

4527 +#: builtin/commit.c:1615

4528 msgid "could not read MERGE_MODE"

4529 msgstr "不能读取 MERGE_MODE"

4530

4612 -#: builtin/commit.c:1600

4531 +#: builtin/commit.c:1634

4532 #, c-format

4533 msgid "could not read commit message: %s"

4534 msgstr "不能读取提交说明：%s"

4535

4617 -#: builtin/commit.c:1611

4536 +#: builtin/commit.c:1645

4537 #, c-format

4538 msgid "Aborting commit; you did not edit the message.\n"

4539 msgstr "终止提交；您未更改来自模版的提交说明。\n"

4540

4622 -#: builtin/commit.c:1616

4541 +#: builtin/commit.c:1650

4542 #, c-format

4543 msgid "Aborting commit due to empty commit message.\n"

4544 msgstr "终止提交因为提交说明为空。\n"

4545

4627 -#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879

4546 +#: builtin/commit.c:1665 builtin/merge.c:857 builtin/merge.c:882

4547 msgid "failed to write commit object"

4548 msgstr "无法写提交对象"

4549

4631 -#: builtin/commit.c:1652

4550 +#: builtin/commit.c:1686

4551 msgid "cannot lock HEAD ref"

4552 msgstr "无法锁定 HEAD 引用"

4553

4635 -#: builtin/commit.c:1656

4554 +#: builtin/commit.c:1690

4555 msgid "cannot update HEAD ref"

4556 msgstr "无法更新 HEAD 引用"

4557

4639 -#: builtin/commit.c:1667

4558 +#: builtin/commit.c:1701

4559 msgid ""

4560 "Repository has been updated, but unable to write\n"

4561 "new_index file. Check that disk is not full or quota is\n"

@@ -4649,127 +4568,127 @@ msgstr ""

4568 msgid "git config [options]"

4569 msgstr "git config [选项]"

4570

4652 -#: builtin/config.c:54

4571 +#: builtin/config.c:53

4572 msgid "Config file location"

4573 msgstr "配置文件位置"

4574

4656 -#: builtin/config.c:55

4575 +#: builtin/config.c:54

4576 msgid "use global config file"

4577 msgstr "使用全局配置文件"

4578

4660 -#: builtin/config.c:56

4579 +#: builtin/config.c:55

4580 msgid "use system config file"

4581 msgstr "使用系统级配置文件"

4582

4664 -#: builtin/config.c:57

4583 +#: builtin/config.c:56

4584 msgid "use repository config file"

4585 msgstr "使用版本库级配置文件"

4586

4668 -#: builtin/config.c:58

4587 +#: builtin/config.c:57

4588 msgid "use given config file"

4589 msgstr "使用指定的配置文件"

4590

4672 -#: builtin/config.c:59

4591 +#: builtin/config.c:58

4592 msgid "blob-id"

4593 msgstr "数据对象ID"

4594

4676 -#: builtin/config.c:59

4595 +#: builtin/config.c:58

4596 msgid "read config from given blob object"

4597 msgstr "从给定的数据对象读取配置"

4598

4680 -#: builtin/config.c:60

4599 +#: builtin/config.c:59

4600 msgid "Action"

4601 msgstr "操作"

4602

4684 -#: builtin/config.c:61

4603 +#: builtin/config.c:60

4604 msgid "get value: name [value-regex]"

4605 msgstr "获取值：name [value-regex]"

4606

4688 -#: builtin/config.c:62

4607 +#: builtin/config.c:61

4608 msgid "get all values: key [value-regex]"

4609 msgstr "获得所有的值：key [value-regex]"

4610

4692 -#: builtin/config.c:63

4611 +#: builtin/config.c:62

4612 msgid "get values for regexp: name-regex [value-regex]"

4613 msgstr "根据正则表达式获得值：name-regex [value-regex]"

4614

4696 -#: builtin/config.c:64

4615 +#: builtin/config.c:63

4616 msgid "get value specific for the URL: section[.var] URL"

4617 msgstr "获得 URL 取值：section[.var] URL"

4618

4700 -#: builtin/config.c:65

4619 +#: builtin/config.c:64

4620 msgid "replace all matching variables: name value [value_regex]"

4621 msgstr "替换所有匹配的变量：name value [value_regex]"

4622

4704 -#: builtin/config.c:66

4623 +#: builtin/config.c:65

4624 msgid "add a new variable: name value"

4625 msgstr "添加一个新的变量：name value"

4626

4708 -#: builtin/config.c:67

4627 +#: builtin/config.c:66

4628 msgid "remove a variable: name [value-regex]"

4629 msgstr "删除一个变量：name [value-regex]"

4630

4712 -#: builtin/config.c:68

4631 +#: builtin/config.c:67

4632 msgid "remove all matches: name [value-regex]"

4633 msgstr "删除所有匹配项：name [value-regex]"

4634

4716 -#: builtin/config.c:69

4635 +#: builtin/config.c:68

4636 msgid "rename section: old-name new-name"

4637 msgstr "重命名小节：old-name new-name"

4638

4720 -#: builtin/config.c:70

4639 +#: builtin/config.c:69

4640 msgid "remove a section: name"

4641 msgstr "删除一个小节：name"

4642

4724 -#: builtin/config.c:71

4643 +#: builtin/config.c:70

4644 msgid "list all"

4645 msgstr "列出所有"

4646

4728 -#: builtin/config.c:72

4647 +#: builtin/config.c:71

4648 msgid "open an editor"

4649 msgstr "打开一个编辑器"

4650

4732 -#: builtin/config.c:73 builtin/config.c:74

4651 +#: builtin/config.c:72 builtin/config.c:73

4652 msgid "slot"

4653 msgstr "slot"

4654

4736 -#: builtin/config.c:73

4655 +#: builtin/config.c:72

4656 msgid "find the color configured: [default]"

4657 msgstr "找到配置的颜色：[默认]"

4658

4740 -#: builtin/config.c:74

4659 +#: builtin/config.c:73

4660 msgid "find the color setting: [stdout-is-tty]"

4661 msgstr "找到颜色设置：[stdout-is-tty]"

4662

4744 -#: builtin/config.c:75

4663 +#: builtin/config.c:74

4664 msgid "Type"

4665 msgstr "类型"

4666

4748 -#: builtin/config.c:76

4667 +#: builtin/config.c:75

4668 msgid "value is \"true\" or \"false\""

4669 msgstr "值是 \"true\" 或 \"false\""

4670

4752 -#: builtin/config.c:77

4671 +#: builtin/config.c:76

4672 msgid "value is decimal number"

4673 msgstr "值是十进制数"

4674

4756 -#: builtin/config.c:78

4675 +#: builtin/config.c:77

4676 msgid "value is --bool or --int"

4677 msgstr "值是 --bool or --int"

4678

4760 -#: builtin/config.c:79

4679 +#: builtin/config.c:78

4680 msgid "value is a path (file or directory name)"

4681 msgstr "值是一个路径（文件或目录名）"

4682

4764 -#: builtin/config.c:80

4683 +#: builtin/config.c:79

4684 msgid "Other"

4685 msgstr "其它"

4686

4768 -#: builtin/config.c:81

4687 +#: builtin/config.c:80

4688 msgid "terminate values with NUL byte"

4689 msgstr "终止值是NUL字节"

4690

4772 -#: builtin/config.c:82

4691 +#: builtin/config.c:81

4692 msgid "respect include directives on lookup"

4693 msgstr "查询时参照 include 指令递归查找"

4694

@@ -4789,47 +4708,47 @@ msgstr "git describe [选项] <提交号>*"

4708 msgid "git describe [options] --dirty"

4709 msgstr "git describe [选项] --dirty"

4710

4792 -#: builtin/describe.c:237

4711 +#: builtin/describe.c:225

4712 #, c-format

4713 msgid "annotated tag %s not available"

4714 msgstr "注释 tag %s 无效"

4715

4797 -#: builtin/describe.c:241

4716 +#: builtin/describe.c:229

4717 #, c-format

4718 msgid "annotated tag %s has no embedded name"

4719 msgstr "注释 tag %s 没有嵌入名称"

4720

4802 -#: builtin/describe.c:243

4721 +#: builtin/describe.c:231

4722 #, c-format

4723 msgid "tag '%s' is really '%s' here"

4724 msgstr "tag '%s' 的确是在 '%s'"

4725

4807 -#: builtin/describe.c:270

4726 +#: builtin/describe.c:258

4727 #, c-format

4728 msgid "Not a valid object name %s"

4729 msgstr "不是一个有效的对象名 %s"

4730

4812 -#: builtin/describe.c:273

4731 +#: builtin/describe.c:261

4732 #, c-format

4733 msgid "%s is not a valid '%s' object"

4734 msgstr "%s 不是一个有效的 '%s' 对象"

4735

4817 -#: builtin/describe.c:290

4736 +#: builtin/describe.c:278

4737 #, c-format

4738 msgid "no tag exactly matches '%s'"

4739 msgstr "没有 tag 准确匹配 '%s'"

4740

4822 -#: builtin/describe.c:292

4741 +#: builtin/describe.c:280

4742 #, c-format

4743 msgid "searching to describe %s\n"

4744 msgstr "搜索描述 %s\n"

4745

4827 -#: builtin/describe.c:332

4746 +#: builtin/describe.c:327

4747 #, c-format

4748 msgid "finished search at %s\n"

4749 msgstr "完成搜索 %s\n"

4750

4832 -#: builtin/describe.c:359

4751 +#: builtin/describe.c:354

4752 #, c-format

4753 msgid ""

4754 "No annotated tags can describe '%s'.\n"

@@ -4838,7 +4757,7 @@ msgstr ""

4757 "没有注释 tag 能描述 '%s'。\n"

4758 "然而，有非注释 tag：尝试 --tags。"

4759

4841 -#: builtin/describe.c:363

4760 +#: builtin/describe.c:358

4761 #, c-format

4762 msgid ""

4763 "No tags can describe '%s'.\n"

@@ -4847,12 +4766,12 @@ msgstr ""

4766 "没有注释 tag 能描述 '%s'。\n"

4767 "尝试 --always，或者创建一些 tag。"

4768

4850 -#: builtin/describe.c:384

4769 +#: builtin/describe.c:379

4770 #, c-format

4771 msgid "traversed %lu commits\n"

4772 msgstr "已遍历 %lu 个提交\n"

4773

4855 -#: builtin/describe.c:387

4774 +#: builtin/describe.c:382

4775 #, c-format

4776 msgid ""

4777 "more than %i tags found; listed %i most recent\n"

@@ -4861,63 +4780,63 @@ msgstr ""

4780 "发现多于 %i 个 tag，列出最近的 %i 个\n"

4781 "在 %s 放弃搜索\n"

4782

4864 -#: builtin/describe.c:409

4783 +#: builtin/describe.c:404

4784 msgid "find the tag that comes after the commit"

4785 msgstr "寻找提交之后的 tag（用于描述提交）"

4786

4868 -#: builtin/describe.c:410

4787 +#: builtin/describe.c:405

4788 msgid "debug search strategy on stderr"

4789 msgstr "在标准错误上调试搜索策略"

4790

4872 -#: builtin/describe.c:411

4791 +#: builtin/describe.c:406

4792 msgid "use any ref"

4793 msgstr "使用任意引用"

4794

4876 -#: builtin/describe.c:412

4795 +#: builtin/describe.c:407

4796 msgid "use any tag, even unannotated"

4797 msgstr "使用任意 tag，即使未带注解"

4798

4880 -#: builtin/describe.c:413

4799 +#: builtin/describe.c:408

4800 msgid "always use long format"

4801 msgstr "始终使用长提交号格式"

4802

4884 -#: builtin/describe.c:414

4803 +#: builtin/describe.c:409

4804 msgid "only follow first parent"

4805 msgstr "只跟随第一个父提交"

4806

4888 -#: builtin/describe.c:417

4807 +#: builtin/describe.c:412

4808 msgid "only output exact matches"

4809 msgstr "只输出精确匹配"

4810

4892 -#: builtin/describe.c:419

4811 +#: builtin/describe.c:414

4812 msgid "consider <n> most recent tags (default: 10)"

4813 msgstr "考虑最近 <n> 个 tags（默认：10）"

4814

4896 -#: builtin/describe.c:421

4815 +#: builtin/describe.c:416

4816 msgid "only consider tags matching <pattern>"

4817 msgstr "只考虑匹配 <模式> 的 tags"

4818

4900 -#: builtin/describe.c:423 builtin/name-rev.c:321

4819 +#: builtin/describe.c:418 builtin/name-rev.c:321

4820 msgid "show abbreviated commit object as fallback"

4821 msgstr "显示简写的提交号作为后备"

4822

4904 -#: builtin/describe.c:424

4823 +#: builtin/describe.c:419

4824 msgid "mark"

4825 msgstr "标记"

4826

4908 -#: builtin/describe.c:425

4827 +#: builtin/describe.c:420

4828 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

4829 msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）"

4830

4912 -#: builtin/describe.c:443

4831 +#: builtin/describe.c:438

4832 msgid "--long is incompatible with --abbrev=0"

4833 msgstr "--long 与 --abbrev=0 不兼容"

4834

4916 -#: builtin/describe.c:469

4835 +#: builtin/describe.c:464

4836 msgid "No names found, cannot describe anything."

4837 msgstr "没有发现名称，无法描述任何东西。"

4838

4920 -#: builtin/describe.c:489

4839 +#: builtin/describe.c:484

4840 msgid "--dirty is incompatible with commit-ishes"

4841 msgstr "--dirty 不能与提交同时使用"

4842

@@ -4948,7 +4867,7 @@ msgstr "提供了超过两个数据（blob）对象：'%s'"

4867 #: builtin/diff.c:416

4868 #, c-format

4869 msgid "unhandled object '%s' given."

4951 -msgstr "提供了无法处理的对象 '%s'。"

4870 +msgstr "无法处理的对象 '%s'。"

4871

4872 #: builtin/fast-export.c:22

4873 msgid "git fast-export [rev-list-opts]"

@@ -5213,7 +5132,7 @@ msgstr "正在获取 %s\n"

5132 msgid "Could not fetch %s"

5133 msgstr "不能获取 %s"

5134

5216 -#: builtin/fetch.c:1036

5135 +#: builtin/fetch.c:1035

5136 msgid ""

5137 "No remote repository specified. Please, specify either a URL or a\n"

5138 "remote name from which new revisions should be fetched."

@@ -5253,10 +5172,10 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5172 msgstr ""

5173 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5174

5256 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702

5257 -#: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164

5258 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446

5259 -#: parse-options.h:135 parse-options.h:242

5175 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700

5176 +#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179

5177 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501

5178 +#: parse-options.h:132 parse-options.h:239

5179 msgid "n"

5180 msgstr "n"

5181

@@ -5320,6 +5239,14 @@ msgstr "key"

5239 msgid "field name to sort on"

5240 msgstr "排序的字段名"

5241

5242 +#: builtin/fsck.c:147 builtin/prune.c:172

5243 +msgid "Checking connectivity"

5244 +msgstr "检查连接中"

5245 +

5246 +#: builtin/fsck.c:544

5247 +msgid "Checking object directories"

5248 +msgstr "检查对象目录中"

5249 +

5250 #: builtin/fsck.c:607

5251 msgid "git fsck [options] [<object>...]"

5252 msgstr "git fsck [选项] [<对象>...]"

@@ -5364,54 +5291,63 @@ msgstr "将摇摆对象写入 .git/lost-found 中"

5291 msgid "show progress"

5292 msgstr "显示进度"

5293

5294 +#: builtin/fsck.c:673

5295 +msgid "Checking objects"

5296 +msgstr "检查对象中"

5297 +

5298 #: builtin/gc.c:24

5299 msgid "git gc [options]"

5300 msgstr "git gc [选项]"

5301

5371 -#: builtin/gc.c:80

5302 +#: builtin/gc.c:90

5303 #, c-format

5304 msgid "Invalid %s: '%s'"

5305 msgstr "无效的 %s：'%s'"

5306

5376 -#: builtin/gc.c:107

5307 +#: builtin/gc.c:117

5308 #, c-format

5309 msgid "insanely long object directory %.*s"

5310 msgstr "不正常的长对象目录 %.*s"

5311

5381 -#: builtin/gc.c:262

5312 +#: builtin/gc.c:273

5313 msgid "prune unreferenced objects"

5314 msgstr "清除未引用的对象"

5315

5385 -#: builtin/gc.c:264

5316 +#: builtin/gc.c:275

5317 msgid "be more thorough (increased runtime)"

5318 msgstr "更彻底（增加运行时间）"

5319

5389 -#: builtin/gc.c:265

5320 +#: builtin/gc.c:276

5321 msgid "enable auto-gc mode"

5322 msgstr "启用自动垃圾回收模式"

5323

5393 -#: builtin/gc.c:266

5324 +#: builtin/gc.c:277

5325 msgid "force running gc even if there may be another gc running"

5326 msgstr "强制执行 gc 即使另外一个 gc 正在执行"

5327

5397 -#: builtin/gc.c:306

5328 +#: builtin/gc.c:318

5329 #, c-format

5399 -msgid ""

5400 -"Auto packing the repository for optimum performance. You may also\n"

5401 -"run \"git gc\" manually. See \"git help gc\" for more information.\n"

5402 -msgstr ""

5403 -"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"

5404 -"参见 \"git help gc\" 以获取更多信息。\n"

5330 +msgid "Auto packing the repository in background for optimum performance.\n"

5331 +msgstr "自动在后台执行版本库打包以求最佳性能。\n"

5332 +

5333 +#: builtin/gc.c:320

5334 +#, c-format

5335 +msgid "Auto packing the repository for optimum performance.\n"

5336 +msgstr "自动打包版本库以求最佳性能。\n"

5337 +

5338 +#: builtin/gc.c:321

5339 +#, c-format

5340 +msgid "See \"git help gc\" for manual housekeeping.\n"

5341 +msgstr "手工维护参见 \"git help gc\"。\n"

5342

5406 -#. be quiet on --auto

5407 -#: builtin/gc.c:316

5343 +#: builtin/gc.c:336

5344 #, c-format

5345 msgid ""

5346 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

5347 msgstr ""

5348 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）"

5349

5414 -#: builtin/gc.c:341

5350 +#: builtin/gc.c:361

5351 msgid ""

5352 "There are too many unreachable loose objects; run 'git prune' to remove them."

5353 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"

@@ -5440,210 +5376,210 @@ msgstr "无法读取树（%s）"

5376 msgid "unable to grep from object of type %s"

5377 msgstr "无法抓取来自于 %s 类型的对象"

5378

5443 -#: builtin/grep.c:551

5379 +#: builtin/grep.c:549

5380 #, c-format

5381 msgid "switch `%c' expects a numerical value"

5382 msgstr "开关 `%c' 期望一个数字值"

5383

5448 -#: builtin/grep.c:568

5384 +#: builtin/grep.c:566

5385 #, c-format

5386 msgid "cannot open '%s'"

5387 msgstr "不能打开 '%s'"

5388

5453 -#: builtin/grep.c:642

5389 +#: builtin/grep.c:640

5390 msgid "search in index instead of in the work tree"

5391 msgstr "在索引区搜索而不是在工作区"

5392

5457 -#: builtin/grep.c:644

5393 +#: builtin/grep.c:642

5394 msgid "find in contents not managed by git"

5395 msgstr "在未被 git 管理的内容中查找"

5396

5397 # 译者：中文字符串拼接，可删除前导空格

5462 -#: builtin/grep.c:646

5398 +#: builtin/grep.c:644

5399 msgid "search in both tracked and untracked files"

5400 msgstr "在跟踪和未跟踪的文件中搜索"

5401

5466 -#: builtin/grep.c:648

5402 +#: builtin/grep.c:646

5403 msgid "search also in ignored files"

5404 msgstr "也在忽略的文件中搜索"

5405

5470 -#: builtin/grep.c:651

5406 +#: builtin/grep.c:649

5407 msgid "show non-matching lines"

5408 msgstr "显示未匹配的行"

5409

5474 -#: builtin/grep.c:653

5410 +#: builtin/grep.c:651

5411 msgid "case insensitive matching"

5412 msgstr "不区分大小写匹配"

5413

5478 -#: builtin/grep.c:655

5414 +#: builtin/grep.c:653

5415 msgid "match patterns only at word boundaries"

5416 msgstr "只在单词边界匹配模式"

5417

5482 -#: builtin/grep.c:657

5418 +#: builtin/grep.c:655

5419 msgid "process binary files as text"

5420 msgstr "把二进制文件当做文本处理"

5421

5486 -#: builtin/grep.c:659

5422 +#: builtin/grep.c:657

5423 msgid "don't match patterns in binary files"

5424 msgstr "不在二进制文件中匹配模式"

5425

5490 -#: builtin/grep.c:662

5426 +#: builtin/grep.c:660

5427 msgid "process binary files with textconv filters"

5428 msgstr "用 textconv 过滤器处理二进制文件"

5429

5494 -#: builtin/grep.c:664

5430 +#: builtin/grep.c:662

5431 msgid "descend at most <depth> levels"

5432 msgstr "最多以指定的深度向下寻找"

5433

5498 -#: builtin/grep.c:668

5434 +#: builtin/grep.c:666

5435 msgid "use extended POSIX regular expressions"

5436 msgstr "使用扩展的 POSIX 正则表达式"

5437

5502 -#: builtin/grep.c:671

5438 +#: builtin/grep.c:669

5439 msgid "use basic POSIX regular expressions (default)"

5440 msgstr "使用基本的 POSIX 正则表达式（默认）"

5441

5506 -#: builtin/grep.c:674

5442 +#: builtin/grep.c:672

5443 msgid "interpret patterns as fixed strings"

5444 msgstr "把模式解析为固定的字符串"

5445

5510 -#: builtin/grep.c:677

5446 +#: builtin/grep.c:675

5447 msgid "use Perl-compatible regular expressions"

5448 msgstr "使用 Perl 兼容的正则表达式"

5449

5514 -#: builtin/grep.c:680

5450 +#: builtin/grep.c:678

5451 msgid "show line numbers"

5452 msgstr "显示行号"

5453

5518 -#: builtin/grep.c:681

5454 +#: builtin/grep.c:679

5455 msgid "don't show filenames"

5456 msgstr "不显示文件名"

5457

5522 -#: builtin/grep.c:682

5458 +#: builtin/grep.c:680

5459 msgid "show filenames"

5460 msgstr "显示文件名"

5461

5526 -#: builtin/grep.c:684

5462 +#: builtin/grep.c:682

5463 msgid "show filenames relative to top directory"

5464 msgstr "显示相对于顶级目录的文件名"

5465

5530 -#: builtin/grep.c:686

5466 +#: builtin/grep.c:684

5467 msgid "show only filenames instead of matching lines"

5468 msgstr "只显示文件名而不显示匹配的行"

5469

5534 -#: builtin/grep.c:688

5470 +#: builtin/grep.c:686

5471 msgid "synonym for --files-with-matches"

5472 msgstr "和 --files-with-matches 同义"

5473

5538 -#: builtin/grep.c:691

5474 +#: builtin/grep.c:689

5475 msgid "show only the names of files without match"

5476 msgstr "只显示未匹配的文件名"

5477

5542 -#: builtin/grep.c:693

5478 +#: builtin/grep.c:691

5479 msgid "print NUL after filenames"

5480 msgstr "在文件名后输出 NUL 字符"

5481

5546 -#: builtin/grep.c:695

5482 +#: builtin/grep.c:693

5483 msgid "show the number of matches instead of matching lines"

5484 msgstr "显示总匹配行数，而不显示匹配的行"

5485

5550 -#: builtin/grep.c:696

5486 +#: builtin/grep.c:694

5487 msgid "highlight matches"

5488 msgstr "高亮显示匹配项"

5489

5554 -#: builtin/grep.c:698

5490 +#: builtin/grep.c:696

5491 msgid "print empty line between matches from different files"

5492 msgstr "在不同文件的匹配项之间打印空行"

5493

5558 -#: builtin/grep.c:700

5494 +#: builtin/grep.c:698

5495 msgid "show filename only once above matches from same file"

5496 msgstr "只在同一文件的匹配项的上面显示一次文件名"

5497

5562 -#: builtin/grep.c:703

5498 +#: builtin/grep.c:701

5499 msgid "show <n> context lines before and after matches"

5500 msgstr "显示匹配项前后的 <n> 行上下文"

5501

5566 -#: builtin/grep.c:706

5502 +#: builtin/grep.c:704

5503 msgid "show <n> context lines before matches"

5504 msgstr "显示匹配项前 <n> 行上下文"

5505

5570 -#: builtin/grep.c:708

5506 +#: builtin/grep.c:706

5507 msgid "show <n> context lines after matches"

5508 msgstr "显示匹配项后 <n> 行上下文"

5509

5574 -#: builtin/grep.c:709

5510 +#: builtin/grep.c:707

5511 msgid "shortcut for -C NUM"

5512 msgstr "快捷键 -C 数字"

5513

5578 -#: builtin/grep.c:712

5514 +#: builtin/grep.c:710

5515 msgid "show a line with the function name before matches"

5516 msgstr "在匹配的前面显示一行函数名"

5517

5582 -#: builtin/grep.c:714

5518 +#: builtin/grep.c:712

5519 msgid "show the surrounding function"

5520 msgstr "显示所在函数的前后内容"

5521

5586 -#: builtin/grep.c:717

5522 +#: builtin/grep.c:715

5523 msgid "read patterns from file"

5524 msgstr "从文件读取模式"

5525

5590 -#: builtin/grep.c:719

5526 +#: builtin/grep.c:717

5527 msgid "match <pattern>"

5528 msgstr "匹配 <模式>"

5529

5594 -#: builtin/grep.c:721

5530 +#: builtin/grep.c:719

5531 msgid "combine patterns specified with -e"

5532 msgstr "组合用 -e 参数设定的模式"

5533

5598 -#: builtin/grep.c:733

5534 +#: builtin/grep.c:731

5535 msgid "indicate hit with exit status without output"

5536 msgstr "不输出，而用退出码标识命中状态"

5537

5602 -#: builtin/grep.c:735

5538 +#: builtin/grep.c:733

5539 msgid "show only matches from files that match all patterns"

5540 msgstr "只显示匹配所有模式的文件中的匹配"

5541

5606 -#: builtin/grep.c:737

5542 +#: builtin/grep.c:735

5543 msgid "show parse tree for grep expression"

5544 msgstr "显示 grep 表达式的解析树"

5545

5610 -#: builtin/grep.c:741

5546 +#: builtin/grep.c:739

5547 msgid "pager"

5548 msgstr "分页"

5549

5614 -#: builtin/grep.c:741

5550 +#: builtin/grep.c:739

5551 msgid "show matching files in the pager"

5552 msgstr "分页显示匹配的文件"

5553

5618 -#: builtin/grep.c:744

5554 +#: builtin/grep.c:742

5555 msgid "allow calling of grep(1) (ignored by this build)"

5556 msgstr "允许调用 grep(1)（本次构建忽略）"

5557

5622 -#: builtin/grep.c:745 builtin/show-ref.c:187

5558 +#: builtin/grep.c:743 builtin/show-ref.c:187

5559 msgid "show usage"

5560 msgstr "显示用法"

5561

5626 -#: builtin/grep.c:812

5562 +#: builtin/grep.c:810

5563 msgid "no pattern given."

5564 msgstr "未提供模式匹配。"

5565

5630 -#: builtin/grep.c:870

5566 +#: builtin/grep.c:868

5567 msgid "--open-files-in-pager only works on the worktree"

5568 msgstr "--open-files-in-pager 仅用于工作区"

5569

5634 -#: builtin/grep.c:893

5570 +#: builtin/grep.c:891

5571 msgid "--cached or --untracked cannot be used with --no-index."

5572 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"

5573

5638 -#: builtin/grep.c:898

5574 +#: builtin/grep.c:896

5575 msgid "--no-index or --untracked cannot be used with revs."

5576 msgstr "--no-index 或 --untracked 不能和版本同时使用。"

5577

5642 -#: builtin/grep.c:901

5578 +#: builtin/grep.c:899

5579 msgid "--[no-]exclude-standard cannot be used for tracked contents."

5580 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"

5581

5646 -#: builtin/grep.c:909

5582 +#: builtin/grep.c:907

5583 msgid "both --cached and trees are given."

5584 msgstr "同时给出了 --cached 和树对象。"

5585

@@ -5659,7 +5595,7 @@ msgstr ""

5595 msgid "git hash-object --stdin-paths < <list-of-paths>"

5596 msgstr "git hash-object --stdin-paths < <路径列表>"

5597

5662 -#: builtin/hash-object.c:72

5598 +#: builtin/hash-object.c:72 builtin/tag.c:521

5599 msgid "type"

5600 msgstr "类型"

5601

@@ -5898,8 +5834,8 @@ msgstr "解压缩严重的不一致"

5834 msgid "SHA1 COLLISION FOUND WITH %s !"

5835 msgstr "发现 %s 出现 SHA1 冲突！"

5836

5901 -#: builtin/index-pack.c:669 builtin/pack-objects.c:171

5902 -#: builtin/pack-objects.c:263

5837 +#: builtin/index-pack.c:669 builtin/pack-objects.c:162

5838 +#: builtin/pack-objects.c:254

5839 #, c-format

5840 msgid "unable to read %s"

5841 msgstr "不能读 %s"

@@ -6165,34 +6101,32 @@ msgstr "不能处理 %d 类型的文件"

6101 msgid "unable to move %s to %s"

6102 msgstr "不能移动 %s 至 %s"

6103

6168 -#.

6169 -#. * TRANSLATORS: The first '%s' is either "Reinitialized

6170 -#. * existing" or "Initialized empty", the second " shared" or

6171 -#. * "", and the last '%s%s' is the verbatim directory name.

6172 -#.

6173 -#: builtin/init-db.c:420

6104 +#. TRANSLATORS: The first '%s' is either "Reinitialized

6105 +#. existing" or "Initialized empty", the second " shared" or

6106 +#. "", and the last '%s%s' is the verbatim directory name.

6107 +#: builtin/init-db.c:418

6108 #, c-format

6109 msgid "%s%s Git repository in %s%s\n"

6110 msgstr "%s%s Git 版本库于 %s%s\n"

6111

6178 -#: builtin/init-db.c:421

6112 +#: builtin/init-db.c:419

6113 msgid "Reinitialized existing"

6114 msgstr "重新初始化现存的"

6115

6182 -#: builtin/init-db.c:421

6116 +#: builtin/init-db.c:419

6117 msgid "Initialized empty"

6118 msgstr "初始化空的"

6119

6120 # 译者：中文字符串拼接，可删除前导空格

6187 -#: builtin/init-db.c:422

6121 +#: builtin/init-db.c:420

6122 msgid " shared"

6123 msgstr "共享"

6124

6191 -#: builtin/init-db.c:441

6125 +#: builtin/init-db.c:439

6126 msgid "cannot tell cwd"

6127 msgstr "无法获知当前路径"

6128

6195 -#: builtin/init-db.c:467

6129 +#: builtin/init-db.c:465

6130 msgid ""

6131 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

6132 "shared[=<permissions>]] [directory]"

@@ -6200,29 +6134,29 @@ msgstr ""

6134 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "

6135 "[目录]"

6136

6203 -#: builtin/init-db.c:490

6137 +#: builtin/init-db.c:488

6138 msgid "permissions"

6139 msgstr "权限"

6140

6207 -#: builtin/init-db.c:491

6141 +#: builtin/init-db.c:489

6142 msgid "specify that the git repository is to be shared amongst several users"

6143 msgstr "指定 git 版本库是多个用户之间共享的"

6144

6211 -#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155

6145 +#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:168

6146 msgid "be quiet"

6147 msgstr "保持安静"

6148

6215 -#: builtin/init-db.c:525 builtin/init-db.c:530

6149 +#: builtin/init-db.c:523 builtin/init-db.c:528

6150 #, c-format

6151 msgid "cannot mkdir %s"

6152 msgstr "不能创建目录 %s"

6153

6220 -#: builtin/init-db.c:534

6154 +#: builtin/init-db.c:532

6155 #, c-format

6156 msgid "cannot chdir to %s"

6157 msgstr "不能切换目录到 %s"

6158

6225 -#: builtin/init-db.c:556

6159 +#: builtin/init-db.c:554

6160 #, c-format

6161 msgid ""

6162 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

@@ -6231,11 +6165,11 @@ msgstr ""

6165 "不允许 %s（或 --work-tree=<directory>）而没有指定 %s（或 --git-"

6166 "dir=<directory>）"

6167

6234 -#: builtin/init-db.c:580

6168 +#: builtin/init-db.c:578

6169 msgid "Cannot access current working directory"

6170 msgstr "不能访问当前工作目录"

6171

6238 -#: builtin/init-db.c:587

6172 +#: builtin/init-db.c:585

6173 #, c-format

6174 msgid "Cannot access work tree '%s'"

6175 msgstr "不能访问工作区 '%s'"

@@ -6498,95 +6432,95 @@ msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"

6432 msgid "Unknown commit %s"

6433 msgstr "未知提交 %s"

6434

6501 -#: builtin/ls-files.c:398

6435 +#: builtin/ls-files.c:401

6436 msgid "git ls-files [options] [<file>...]"

6437 msgstr "git ls-files [选项] [<文件>...]"

6438

6505 -#: builtin/ls-files.c:455

6439 +#: builtin/ls-files.c:458

6440 msgid "identify the file status with tags"

6441 msgstr "用标签标识文件的状态"

6442

6509 -#: builtin/ls-files.c:457

6443 +#: builtin/ls-files.c:460

6444 msgid "use lowercase letters for 'assume unchanged' files"

6445 msgstr "使用小写字母表示 '假设未改变的' 文件"

6446

6513 -#: builtin/ls-files.c:459

6447 +#: builtin/ls-files.c:462

6448 msgid "show cached files in the output (default)"

6449 msgstr "显示缓存的文件（默认）"

6450

6517 -#: builtin/ls-files.c:461

6451 +#: builtin/ls-files.c:464

6452 msgid "show deleted files in the output"

6453 msgstr "显示已删除的文件"

6454

6521 -#: builtin/ls-files.c:463

6455 +#: builtin/ls-files.c:466

6456 msgid "show modified files in the output"

6457 msgstr "显示已修改的文件"

6458

6525 -#: builtin/ls-files.c:465

6459 +#: builtin/ls-files.c:468

6460 msgid "show other files in the output"

6461 msgstr "显示其它文件"

6462

6529 -#: builtin/ls-files.c:467

6463 +#: builtin/ls-files.c:470

6464 msgid "show ignored files in the output"

6465 msgstr "显示忽略的文件"

6466

6533 -#: builtin/ls-files.c:470

6467 +#: builtin/ls-files.c:473

6468 msgid "show staged contents' object name in the output"

6469 msgstr "显示暂存区内容的对象名称"

6470

6537 -#: builtin/ls-files.c:472

6471 +#: builtin/ls-files.c:475

6472 msgid "show files on the filesystem that need to be removed"

6473 msgstr "显示文件系统需要删除的文件"

6474

6541 -#: builtin/ls-files.c:474

6475 +#: builtin/ls-files.c:477

6476 msgid "show 'other' directories' name only"

6477 msgstr "只显示“其他”目录的名称"

6478

6545 -#: builtin/ls-files.c:477

6479 +#: builtin/ls-files.c:480

6480 msgid "don't show empty directories"

6481 msgstr "不显示空目录"

6482

6549 -#: builtin/ls-files.c:480

6483 +#: builtin/ls-files.c:483

6484 msgid "show unmerged files in the output"

6485 msgstr "显示未合并的文件"

6486

6553 -#: builtin/ls-files.c:482

6487 +#: builtin/ls-files.c:485

6488 msgid "show resolve-undo information"

6489 msgstr "显示 resolve-undo 信息"

6490

6557 -#: builtin/ls-files.c:484

6491 +#: builtin/ls-files.c:487

6492 msgid "skip files matching pattern"

6493 msgstr "匹配排除文件的模式"

6494

6561 -#: builtin/ls-files.c:487

6495 +#: builtin/ls-files.c:490

6496 msgid "exclude patterns are read from <file>"

6497 msgstr "从 <文件> 中读取排除模式"

6498

6565 -#: builtin/ls-files.c:490

6499 +#: builtin/ls-files.c:493

6500 msgid "read additional per-directory exclude patterns in <file>"

6501 msgstr "从 <文件> 读取额外的每个目录的排除模式"

6502

6569 -#: builtin/ls-files.c:492

6503 +#: builtin/ls-files.c:495

6504 msgid "add the standard git exclusions"

6505 msgstr "添加标准的 git 排除"

6506

6573 -#: builtin/ls-files.c:495

6507 +#: builtin/ls-files.c:498

6508 msgid "make the output relative to the project top directory"

6509 msgstr "显示相对于顶级目录的文件名"

6510

6577 -#: builtin/ls-files.c:498

6511 +#: builtin/ls-files.c:501

6512 msgid "if any <file> is not in the index, treat this as an error"

6513 msgstr "如果任何 <文件> 都不在索引区，视为错误"

6514

6581 -#: builtin/ls-files.c:499

6515 +#: builtin/ls-files.c:502

6516 msgid "tree-ish"

6517 msgstr "树或提交"

6518

6585 -#: builtin/ls-files.c:500

6519 +#: builtin/ls-files.c:503

6520 msgid "pretend that paths removed since <tree-ish> are still present"

6521 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"

6522

6589 -#: builtin/ls-files.c:502

6523 +#: builtin/ls-files.c:505

6524 msgid "show debugging data"

6525 msgstr "显示调试数据"

6526

@@ -6697,7 +6631,7 @@ msgstr "如果不能快进就放弃合并"

6631 msgid "Verify that the named commit has a valid GPG signature"

6632 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"

6633

6700 -#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89

6634 +#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89

6635 msgid "strategy"

6636 msgstr "策略"

6637

@@ -6771,35 +6705,35 @@ msgstr "'%s' 没有指向一个提交"

6705 msgid "Bad branch.%s.mergeoptions string: %s"

6706 msgstr "坏的 branch.%s.mergeoptions 字符串：%s"

6707

6774 -#: builtin/merge.c:650

6708 +#: builtin/merge.c:653

6709 msgid "git write-tree failed to write a tree"

6710 msgstr "git write-tree 无法写入一树对象"

6711

6778 -#: builtin/merge.c:678

6712 +#: builtin/merge.c:681

6713 msgid "Not handling anything other than two heads merge."

6714 msgstr "不能处理两个头合并之外的任何操作。"

6715

6782 -#: builtin/merge.c:692

6716 +#: builtin/merge.c:695

6717 #, c-format

6718 msgid "Unknown option for merge-recursive: -X%s"

6719 msgstr "merge-recursive 的未知选项：-X%s"

6720

6787 -#: builtin/merge.c:706

6721 +#: builtin/merge.c:709

6722 #, c-format

6723 msgid "unable to write %s"

6724 msgstr "不能写 %s"

6725

6792 -#: builtin/merge.c:795

6726 +#: builtin/merge.c:798

6727 #, c-format

6728 msgid "Could not read from '%s'"

6729 msgstr "不能从 '%s' 读取"

6730

6797 -#: builtin/merge.c:804

6731 +#: builtin/merge.c:807

6732 #, c-format

6733 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

6734 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"

6735

6802 -#: builtin/merge.c:810

6736 +#: builtin/merge.c:813

6737 #, c-format

6738 msgid ""

6739 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -6813,47 +6747,47 @@ msgstr ""

6747 "\n"

6748 "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"

6749

6816 -#: builtin/merge.c:834

6750 +#: builtin/merge.c:837

6751 msgid "Empty commit message."

6752 msgstr "空提交信息。"

6753

6820 -#: builtin/merge.c:846

6754 +#: builtin/merge.c:849

6755 #, c-format

6756 msgid "Wonderful.\n"

6757 msgstr "太棒了。\n"

6758

6825 -#: builtin/merge.c:911

6759 +#: builtin/merge.c:914

6760 #, c-format

6761 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

6762 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"

6763

6830 -#: builtin/merge.c:927

6764 +#: builtin/merge.c:930

6765 #, c-format

6766 msgid "'%s' is not a commit"

6767 msgstr "'%s' 不是一个提交"

6768

6835 -#: builtin/merge.c:968

6769 +#: builtin/merge.c:971

6770 msgid "No current branch."

6771 msgstr "没有当前分支。"

6772

6839 -#: builtin/merge.c:970

6773 +#: builtin/merge.c:973

6774 msgid "No remote for the current branch."

6775 msgstr "当前分支没有对应的远程版本库。"

6776

6843 -#: builtin/merge.c:972

6777 +#: builtin/merge.c:975

6778 msgid "No default upstream defined for the current branch."

6779 msgstr "当前分支没有定义默认的上游分支。"

6780

6847 -#: builtin/merge.c:977

6781 +#: builtin/merge.c:980

6782 #, c-format

6783 msgid "No remote-tracking branch for %s from %s"

6784 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"

6785

6852 -#: builtin/merge.c:1133

6786 +#: builtin/merge.c:1136

6787 msgid "There is no merge to abort (MERGE_HEAD missing)."

6788 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"

6789

6856 -#: builtin/merge.c:1149 git-pull.sh:31

6790 +#: builtin/merge.c:1152 git-pull.sh:31

6791 msgid ""

6792 "You have not concluded your merge (MERGE_HEAD exists).\n"

6793 "Please, commit your changes before you can merge."

@@ -6861,11 +6795,11 @@ msgstr ""

6795 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"

6796 "请在合并前先提交您的修改。"

6797

6864 -#: builtin/merge.c:1152 git-pull.sh:34

6798 +#: builtin/merge.c:1155 git-pull.sh:34

6799 msgid "You have not concluded your merge (MERGE_HEAD exists)."

6800 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"

6801

6868 -#: builtin/merge.c:1156

6802 +#: builtin/merge.c:1159

6803 msgid ""

6804 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

6805 "Please, commit your changes before you can merge."

@@ -6873,101 +6807,100 @@ msgstr ""

6807 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"

6808 "请在合并前先提交您的修改。"

6809

6876 -#: builtin/merge.c:1159

6810 +#: builtin/merge.c:1162

6811 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

6812 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"

6813

6880 -#: builtin/merge.c:1168

6814 +#: builtin/merge.c:1171

6815 msgid "You cannot combine --squash with --no-ff."

6816 msgstr "您不能将 --squash 与 --no-ff 同时使用。"

6817

6884 -#: builtin/merge.c:1177

6818 +#: builtin/merge.c:1180

6819 msgid "No commit specified and merge.defaultToUpstream not set."

6820 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"

6821

6888 -#: builtin/merge.c:1209

6822 +#: builtin/merge.c:1212

6823 msgid "Can merge only exactly one commit into empty head"

6824 msgstr "只能将一个提交合并到空分支上"

6825

6892 -#: builtin/merge.c:1212

6826 +#: builtin/merge.c:1215

6827 msgid "Squash commit into empty head not supported yet"

6828 msgstr "尚不支持到空分支的压缩提交"

6829

6896 -#: builtin/merge.c:1214

6830 +#: builtin/merge.c:1217

6831 msgid "Non-fast-forward commit does not make sense into an empty head"

6832 msgstr "到空分支的非快进式提交没有意义"

6833

6900 -#: builtin/merge.c:1219

6834 +#: builtin/merge.c:1222

6835 #, c-format

6836 msgid "%s - not something we can merge"

6837 msgstr "%s - 不能被合并"

6838

6905 -#: builtin/merge.c:1270

6839 +#: builtin/merge.c:1273

6840 #, c-format

6841 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

6842 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"

6843

6910 -#: builtin/merge.c:1273

6844 +#: builtin/merge.c:1276

6845 #, c-format

6846 msgid "Commit %s has a bad GPG signature allegedly by %s."

6847 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"

6848

6915 -#. 'N'

6916 -#: builtin/merge.c:1276

6849 +#: builtin/merge.c:1279

6850 #, c-format

6851 msgid "Commit %s does not have a GPG signature."

6852 msgstr "提交 %s 没有一个 GPG 签名。"

6853

6921 -#: builtin/merge.c:1279

6854 +#: builtin/merge.c:1282

6855 #, c-format

6856 msgid "Commit %s has a good GPG signature by %s\n"

6857 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"

6858

6926 -#: builtin/merge.c:1363

6859 +#: builtin/merge.c:1366

6860 #, c-format

6861 msgid "Updating %s..%s\n"

6862 msgstr "更新 %s..%s\n"

6863

6931 -#: builtin/merge.c:1402

6864 +#: builtin/merge.c:1405

6865 #, c-format

6866 msgid "Trying really trivial in-index merge...\n"

6867 msgstr "尝试非常小的索引内合并...\n"

6868

6936 -#: builtin/merge.c:1409

6869 +#: builtin/merge.c:1412

6870 #, c-format

6871 msgid "Nope.\n"

6872 msgstr "无。\n"

6873

6941 -#: builtin/merge.c:1441

6874 +#: builtin/merge.c:1444

6875 msgid "Not possible to fast-forward, aborting."

6876 msgstr "无法快进，终止。"

6877

6945 -#: builtin/merge.c:1464 builtin/merge.c:1543

6878 +#: builtin/merge.c:1467 builtin/merge.c:1546

6879 #, c-format

6880 msgid "Rewinding the tree to pristine...\n"

6881 msgstr "将树回滚至原始状态...\n"

6882

6950 -#: builtin/merge.c:1468

6883 +#: builtin/merge.c:1471

6884 #, c-format

6885 msgid "Trying merge strategy %s...\n"

6886 msgstr "尝试合并策略 %s...\n"

6887

6955 -#: builtin/merge.c:1534

6888 +#: builtin/merge.c:1537

6889 #, c-format

6890 msgid "No merge strategy handled the merge.\n"

6891 msgstr "没有合并策略处理此合并。\n"

6892

6960 -#: builtin/merge.c:1536

6893 +#: builtin/merge.c:1539

6894 #, c-format

6895 msgid "Merge with strategy %s failed.\n"

6896 msgstr "使用策略 %s 合并失败。\n"

6897

6965 -#: builtin/merge.c:1545

6898 +#: builtin/merge.c:1548

6899 #, c-format

6900 msgid "Using the %s to prepare resolving by hand.\n"

6901 msgstr "使用 %s 以准备手工解决。\n"

6902

6970 -#: builtin/merge.c:1557

6903 +#: builtin/merge.c:1560

6904 #, c-format

6905 msgid "Automatic merge went well; stopped before committing as requested\n"

6906 msgstr "自动合并进展顺利，按要求在提交前停止\n"

@@ -7051,19 +6984,19 @@ msgstr "不要警告冲突"

6984 msgid "set labels for file1/orig_file/file2"

6985 msgstr "为 file1/orig_file/file2 设置标签"

6986

7054 -#: builtin/mktree.c:67

6987 +#: builtin/mktree.c:64

6988 msgid "git mktree [-z] [--missing] [--batch]"

6989 msgstr "git mktree [-z] [--missing] [--batch]"

6990

7058 -#: builtin/mktree.c:153

6991 +#: builtin/mktree.c:150

6992 msgid "input is NUL terminated"

6993 msgstr "输入以 NUL 字符终止"

6994

7062 -#: builtin/mktree.c:154 builtin/write-tree.c:24

6995 +#: builtin/mktree.c:151 builtin/write-tree.c:24

6996 msgid "allow missing objects"

6997 msgstr "允许丢失的对象"

6998

7066 -#: builtin/mktree.c:155

6999 +#: builtin/mktree.c:152

7000 msgid "allow creation of more than one tree"

7001 msgstr "允许创建一个以上的树"

7002

@@ -7110,46 +7043,46 @@ msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"

7043 msgid "Huh? %.*s is in index?"

7044 msgstr "嗯？%.*s 在索引中？"

7045

7113 -#: builtin/mv.c:168

7046 +#: builtin/mv.c:169

7047 msgid "source directory is empty"

7048 msgstr "源目录为空"

7049

7117 -#: builtin/mv.c:200

7050 +#: builtin/mv.c:205

7051 msgid "not under version control"

7052 msgstr "不在版本控制之下"

7053

7121 -#: builtin/mv.c:202

7054 +#: builtin/mv.c:207

7055 msgid "destination exists"

7056 msgstr "目标已存在"

7057

7125 -#: builtin/mv.c:210

7058 +#: builtin/mv.c:215

7059 #, c-format

7060 msgid "overwriting '%s'"

7061 msgstr "覆盖 '%s'"

7062

7130 -#: builtin/mv.c:213

7063 +#: builtin/mv.c:218

7064 msgid "Cannot overwrite"

7065 msgstr "不能覆盖"

7066

7134 -#: builtin/mv.c:216

7067 +#: builtin/mv.c:221

7068 msgid "multiple sources for the same target"

7069 msgstr "同一目标具有多个源"

7070

7138 -#: builtin/mv.c:218

7071 +#: builtin/mv.c:223

7072 msgid "destination directory does not exist"

7073 msgstr "目标目录不存在"

7074

7142 -#: builtin/mv.c:233

7075 +#: builtin/mv.c:243

7076 #, c-format

7077 msgid "%s, source=%s, destination=%s"

7078 msgstr "%s，源=%s，目标=%s"

7079

7147 -#: builtin/mv.c:243

7080 +#: builtin/mv.c:253

7081 #, c-format

7082 msgid "Renaming %s to %s\n"

7083 msgstr "重命名 %s 至 %s\n"

7084

7152 -#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328

7085 +#: builtin/mv.c:256 builtin/remote.c:726 builtin/repack.c:355

7086 #, c-format

7087 msgid "renaming '%s' failed"

7088 msgstr "重命名 '%s' 失败"

@@ -7317,7 +7250,7 @@ msgstr "不能读取 'show' 的输出"

7250 msgid "failed to finish 'show' for object '%s'"

7251 msgstr "无法为对象 '%s' 完成 'show'"

7252

7320 -#: builtin/notes.c:167 builtin/tag.c:341

7253 +#: builtin/notes.c:167 builtin/tag.c:373

7254 #, c-format

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

7256 msgstr "不能创建文件 '%s'"

@@ -7326,7 +7259,7 @@ msgstr "不能创建文件 '%s'"

7259 msgid "Please supply the note contents using either -m or -F option"

7260 msgstr "请通过 -m 或 -F 选项为注解提供内容"

7261

7329 -#: builtin/notes.c:207 builtin/notes.c:844

7262 +#: builtin/notes.c:207 builtin/notes.c:848

7263 #, c-format

7264 msgid "Removing note for object %s\n"

7265 msgstr "删除对象 %s 的注解\n"

@@ -7340,20 +7273,20 @@ msgstr "不能写注解对象"

7273 msgid "The note contents has been left in %s"

7274 msgstr "注解内容被留在文件 %s 中"

7275

7343 -#: builtin/notes.c:248 builtin/tag.c:537

7276 +#: builtin/notes.c:248 builtin/tag.c:604

7277 #, c-format

7278 msgid "cannot read '%s'"

7279 msgstr "不能读取 '%s'"

7280

7348 -#: builtin/notes.c:250 builtin/tag.c:540

7281 +#: builtin/notes.c:250 builtin/tag.c:607

7282 #, c-format

7283 msgid "could not open or read '%s'"

7284 msgstr "不能打开或读取 '%s'"

7285

7353 -#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318

7354 -#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515

7355 -#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637

7356 -#: builtin/notes.c:839 builtin/tag.c:553

7286 +#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322

7287 +#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519

7288 +#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641

7289 +#: builtin/notes.c:843 builtin/tag.c:620

7290 #, c-format

7291 msgid "Failed to resolve '%s' as a valid ref."

7292 msgstr "无法解析 '%s' 为一个有效引用。"

@@ -7363,89 +7296,94 @@ msgstr "无法解析 '%s' 为一个有效引用。"

7296 msgid "Failed to read object '%s'."

7297 msgstr "无法读取对象 '%s'。"

7298

7366 -#: builtin/notes.c:312

7299 +#: builtin/notes.c:276

7300 +#, c-format

7301 +msgid "Cannot read note data from non-blob object '%s'."

7302 +msgstr "不能从非数据对象 '%s' 中读取注解数据"

7303 +

7304 +#: builtin/notes.c:316

7305 #, c-format

7306 msgid "Malformed input line: '%s'."

7307 msgstr "非法的输入行：'%s'。"

7308

7371 -#: builtin/notes.c:327

7309 +#: builtin/notes.c:331

7310 #, c-format

7311 msgid "Failed to copy notes from '%s' to '%s'"

7312 msgstr "无法从 '%s' 到 '%s' 拷贝注解"

7313

7376 -#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498

7377 -#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630

7378 -#: builtin/notes.c:904

7314 +#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502

7315 +#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634

7316 +#: builtin/notes.c:908

7317 msgid "too many parameters"

7318 msgstr "参数太多"

7319

7382 -#: builtin/notes.c:384 builtin/notes.c:643

7320 +#: builtin/notes.c:388 builtin/notes.c:647

7321 #, c-format

7322 msgid "No note found for object %s."

7323 msgstr "未发现对象 %s 的注解。"

7324

7387 -#: builtin/notes.c:406 builtin/notes.c:563

7325 +#: builtin/notes.c:410 builtin/notes.c:567

7326 msgid "note contents as a string"

7327 msgstr "注解内容作为一个字符串"

7328

7391 -#: builtin/notes.c:409 builtin/notes.c:566

7329 +#: builtin/notes.c:413 builtin/notes.c:570

7330 msgid "note contents in a file"

7331 msgstr "注解内容到一个文件中"

7332

7395 -#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568

7396 -#: builtin/notes.c:571 builtin/tag.c:474

7333 +#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572

7334 +#: builtin/notes.c:575 builtin/tag.c:539

7335 msgid "object"

7336 msgstr "对象"

7337

7400 -#: builtin/notes.c:412 builtin/notes.c:569

7338 +#: builtin/notes.c:416 builtin/notes.c:573

7339 msgid "reuse and edit specified note object"

7340 msgstr "重用和编辑指定的注解对象"

7341

7404 -#: builtin/notes.c:415 builtin/notes.c:572

7342 +#: builtin/notes.c:419 builtin/notes.c:576

7343 msgid "reuse specified note object"

7344 msgstr "重用指定的注解对象"

7345

7408 -#: builtin/notes.c:417 builtin/notes.c:485

7346 +#: builtin/notes.c:421 builtin/notes.c:489

7347 msgid "replace existing notes"

7348 msgstr "替换已存在的注解"

7349

7412 -#: builtin/notes.c:451

7350 +#: builtin/notes.c:455

7351 #, c-format

7352 msgid ""

7353 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "

7354 "existing notes"

7355 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

7356

7419 -#: builtin/notes.c:456 builtin/notes.c:533

7357 +#: builtin/notes.c:460 builtin/notes.c:537

7358 #, c-format

7359 msgid "Overwriting existing notes for object %s\n"

7360 msgstr "覆盖对象 %s 现存注解\n"

7361

7424 -#: builtin/notes.c:486

7362 +#: builtin/notes.c:490

7363 msgid "read objects from stdin"

7364 msgstr "从标准输入读取对象"

7365

7428 -#: builtin/notes.c:488

7366 +#: builtin/notes.c:492

7367 msgid "load rewriting config for <command> (implies --stdin)"

7368 msgstr "重新加载 <命令> 的配置（隐含 --stdin）"

7369

7432 -#: builtin/notes.c:506

7370 +#: builtin/notes.c:510

7371 msgid "too few parameters"

7372 msgstr "参数太少"

7373

7436 -#: builtin/notes.c:527

7374 +#: builtin/notes.c:531

7375 #, c-format

7376 msgid ""

7377 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "

7378 "existing notes"

7379 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

7380

7443 -#: builtin/notes.c:539

7381 +#: builtin/notes.c:543

7382 #, c-format

7383 msgid "Missing notes on source object %s. Cannot copy."

7384 msgstr "源对象 %s 缺少注解。不能拷贝。"

7385

7448 -#: builtin/notes.c:588

7386 +#: builtin/notes.c:592

7387 #, c-format

7388 msgid ""

7389 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

@@ -7454,215 +7392,239 @@ msgstr ""

7392 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"

7393 "请换用 'git notes add -f -m/-F/-c/-C'。\n"

7394

7457 -#: builtin/notes.c:735

7395 +#: builtin/notes.c:739

7396 msgid "General options"

7397 msgstr "通用选项"

7398

7461 -#: builtin/notes.c:737

7399 +#: builtin/notes.c:741

7400 msgid "Merge options"

7401 msgstr "合并选项"

7402

7465 -#: builtin/notes.c:739

7403 +#: builtin/notes.c:743

7404 msgid ""

7405 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"

7406 "cat_sort_uniq)"

7407 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"

7408

7471 -#: builtin/notes.c:741

7409 +#: builtin/notes.c:745

7410 msgid "Committing unmerged notes"

7411 msgstr "提交未合并的注解"

7412

7475 -#: builtin/notes.c:743

7413 +#: builtin/notes.c:747

7414 msgid "finalize notes merge by committing unmerged notes"

7415 msgstr "通过提交未合并的注解来完成注解合并"

7416

7479 -#: builtin/notes.c:745

7417 +#: builtin/notes.c:749

7418 msgid "Aborting notes merge resolution"

7419 msgstr "中止注解合并的方案"

7420

7483 -#: builtin/notes.c:747

7421 +#: builtin/notes.c:751

7422 msgid "abort notes merge"

7423 msgstr "中止注解合并"

7424

7487 -#: builtin/notes.c:842

7425 +#: builtin/notes.c:846

7426 #, c-format

7427 msgid "Object %s has no note\n"

7428 msgstr "对象 %s 没有注解\n"

7429

7492 -#: builtin/notes.c:854

7430 +#: builtin/notes.c:858

7431 msgid "attempt to remove non-existent note is not an error"

7432 msgstr "尝试删除不存在的注解不是一个错误"

7433

7496 -#: builtin/notes.c:857

7434 +#: builtin/notes.c:861

7435 msgid "read object names from the standard input"

7436 msgstr "从标准输入读取对象名称"

7437

7500 -#: builtin/notes.c:938

7501 -msgid "notes_ref"

7438 +#: builtin/notes.c:942

7439 +msgid "notes-ref"

7440 msgstr "注解引用"

7441

7504 -#: builtin/notes.c:939

7442 +#: builtin/notes.c:943

7443 msgid "use notes from <notes_ref>"

7444 msgstr "从 <注解引用> 使用注解"

7445

7508 -#: builtin/notes.c:974 builtin/remote.c:1593

7446 +#: builtin/notes.c:978 builtin/remote.c:1593

7447 #, c-format

7448 msgid "Unknown subcommand: %s"

7449 msgstr "未知子命令：%s"

7450

7513 -#: builtin/pack-objects.c:23

7451 +#: builtin/pack-objects.c:25

7452 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"

7453 msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"

7454

7517 -#: builtin/pack-objects.c:24

7455 +#: builtin/pack-objects.c:26

7456 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"

7457 msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"

7458

7521 -#: builtin/pack-objects.c:184 builtin/pack-objects.c:187

7459 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178

7460 #, c-format

7461 msgid "deflate error (%d)"

7462 msgstr "压缩错误 (%d)"

7463

7526 -#: builtin/pack-objects.c:2396

7464 +#: builtin/pack-objects.c:771

7465 +msgid "Writing objects"

7466 +msgstr "写入对象中"

7467 +

7468 +#: builtin/pack-objects.c:1012

7469 +msgid "disabling bitmap writing, as some objects are not being packed"

7470 +msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"

7471 +

7472 +#: builtin/pack-objects.c:2174

7473 +msgid "Compressing objects"

7474 +msgstr "压缩对象中"

7475 +

7476 +#: builtin/pack-objects.c:2530

7477 #, c-format

7478 msgid "unsupported index version %s"

7479 msgstr "不支持的索引版本 %s"

7480

7531 -#: builtin/pack-objects.c:2400

7481 +#: builtin/pack-objects.c:2534

7482 #, c-format

7483 msgid "bad index version '%s'"

7484 msgstr "坏的索引版本 '%s'"

7485

7536 -#: builtin/pack-objects.c:2423

7486 +#: builtin/pack-objects.c:2557

7487 #, c-format

7488 msgid "option %s does not accept negative form"

7489 msgstr "选项 %s 不接受否定格式"

7490

7541 -#: builtin/pack-objects.c:2427

7491 +#: builtin/pack-objects.c:2561

7492 #, c-format

7493 msgid "unable to parse value '%s' for option %s"

7494 msgstr "不能解析选项 %1$s 的值 '%2$s'"

7495

7546 -#: builtin/pack-objects.c:2446

7496 +#: builtin/pack-objects.c:2580

7497 msgid "do not show progress meter"

7498 msgstr "不显示进度表"

7499

7550 -#: builtin/pack-objects.c:2448

7500 +#: builtin/pack-objects.c:2582

7501 msgid "show progress meter"

7502 msgstr "显示进度表"

7503

7554 -#: builtin/pack-objects.c:2450

7504 +#: builtin/pack-objects.c:2584

7505 msgid "show progress meter during object writing phase"

7506 msgstr "在对象写入阶段显示进度表"

7507

7558 -#: builtin/pack-objects.c:2453

7508 +#: builtin/pack-objects.c:2587

7509 msgid "similar to --all-progress when progress meter is shown"

7510 msgstr "当进度表显示时类似于 --all-progress"

7511

7562 -#: builtin/pack-objects.c:2454

7512 +#: builtin/pack-objects.c:2588

7513 msgid "version[,offset]"

7514 msgstr "版本[,偏移]"

7515

7566 -#: builtin/pack-objects.c:2455

7516 +#: builtin/pack-objects.c:2589

7517 msgid "write the pack index file in the specified idx format version"

7518 msgstr "用指定的 idx 格式版本来写包索引文件"

7519

7570 -#: builtin/pack-objects.c:2458

7520 +#: builtin/pack-objects.c:2592

7521 msgid "maximum size of each output pack file"

7522 msgstr "每个输出包的最大尺寸"

7523

7574 -#: builtin/pack-objects.c:2460

7524 +#: builtin/pack-objects.c:2594

7525 msgid "ignore borrowed objects from alternate object store"

7526 msgstr "忽略从替代对象存储里借用对象"

7527

7578 -#: builtin/pack-objects.c:2462

7528 +#: builtin/pack-objects.c:2596

7529 msgid "ignore packed objects"

7530 msgstr "忽略包对象"

7531

7582 -#: builtin/pack-objects.c:2464

7532 +#: builtin/pack-objects.c:2598

7533 msgid "limit pack window by objects"

7534 msgstr "限制打包窗口的对象数"

7535

7586 -#: builtin/pack-objects.c:2466

7536 +#: builtin/pack-objects.c:2600

7537 msgid "limit pack window by memory in addition to object limit"

7538 msgstr "除对象数量限制外设置打包窗口的内存限制"

7539

7590 -#: builtin/pack-objects.c:2468

7540 +#: builtin/pack-objects.c:2602

7541 msgid "maximum length of delta chain allowed in the resulting pack"

7542 msgstr "打包允许的 delta 链的最大长度"

7543

7594 -#: builtin/pack-objects.c:2470

7544 +#: builtin/pack-objects.c:2604

7545 msgid "reuse existing deltas"

7546 msgstr "重用已存在的 deltas"

7547

7598 -#: builtin/pack-objects.c:2472

7548 +#: builtin/pack-objects.c:2606

7549 msgid "reuse existing objects"

7550 msgstr "重用已存在的对象"

7551

7602 -#: builtin/pack-objects.c:2474

7552 +#: builtin/pack-objects.c:2608

7553 msgid "use OFS_DELTA objects"

7554 msgstr "使用 OFS_DELTA 对象"

7555

7606 -#: builtin/pack-objects.c:2476

7556 +#: builtin/pack-objects.c:2610

7557 msgid "use threads when searching for best delta matches"

7558 msgstr "使用线程查询最佳 delta 匹配"

7559

7610 -#: builtin/pack-objects.c:2478

7560 +#: builtin/pack-objects.c:2612

7561 msgid "do not create an empty pack output"

7562 msgstr "不创建空的包输出"

7563

7614 -#: builtin/pack-objects.c:2480

7564 +#: builtin/pack-objects.c:2614

7565 msgid "read revision arguments from standard input"

7566 msgstr "从标准输入读取修订号参数"

7567

7618 -#: builtin/pack-objects.c:2482

7568 +#: builtin/pack-objects.c:2616

7569 msgid "limit the objects to those that are not yet packed"

7570 msgstr "限制那些尚未打包的对象"

7571

7622 -#: builtin/pack-objects.c:2485

7572 +#: builtin/pack-objects.c:2619

7573 msgid "include objects reachable from any reference"

7574 msgstr "包括可以从任何引用访问到的对象"

7575

7626 -#: builtin/pack-objects.c:2488

7576 +#: builtin/pack-objects.c:2622

7577 msgid "include objects referred by reflog entries"

7578 msgstr "包括被引用日志引用到的对象"

7579

7630 -#: builtin/pack-objects.c:2491

7580 +#: builtin/pack-objects.c:2625

7581 msgid "output pack to stdout"

7582 msgstr "输出包到标准输出"

7583

7634 -#: builtin/pack-objects.c:2493

7584 +#: builtin/pack-objects.c:2627

7585 msgid "include tag objects that refer to objects to be packed"

7586 msgstr "包括引用了打包对象的 tag"

7587

7638 -#: builtin/pack-objects.c:2495

7588 +#: builtin/pack-objects.c:2629

7589 msgid "keep unreachable objects"

7590 msgstr "维持不可达的对象"

7591

7642 -#: builtin/pack-objects.c:2496 parse-options.h:143

7592 +#: builtin/pack-objects.c:2630 parse-options.h:140

7593 msgid "time"

7594 msgstr "时间"

7595

7646 -#: builtin/pack-objects.c:2497

7596 +#: builtin/pack-objects.c:2631

7597 msgid "unpack unreachable objects newer than <time>"

7598 msgstr "将比给定 <时间> 新的无法访问的对象解包"

7599

7650 -#: builtin/pack-objects.c:2500

7600 +#: builtin/pack-objects.c:2634

7601 msgid "create thin packs"

7602 msgstr "创建精简包"

7603

7654 -#: builtin/pack-objects.c:2502

7604 +#: builtin/pack-objects.c:2636

7605 msgid "ignore packs that have companion .keep file"

7606 msgstr "忽略配有 .keep 文件的包"

7607

7658 -#: builtin/pack-objects.c:2504

7608 +#: builtin/pack-objects.c:2638

7609 msgid "pack compression level"

7610 msgstr "打包压缩级别"

7611

7662 -#: builtin/pack-objects.c:2506

7612 +#: builtin/pack-objects.c:2640

7613 msgid "do not hide commits by grafts"

7614 msgstr "显示被嫁接隐藏的提交"

7615

7616 +#: builtin/pack-objects.c:2642

7617 +msgid "use a bitmap index if available to speed up counting objects"

7618 +msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"

7619 +

7620 +#: builtin/pack-objects.c:2644

7621 +msgid "write a bitmap index together with the pack index"

7622 +msgstr "在建立包索引的同时创建 bitmap 索引"

7623 +

7624 +#: builtin/pack-objects.c:2723

7625 +msgid "Counting objects"

7626 +msgstr "对象计数中"

l10n: zh_CN.po: translate 46 new messages (2229t0f0u)