069917778f · matheusbsbs/matheus-bagliano

@@ -138,8 +138,8 @@ msgid ""

138 msgstr ""

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

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

141 -"POT-Creation-Date: 2018-12-02 10:55+0800\n"

142 -"PO-Revision-Date: 2018-12-03 18:08+0800\n"

141 +"POT-Creation-Date: 2019-02-15 10:09+0800\n"

142 +"PO-Revision-Date: 2019-02-15 10:26+0800\n"

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

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

145 "Language: zh_CN\n"

@@ -148,37 +148,37 @@ msgstr ""

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

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

150

151 -#: advice.c:99

151 +#: advice.c:101

152 #, c-format

153 msgid "%shint: %.*s%s\n"

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

155

156 -#: advice.c:152

156 +#: advice.c:154

157 msgid "Cherry-picking is not possible because you have unmerged files."

158 msgstr "无法拣选，因为您有未合并的文件。"

159

160 -#: advice.c:154

160 +#: advice.c:156

161 msgid "Committing is not possible because you have unmerged files."

162 msgstr "无法提交，因为您有未合并的文件。"

163

164 -#: advice.c:156

164 +#: advice.c:158

165 msgid "Merging is not possible because you have unmerged files."

166 msgstr "无法合并，因为您有未合并的文件。"

167

168 -#: advice.c:158

168 +#: advice.c:160

169 msgid "Pulling is not possible because you have unmerged files."

170 msgstr "无法拉取，因为您有未合并的文件。"

171

172 -#: advice.c:160

172 +#: advice.c:162

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

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

175

176 -#: advice.c:162

176 +#: advice.c:164

177 #, c-format

178 msgid "It is not possible to %s because you have unmerged files."

179 msgstr "无法 %s，因为您有未合并的文件。"

180

181 -#: advice.c:170

181 +#: advice.c:172

182 msgid ""

183 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

184 "as appropriate to mark resolution and make a commit."

@@ -186,23 +186,23 @@ msgstr ""

186 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"

187 "解决方案并提交。"

188

189 -#: advice.c:178

189 +#: advice.c:180

190 msgid "Exiting because of an unresolved conflict."

191 msgstr "因为存在未解决的冲突而退出。"

192

193 -#: advice.c:183 builtin/merge.c:1289

193 +#: advice.c:185 builtin/merge.c:1290

194 msgid "You have not concluded your merge (MERGE_HEAD exists)."

195 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"

196

197 -#: advice.c:185

197 +#: advice.c:187

198 msgid "Please, commit your changes before merging."

199 msgstr "请在合并前先提交您的修改。"

200

201 -#: advice.c:186

201 +#: advice.c:188

202 msgid "Exiting because of unfinished merge."

203 msgstr "因为存在未完成的合并而退出。"

204

205 -#: advice.c:192

205 +#: advice.c:194

206 #, c-format

207 msgid ""

208 "Note: checking out '%s'.\n"

@@ -229,6 +229,14 @@ msgstr ""

229 " git checkout -b <新分支名>\n"

230 "\n"

231

232 +#: alias.c:50

233 +msgid "cmdline ends with \\"

234 +msgstr "命令行以 \\ 结尾"

235 +

236 +#: alias.c:51

237 +msgid "unclosed quote"

238 +msgstr "未关闭的引号"

239 +

240 #: apply.c:59

241 #, c-format

242 msgid "unrecognized whitespace option '%s'"

@@ -259,62 +267,62 @@ msgstr "--index 在一个仓库之外"

267 msgid "--cached outside a repository"

268 msgstr "--cached 在一个仓库之外"

269

262 -#: apply.c:826

270 +#: apply.c:825

271 #, c-format

272 msgid "Cannot prepare timestamp regexp %s"

273 msgstr "无法准备时间戳正则表达式 %s"

274

267 -#: apply.c:835

275 +#: apply.c:834

276 #, c-format

277 msgid "regexec returned %d for input: %s"

278 msgstr "regexec 返回 %d，输入为：%s"

279

272 -#: apply.c:909

280 +#: apply.c:908

281 #, c-format

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

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

284

277 -#: apply.c:947

285 +#: apply.c:946

286 #, c-format

287 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

288 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"

289

282 -#: apply.c:953

290 +#: apply.c:952

291 #, c-format

292 msgid "git apply: bad git-diff - inconsistent new filename on line %d"

293 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"

294

287 -#: apply.c:954

295 +#: apply.c:953

296 #, c-format

297 msgid "git apply: bad git-diff - inconsistent old filename on line %d"

298 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"

299

292 -#: apply.c:959

300 +#: apply.c:958

301 #, c-format

302 msgid "git apply: bad git-diff - expected /dev/null on line %d"

303 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"

304

297 -#: apply.c:988

305 +#: apply.c:987

306 #, c-format

307 msgid "invalid mode on line %d: %s"

308 msgstr "第 %d 行包含无效文件模式：%s"

309

302 -#: apply.c:1307

310 +#: apply.c:1306

311 #, c-format

312 msgid "inconsistent header lines %d and %d"

313 msgstr "不一致的文件头，%d 行和 %d 行"

314

307 -#: apply.c:1479

315 +#: apply.c:1478

316 #, c-format

317 msgid "recount: unexpected line: %.*s"

318 msgstr "recount：意外的行：%.*s"

319

312 -#: apply.c:1548

320 +#: apply.c:1547

321 #, c-format

322 msgid "patch fragment without header at line %d: %.*s"

323 msgstr "第 %d 行的补丁片段没有头信息：%.*s"

324

317 -#: apply.c:1568

325 +#: apply.c:1567

326 #, c-format

327 msgid ""

328 "git diff header lacks filename information when removing %d leading pathname "

@@ -325,82 +333,82 @@ msgid_plural ""

333 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"

334 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"

335

328 -#: apply.c:1581

336 +#: apply.c:1580

337 #, c-format

338 msgid "git diff header lacks filename information (line %d)"

339 msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"

340

333 -#: apply.c:1769

341 +#: apply.c:1768

342 msgid "new file depends on old contents"

343 msgstr "新文件依赖旧内容"

344

337 -#: apply.c:1771

345 +#: apply.c:1770

346 msgid "deleted file still has contents"

347 msgstr "删除的文件仍有内容"

348

341 -#: apply.c:1805

349 +#: apply.c:1804

350 #, c-format

351 msgid "corrupt patch at line %d"

352 msgstr "补丁在第 %d 行损坏"

353

346 -#: apply.c:1842

354 +#: apply.c:1841

355 #, c-format

356 msgid "new file %s depends on old contents"

357 msgstr "新文件 %s 依赖旧内容"

358

351 -#: apply.c:1844

359 +#: apply.c:1843

360 #, c-format

361 msgid "deleted file %s still has contents"

362 msgstr "删除的文件 %s 仍有内容"

363

356 -#: apply.c:1847

364 +#: apply.c:1846

365 #, c-format

366 msgid "** warning: file %s becomes empty but is not deleted"

367 msgstr "** 警告：文件 %s 成为空文件但并未删除"

368

361 -#: apply.c:1994

369 +#: apply.c:1993

370 #, c-format

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

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

373

366 -#: apply.c:2031

374 +#: apply.c:2030

375 #, c-format

376 msgid "unrecognized binary patch at line %d"

377 msgstr "未能识别的二进制补丁位于第 %d 行"

378

371 -#: apply.c:2193

379 +#: apply.c:2192

380 #, c-format

381 msgid "patch with only garbage at line %d"

382 msgstr "补丁文件的第 %d 行只有垃圾数据"

383

376 -#: apply.c:2279

384 +#: apply.c:2278

385 #, c-format

386 msgid "unable to read symlink %s"

387 msgstr "无法读取符号链接 %s"

388

381 -#: apply.c:2283

389 +#: apply.c:2282

390 #, c-format

391 msgid "unable to open or read %s"

392 msgstr "不能打开或读取 %s"

393

386 -#: apply.c:2942

394 +#: apply.c:2941

395 #, c-format

396 msgid "invalid start of line: '%c'"

397 msgstr "无效的行首字符：'%c'"

398

391 -#: apply.c:3063

399 +#: apply.c:3062

400 #, c-format

401 msgid "Hunk #%d succeeded at %d (offset %d line)."

402 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

403 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"

404 msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"

405

398 -#: apply.c:3075

406 +#: apply.c:3074

407 #, c-format

408 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

409 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"

410

403 -#: apply.c:3081

411 +#: apply.c:3080

412 #, c-format

413 msgid ""

414 "while searching for:\n"

@@ -409,48 +417,48 @@ msgstr ""

417 "当查询：\n"

418 "%.*s"

419

412 -#: apply.c:3103

420 +#: apply.c:3102

421 #, c-format

422 msgid "missing binary patch data for '%s'"

423 msgstr "缺失 '%s' 的二进制补丁数据"

424

417 -#: apply.c:3111

425 +#: apply.c:3110

426 #, c-format

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

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

429

422 -#: apply.c:3158

430 +#: apply.c:3157

431 #, c-format

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

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

434

427 -#: apply.c:3168

435 +#: apply.c:3167

436 #, c-format

437 msgid ""

438 "the patch applies to '%s' (%s), which does not match the current contents."

439 msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"

440

433 -#: apply.c:3176

441 +#: apply.c:3175

442 #, c-format

443 msgid "the patch applies to an empty '%s' but it is not empty"

444 msgstr "补丁应用到空文件 '%s'，但其并非空文件"

445

438 -#: apply.c:3194

446 +#: apply.c:3193

447 #, c-format

448 msgid "the necessary postimage %s for '%s' cannot be read"

449 msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"

450

443 -#: apply.c:3207

451 +#: apply.c:3206

452 #, c-format

453 msgid "binary patch does not apply to '%s'"

454 msgstr "二进制补丁未应用到 '%s'"

455

448 -#: apply.c:3213

456 +#: apply.c:3212

457 #, c-format

458 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

459 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"

460

453 -#: apply.c:3234

461 +#: apply.c:3233

462 #, c-format

463 msgid "patch failed: %s:%ld"

464 msgstr "打补丁失败：%s:%ld"

@@ -528,7 +536,8 @@ msgstr "%s：错误类型"

536 msgid "%s has type %o, expected %o"

537 msgstr "%s 的类型是 %o，应为 %o"

538

531 -#: apply.c:3881 apply.c:3883

539 +#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846

540 +#: read-cache.c:1299

541 #, c-format

542 msgid "invalid path '%s'"

543 msgstr "无效路径 '%s'"

@@ -566,7 +575,7 @@ msgstr "%s：补丁未应用"

575 #: apply.c:4006

576 #, c-format

577 msgid "Checking patch %s..."

569 -msgstr "检查补丁 %s..."

578 +msgstr "正在检查补丁 %s..."

579

580 #: apply.c:4098

581 #, c-format

@@ -583,7 +592,7 @@ msgstr "%s 的模式变更，但它不在当前 HEAD 中"

592 msgid "sha1 information is lacking or useless (%s)."

593 msgstr "sha1 信息缺失或无效（%s）。"

594

586 -#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142

595 +#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143

596 #, c-format

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

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

@@ -659,7 +668,7 @@ msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

668 msgid "truncating .rej filename to %.*s.rej"

669 msgstr "截短 .rej 文件名为 %.*s.rej"

670

662 -#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122

671 +#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118

672 #, c-format

673 msgid "cannot open %s"

674 msgstr "不能打开 %s"

@@ -683,171 +692,171 @@ msgstr "略过补丁 '%s'。"

692 msgid "unrecognized input"

693 msgstr "未能识别的输入"

694

686 -#: apply.c:4719

695 +#: apply.c:4720

696 msgid "unable to read index file"

697 msgstr "无法读取索引文件"

698

690 -#: apply.c:4874

699 +#: apply.c:4875

700 #, c-format

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

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

703

695 -#: apply.c:4901

704 +#: apply.c:4902

705 #, c-format

706 msgid "squelched %d whitespace error"

707 msgid_plural "squelched %d whitespace errors"

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

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

710

702 -#: apply.c:4907 apply.c:4922

711 +#: apply.c:4908 apply.c:4923

712 #, c-format

713 msgid "%d line adds whitespace errors."

714 msgid_plural "%d lines add whitespace errors."

715 msgstr[0] "%d 行新增了空白字符误用。"

716 msgstr[1] "%d 行新增了空白字符误用。"

717

709 -#: apply.c:4915

718 +#: apply.c:4916

719 #, c-format

720 msgid "%d line applied after fixing whitespace errors."

721 msgid_plural "%d lines applied after fixing whitespace errors."

722 msgstr[0] "修复空白错误后，应用了 %d 行。"

723 msgstr[1] "修复空白错误后，应用了 %d 行。"

724

716 -#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

725 +#: apply.c:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390

726 msgid "Unable to write new index file"

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

728

720 -#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212

721 -#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262

722 -#: builtin/pull.c:199 builtin/submodule--helper.c:406

723 -#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365

724 -#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849

725 -#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197

729 +#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206

730 +#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263

731 +#: builtin/pull.c:200 builtin/submodule--helper.c:407

732 +#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369

733 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853

734 +#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197

735 msgid "path"

736 msgstr "路径"

737

729 -#: apply.c:4959

738 +#: apply.c:4960

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

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

741

733 -#: apply.c:4962

742 +#: apply.c:4963

743 msgid "apply changes matching the given path"

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

745

737 -#: apply.c:4964 builtin/am.c:2218

746 +#: apply.c:4965 builtin/am.c:2212

747 msgid "num"

748 msgstr "数字"

749

741 -#: apply.c:4965

750 +#: apply.c:4966

751 msgid "remove <num> leading slashes from traditional diff paths"

752 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"

753

745 -#: apply.c:4968

754 +#: apply.c:4969

755 msgid "ignore additions made by the patch"

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

757

749 -#: apply.c:4970

758 +#: apply.c:4971

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

760 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"

761

753 -#: apply.c:4974

762 +#: apply.c:4975

763 msgid "show number of added and deleted lines in decimal notation"

764 msgstr "以十进制数显示添加和删除的行数"

765

757 -#: apply.c:4976

766 +#: apply.c:4977

767 msgid "instead of applying the patch, output a summary for the input"

768 msgstr "不应用补丁，而是显示输入的概要"

769

761 -#: apply.c:4978

770 +#: apply.c:4979

771 msgid "instead of applying the patch, see if the patch is applicable"

772 msgstr "不应用补丁，而是查看补丁是否可应用"

773

765 -#: apply.c:4980

774 +#: apply.c:4981

775 msgid "make sure the patch is applicable to the current index"

776 msgstr "确认补丁可以应用到当前索引"

777

769 -#: apply.c:4982

778 +#: apply.c:4983

779 msgid "mark new files with `git add --intent-to-add`"

780 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"

781

773 -#: apply.c:4984

782 +#: apply.c:4985

783 msgid "apply a patch without touching the working tree"

784 msgstr "应用补丁而不修改工作区"

785

777 -#: apply.c:4986

786 +#: apply.c:4987

787 msgid "accept a patch that touches outside the working area"

788 msgstr "接受修改工作区之外文件的补丁"

789

781 -#: apply.c:4989

790 +#: apply.c:4990

791 msgid "also apply the patch (use with --stat/--summary/--check)"

792 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"

793

785 -#: apply.c:4991

794 +#: apply.c:4992

795 msgid "attempt three-way merge if a patch does not apply"

796 msgstr "如果一个补丁不能应用则尝试三方合并"

797

789 -#: apply.c:4993

798 +#: apply.c:4994

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

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

801

793 -#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523

802 +#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524

803 msgid "paths are separated with NUL character"

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

805

797 -#: apply.c:4998

806 +#: apply.c:4999

807 msgid "ensure at least <n> lines of context match"

808 msgstr "确保至少匹配 <n> 行上下文"

809

801 -#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97

810 +#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97

811 #: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101

803 -#: builtin/pack-objects.c:3312 builtin/rebase.c:857

812 +#: builtin/pack-objects.c:3314 builtin/rebase.c:1065

813 msgid "action"

814 msgstr "动作"

815

807 -#: apply.c:5000

816 +#: apply.c:5001

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

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

819

811 -#: apply.c:5003 apply.c:5006

820 +#: apply.c:5004 apply.c:5007

821 msgid "ignore changes in whitespace when finding context"

822 msgstr "查找上下文时忽略空白字符的变更"

823

815 -#: apply.c:5009

824 +#: apply.c:5010

825 msgid "apply the patch in reverse"

826 msgstr "反向应用补丁"

827

819 -#: apply.c:5011

828 +#: apply.c:5012

829 msgid "don't expect at least one line of context"

830 msgstr "无需至少一行上下文"

831

823 -#: apply.c:5013

832 +#: apply.c:5014

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

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

835

827 -#: apply.c:5015

836 +#: apply.c:5016

837 msgid "allow overlapping hunks"

838 msgstr "允许重叠的补丁片段"

839

831 -#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21

832 -#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698

833 -#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127

834 -#: builtin/rebase--interactive.c:157

840 +#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22

841 +#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724

842 +#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128

843 +#: builtin/rebase--interactive.c:159

844 msgid "be verbose"

845 msgstr "冗长输出"

846

838 -#: apply.c:5018

847 +#: apply.c:5019

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

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

850

842 -#: apply.c:5021

851 +#: apply.c:5022

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

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

854

846 -#: apply.c:5023 builtin/am.c:2206

855 +#: apply.c:5024 builtin/am.c:2200

856 msgid "root"

857 msgstr "根目录"

858

850 -#: apply.c:5024

859 +#: apply.c:5025

860 msgid "prepend <root> to all filenames"

861 msgstr "为所有文件名前添加 <根目录>"

862

@@ -869,99 +878,118 @@ msgstr ""

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

879 msgstr "git archive --remote <仓库> [--exec <命令>] --list"

880

872 -#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

881 +#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299

882 #, c-format

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

884 msgstr "路径规格 '%s' 未匹配任何文件"

885

877 -#: archive.c:453

886 +#: archive.c:396

887 +#, c-format

888 +msgid "no such ref: %.*s"

889 +msgstr "无此引用：%.*s"

890 +

891 +#: archive.c:401

892 +#, c-format

893 +msgid "not a valid object name: %s"

894 +msgstr "不是一个有效的对象名：%s"

895 +

896 +#: archive.c:414

897 +#, c-format

898 +msgid "not a tree object: %s"

899 +msgstr "不是一个树对象：%s"

900 +

901 +#: archive.c:424

902 +msgid "current working directory is untracked"

903 +msgstr "当前工作目录未被跟踪"

904 +

905 +#: archive.c:455

906 msgid "fmt"

907 msgstr "格式"

908

881 -#: archive.c:453

909 +#: archive.c:455

910 msgid "archive format"

911 msgstr "归档格式"

912

885 -#: archive.c:454 builtin/log.c:1536

913 +#: archive.c:456 builtin/log.c:1549

914 msgid "prefix"

915 msgstr "前缀"

916

889 -#: archive.c:455

917 +#: archive.c:457

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

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

920

893 -#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

894 -#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884

895 -#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562

896 -#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122

921 +#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

922 +#: builtin/fast-export.c:1091 builtin/fast-export.c:1093 builtin/grep.c:895

923 +#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563

924 +#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123

925 #: parse-options.h:162

926 msgid "file"

927 msgstr "文件"

928

901 -#: archive.c:457 builtin/archive.c:89

929 +#: archive.c:459 builtin/archive.c:90

930 msgid "write the archive to this file"

931 msgstr "归档写入此文件"

932

905 -#: archive.c:459

933 +#: archive.c:461

934 msgid "read .gitattributes in working directory"

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

936

909 -#: archive.c:460

937 +#: archive.c:462

938 msgid "report archived files on stderr"

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

940

913 -#: archive.c:461

941 +#: archive.c:463

942 msgid "store only"

943 msgstr "只存储"

944

917 -#: archive.c:462

945 +#: archive.c:464

946 msgid "compress faster"

947 msgstr "压缩速度更快"

948

921 -#: archive.c:470

949 +#: archive.c:472

950 msgid "compress better"

951 msgstr "压缩效果更好"

952

925 -#: archive.c:473

953 +#: archive.c:475

954 msgid "list supported archive formats"

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

956

929 -#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

930 -#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855

957 +#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115

958 +#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859

959 msgid "repo"

960 msgstr "仓库"

961

934 -#: archive.c:476 builtin/archive.c:91

962 +#: archive.c:478 builtin/archive.c:92

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

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

965

938 -#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714

939 -#: builtin/notes.c:496

966 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715

967 +#: builtin/notes.c:498

968 msgid "command"

969 msgstr "命令"

970

943 -#: archive.c:478 builtin/archive.c:93

971 +#: archive.c:480 builtin/archive.c:94

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

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

974

947 -#: archive.c:485

975 +#: archive.c:487

976 msgid "Unexpected option --remote"

977 msgstr "未知参数 --remote"

978

951 -#: archive.c:487

979 +#: archive.c:489

980 msgid "Option --exec can only be used together with --remote"

981 msgstr "选项 --exec 只能和 --remote 同时使用"

982

955 -#: archive.c:489

983 +#: archive.c:491

984 msgid "Unexpected option --output"

985 msgstr "未知参数 --output"

986

959 -#: archive.c:511

987 +#: archive.c:513

988 #, c-format

989 msgid "Unknown archive format '%s'"

990 msgstr "未知归档格式 '%s'"

991

964 -#: archive.c:518

992 +#: archive.c:520

993 #, c-format

994 msgid "Argument not supported for format '%s': -%d"

995 msgstr "参数不支持此格式 '%s'：-%d"

@@ -1005,7 +1033,7 @@ msgstr "路径不是有效的 UTF-8：%s"

1033 msgid "path too long (%d chars, SHA1: %s): %s"

1034 msgstr "路径太长（%d 字符，SHA1：%s）：%s"

1035

1008 -#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227

1036 +#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228

1037 #, c-format

1038 msgid "deflate error (%d)"

1039 msgstr "压缩错误 (%d)"

@@ -1015,12 +1043,17 @@ msgstr "压缩错误 (%d)"

1043 msgid "timestamp too large for this system: %<PRIuMAX>"

1044 msgstr "对于本系统时间戳太大：%<PRIuMAX>"

1045

1018 -#: attr.c:212

1046 +#: attr.c:211

1047 #, c-format

1048 msgid "%.*s is not a valid attribute name"

1049 msgstr "%.*s 不是一个有效的属性名"

1050

1023 -#: attr.c:409

1051 +#: attr.c:368

1052 +#, c-format

1053 +msgid "%s not allowed: %s:%d"

1054 +msgstr "%s 不被允许：%s:%d"

1055 +

1056 +#: attr.c:408

1057 msgid ""

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

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

@@ -1033,17 +1066,17 @@ msgstr ""

1066 msgid "Badly quoted content in file '%s': %s"

1067 msgstr "文件 '%s' 包含错误的引用格式：%s"

1068

1036 -#: bisect.c:676

1069 +#: bisect.c:678

1070 #, c-format

1071 msgid "We cannot bisect more!\n"

1072 msgstr "我们无法进行更多的二分查找！\n"

1073

1041 -#: bisect.c:730

1074 +#: bisect.c:733

1075 #, c-format

1076 msgid "Not a valid commit name %s"

1077 msgstr "不是一个有效的提交名 %s"

1078

1046 -#: bisect.c:754

1079 +#: bisect.c:758

1080 #, c-format

1081 msgid ""

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

@@ -1052,7 +1085,7 @@ msgstr ""

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

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

1087

1055 -#: bisect.c:759

1088 +#: bisect.c:763

1089 #, c-format

1090 msgid ""

1091 "The merge base %s is new.\n"

@@ -1061,7 +1094,7 @@ msgstr ""

1094 "合并基线 %s 是新的。\n"

1095 "介于 %s 和 [%s] 之间的属性已经被修改。\n"

1096

1064 -#: bisect.c:764

1097 +#: bisect.c:768

1098 #, c-format

1099 msgid ""

1100 "The merge base %s is %s.\n"

@@ -1070,7 +1103,7 @@ msgstr ""

1103 "合并基线 %s 是 %s。\n"

1104 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"

1105

1073 -#: bisect.c:772

1106 +#: bisect.c:776

1107 #, c-format

1108 msgid ""

1109 "Some %s revs are not ancestors of the %s rev.\n"

@@ -1081,7 +1114,7 @@ msgstr ""

1114 "这种情况下 git 二分查找无法正常工作。\n"

1115 "您可能弄错了 %s 和 %s 版本？\n"

1116

1084 -#: bisect.c:785

1117 +#: bisect.c:789

1118 #, c-format

1119 msgid ""

1120 "the merge base between %s and [%s] must be skipped.\n"

@@ -1092,36 +1125,36 @@ msgstr ""

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

1126 "我们仍旧继续。"

1127

1095 -#: bisect.c:818

1128 +#: bisect.c:822

1129 #, c-format

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

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

1132

1100 -#: bisect.c:858

1133 +#: bisect.c:865

1134 #, c-format

1135 msgid "a %s revision is needed"

1136 msgstr "需要一个 %s 版本"

1137

1105 -#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237

1138 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237

1139 #, c-format

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

1141 msgstr "不能创建文件 '%s'"

1142

1110 -#: bisect.c:928 builtin/merge.c:138

1143 +#: bisect.c:937 builtin/merge.c:139

1144 #, c-format

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

1146 msgstr "不能读取文件 '%s'"

1147

1115 -#: bisect.c:958

1148 +#: bisect.c:967

1149 msgid "reading bisect refs failed"

1150 msgstr "读取二分查找引用失败"

1151

1119 -#: bisect.c:977

1152 +#: bisect.c:986

1153 #, c-format

1154 msgid "%s was both %s and %s\n"

1155 msgstr "%s 同时为 %s 和 %s\n"

1156

1124 -#: bisect.c:985

1157 +#: bisect.c:994

1158 #, c-format

1159 msgid ""

1160 "No testable commit found.\n"

@@ -1130,7 +1163,7 @@ msgstr ""

1163 "没有发现可测试的提交。\n"

1164 "可能您在运行时使用了错误的路径参数？\n"

1165

1133 -#: bisect.c:1004

1166 +#: bisect.c:1013

1167 #, c-format

1168 msgid "(roughly %d step)"

1169 msgid_plural "(roughly %d steps)"

@@ -1140,44 +1173,44 @@ msgstr[1] "（大概 %d 步）"

1173 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

1174 #. steps)" translation.

1175 #.

1143 -#: bisect.c:1010

1176 +#: bisect.c:1019

1177 #, c-format

1178 msgid "Bisecting: %d revision left to test after this %s\n"

1179 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

1180 msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1181 msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"

1182

1150 -#: blame.c:1787

1183 +#: blame.c:1792

1184 msgid "--contents and --reverse do not blend well."

1185 msgstr "--contents 和 --reverse 不能混用。"

1186

1154 -#: blame.c:1801

1187 +#: blame.c:1806

1188 msgid "cannot use --contents with final commit object name"

1189 msgstr "不能将 --contents 和最终的提交对象名共用"

1190

1158 -#: blame.c:1822

1191 +#: blame.c:1827

1192 msgid "--reverse and --first-parent together require specified latest commit"

1193 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"

1194

1162 -#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963

1163 -#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932

1164 -#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406

1195 +#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993

1196 +#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936

1197 +#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407

1198 #: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152

1199 #: builtin/shortlog.c:192

1200 msgid "revision walk setup failed"

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

1202

1170 -#: blame.c:1849

1203 +#: blame.c:1854

1204 msgid ""

1205 "--reverse --first-parent together require range along first-parent chain"

1206 msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"

1207

1175 -#: blame.c:1860

1208 +#: blame.c:1865

1209 #, c-format

1210 msgid "no such path %s in %s"

1211 msgstr "在 %2$s 中无此路径 %1$s"

1212

1180 -#: blame.c:1871

1213 +#: blame.c:1876

1214 #, c-format

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

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

@@ -1290,27 +1323,27 @@ msgstr ""

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

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

1325

1293 -#: branch.c:279

1326 +#: branch.c:280

1327 #, c-format

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

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

1330

1298 -#: branch.c:299

1331 +#: branch.c:300

1332 #, c-format

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

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

1335

1303 -#: branch.c:304

1336 +#: branch.c:305

1337 #, c-format

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

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

1340

1308 -#: branch.c:358

1341 +#: branch.c:359

1342 #, c-format

1343 msgid "'%s' is already checked out at '%s'"

1344 msgstr "'%s' 已经检出到 '%s'"

1345

1313 -#: branch.c:381

1346 +#: branch.c:382

1347 #, c-format

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

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

@@ -1325,70 +1358,70 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"

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

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

1360

1328 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722

1329 -#: builtin/commit.c:774

1361 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763

1362 +#: builtin/commit.c:776

1363 #, c-format

1364 msgid "could not open '%s'"

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

1366

1334 -#: bundle.c:141

1367 +#: bundle.c:143

1368 msgid "Repository lacks these prerequisite commits:"

1369 msgstr "仓库中缺少这些必备的提交："

1370

1338 -#: bundle.c:192

1371 +#: bundle.c:194

1372 #, c-format

1373 msgid "The bundle contains this ref:"

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

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

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

1377

1345 -#: bundle.c:199

1378 +#: bundle.c:201

1379 msgid "The bundle records a complete history."

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

1381

1349 -#: bundle.c:201

1382 +#: bundle.c:203

1383 #, c-format

1384 msgid "The bundle requires this ref:"

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

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

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

1388

1356 -#: bundle.c:267

1389 +#: bundle.c:269

1390 msgid "unable to dup bundle descriptor"

1391 msgstr "无法复制 bundle 描述符"

1392

1360 -#: bundle.c:274

1393 +#: bundle.c:276

1394 msgid "Could not spawn pack-objects"

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

1396

1364 -#: bundle.c:285

1397 +#: bundle.c:287

1398 msgid "pack-objects died"

1399 msgstr "pack-objects 终止"

1400

1368 -#: bundle.c:327

1401 +#: bundle.c:329

1402 msgid "rev-list died"

1403 msgstr "rev-list 终止"

1404

1372 -#: bundle.c:376

1405 +#: bundle.c:378

1406 #, c-format

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

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

1409

1377 -#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304

1410 +#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306

1411 #, c-format

1412 msgid "unrecognized argument: %s"

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

1414

1382 -#: bundle.c:464

1415 +#: bundle.c:465

1416 msgid "Refusing to create empty bundle."

1417 msgstr "不能创建空包。"

1418

1386 -#: bundle.c:474

1419 +#: bundle.c:475

1420 #, c-format

1421 msgid "cannot create '%s'"

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

1423

1391 -#: bundle.c:498

1424 +#: bundle.c:500

1425 msgid "index-pack died"

1426 msgstr "index-pack 终止"

1427

@@ -1397,8 +1430,8 @@ msgstr "index-pack 终止"

1430 msgid "invalid color value: %.*s"

1431 msgstr "无效的颜色值：%.*s"

1432

1400 -#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414

1401 -#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376

1433 +#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399

1434 +#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376

1435 #: builtin/replace.c:448

1436 #, c-format

1437 msgid "could not parse %s"

@@ -1429,27 +1462,27 @@ msgstr ""

1462 "设置 \"git config advice.graftFileDeprecated false\"\n"

1463 "可关闭本消息"

1464

1432 -#: commit.c:1115

1465 +#: commit.c:1122

1466 #, c-format

1467 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

1468 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"

1469

1437 -#: commit.c:1118

1470 +#: commit.c:1125

1471 #, c-format

1472 msgid "Commit %s has a bad GPG signature allegedly by %s."

1473 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"

1474

1442 -#: commit.c:1121

1475 +#: commit.c:1128

1476 #, c-format

1477 msgid "Commit %s does not have a GPG signature."

1478 msgstr "提交 %s 没有 GPG 签名。"

1479

1447 -#: commit.c:1124

1480 +#: commit.c:1131

1481 #, c-format

1482 msgid "Commit %s has a good GPG signature by %s\n"

1483 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"

1484

1452 -#: commit.c:1378

1485 +#: commit.c:1385

1486 msgid ""

1487 "Warning: commit message did not conform to UTF-8.\n"

1488 "You may want to amend it after fixing the message, or set the config\n"

@@ -1459,91 +1492,132 @@ msgstr ""

1492 "您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"

1493 "设置为您项目所用的字符编码。\n"

1494

1462 -#: commit-graph.c:108

1495 +#: commit-graph.c:101

1496 #, c-format

1497 msgid "graph file %s is too small"

1498 msgstr "图形文件 %s 太小"

1499

1467 -#: commit-graph.c:115

1500 +#: commit-graph.c:136

1501 #, c-format

1502 msgid "graph signature %X does not match signature %X"

1503 msgstr "图形签名 %X 和签名 %X 不匹配"

1504

1472 -#: commit-graph.c:122

1505 +#: commit-graph.c:143

1506 #, c-format

1507 msgid "graph version %X does not match version %X"

1508 msgstr "图形版本 %X 和版本 %X 不匹配"

1509

1477 -#: commit-graph.c:129

1510 +#: commit-graph.c:150

1511 #, c-format

1512 msgid "hash version %X does not match version %X"

1513 msgstr "散列版本 %X 和版本 %X 不匹配"

1514

1482 -#: commit-graph.c:153

1515 +#: commit-graph.c:173

1516 +msgid "chunk lookup table entry missing; graph file may be incomplete"

1517 +msgstr "块查找表条目丢失，图形文件可能不完整"

1518 +

1519 +#: commit-graph.c:184

1520 #, c-format

1521 msgid "improper chunk offset %08x%08x"

1522 msgstr "不正确的块偏移 %08x%08x"

1523

1487 -#: commit-graph.c:189

1524 +#: commit-graph.c:221

1525 #, c-format

1526 msgid "chunk id %08x appears multiple times"

1527 msgstr "块 id %08x 出现了多次"

1528

1492 -#: commit-graph.c:308

1529 +#: commit-graph.c:334

1530 #, c-format

1531 msgid "could not find commit %s"

1532 msgstr "无法找到提交 %s"

1533

1497 -#: commit-graph.c:617 builtin/pack-objects.c:2652

1534 +#: commit-graph.c:671 builtin/pack-objects.c:2646

1535 #, c-format

1536 msgid "unable to get type of object %s"

1537 msgstr "无法获得对象 %s 类型"

1538

1502 -#: commit-graph.c:651

1503 -msgid "Annotating commits in commit graph"

1504 -msgstr "正在注解提交图中的提交"

1539 +#: commit-graph.c:704

1540 +msgid "Loading known commits in commit graph"

1541 +msgstr "正在加载提交图中的已知提交"

1542 +

1543 +#: commit-graph.c:720

1544 +msgid "Expanding reachable commits in commit graph"

1545 +msgstr "正在扩展提交图中的可达提交"

1546 +

1547 +#: commit-graph.c:732

1548 +msgid "Clearing commit marks in commit graph"

1549 +msgstr "正在清除提交图中的提交标记"

1550

1506 -#: commit-graph.c:691

1551 +#: commit-graph.c:752

1552 msgid "Computing commit graph generation numbers"

1553 msgstr "正在计算提交图世代数字"

1554

1510 -#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852

1511 -msgid "Finding commits for commit graph"

1512 -msgstr "正在查找提交图的提交"

1555 +#: commit-graph.c:869

1556 +#, c-format

1557 +msgid "Finding commits for commit graph in %d pack"

1558 +msgid_plural "Finding commits for commit graph in %d packs"

1559 +msgstr[0] "正在 %d 个包中查找提交图的提交"

1560 +msgstr[1] "正在 %d 个包中查找提交图的提交"

1561

1514 -#: commit-graph.c:812

1562 +#: commit-graph.c:882

1563 #, c-format

1564 msgid "error adding pack %s"

1565 msgstr "添加包 %s 出错"

1566

1519 -#: commit-graph.c:814

1567 +#: commit-graph.c:884

1568 #, c-format

1569 msgid "error opening index for %s"

1570 msgstr "为 %s 打开索引出错"

1571

1524 -#: commit-graph.c:868

1572 +#: commit-graph.c:898

1573 +#, c-format

1574 +msgid "Finding commits for commit graph from %d ref"

1575 +msgid_plural "Finding commits for commit graph from %d refs"

1576 +msgstr[0] "正在从 %d 个引用中查找提交图的提交"

1577 +msgstr[1] "正在从 %d 个引用中查找提交图的提交"

1578 +

1579 +#: commit-graph.c:930

1580 +msgid "Finding commits for commit graph among packed objects"

1581 +msgstr "正在打包对象中查找提交图的提交"

1582 +

1583 +#: commit-graph.c:943

1584 +msgid "Counting distinct commits in commit graph"

1585 +msgstr "在提交图中计算不同的提交"

1586 +

1587 +#: commit-graph.c:956

1588 #, c-format

1589 msgid "the commit graph format cannot write %d commits"

1590 msgstr "提交图格式不能写入 %d 个提交"

1591

1529 -#: commit-graph.c:895

1592 +#: commit-graph.c:965

1593 +msgid "Finding extra edges in commit graph"

1594 +msgstr "在提交图中查找额外的边"

1595 +

1596 +#: commit-graph.c:989

1597 msgid "too many commits to write graph"

1598 msgstr "提交太多不能画图"

1599

1533 -#: commit-graph.c:902 midx.c:769

1600 +#: commit-graph.c:996 midx.c:769

1601 #, c-format

1602 msgid "unable to create leading directories of %s"

1603 msgstr "不能为 %s 创建先导目录"

1604

1538 -#: commit-graph.c:1002

1605 +#: commit-graph.c:1036

1606 +#, c-format

1607 +msgid "Writing out commit graph in %d pass"

1608 +msgid_plural "Writing out commit graph in %d passes"

1609 +msgstr[0] "用 %d 步写出提交图"

1610 +msgstr[1] "用 %d 步写出提交图"

1611 +

1612 +#: commit-graph.c:1109

1613 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

1614 msgstr "提交图文件的校验码错误，可能已经损坏"

1615

1542 -#: commit-graph.c:1046

1616 +#: commit-graph.c:1153

1617 msgid "Verifying commits in commit graph"

1618 msgstr "校验提交图中的提交"

1619

1546 -#: compat/obstack.c:405 compat/obstack.c:407

1620 +#: compat/obstack.c:406 compat/obstack.c:408

1621 msgid "memory exhausted"

1622 msgstr "内存耗尽"

1623

@@ -1585,7 +1659,7 @@ msgstr "键名没有包含一个小节名称：%s"

1659 msgid "key does not contain variable name: %s"

1660 msgstr "键名没有包含变量名：%s"

1661

1588 -#: config.c:378 sequencer.c:2296

1662 +#: config.c:378 sequencer.c:2330

1663 #, c-format

1664 msgid "invalid key: %s"

1665 msgstr "无效键名：%s"

@@ -1721,7 +1795,7 @@ msgstr "%s 的取值格式错误：%s"

1795 msgid "must be one of nothing, matching, simple, upstream or current"

1796 msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"

1797

1724 -#: config.c:1481 builtin/pack-objects.c:3391

1798 +#: config.c:1481 builtin/pack-objects.c:3394

1799 #, c-format

1800 msgid "bad pack compression level %d"

1801 msgstr "错误的打包压缩级别 %d"

@@ -1794,62 +1868,62 @@ msgstr "%s 有多个取值"

1868 msgid "failed to write new configuration file %s"

1869 msgstr "写入新的配置文件 %s 失败"

1870

1797 -#: config.c:2717 config.c:3041

1871 +#: config.c:2716 config.c:3040

1872 #, c-format

1873 msgid "could not lock config file %s"

1874 msgstr "不能锁定配置文件 %s"

1875

1802 -#: config.c:2728

1876 +#: config.c:2727

1877 #, c-format

1878 msgid "opening %s"

1879 msgstr "打开 %s"

1880

1807 -#: config.c:2763 builtin/config.c:327

1881 +#: config.c:2762 builtin/config.c:328

1882 #, c-format

1883 msgid "invalid pattern: %s"

1884 msgstr "无效模式：%s"

1885

1812 -#: config.c:2788

1886 +#: config.c:2787

1887 #, c-format

1888 msgid "invalid config file %s"

1889 msgstr "无效的配置文件 %s"

1890

1817 -#: config.c:2801 config.c:3054

1891 +#: config.c:2800 config.c:3053

1892 #, c-format

1893 msgid "fstat on %s failed"

1894 msgstr "对 %s 调用 fstat 失败"

1895

1822 -#: config.c:2812

1896 +#: config.c:2811

1897 #, c-format

1898 msgid "unable to mmap '%s'"

1899 msgstr "不能 mmap '%s'"

1900

1827 -#: config.c:2821 config.c:3059

1901 +#: config.c:2820 config.c:3058

1902 #, c-format

1903 msgid "chmod on %s failed"

1904 msgstr "对 %s 调用 chmod 失败"

1905

1832 -#: config.c:2906 config.c:3156

1906 +#: config.c:2905 config.c:3155

1907 #, c-format

1908 msgid "could not write config file %s"

1909 msgstr "不能写入配置文件 %s"

1910

1837 -#: config.c:2940

1911 +#: config.c:2939

1912 #, c-format

1913 msgid "could not set '%s' to '%s'"

1914 msgstr "不能设置 '%s' 为 '%s'"

1915

1842 -#: config.c:2942 builtin/remote.c:782

1916 +#: config.c:2941 builtin/remote.c:782

1917 #, c-format

1918 msgid "could not unset '%s'"

1919 msgstr "不能取消设置 '%s'"

1920

1847 -#: config.c:3032

1921 +#: config.c:3031

1922 #, c-format

1923 msgid "invalid section name: %s"

1924 msgstr "无效的小节名称：%s"

1925

1852 -#: config.c:3199

1926 +#: config.c:3198

1927 #, c-format

1928 msgid "missing value for '%s'"

1929 msgstr "%s 的取值缺失"

@@ -1901,50 +1975,45 @@ msgstr "协议错误：预期浅克隆 sha-1，却得到 '%s'"

1975 msgid "repository on the other end cannot be shallow"

1976 msgstr "另一端的仓库不能是浅克隆仓库"

1977

1904 -#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63

1905 -#, c-format

1906 -msgid "remote error: %s"

1907 -msgstr "远程错误：%s"

1908 -

1909 -#: connect.c:316

1978 +#: connect.c:313

1979 msgid "invalid packet"

1980 msgstr "无效数据包"

1981

1913 -#: connect.c:336

1982 +#: connect.c:333

1983 #, c-format

1984 msgid "protocol error: unexpected '%s'"

1985 msgstr "协议错误：意外的 '%s'"

1986

1918 -#: connect.c:444

1987 +#: connect.c:441

1988 #, c-format

1989 msgid "invalid ls-refs response: %s"

1990 msgstr "无效的 ls-refs 响应：%s"

1991

1923 -#: connect.c:448

1992 +#: connect.c:445

1993 msgid "expected flush after ref listing"

1994 msgstr "在引用列表之后应该有一个 flush 包"

1995

1927 -#: connect.c:547

1996 +#: connect.c:544

1997 #, c-format

1998 msgid "protocol '%s' is not supported"

1999 msgstr "不支持 '%s' 协议"

2000

1932 -#: connect.c:598

2001 +#: connect.c:595

2002 msgid "unable to set SO_KEEPALIVE on socket"

2003 msgstr "无法为 socket 设置 SO_KEEPALIVE"

2004

1936 -#: connect.c:638 connect.c:701

2005 +#: connect.c:635 connect.c:698

2006 #, c-format

2007 msgid "Looking up %s ... "

2008 msgstr "查找 %s ..."

2009

1941 -#: connect.c:642

2010 +#: connect.c:639

2011 #, c-format

2012 msgid "unable to look up %s (port %s) (%s)"

2013 msgstr "无法查找 %s（端口 %s）（%s）"

2014

2015 #. TRANSLATORS: this is the end of "Looking up %s ... "

1947 -#: connect.c:646 connect.c:717

2016 +#: connect.c:643 connect.c:714

2017 #, c-format

2018 msgid ""

2019 "done.\n"

@@ -1953,7 +2022,7 @@ msgstr ""

2022 "完成。\n"

2023 "连接到 %s（端口 %s）... "

2024

1956 -#: connect.c:668 connect.c:745

2025 +#: connect.c:665 connect.c:742

2026 #, c-format

2027 msgid ""

2028 "unable to connect to %s:\n"

@@ -1963,63 +2032,63 @@ msgstr ""

2032 "%s"

2033

2034 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

1966 -#: connect.c:674 connect.c:751

2035 +#: connect.c:671 connect.c:748

2036 msgid "done."

2037 msgstr "完成。"

2038

1970 -#: connect.c:705

2039 +#: connect.c:702

2040 #, c-format

2041 msgid "unable to look up %s (%s)"

2042 msgstr "无法查找 %s（%s）"

2043

1975 -#: connect.c:711

2044 +#: connect.c:708

2045 #, c-format

2046 msgid "unknown port %s"

2047 msgstr "未知端口 %s"

2048

1980 -#: connect.c:848 connect.c:1174

2049 +#: connect.c:845 connect.c:1171

2050 #, c-format

2051 msgid "strange hostname '%s' blocked"

2052 msgstr "已阻止奇怪的主机名 '%s'"

2053

1985 -#: connect.c:850

2054 +#: connect.c:847

2055 #, c-format

2056 msgid "strange port '%s' blocked"

2057 msgstr "已阻止奇怪的端口号 '%s'"

2058

1990 -#: connect.c:860

2059 +#: connect.c:857

2060 #, c-format

2061 msgid "cannot start proxy %s"

2062 msgstr "不能启动代理 %s"

2063

1995 -#: connect.c:927

2064 +#: connect.c:924

2065 msgid "no path specified; see 'git help pull' for valid url syntax"

2066 msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"

2067

1999 -#: connect.c:1122

2068 +#: connect.c:1119

2069 msgid "ssh variant 'simple' does not support -4"

2070 msgstr "ssh 变体 'simple' 不支持 -4"

2071

2003 -#: connect.c:1134

2072 +#: connect.c:1131

2073 msgid "ssh variant 'simple' does not support -6"

2074 msgstr "ssh 变体 'simple' 不支持 -6"

2075

2007 -#: connect.c:1151

2076 +#: connect.c:1148

2077 msgid "ssh variant 'simple' does not support setting port"

2078 msgstr "ssh 变体 'simple' 不支持设置端口"

2079

2011 -#: connect.c:1262

2080 +#: connect.c:1259

2081 #, c-format

2082 msgid "strange pathname '%s' blocked"

2083 msgstr "已阻止奇怪的路径名 '%s'"

2084

2016 -#: connect.c:1307

2085 +#: connect.c:1304

2086 msgid "unable to fork"

2087 msgstr "无法 fork"

2088

2020 -#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147

2089 +#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146

2090 msgid "Checking connectivity"

2022 -msgstr "检查连接中"

2091 +msgstr "正在检查连通性"

2092

2093 #: connected.c:80

2094 msgid "Could not run 'git rev-list'"

@@ -2033,17 +2102,17 @@ msgstr "写入 rev-list 失败"

2102 msgid "failed to close rev-list's stdin"

2103 msgstr "关闭 rev-list 的标准输入失败"

2104

2036 -#: convert.c:194

2105 +#: convert.c:193

2106 #, c-format

2107 msgid "illegal crlf_action %d"

2108 msgstr "非法的 crlf 动作 %d"

2109

2041 -#: convert.c:207

2110 +#: convert.c:206

2111 #, c-format

2112 msgid "CRLF would be replaced by LF in %s"

2113 msgstr "%s 中的 CRLF 将被 LF 替换"

2114

2046 -#: convert.c:209

2115 +#: convert.c:208

2116 #, c-format

2117 msgid ""

2118 "CRLF will be replaced by LF in %s.\n"

@@ -2052,12 +2121,12 @@ msgstr ""

2121 "%s 中的 CRLF 将被 LF 替换。<\n"

2122 "在工作区中该文件仍保持原有的换行符。"

2123

2055 -#: convert.c:217

2124 +#: convert.c:216

2125 #, c-format

2126 msgid "LF would be replaced by CRLF in %s"

2127 msgstr "文件 %s 中的 LF 将被 CRLF 替换"

2128

2060 -#: convert.c:219

2129 +#: convert.c:218

2130 #, c-format

2131 msgid ""

2132 "LF will be replaced by CRLF in %s.\n"

@@ -2066,24 +2135,24 @@ msgstr ""

2135 "%s 中的 LF 将被 CRLF 替换。\n"

2136 "在工作区中该文件仍保持原有的换行符"

2137

2069 -#: convert.c:280

2138 +#: convert.c:279

2139 #, c-format

2140 msgid "BOM is prohibited in '%s' if encoded as %s"

2141 msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM"

2142

2074 -#: convert.c:287

2143 +#: convert.c:286

2144 #, c-format

2145 msgid ""

2146 "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"

2147 "tree-encoding."

2148 msgstr "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%s 作为工作区编码。"

2149

2081 -#: convert.c:305

2150 +#: convert.c:304

2151 #, c-format

2152 msgid "BOM is required in '%s' if encoded as %s"

2153 msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM"

2154

2086 -#: convert.c:307

2155 +#: convert.c:306

2156 #, c-format

2157 msgid ""

2158 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

@@ -2092,37 +2161,37 @@ msgstr ""

2161 "文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字"

2162 "节序）作为工作区编码。"

2163

2095 -#: convert.c:425 convert.c:496

2164 +#: convert.c:424 convert.c:495

2165 #, c-format

2166 msgid "failed to encode '%s' from %s to %s"

2167 msgstr "无法对 '%s' 进行从 %s 到 %s 的编码"

2168

2100 -#: convert.c:468

2169 +#: convert.c:467

2170 #, c-format

2171 msgid "encoding '%s' from %s to %s and back is not the same"

2172 msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"

2173

2105 -#: convert.c:674

2174 +#: convert.c:673

2175 #, c-format

2176 msgid "cannot fork to run external filter '%s'"

2177 msgstr "不能 fork 以执行外部过滤器 '%s'"

2178

2110 -#: convert.c:694

2179 +#: convert.c:693

2180 #, c-format

2181 msgid "cannot feed the input to external filter '%s'"

2182 msgstr "不能将输入传递给外部过滤器 '%s'"

2183

2115 -#: convert.c:701

2184 +#: convert.c:700

2185 #, c-format

2186 msgid "external filter '%s' failed %d"

2187 msgstr "外部过滤器 '%s' 失败码 %d"

2188

2120 -#: convert.c:736 convert.c:739

2189 +#: convert.c:735 convert.c:738

2190 #, c-format

2191 msgid "read from external filter '%s' failed"

2192 msgstr "从外部过滤器 '%s' 读取失败"

2193

2125 -#: convert.c:742 convert.c:796

2194 +#: convert.c:741 convert.c:796

2195 #, c-format

2196 msgid "external filter '%s' failed"

2197 msgstr "外部过滤器 '%s' 失败"

@@ -2156,53 +2225,53 @@ msgstr "%s：clean 过滤器 '%s' 失败"

2225 msgid "%s: smudge filter %s failed"

2226 msgstr "%s：smudge 过滤器 %s 失败"

2227

2159 -#: date.c:116

2228 +#: date.c:137

2229 msgid "in the future"

2230 msgstr "在将来"

2231

2163 -#: date.c:122

2232 +#: date.c:143

2233 #, c-format

2234 msgid "%<PRIuMAX> second ago"

2235 msgid_plural "%<PRIuMAX> seconds ago"

2236 msgstr[0] "%<PRIuMAX> 秒钟前"

2237 msgstr[1] "%<PRIuMAX> 秒钟前"

2238

2170 -#: date.c:129

2239 +#: date.c:150

2240 #, c-format

2241 msgid "%<PRIuMAX> minute ago"

2242 msgid_plural "%<PRIuMAX> minutes ago"

2243 msgstr[0] "%<PRIuMAX> 分钟前"

2244 msgstr[1] "%<PRIuMAX> 分钟前"

2245

2177 -#: date.c:136

2246 +#: date.c:157

2247 #, c-format

2248 msgid "%<PRIuMAX> hour ago"

2249 msgid_plural "%<PRIuMAX> hours ago"

2250 msgstr[0] "%<PRIuMAX> 小时前"

2251 msgstr[1] "%<PRIuMAX> 小时前"

2252

2184 -#: date.c:143

2253 +#: date.c:164

2254 #, c-format

2255 msgid "%<PRIuMAX> day ago"

2256 msgid_plural "%<PRIuMAX> days ago"

2257 msgstr[0] "%<PRIuMAX> 天前"

2258 msgstr[1] "%<PRIuMAX> 天前"

2259

2191 -#: date.c:149

2260 +#: date.c:170

2261 #, c-format

2262 msgid "%<PRIuMAX> week ago"

2263 msgid_plural "%<PRIuMAX> weeks ago"

2264 msgstr[0] "%<PRIuMAX> 周前"

2265 msgstr[1] "%<PRIuMAX> 周前"

2266

2198 -#: date.c:156

2267 +#: date.c:177

2268 #, c-format

2269 msgid "%<PRIuMAX> month ago"

2270 msgid_plural "%<PRIuMAX> months ago"

2271 msgstr[0] "%<PRIuMAX> 个月前"

2272 msgstr[1] "%<PRIuMAX> 个月前"

2273

2205 -#: date.c:167

2274 +#: date.c:188

2275 #, c-format

2276 msgid "%<PRIuMAX> year"

2277 msgid_plural "%<PRIuMAX> years"

@@ -2210,40 +2279,40 @@ msgstr[0] "%<PRIuMAX> 年"

2279 msgstr[1] "%<PRIuMAX> 年"

2280

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

2213 -#: date.c:170

2282 +#: date.c:191

2283 #, c-format

2284 msgid "%s, %<PRIuMAX> month ago"

2285 msgid_plural "%s, %<PRIuMAX> months ago"

2286 msgstr[0] "%s %<PRIuMAX> 个月前"

2287 msgstr[1] "%s %<PRIuMAX> 个月前"

2288

2220 -#: date.c:175 date.c:180

2289 +#: date.c:196 date.c:201

2290 #, c-format

2291 msgid "%<PRIuMAX> year ago"

2292 msgid_plural "%<PRIuMAX> years ago"

2293 msgstr[0] "%<PRIuMAX> 年前"

2294 msgstr[1] "%<PRIuMAX> 年前"

2295

2227 -#: delta-islands.c:268

2296 +#: delta-islands.c:272

2297 msgid "Propagating island marks"

2298 msgstr "正在传播数据岛标记"

2299

2231 -#: delta-islands.c:286

2300 +#: delta-islands.c:290

2301 #, c-format

2302 msgid "bad tree object %s"

2303 msgstr "坏的树对象 %s"

2304

2236 -#: delta-islands.c:330

2305 +#: delta-islands.c:334

2306 #, c-format

2307 msgid "failed to load island regex for '%s': %s"

2308 msgstr "未能加载 '%s' 的数据岛正则表达式：%s"

2309

2241 -#: delta-islands.c:386

2310 +#: delta-islands.c:390

2311 #, c-format

2312 msgid "island regex from config has too many capture groups (max=%d)"

2313 msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 %d 个）"

2314

2246 -#: delta-islands.c:462

2315 +#: delta-islands.c:466

2316 #, c-format

2317 msgid "Marked %d islands, done.\n"

2318 msgstr "已标记 %d 个数据岛，结束。\n"

@@ -2260,7 +2329,7 @@ msgstr "正在进行非精确的重命名探测"

2329 #: diff.c:108

2330 #, c-format

2331 msgid "option '%s' requires a value"

2263 -msgstr "选项 '%s' 需要一个值"

2332 +msgstr "选项 '%s' 需要一个值"

2333

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

2335 #: diff.c:158

@@ -2282,23 +2351,27 @@ msgstr ""

2351 "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 "

2352 "'plain'"

2353

2285 -#: diff.c:316

2354 +#: diff.c:319

2355 #, c-format

2287 -msgid "ignoring unknown color-moved-ws mode '%s'"

2288 -msgstr "忽略未知的 color-moved-ws 模式 '%s'"

2356 +msgid ""

2357 +"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "

2358 +"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"

2359 +msgstr ""

2360 +"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"

2361 +"space-at-eol'、'ignore-all-space'、'allow-indentation-change'"

2362

2290 -#: diff.c:323

2363 +#: diff.c:327

2364 msgid ""

2292 -"color-moved-ws: allow-indentation-change cannot be combined with other white "

2293 -"space modes"

2365 +"color-moved-ws: allow-indentation-change cannot be combined with other "

2366 +"whitespace modes"

2367 msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用"

2368

2296 -#: diff.c:394

2369 +#: diff.c:400

2370 #, c-format

2371 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

2372 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"

2373

2301 -#: diff.c:454

2374 +#: diff.c:460

2375 #, c-format

2376 msgid ""

2377 "Found errors in 'diff.dirstat' config variable:\n"

@@ -2307,24 +2380,24 @@ msgstr ""

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

2381 "%s"

2382

2310 -#: diff.c:4140

2383 +#: diff.c:4211

2384 #, c-format

2385 msgid "external diff died, stopping at %s"

2386 msgstr "外部 diff 退出，停止在 %s"

2387

2315 -#: diff.c:4482

2388 +#: diff.c:4553

2389 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

2390 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"

2391

2319 -#: diff.c:4485

2392 +#: diff.c:4556

2393 msgid "-G, -S and --find-object are mutually exclusive"

2394 msgstr "-G、-S 和 --find-object 是互斥的"

2395

2323 -#: diff.c:4563

2396 +#: diff.c:4634

2397 msgid "--follow requires exactly one pathspec"

2398 msgstr "--follow 明确要求只跟一个路径规格"

2399

2327 -#: diff.c:4729

2400 +#: diff.c:4800

2401 #, c-format

2402 msgid ""

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

@@ -2333,59 +2406,59 @@ msgstr ""

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

2407 "%s"

2408

2336 -#: diff.c:4743

2409 +#: diff.c:4814

2410 #, c-format

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

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

2413

2341 -#: diff.c:5823

2414 +#: diff.c:5900

2415 msgid "inexact rename detection was skipped due to too many files."

2416 msgstr "因为文件太多，略过不严格的重命名检查。"

2417

2345 -#: diff.c:5826

2418 +#: diff.c:5903

2419 msgid "only found copies from modified paths due to too many files."

2420 msgstr "因为文件太多，只在修改的路径中查找拷贝。"

2421

2349 -#: diff.c:5829

2422 +#: diff.c:5906

2423 #, c-format

2424 msgid ""

2425 "you may want to set your %s variable to at least %d and retry the command."

2426 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"

2427

2355 -#: dir.c:576

2428 +#: dir.c:538

2429 #, c-format

2430 msgid "pathspec '%s' did not match any file(s) known to git"

2431 msgstr "路径规格 '%s' 未匹配任何 git 已知文件"

2432

2360 -#: dir.c:965

2433 +#: dir.c:927

2434 #, c-format

2435 msgid "cannot use %s as an exclude file"

2436 msgstr "不能将 %s 用作排除文件"

2437

2365 -#: dir.c:1880

2438 +#: dir.c:1842

2439 #, c-format

2440 msgid "could not open directory '%s'"

2441 msgstr "不能打开目录 '%s'"

2442

2370 -#: dir.c:2122

2443 +#: dir.c:2084

2444 msgid "failed to get kernel name and information"

2445 msgstr "无法获得内核名称和信息"

2446

2374 -#: dir.c:2246

2447 +#: dir.c:2208

2448 msgid "untracked cache is disabled on this system or location"

2449 msgstr "缓存未跟踪文件在本系统或位置中被禁用"

2450

2378 -#: dir.c:3047

2451 +#: dir.c:3009

2452 #, c-format

2453 msgid "index file corrupt in repo %s"

2454 msgstr "仓库 %s 中的索引文件损坏"

2455

2383 -#: dir.c:3092 dir.c:3097

2456 +#: dir.c:3054 dir.c:3059

2457 #, c-format

2458 msgid "could not create directories for %s"

2459 msgstr "不能为 %s 创建目录"

2460

2388 -#: dir.c:3126

2461 +#: dir.c:3088

2462 #, c-format

2463 msgid "could not migrate git directory from '%s' to '%s'"

2464 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"

@@ -2427,235 +2500,239 @@ msgstr "远程未设置 URL"

2500 msgid "git fetch-pack: expected shallow list"

2501 msgstr "git fetch-pack：应为 shallow 列表"

2502

2430 -#: fetch-pack.c:163

2503 +#: fetch-pack.c:154

2504 +msgid "git fetch-pack: expected a flush packet after shallow list"

2505 +msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"

2506 +

2507 +#: fetch-pack.c:165

2508 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

2509 msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"

2510

2434 -#: fetch-pack.c:183

2511 +#: fetch-pack.c:185

2512 #, c-format

2513 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

2514 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"

2515

2439 -#: fetch-pack.c:253

2516 +#: fetch-pack.c:256

2517 msgid "--stateless-rpc requires multi_ack_detailed"

2518 msgstr "--stateless-rpc 需要 multi_ack_detailed"

2519

2443 -#: fetch-pack.c:347 fetch-pack.c:1277

2520 +#: fetch-pack.c:358 fetch-pack.c:1264

2521 #, c-format

2522 msgid "invalid shallow line: %s"

2523 msgstr "无效的 shallow 信息：%s"

2524

2448 -#: fetch-pack.c:353 fetch-pack.c:1283

2525 +#: fetch-pack.c:364 fetch-pack.c:1271

2526 #, c-format

2527 msgid "invalid unshallow line: %s"

2528 msgstr "无效的 unshallow 信息：%s"

2529

2453 -#: fetch-pack.c:355 fetch-pack.c:1285

2530 +#: fetch-pack.c:366 fetch-pack.c:1273

2531 #, c-format

2532 msgid "object not found: %s"

2533 msgstr "对象未找到：%s"

2534

2458 -#: fetch-pack.c:358 fetch-pack.c:1288

2535 +#: fetch-pack.c:369 fetch-pack.c:1276

2536 #, c-format

2537 msgid "error in object: %s"

2538 msgstr "对象中出错：%s"

2539

2463 -#: fetch-pack.c:360 fetch-pack.c:1290

2540 +#: fetch-pack.c:371 fetch-pack.c:1278

2541 #, c-format

2542 msgid "no shallow found: %s"

2543 msgstr "未发现 shallow：%s"

2544

2468 -#: fetch-pack.c:363 fetch-pack.c:1293

2545 +#: fetch-pack.c:374 fetch-pack.c:1282

2546 #, c-format

2547 msgid "expected shallow/unshallow, got %s"

2548 msgstr "应为 shallow/unshallow，却得到 %s"

2549

2473 -#: fetch-pack.c:404

2550 +#: fetch-pack.c:415

2551 #, c-format

2552 msgid "got %s %d %s"

2553 msgstr "得到 %s %d %s"

2554

2478 -#: fetch-pack.c:421

2555 +#: fetch-pack.c:432

2556 #, c-format

2557 msgid "invalid commit %s"

2558 msgstr "无效提交 %s"

2559

2483 -#: fetch-pack.c:452

2560 +#: fetch-pack.c:463

2561 msgid "giving up"

2562 msgstr "放弃"

2563

2487 -#: fetch-pack.c:464 progress.c:229

2564 +#: fetch-pack.c:475 progress.c:229

2565 msgid "done"

2566 msgstr "完成"

2567

2491 -#: fetch-pack.c:476

2568 +#: fetch-pack.c:487

2569 #, c-format

2570 msgid "got %s (%d) %s"

2571 msgstr "得到 %s (%d) %s"

2572

2496 -#: fetch-pack.c:522

2573 +#: fetch-pack.c:533

2574 #, c-format

2575 msgid "Marking %s as complete"

2576 msgstr "标记 %s 为完成"

2577

2501 -#: fetch-pack.c:764

2578 +#: fetch-pack.c:740

2579 #, c-format

2580 msgid "already have %s (%s)"

2581 msgstr "已经有 %s（%s）"

2582

2506 -#: fetch-pack.c:803

2583 +#: fetch-pack.c:779

2584 msgid "fetch-pack: unable to fork off sideband demultiplexer"

2585 msgstr "fetch-pack：无法派生 sideband 多路输出"

2586

2510 -#: fetch-pack.c:811

2587 +#: fetch-pack.c:787

2588 msgid "protocol error: bad pack header"

2589 msgstr "协议错误：坏的包头"

2590

2514 -#: fetch-pack.c:879

2591 +#: fetch-pack.c:855

2592 #, c-format

2593 msgid "fetch-pack: unable to fork off %s"

2594 msgstr "fetch-pack：无法派生进程 %s"

2595

2519 -#: fetch-pack.c:895

2596 +#: fetch-pack.c:871

2597 #, c-format

2598 msgid "%s failed"

2599 msgstr "%s 失败"

2600

2524 -#: fetch-pack.c:897

2601 +#: fetch-pack.c:873

2602 msgid "error in sideband demultiplexer"

2603 msgstr "sideband 多路输出出错"

2604

2528 -#: fetch-pack.c:926

2605 +#: fetch-pack.c:902

2606 msgid "Server does not support shallow clients"

2607 msgstr "服务器不支持 shalllow 客户端"

2608

2532 -#: fetch-pack.c:930

2609 +#: fetch-pack.c:906

2610 msgid "Server supports multi_ack_detailed"

2611 msgstr "服务器支持 multi_ack_detailed"

2612

2536 -#: fetch-pack.c:933

2613 +#: fetch-pack.c:909

2614 msgid "Server supports no-done"

2615 msgstr "服务器支持 no-done"

2616

2540 -#: fetch-pack.c:939

2617 +#: fetch-pack.c:915

2618 msgid "Server supports multi_ack"

2619 msgstr "服务器支持 multi_ack"

2620

2544 -#: fetch-pack.c:943

2621 +#: fetch-pack.c:919

2622 msgid "Server supports side-band-64k"

2623 msgstr "服务器支持 side-band-64k"

2624

2548 -#: fetch-pack.c:947

2625 +#: fetch-pack.c:923

2626 msgid "Server supports side-band"

2627 msgstr "服务器支持 side-band"

2628

2552 -#: fetch-pack.c:951

2629 +#: fetch-pack.c:927

2630 msgid "Server supports allow-tip-sha1-in-want"

2631 msgstr "服务器支持 allow-tip-sha1-in-want"

2632

2556 -#: fetch-pack.c:955

2633 +#: fetch-pack.c:931

2634 msgid "Server supports allow-reachable-sha1-in-want"

2635 msgstr "服务器支持 allow-reachable-sha1-in-want"

2636

2560 -#: fetch-pack.c:965

2637 +#: fetch-pack.c:941

2638 msgid "Server supports ofs-delta"

2639 msgstr "服务器支持 ofs-delta"

2640

2564 -#: fetch-pack.c:971 fetch-pack.c:1158

2641 +#: fetch-pack.c:947 fetch-pack.c:1140

2642 msgid "Server supports filter"

2643 msgstr "服务器支持 filter"

2644

2568 -#: fetch-pack.c:979

2645 +#: fetch-pack.c:955

2646 #, c-format

2647 msgid "Server version is %.*s"

2648 msgstr "服务器版本 %.*s"

2649

2573 -#: fetch-pack.c:985

2650 +#: fetch-pack.c:961

2651 msgid "Server does not support --shallow-since"

2652 msgstr "服务器不支持 --shallow-since"

2653

2577 -#: fetch-pack.c:989

2654 +#: fetch-pack.c:965

2655 msgid "Server does not support --shallow-exclude"

2656 msgstr "服务器不支持 --shallow-exclude"

2657

2581 -#: fetch-pack.c:991

2658 +#: fetch-pack.c:967

2659 msgid "Server does not support --deepen"

2660 msgstr "服务器不支持 --deepen"

2661

2585 -#: fetch-pack.c:1008

2662 +#: fetch-pack.c:984

2663 msgid "no common commits"

2664 msgstr "没有共同的提交"

2665

2589 -#: fetch-pack.c:1020 fetch-pack.c:1418

2666 +#: fetch-pack.c:996 fetch-pack.c:1419

2667 msgid "git fetch-pack: fetch failed."

2668 msgstr "git fetch-pack：获取失败。"

2669

2593 -#: fetch-pack.c:1153

2670 +#: fetch-pack.c:1134

2671 msgid "Server does not support shallow requests"

2672 msgstr "服务器不支持 shalllow 请求"

2673

2597 -#: fetch-pack.c:1199

2674 +#: fetch-pack.c:1184

2675 #, c-format

2676 msgid "error reading section header '%s'"

2677 msgstr "读取节标题 '%s' 出错"

2678

2602 -#: fetch-pack.c:1205

2679 +#: fetch-pack.c:1190

2680 #, c-format

2681 msgid "expected '%s', received '%s'"

2682 msgstr "预期 '%s'，得到 '%s'"

2683

2607 -#: fetch-pack.c:1244

2684 +#: fetch-pack.c:1229

2685 #, c-format

2686 msgid "unexpected acknowledgment line: '%s'"

2687 msgstr "意外的确认行：'%s'"

2688

2612 -#: fetch-pack.c:1249

2689 +#: fetch-pack.c:1234

2690 #, c-format

2691 msgid "error processing acks: %d"

2692 msgstr "处理 ack 出错：%d"

2693

2617 -#: fetch-pack.c:1259

2694 +#: fetch-pack.c:1244

2695 msgid "expected packfile to be sent after 'ready'"

2696 msgstr "预期在 'ready' 之后发送 packfile"

2697

2621 -#: fetch-pack.c:1261

2698 +#: fetch-pack.c:1246

2699 msgid "expected no other sections to be sent after no 'ready'"

2700 msgstr "在没有 'ready' 不应该发送其它小节"

2701

2625 -#: fetch-pack.c:1298

2702 +#: fetch-pack.c:1287

2703 #, c-format

2704 msgid "error processing shallow info: %d"

2705 msgstr "处理浅克隆信息出错：%d"

2706

2630 -#: fetch-pack.c:1314

2707 +#: fetch-pack.c:1308

2708 #, c-format

2709 msgid "expected wanted-ref, got '%s'"

2710 msgstr "预期 wanted-ref，得到 '%s'"

2711

2635 -#: fetch-pack.c:1324

2712 +#: fetch-pack.c:1318

2713 #, c-format

2714 msgid "unexpected wanted-ref: '%s'"

2715 msgstr "意外的 wanted-ref：'%s'"

2716

2640 -#: fetch-pack.c:1328

2717 +#: fetch-pack.c:1322

2718 #, c-format

2719 msgid "error processing wanted refs: %d"

2720 msgstr "处理要获取的引用出错：%d"

2721

2645 -#: fetch-pack.c:1642

2722 +#: fetch-pack.c:1646

2723 msgid "no matching remote head"

2724 msgstr "没有匹配的远程分支"

2725

2649 -#: fetch-pack.c:1660 builtin/clone.c:664

2726 +#: fetch-pack.c:1664 builtin/clone.c:671

2727 msgid "remote did not send all necessary objects"

2728 msgstr "远程没有发送所有必需的对象"

2729

2653 -#: fetch-pack.c:1686

2730 +#: fetch-pack.c:1690

2731 #, c-format

2732 msgid "no such remote ref %s"

2733 msgstr "没有这样的远程引用 %s"

2734

2658 -#: fetch-pack.c:1689

2735 +#: fetch-pack.c:1693

2736 #, c-format

2737 msgid "Server does not allow request for unadvertised object %s"

2738 msgstr "服务器不允许请求未公开的对象 %s"

@@ -2683,8 +2760,8 @@ msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"

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

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

2762

2686 -#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2687 -#: builtin/rm.c:134

2763 +#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82

2764 +#: builtin/rm.c:135

2765 #, c-format

2766 msgid "failed to stat '%s'"

2767 msgstr "对 '%s' 调用 stat 失败"

@@ -2746,41 +2823,41 @@ msgstr "低级命令/同步仓库"

2823 msgid "Low-level Commands / Internal Helpers"

2824 msgstr "低级命令/内部助手"

2825

2749 -#: help.c:296

2826 +#: help.c:298

2827 #, c-format

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

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

2830

2754 -#: help.c:303

2831 +#: help.c:305

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

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

2834

2758 -#: help.c:312

2835 +#: help.c:314

2836 msgid "These are common Git commands used in various situations:"

2837 msgstr "这些是各种场合常见的 Git 命令："

2838

2762 -#: help.c:361 git.c:90

2839 +#: help.c:363 git.c:90

2840 #, c-format

2841 msgid "unsupported command listing type '%s'"

2842 msgstr "不支持的命令列表类型 '%s'"

2843

2767 -#: help.c:408

2844 +#: help.c:410

2845 msgid "The common Git guides are:"

2846 msgstr "最常用的 Git 向导有："

2847

2771 -#: help.c:517

2848 +#: help.c:519

2849 msgid "See 'git help <command>' to read about a specific subcommand"

2850 msgstr "执行　'git help <command>' 来查看特定子命令"

2851

2775 -#: help.c:522

2852 +#: help.c:524

2853 msgid "External commands"

2854 msgstr "外部命令"

2855

2779 -#: help.c:530

2856 +#: help.c:539

2857 msgid "Command aliases"

2858 msgstr "命令别名"

2859

2783 -#: help.c:594

2860 +#: help.c:603

2861 #, c-format

2862 msgid ""

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

@@ -2789,31 +2866,31 @@ msgstr ""

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

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

2868

2792 -#: help.c:653

2869 +#: help.c:662

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

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

2872

2796 -#: help.c:675

2873 +#: help.c:684

2874 #, c-format

2875 msgid "WARNING: You called a Git command named '%s', which does not exist."

2876 msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"

2877

2801 -#: help.c:680

2878 +#: help.c:689

2879 #, c-format

2880 msgid "Continuing under the assumption that you meant '%s'."

2881 msgstr "假定你想要的是 '%s' 并继续。"

2882

2806 -#: help.c:685

2883 +#: help.c:694

2884 #, c-format

2885 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

2886 msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"

2887

2811 -#: help.c:693

2888 +#: help.c:702

2889 #, c-format

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

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

2892

2816 -#: help.c:697

2893 +#: help.c:706

2894 msgid ""

2895 "\n"

2896 "The most similar command is"

@@ -2827,16 +2904,16 @@ msgstr[1] ""

2904 "\n"

2905 "最相似的命令是"

2906

2830 -#: help.c:712

2907 +#: help.c:721

2908 msgid "git version [<options>]"

2909 msgstr "git version [<选项>]"

2910

2834 -#: help.c:780

2911 +#: help.c:789

2912 #, c-format

2913 msgid "%s: %s - %s"

2914 msgstr "%s：%s - %s"

2915

2839 -#: help.c:784

2916 +#: help.c:793

2917 msgid ""

2918 "\n"

2919 "Did you mean this?"

@@ -2903,20 +2980,20 @@ msgstr "不允许空的姓名（对于 <%s>）"

2980 msgid "name consists only of disallowed characters: %s"

2981 msgstr "姓名中仅包含禁用字符：%s"

2982

2906 -#: ident.c:419 builtin/commit.c:606

2983 +#: ident.c:419 builtin/commit.c:608

2984 #, c-format

2985 msgid "invalid date format: %s"

2986 msgstr "无效的日期格式：%s"

2987

2911 -#: list-objects-filter-options.c:35

2988 +#: list-objects-filter-options.c:36

2989 msgid "multiple filter-specs cannot be combined"

2990 msgstr "不能混用多种过滤规格"

2991

2992 #: list-objects-filter-options.c:58

2916 -msgid "only 'tree:0' is supported"

2917 -msgstr "只支持 'tree:0'"

2993 +msgid "expected 'tree:<depth>'"

2994 +msgstr "期望 'tree:<深度>'"

2995

2919 -#: list-objects-filter-options.c:137

2996 +#: list-objects-filter-options.c:152

2997 msgid "cannot change partial clone promisor remote"

2998 msgstr "无法修改部分克隆的 promisor 远程仓库"

2999

@@ -2947,94 +3024,94 @@ msgstr "不能创建 '%s.lock'：%s"

3024 msgid "failed to read the cache"

3025 msgstr "读取缓存失败"

3026

2950 -#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933

2951 -#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764

3027 +#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918

3028 +#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771

3029 msgid "unable to write new index file"

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

3031

2955 -#: merge-recursive.c:323

3032 +#: merge-recursive.c:332

3033 msgid "(bad commit)\n"

3034 msgstr "（坏提交）\n"

3035

2959 -#: merge-recursive.c:345

3036 +#: merge-recursive.c:355

3037 #, c-format

3038 msgid "add_cacheinfo failed for path '%s'; merge aborting."

3039 msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。"

3040

2964 -#: merge-recursive.c:353

3041 +#: merge-recursive.c:364

3042 #, c-format

3043 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

3044 msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。"

3045

2969 -#: merge-recursive.c:435

3046 +#: merge-recursive.c:447

3047 msgid "error building trees"

3048 msgstr "创建树出错"

3049

2973 -#: merge-recursive.c:906

3050 +#: merge-recursive.c:902

3051 #, c-format

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

3053 msgstr "创建路径 '%s'%s 失败"

3054

2978 -#: merge-recursive.c:917

3055 +#: merge-recursive.c:913

3056 #, c-format

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

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

3059

2983 -#: merge-recursive.c:931 merge-recursive.c:950

3060 +#: merge-recursive.c:927 merge-recursive.c:946

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

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

3063

2987 -#: merge-recursive.c:940

3064 +#: merge-recursive.c:936

3065 #, c-format

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

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

3068

2992 -#: merge-recursive.c:982 builtin/cat-file.c:39

3069 +#: merge-recursive.c:978 builtin/cat-file.c:40

3070 #, c-format

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

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

3073

2997 -#: merge-recursive.c:984

3074 +#: merge-recursive.c:980

3075 #, c-format

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

3077 msgstr "%s '%s' 应为数据对象"

3078

3002 -#: merge-recursive.c:1008

3079 +#: merge-recursive.c:1004

3080 #, c-format

3081 msgid "failed to open '%s': %s"

3082 msgstr "打开 '%s' 失败：%s"

3083

3007 -#: merge-recursive.c:1019

3084 +#: merge-recursive.c:1015

3085 #, c-format

3086 msgid "failed to symlink '%s': %s"

3087 msgstr "创建符号链接 '%s' 失败：%s"

3088

3012 -#: merge-recursive.c:1024

3089 +#: merge-recursive.c:1020

3090 #, c-format

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

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

3093

3017 -#: merge-recursive.c:1212

3094 +#: merge-recursive.c:1211

3095 #, c-format

3096 msgid "Failed to merge submodule %s (not checked out)"

3097 msgstr "无法合并子模组 %s （没有检出）"

3098

3022 -#: merge-recursive.c:1219

3099 +#: merge-recursive.c:1218

3100 #, c-format

3101 msgid "Failed to merge submodule %s (commits not present)"

3102 msgstr "无法合并子模组 %s（提交不存在）"

3103

3027 -#: merge-recursive.c:1226

3104 +#: merge-recursive.c:1225

3105 #, c-format

3106 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

3107 msgstr "无法合并子模组 %s （提交未跟随合并基线）"

3108

3032 -#: merge-recursive.c:1234 merge-recursive.c:1246

3109 +#: merge-recursive.c:1233 merge-recursive.c:1245

3110 #, c-format

3111 msgid "Fast-forwarding submodule %s to the following commit:"

3112 msgstr "子模组 %s 快进到如下提交："

3113

3037 -#: merge-recursive.c:1237 merge-recursive.c:1249

3114 +#: merge-recursive.c:1236 merge-recursive.c:1248

3115 #, c-format

3116 msgid "Fast-forwarding submodule %s"

3117 msgstr "快进子模组 %s"

@@ -3074,26 +3151,26 @@ msgstr ""

3151 msgid "Failed to merge submodule %s (multiple merges found)"

3152 msgstr "无法合并子模组 %s （发现多个合并）"

3153

3077 -#: merge-recursive.c:1358

3154 +#: merge-recursive.c:1361

3155 msgid "Failed to execute internal merge"

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

3157

3081 -#: merge-recursive.c:1363

3158 +#: merge-recursive.c:1366

3159 #, c-format

3160 msgid "Unable to add %s to database"

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

3162

3086 -#: merge-recursive.c:1395

3163 +#: merge-recursive.c:1398

3164 #, c-format

3165 msgid "Auto-merging %s"

3166 msgstr "自动合并 %s"

3167

3091 -#: merge-recursive.c:1416

3168 +#: merge-recursive.c:1419

3169 #, c-format

3170 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

3171 msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。"

3172

3096 -#: merge-recursive.c:1483

3173 +#: merge-recursive.c:1486

3174 #, c-format

3175 msgid ""

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

@@ -3102,7 +3179,7 @@ msgstr ""

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

3180 "本被保留。"

3181

3105 -#: merge-recursive.c:1488

3182 +#: merge-recursive.c:1491

3183 #, c-format

3184 msgid ""

3185 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -3111,7 +3188,7 @@ msgstr ""

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

3189 "%7$s 版本被保留。"

3190

3114 -#: merge-recursive.c:1495

3191 +#: merge-recursive.c:1498

3192 #, c-format

3193 msgid ""

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

@@ -3120,7 +3197,7 @@ msgstr ""

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

3198 "本保留在 %8$s 中。"

3199

3123 -#: merge-recursive.c:1500

3200 +#: merge-recursive.c:1503

3201 #, c-format

3202 msgid ""

3203 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -3129,31 +3206,40 @@ msgstr ""

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

3207 "%7$s 版本保留在 %9$s 中。"

3208

3132 -#: merge-recursive.c:1534

3209 +#: merge-recursive.c:1537

3210 msgid "rename"

3211 msgstr "重命名"

3212

3136 -#: merge-recursive.c:1534

3213 +#: merge-recursive.c:1537

3214 msgid "renamed"

3215 msgstr "重命名"

3216

3140 -#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369

3141 -#: merge-recursive.c:3124

3217 +#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213

3218 #, c-format

3219 msgid "Refusing to lose dirty file at %s"

3220 msgstr "拒绝丢失脏文件 '%s'"

3221

3146 -#: merge-recursive.c:1602

3222 +#: merge-recursive.c:1643

3223 +#, c-format

3224 +msgid "Refusing to lose untracked file at %s, even though it's in the way."

3225 +msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"

3226 +

3227 +#: merge-recursive.c:1706

3228 +#, c-format

3229 +msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

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

3231 +

3232 +#: merge-recursive.c:1734

3233 #, c-format

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

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

3236

3151 -#: merge-recursive.c:1607

3237 +#: merge-recursive.c:1739

3238 #, c-format

3239 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3240 msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s"

3241

3156 -#: merge-recursive.c:1633

3242 +#: merge-recursive.c:1759

3243 #, c-format

3244 msgid ""

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

@@ -3162,28 +3248,18 @@ msgstr ""

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

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

3250

3165 -#: merge-recursive.c:1638

3251 +#: merge-recursive.c:1764

3252 msgid " (left unresolved)"

3253 msgstr "（留下未解决）"

3254

3169 -#: merge-recursive.c:1699

3255 +#: merge-recursive.c:1868

3256 #, c-format

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

3258 msgstr ""

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

3260 "%5$s"

3261

3176 -#: merge-recursive.c:1734

3177 -#, c-format

3178 -msgid "Renaming %s to %s and %s to %s instead"

3179 -msgstr "代之以重命名 %s 至 %s，以及 %s 至 %s"

3180 -

3181 -#: merge-recursive.c:1746

3182 -#, c-format

3183 -msgid "Refusing to lose untracked file at %s, even though it's in the way."

3184 -msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。"

3185 -

3186 -#: merge-recursive.c:1952

3262 +#: merge-recursive.c:2064

3263 #, c-format

3264 msgid ""

3265 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3193,7 +3269,7 @@ msgstr ""

3269 "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"

3270 "其它目录，没有目录包含大部分文件。"

3271

3196 -#: merge-recursive.c:1984

3272 +#: merge-recursive.c:2096

3273 #, c-format

3274 msgid ""

3275 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3202,7 +3278,7 @@ msgstr ""

3278 "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"

3279 "在：%s。"

3280

3205 -#: merge-recursive.c:1994

3281 +#: merge-recursive.c:2106

3282 #, c-format

3283 msgid ""

3284 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3211,7 +3287,7 @@ msgstr ""

3287 "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"

3288 "径放置于此：%s"

3289

3214 -#: merge-recursive.c:2086

3290 +#: merge-recursive.c:2198

3291 #, c-format

3292 msgid ""

3293 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3220,92 +3296,87 @@ msgstr ""

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

3297 "%4$s->%5$s"

3298

3223 -#: merge-recursive.c:2331

3299 +#: merge-recursive.c:2443

3300 #, c-format

3301 msgid ""

3302 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

3303 "renamed."

3304 msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"

3305

3230 -#: merge-recursive.c:2737

3231 -#, c-format

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

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

3234 -

3235 -#: merge-recursive.c:2763

3236 -#, c-format

3237 -msgid "Adding merged %s"

3238 -msgstr "添加合并后的 %s"

3239 -

3240 -#: merge-recursive.c:2770 merge-recursive.c:3127

3241 -#, c-format

3242 -msgid "Adding as %s instead"

3243 -msgstr "而是以 %s 为名添加"

3244 -

3245 -#: merge-recursive.c:2934

3306 +#: merge-recursive.c:3022

3307 #, c-format

3308 msgid "cannot read object %s"

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

3310

3250 -#: merge-recursive.c:2937

3311 +#: merge-recursive.c:3025

3312 #, c-format

3313 msgid "object %s is not a blob"

3314 msgstr "对象 %s 不是一个数据对象"

3315

3255 -#: merge-recursive.c:3006

3316 +#: merge-recursive.c:3094

3317 msgid "modify"

3318 msgstr "修改"

3319

3259 -#: merge-recursive.c:3006

3320 +#: merge-recursive.c:3094

3321 msgid "modified"

3322 msgstr "修改"

3323

3263 -#: merge-recursive.c:3017

3324 +#: merge-recursive.c:3105

3325 msgid "content"

3326 msgstr "内容"

3327

3267 -#: merge-recursive.c:3024

3328 +#: merge-recursive.c:3112

3329 msgid "add/add"

3330 msgstr "添加/添加"

3331

3271 -#: merge-recursive.c:3071

3332 +#: merge-recursive.c:3160

3333 #, c-format

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

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

3336

3276 -#: merge-recursive.c:3093 git-submodule.sh:858

3337 +#: merge-recursive.c:3182 git-submodule.sh:861

3338 msgid "submodule"

3339 msgstr "子模组"

3340

3280 -#: merge-recursive.c:3094

3341 +#: merge-recursive.c:3183

3342 #, c-format

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

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

3345

3346 #: merge-recursive.c:3216

3347 #, c-format

3348 +msgid "Adding as %s instead"

3349 +msgstr "而是以 %s 为名添加"

3350 +

3351 +#: merge-recursive.c:3319

3352 +#, c-format

3353 msgid "Removing %s"

3354 msgstr "删除 %s"

3355

3290 -#: merge-recursive.c:3242

3356 +#: merge-recursive.c:3345

3357 msgid "file/directory"

3358 msgstr "文件/目录"

3359

3294 -#: merge-recursive.c:3248

3360 +#: merge-recursive.c:3351

3361 msgid "directory/file"

3362 msgstr "目录/文件"

3363

3298 -#: merge-recursive.c:3255

3364 +#: merge-recursive.c:3358

3365 #, c-format

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

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

3368

3303 -#: merge-recursive.c:3264

3369 +#: merge-recursive.c:3367

3370 #, c-format

3371 msgid "Adding %s"

3372 msgstr "添加 %s"

3373

3308 -#: merge-recursive.c:3300

3374 +#: merge-recursive.c:3376

3375 +#, c-format

3376 +msgid "CONFLICT (add/add): Merge conflict in %s"

3377 +msgstr "冲突（add/add）：合并冲突于 %s"

3378 +

3379 +#: merge-recursive.c:3417

3380 #, c-format

3381 msgid ""

3382 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3314,36 +3385,36 @@ msgstr ""

3385 "您对下列文件的本地修改将被合并操作覆盖：\n"

3386 " %s"

3387

3317 -#: merge-recursive.c:3311

3388 +#: merge-recursive.c:3428

3389 msgid "Already up to date!"

3390 msgstr "已经是最新的！"

3391

3321 -#: merge-recursive.c:3320

3392 +#: merge-recursive.c:3437

3393 #, c-format

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

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

3396

3326 -#: merge-recursive.c:3419

3397 +#: merge-recursive.c:3536

3398 msgid "Merging:"

3399 msgstr "合并："

3400

3330 -#: merge-recursive.c:3432

3401 +#: merge-recursive.c:3549

3402 #, c-format

3403 msgid "found %u common ancestor:"

3404 msgid_plural "found %u common ancestors:"

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

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

3407

3337 -#: merge-recursive.c:3471

3408 +#: merge-recursive.c:3588

3409 msgid "merge returned no commit"

3410 msgstr "合并未返回提交"

3411

3341 -#: merge-recursive.c:3537

3412 +#: merge-recursive.c:3654

3413 #, c-format

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

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

3416

3346 -#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849

3417 +#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850

3418 msgid "Unable to write index."

3419 msgstr "不能写入索引。"

3420

@@ -3433,12 +3504,12 @@ msgstr "清理位于 %s 的多包索引失败"

3504 #, c-format

3505 msgid ""

3506 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

3436 -msgstr "oid 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

3507 +msgstr "对象ID扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

3508

3509 #: midx.c:992

3510 #, c-format

3511 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

3441 -msgstr "oid 查询无序：oid[%d] = %s >= %s = oid[%d]"

3512 +msgstr "对象ID查询无序：oid[%d] = %s >= %s = oid[%d]"

3513

3514 #: midx.c:996

3515 msgid "Verifying object offsets"

@@ -3459,22 +3530,22 @@ msgstr "为包文件 %s 加载包索引失败"

3530 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

3531 msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"

3532

3462 -#: name-hash.c:532

3533 +#: name-hash.c:531

3534 #, c-format

3535 msgid "unable to create lazy_dir thread: %s"

3536 msgstr "不能创建 lazy_dir 线程：%s"

3537

3467 -#: name-hash.c:554

3538 +#: name-hash.c:553

3539 #, c-format

3540 msgid "unable to create lazy_name thread: %s"

3541 msgstr "不能创建 lazy_name 线程：%s"

3542

3472 -#: name-hash.c:560

3543 +#: name-hash.c:559

3544 #, c-format

3545 msgid "unable to join lazy_name thread: %s"

3546 msgstr "不能加入 lasy_name 线程：%s"

3547

3477 -#: notes-merge.c:275

3548 +#: notes-merge.c:277

3549 #, c-format

3550 msgid ""

3551 "You have not concluded your previous notes merge (%s exists).\n"

@@ -3485,21 +3556,21 @@ msgstr ""

3556 "在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git "

3557 "notes merge --abort' 来提交/终止前一次合并。"

3558

3488 -#: notes-merge.c:282

3559 +#: notes-merge.c:284

3560 #, c-format

3561 msgid "You have not concluded your notes merge (%s exists)."

3562 msgstr "您尚未结束注释合并（存在 %s）。"

3563

3493 -#: notes-utils.c:45

3564 +#: notes-utils.c:46

3565 msgid "Cannot commit uninitialized/unreferenced notes tree"

3566 msgstr "不能提交未初始化/未引用的注解树"

3567

3497 -#: notes-utils.c:104

3568 +#: notes-utils.c:105

3569 #, c-format

3570 msgid "Bad notes.rewriteMode value: '%s'"

3571 msgstr "坏的 notes.rewriteMode 值：'%s'"

3572

3502 -#: notes-utils.c:114

3573 +#: notes-utils.c:115

3574 #, c-format

3575 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

3576 msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

@@ -3508,7 +3579,7 @@ msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

3579 #. the environment variable, the second %s is

3580 #. its value.

3581 #.

3511 -#: notes-utils.c:144

3582 +#: notes-utils.c:145

3583 #, c-format

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

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

@@ -3518,45 +3589,105 @@ msgstr "坏的 %s 值：'%s'"

3589 msgid "invalid object type \"%s\""

3590 msgstr "无效的对象类型 \"%s\""

3591

3521 -#: object.c:173

3592 +#: object.c:174

3593 #, c-format

3594 msgid "object %s is a %s, not a %s"

3595 msgstr "对象 %s 是一个 %s，不是一个 %s"

3596

3526 -#: object.c:233

3597 +#: object.c:234

3598 #, c-format

3599 msgid "object %s has unknown type id %d"

3600 msgstr "对象 %s 有未知的类型 id %d"

3601

3531 -#: object.c:246

3602 +#: object.c:247

3603 #, c-format

3604 msgid "unable to parse object: %s"

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

3606

3536 -#: object.c:266 object.c:277

3607 +#: object.c:267 object.c:278

3608 #, c-format

3538 -msgid "sha1 mismatch %s"

3539 -msgstr "sha1 与 %s 不匹配"

3609 +msgid "hash mismatch %s"

3610 +msgstr "哈希值与 %s 不匹配"

3611

3612 #: packfile.c:607

3613 msgid "offset before end of packfile (broken .idx?)"

3614 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"

3615

3545 -#: packfile.c:1864

3616 +#: packfile.c:1870

3617 #, c-format

3618 msgid "offset before start of pack index for %s (corrupt index?)"

3619 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"

3620

3550 -#: packfile.c:1868

3621 +#: packfile.c:1874

3622 #, c-format

3623 msgid "offset beyond end of pack index for %s (truncated index?)"

3624 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"

3625

3555 -#: parse-options.c:672

3626 +#: parse-options.c:35

3627 +#, c-format

3628 +msgid "%s requires a value"

3629 +msgstr "'%s' 需要一个值"

3630 +

3631 +#: parse-options.c:69

3632 +#, c-format

3633 +msgid "%s is incompatible with %s"

3634 +msgstr "%s 与 %s 不兼容"

3635 +

3636 +#: parse-options.c:74

3637 +#, c-format

3638 +msgid "%s : incompatible with something else"

3639 +msgstr "%s：和其它的不兼容"

3640 +

3641 +#: parse-options.c:88 parse-options.c:92 parse-options.c:260

3642 +#, c-format

3643 +msgid "%s takes no value"

3644 +msgstr "%s 无取值"

3645 +

3646 +#: parse-options.c:90

3647 +#, c-format

3648 +msgid "%s isn't available"

3649 +msgstr "%s 不可用"

3650 +

3651 +#: parse-options.c:178

3652 +#, c-format

3653 +msgid "%s expects a numerical value"

3654 +msgstr "%s 期望一个数字值"

3655 +

3656 +#: parse-options.c:194

3657 +#, c-format

3658 +msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

3659 +msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"

3660 +

3661 +#: parse-options.c:322

3662 +#, c-format

3663 +msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

3664 +msgstr "模棱两可的选项：%s（可以是 --%s%s 或 --%s%s）"

3665 +

3666 +#: parse-options.c:356 parse-options.c:364

3667 +#, c-format

3668 +msgid "did you mean `--%s` (with two dashes ?)"

3669 +msgstr "你的意思是 `--%s`（有两个短线？）"

3670 +

3671 +#: parse-options.c:649

3672 +#, c-format

3673 +msgid "unknown option `%s'"

3674 +msgstr "未知选项 `%s'"

3675 +

3676 +#: parse-options.c:651

3677 +#, c-format

3678 +msgid "unknown switch `%c'"

3679 +msgstr "未知开关 `%c'"

3680 +

3681 +#: parse-options.c:653

3682 +#, c-format

3683 +msgid "unknown non-ascii option in string: `%s'"

3684 +msgstr "字符串中未知的非ascii字符选项：`%s'"

3685 +

3686 +#: parse-options.c:675

3687 msgid "..."

3688 msgstr "..."

3689

3559 -#: parse-options.c:691

3690 +#: parse-options.c:694

3691 #, c-format

3692 msgid "usage: %s"

3693 msgstr "用法：%s"

@@ -3564,27 +3695,37 @@ msgstr "用法：%s"

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

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

3697 #.

3567 -#: parse-options.c:697

3698 +#: parse-options.c:700

3699 #, c-format

3700 msgid " or: %s"

3701 msgstr " 或：%s"

3702

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

3573 -#: parse-options.c:700

3704 +#: parse-options.c:703

3705 #, c-format

3706 msgid " %s"

3707 msgstr " %s"

3708

3578 -#: parse-options.c:739

3709 +#: parse-options.c:742

3710 msgid "-NUM"

3711 msgstr "-数字"

3712

3582 -#: parse-options-cb.c:37

3713 +#: parse-options-cb.c:21

3714 +#, c-format

3715 +msgid "option `%s' expects a numerical value"

3716 +msgstr "选项 `%s' 期望一个数字值"

3717 +

3718 +#: parse-options-cb.c:38

3719 #, c-format

3720 msgid "malformed expiration date '%s'"

3721 msgstr "格式错误的到期时间：'%s'"

3722

3587 -#: parse-options-cb.c:109

3723 +#: parse-options-cb.c:51

3724 +#, c-format

3725 +msgid "option `%s' expects \"always\", \"auto\", or \"never\""

3726 +msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""

3727 +

3728 +#: parse-options-cb.c:110

3729 #, c-format

3730 msgid "malformed object name '%s'"

3731 msgstr "格式错误的对象名 '%s'"

@@ -3594,73 +3735,73 @@ msgstr "格式错误的对象名 '%s'"

3735 msgid "Could not make %s writable by group"

3736 msgstr "不能设置 %s 为组可写"

3737

3597 -#: pathspec.c:129

3738 +#: pathspec.c:128

3739 msgid "Escape character '\\' not allowed as last character in attr value"

3740 msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"

3741

3601 -#: pathspec.c:147

3742 +#: pathspec.c:146

3743 msgid "Only one 'attr:' specification is allowed."

3744 msgstr "只允许一个 'attr:' 规格。"

3745

3605 -#: pathspec.c:150

3746 +#: pathspec.c:149

3747 msgid "attr spec must not be empty"

3748 msgstr "属性规格不能为空"

3749

3609 -#: pathspec.c:193

3750 +#: pathspec.c:192

3751 #, c-format

3752 msgid "invalid attribute name %s"

3753 msgstr "无效的属性名 %s"

3754

3614 -#: pathspec.c:258

3755 +#: pathspec.c:257

3756 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

3757 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"

3758

3618 -#: pathspec.c:265

3759 +#: pathspec.c:264

3760 msgid ""

3761 "global 'literal' pathspec setting is incompatible with all other global "

3762 "pathspec settings"

3763 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"

3764

3624 -#: pathspec.c:305

3765 +#: pathspec.c:304

3766 msgid "invalid parameter for pathspec magic 'prefix'"

3767 msgstr "路径规格包含无效的神奇前缀"

3768

3628 -#: pathspec.c:326

3769 +#: pathspec.c:325

3770 #, c-format

3771 msgid "Invalid pathspec magic '%.*s' in '%s'"

3772 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"

3773

3633 -#: pathspec.c:331

3774 +#: pathspec.c:330

3775 #, c-format

3776 msgid "Missing ')' at the end of pathspec magic in '%s'"

3777 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"

3778

3638 -#: pathspec.c:369

3779 +#: pathspec.c:368

3780 #, c-format

3781 msgid "Unimplemented pathspec magic '%c' in '%s'"

3782 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"

3783

3643 -#: pathspec.c:428

3784 +#: pathspec.c:427

3785 #, c-format

3786 msgid "%s: 'literal' and 'glob' are incompatible"

3787 msgstr "%s：'literal' 和 'glob' 不兼容"

3788

3648 -#: pathspec.c:441

3789 +#: pathspec.c:440

3790 #, c-format

3791 msgid "%s: '%s' is outside repository"

3792 msgstr "%s：'%s' 在仓库之外"

3793

3653 -#: pathspec.c:515

3794 +#: pathspec.c:514

3795 #, c-format

3796 msgid "'%s' (mnemonic: '%c')"

3797 msgstr "'%s'（助记符：'%c'）"

3798

3658 -#: pathspec.c:525

3799 +#: pathspec.c:524

3800 #, c-format

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

3802 msgstr "%s：路径规格神奇前缀不被此命令支持：%s"

3803

3663 -#: pathspec.c:592

3804 +#: pathspec.c:591

3805 #, c-format

3806 msgid "pathspec '%s' is beyond a symbolic link"

3807 msgstr "路径规格 '%s' 位于符号链接中"

@@ -3669,50 +3810,55 @@ msgstr "路径规格 '%s' 位于符号链接中"

3810 msgid "flush packet write failed"

3811 msgstr "flush 包写错误"

3812

3672 -#: pkt-line.c:142 pkt-line.c:228

3813 +#: pkt-line.c:144 pkt-line.c:230

3814 msgid "protocol error: impossibly long line"

3815 msgstr "协议错误：不可能的长行"

3816

3676 -#: pkt-line.c:158 pkt-line.c:160

3817 +#: pkt-line.c:160 pkt-line.c:162

3818 msgid "packet write with format failed"

3819 msgstr "格式化包写入错误"

3820

3680 -#: pkt-line.c:192

3821 +#: pkt-line.c:194

3822 msgid "packet write failed - data exceeds max packet size"

3823 msgstr "写数据包失败：数据超过了包的最大长度"

3824

3684 -#: pkt-line.c:199 pkt-line.c:206

3825 +#: pkt-line.c:201 pkt-line.c:208

3826 msgid "packet write failed"

3827 msgstr "数据包写入失败"

3828

3688 -#: pkt-line.c:291

3829 +#: pkt-line.c:293

3830 msgid "read error"

3831 msgstr "读取错误"

3832

3692 -#: pkt-line.c:299

3833 +#: pkt-line.c:301

3834 msgid "the remote end hung up unexpectedly"

3835 msgstr "远端意外挂断了"

3836

3696 -#: pkt-line.c:327

3837 +#: pkt-line.c:329

3838 #, c-format

3839 msgid "protocol error: bad line length character: %.4s"

3840 msgstr "协议错误：错误的行长度字符串：%.4s"

3841

3701 -#: pkt-line.c:337 pkt-line.c:342

3842 +#: pkt-line.c:339 pkt-line.c:344

3843 #, c-format

3844 msgid "protocol error: bad line length %d"

3845 msgstr "协议错误：错误的行长度 %d"

3846

3706 -#: preload-index.c:118

3847 +#: pkt-line.c:353

3848 +#, c-format

3849 +msgid "remote error: %s"

3850 +msgstr "远程错误：%s"

3851 +

3852 +#: preload-index.c:119

3853 msgid "Refreshing index"

3854 msgstr "正在刷新索引"

3855

3710 -#: preload-index.c:137

3856 +#: preload-index.c:138

3857 #, c-format

3858 msgid "unable to create threaded lstat: %s"

3859 msgstr "无法创建线程 lstat：%s"

3860

3715 -#: pretty.c:962

3861 +#: pretty.c:963

3862 msgid "unable to parse --pretty format"

3863 msgstr "不能解析 --pretty 格式"

3864

@@ -3724,7 +3870,7 @@ msgstr "不能启动 `log`"

3870 msgid "could not read `log` output"

3871 msgstr "不能读取 `log` 的输出"

3872

3727 -#: range-diff.c:74 sequencer.c:4764

3873 +#: range-diff.c:74 sequencer.c:4828

3874 #, c-format

3875 msgid "could not parse commit '%s'"

3876 msgstr "不能解析提交 '%s'"

@@ -3738,11 +3884,45 @@ msgstr "生成 diff 失败"

3884 msgid "could not parse log for '%s'"

3885 msgstr "不能解析 '%s' 的日志"

3886

3741 -#: read-cache.c:1490

3887 +#: read-cache.c:673

3888 +#, c-format

3889 +msgid "will not add file alias '%s' ('%s' already exists in index)"

3890 +msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）"

3891 +

3892 +#: read-cache.c:689

3893 +msgid "cannot create an empty blob in the object database"

3894 +msgstr "不能在对象数据库中创建空的数据对象"

3895 +

3896 +#: read-cache.c:710

3897 +#, c-format

3898 +msgid "%s: can only add regular files, symbolic links or git-directories"

3899 +msgstr "%s：只能添加常规文件、符号链接或 git 目录"

3900 +

3901 +#: read-cache.c:765

3902 +#, c-format

3903 +msgid "unable to index file '%s'"

3904 +msgstr "无法索引文件 '%s'"

3905 +

3906 +#: read-cache.c:784

3907 +#, c-format

3908 +msgid "unable to add '%s' to index"

3909 +msgstr "无法在索引中添加 '%s'"

3910 +

3911 +#: read-cache.c:795

3912 +#, c-format

3913 +msgid "unable to stat '%s'"

3914 +msgstr "无法对 %s 执行 stat"

3915 +

3916 +#: read-cache.c:1304

3917 +#, c-format

3918 +msgid "'%s' appears as both a file and as a directory"

3919 +msgstr "'%s' 既显示为文件又显示为目录"

3920 +

3921 +#: read-cache.c:1489

3922 msgid "Refresh index"

3923 msgstr "刷新索引"

3924

3745 -#: read-cache.c:1604

3925 +#: read-cache.c:1603

3926 #, c-format

3927 msgid ""

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

@@ -3751,7 +3931,7 @@ msgstr ""

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

3932 "使用版本 %i"

3933

3754 -#: read-cache.c:1614

3934 +#: read-cache.c:1613

3935 #, c-format

3936 msgid ""

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

@@ -3760,59 +3940,144 @@ msgstr ""

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

3941 "使用版本 %i"

3942

3763 -#: read-cache.c:1792

3943 +#: read-cache.c:1684

3944 +#, c-format

3945 +msgid "bad signature 0x%08x"

3946 +msgstr "坏的签名 0x%08x"

3947 +

3948 +#: read-cache.c:1687

3949 +#, c-format

3950 +msgid "bad index version %d"

3951 +msgstr "坏的索引版本 %d"

3952 +

3953 +#: read-cache.c:1696

3954 +msgid "bad index file sha1 signature"

3955 +msgstr "坏的索引文件哈希值签名"

3956 +

3957 +#: read-cache.c:1726

3958 +#, c-format

3959 +msgid "index uses %.4s extension, which we do not understand"

3960 +msgstr "索引使用不被支持的 %.4s 扩展"

3961 +

3962 +#

3963 +#: read-cache.c:1728

3964 +#, c-format

3965 +msgid "ignoring %.4s extension"

3966 +msgstr "忽略 %.4s 扩展"

3967 +

3968 +#: read-cache.c:1765

3969 +#, c-format

3970 +msgid "unknown index entry format 0x%08x"

3971 +msgstr "未知的索引条目格式 0x%08x"

3972 +

3973 +#: read-cache.c:1781

3974 #, c-format

3975 msgid "malformed name field in the index, near path '%s'"

3976 msgstr "索引中靠近路径 '%s' 有错误的名称字段"

3977

3768 -#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458

3769 -#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585

3770 -#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343

3771 -#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144

3772 -#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329

3978 +#: read-cache.c:1836

3979 +msgid "unordered stage entries in index"

3980 +msgstr "索引中有未排序的暂存条目"

3981 +

3982 +#: read-cache.c:1839

3983 +#, c-format

3984 +msgid "multiple stage entries for merged file '%s'"

3985 +msgstr "合并文件 '%s' 有多个暂存条目"

3986 +

3987 +#: read-cache.c:1842

3988 +#, c-format

3989 +msgid "unordered stage entries for '%s'"

3990 +msgstr "'%s' 的未排序暂存条目"

3991 +

3992 +#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111

3993 +#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294

3994 +#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955

3995 +#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498

3996 +#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271

3997 +#: builtin/submodule--helper.c:330

3998 msgid "index file corrupt"

3999 msgstr "索引文件损坏"

4000

3776 -#: read-cache.c:2101

4001 +#: read-cache.c:2090

4002 #, c-format

4003 msgid "unable to create load_cache_entries thread: %s"

4004 msgstr "无法创建 load_cache_entries 线程：%s"

4005

3781 -#: read-cache.c:2114

4006 +#: read-cache.c:2103

4007 #, c-format

4008 msgid "unable to join load_cache_entries thread: %s"

4009 msgstr "无法加入 load_cache_entries 线程：%s"

4010

3786 -#: read-cache.c:2201

4011 +#: read-cache.c:2136

4012 +#, c-format

4013 +msgid "%s: index file open failed"

4014 +msgstr "%s：打开索引文件失败"

4015 +

4016 +#: read-cache.c:2140

4017 +#, c-format

4018 +msgid "%s: cannot stat the open index"

4019 +msgstr "%s：不能对打开的索引执行 stat 操作"

4020 +

4021 +#: read-cache.c:2144

4022 +#, c-format

4023 +msgid "%s: index file smaller than expected"

4024 +msgstr "%s：索引文件比预期的小"

4025 +

4026 +#: read-cache.c:2148

4027 +#, c-format

4028 +msgid "%s: unable to map index file"

4029 +msgstr "%s：无法对索引文件执行 map 操作"

4030 +

4031 +#: read-cache.c:2190

4032 #, c-format

4033 msgid "unable to create load_index_extensions thread: %s"

4034 msgstr "无法创建 load_index_extensions 线程：%s"

4035

3791 -#: read-cache.c:2228

4036 +#: read-cache.c:2217

4037 #, c-format

4038 msgid "unable to join load_index_extensions thread: %s"

4039 msgstr "无法加入 load_index_extensions 线程：%s"

4040

3796 -#: read-cache.c:2982 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086

4041 +#: read-cache.c:2239

4042 +#, c-format

4043 +msgid "could not freshen shared index '%s'"

4044 +msgstr "无法刷新共享索引 '%s'"

4045 +

4046 +#: read-cache.c:2274

4047 +#, c-format

4048 +msgid "broken index, expect %s in %s, got %s"

4049 +msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

4050 +

4051 +#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087

4052 #, c-format

4053 msgid "could not close '%s'"

4054 msgstr "不能关闭 '%s'"

4055

3801 -#: read-cache.c:3055 sequencer.c:2203 sequencer.c:3592

4056 +#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647

4057 #, c-format

4058 msgid "could not stat '%s'"

4059 msgstr "不能对 '%s' 调用 stat"

4060

3806 -#: read-cache.c:3068

4061 +#: read-cache.c:3057

4062 #, c-format

4063 msgid "unable to open git dir: %s"

4064 msgstr "不能打开 git 目录：%s"

4065

3811 -#: read-cache.c:3080

4066 +#: read-cache.c:3069

4067 #, c-format

4068 msgid "unable to unlink: %s"

4069 msgstr "无法删除：%s"

4070

4071 +#: read-cache.c:3088

4072 +#, c-format

4073 +msgid "cannot fix permission bits on '%s'"

4074 +msgstr "不能修复 '%s' 的权限位"

4075 +

4076 +#: read-cache.c:3237

4077 +#, c-format

4078 +msgid "%s: cannot drop to stage #0"

4079 +msgstr "%s：不能落到暂存区 #0"

4080 +

4081 #: rebase-interactive.c:10

4082 msgid ""

4083 "\n"

@@ -3897,8 +4162,8 @@ msgstr ""

4162 msgid "Note that empty commits are commented out"

4163 msgstr "注意空提交已被注释掉"

4164

3900 -#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186

3901 -#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836

4165 +#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219

4166 +#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900

4167 #, c-format

4168 msgid "could not read '%s'."

4169 msgstr "不能读取 '%s'。"

@@ -3913,7 +4178,7 @@ msgstr "%s 没有指向一个有效的对象！"

4178 msgid "ignoring dangling symref %s"

4179 msgstr "忽略悬空符号引用 %s"

4180

3916 -#: refs.c:585 ref-filter.c:1951

4181 +#: refs.c:585 ref-filter.c:1976

4182 #, c-format

4183 msgid "ignoring broken ref %s"

4184 msgstr "忽略损坏的引用 %s"

@@ -3938,15 +4203,15 @@ msgstr "引用 '%s' 已经存在"

4203 msgid "unexpected object ID when writing '%s'"

4204 msgstr "写入 '%s' 时意外的对象 ID"

4205

3941 -#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636

3942 -#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788

4206 +#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675

4207 +#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852

4208 #: wrapper.c:656

4209 #, c-format

4210 msgid "could not write to '%s'"

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

4212

3948 -#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395

3949 -#: builtin/am.c:728

4213 +#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395

4214 +#: builtin/am.c:713 builtin/rebase.c:575

4215 #, c-format

4216 msgid "could not open '%s' for writing"

4217 msgstr "无法打开 '%s' 进行写入"

@@ -4021,7 +4286,7 @@ msgstr "无法删除引用：%s"

4286 msgid "invalid refspec '%s'"

4287 msgstr "无效的引用表达式：'%s'"

4288

4024 -#: ref-filter.c:39 wt-status.c:1855

4289 +#: ref-filter.c:39 wt-status.c:1861

4290 msgid "gone"

4291 msgstr "丢失"

4292

@@ -4070,148 +4335,153 @@ msgstr "未能识别的 %%(%s) 参数：%s"

4335 msgid "%%(objecttype) does not take arguments"

4336 msgstr "%%(objecttype) 不带参数"

4337

4073 -#: ref-filter.c:235

4338 +#: ref-filter.c:245

4339 +#, c-format

4340 +msgid "unrecognized %%(objectsize) argument: %s"

4341 +msgstr "未能识别的 %%(objectsize) 参数：%s"

4342 +

4343 +#: ref-filter.c:253

4344 #, c-format

4075 -msgid "%%(objectsize) does not take arguments"

4076 -msgstr "%%(objectsize) 不带参数"

4345 +msgid "%%(deltabase) does not take arguments"

4346 +msgstr "%%(deltabase) 不带参数"

4347

4078 -#: ref-filter.c:247

4348 +#: ref-filter.c:265

4349 #, c-format

4350 msgid "%%(body) does not take arguments"

4351 msgstr "%%(body) 不带参数"

4352

4083 -#: ref-filter.c:256

4353 +#: ref-filter.c:274

4354 #, c-format

4355 msgid "%%(subject) does not take arguments"

4356 msgstr "%%(subject) 不带参数"

4357

4088 -#: ref-filter.c:278

4358 +#: ref-filter.c:296

4359 #, c-format

4360 msgid "unknown %%(trailers) argument: %s"

4361 msgstr "未知的 %%(trailers) 参数：%s"

4362

4093 -#: ref-filter.c:307

4363 +#: ref-filter.c:325

4364 #, c-format

4365 msgid "positive value expected contents:lines=%s"

4366 msgstr "期望一个正数 contents:lines=%s"

4367

4098 -#: ref-filter.c:309

4368 +#: ref-filter.c:327

4369 #, c-format

4370 msgid "unrecognized %%(contents) argument: %s"

4371 msgstr "未能识别的 %%(contents) 参数：%s"

4372

4103 -#: ref-filter.c:324

4373 +#: ref-filter.c:342

4374 #, c-format

4375 msgid "positive value expected objectname:short=%s"

4376 msgstr "期望一个正数 objectname:short=%s"

4377

4108 -#: ref-filter.c:328

4378 +#: ref-filter.c:346

4379 #, c-format

4380 msgid "unrecognized %%(objectname) argument: %s"

4381 msgstr "未能识别的 %%(objectname) 参数：%s"

4382

4113 -#: ref-filter.c:358

4383 +#: ref-filter.c:376

4384 #, c-format

4385 msgid "expected format: %%(align:<width>,<position>)"

4386 msgstr "期望的格式：%%(align:<宽度>,<位置>)"

4387

4118 -#: ref-filter.c:370

4388 +#: ref-filter.c:388

4389 #, c-format

4390 msgid "unrecognized position:%s"

4391 msgstr "未能识别的位置：%s"

4392

4123 -#: ref-filter.c:377

4393 +#: ref-filter.c:395

4394 #, c-format

4395 msgid "unrecognized width:%s"

4396 msgstr "未能识别的宽度：%s"

4397

4128 -#: ref-filter.c:386

4398 +#: ref-filter.c:404

4399 #, c-format

4400 msgid "unrecognized %%(align) argument: %s"

4401 msgstr "未能识别的 %%(align) 参数：%s"

4402

4133 -#: ref-filter.c:394

4403 +#: ref-filter.c:412

4404 #, c-format

4405 msgid "positive width expected with the %%(align) atom"

4406 msgstr "元素 %%(align) 需要一个正数的宽度"

4407

4138 -#: ref-filter.c:412

4408 +#: ref-filter.c:430

4409 #, c-format

4410 msgid "unrecognized %%(if) argument: %s"

4411 msgstr "未能识别的 %%(if) 参数：%s"

4412

4143 -#: ref-filter.c:508

4413 +#: ref-filter.c:527

4414 #, c-format

4415 msgid "malformed field name: %.*s"

4416 msgstr "格式错误的字段名：%.*s"

4417

4148 -#: ref-filter.c:535

4418 +#: ref-filter.c:554

4419 #, c-format

4420 msgid "unknown field name: %.*s"

4421 msgstr "未知的字段名：%.*s"

4422

4153 -#: ref-filter.c:539

4423 +#: ref-filter.c:558

4424 #, c-format

4425 msgid ""

4426 "not a git repository, but the field '%.*s' requires access to object data"

4427 msgstr "不是一个 git 仓库，但是字段 '%.*s' 需要访问对象数据"

4428

4159 -#: ref-filter.c:663

4429 +#: ref-filter.c:682

4430 #, c-format

4431 msgid "format: %%(if) atom used without a %%(then) atom"

4432 msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"

4433

4164 -#: ref-filter.c:726

4434 +#: ref-filter.c:745

4435 #, c-format

4436 msgid "format: %%(then) atom used without an %%(if) atom"

4437 msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"

4438

4169 -#: ref-filter.c:728

4439 +#: ref-filter.c:747

4440 #, c-format

4441 msgid "format: %%(then) atom used more than once"

4442 msgstr "格式：%%(then) 元素用了多次"

4443

4174 -#: ref-filter.c:730

4444 +#: ref-filter.c:749

4445 #, c-format

4446 msgid "format: %%(then) atom used after %%(else)"

4447 msgstr "格式：%%(then) 元素用在了 %%(else) 之后"

4448

4179 -#: ref-filter.c:758

4449 +#: ref-filter.c:777

4450 #, c-format

4451 msgid "format: %%(else) atom used without an %%(if) atom"

4452 msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"

4453

4184 -#: ref-filter.c:760

4454 +#: ref-filter.c:779

4455 #, c-format

4456 msgid "format: %%(else) atom used without a %%(then) atom"

4457 msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"

4458

4189 -#: ref-filter.c:762

4459 +#: ref-filter.c:781

4460 #, c-format

4461 msgid "format: %%(else) atom used more than once"

4462 msgstr "格式：%%(else) 元素用了多次"

4463

4194 -#: ref-filter.c:777

4464 +#: ref-filter.c:796

4465 #, c-format

4466 msgid "format: %%(end) atom used without corresponding atom"

4467 msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"

4468

4199 -#: ref-filter.c:834

4469 +#: ref-filter.c:853

4470 #, c-format

4471 msgid "malformed format string %s"

4472 msgstr "错误的格式化字符串 %s"

4473

4204 -#: ref-filter.c:1424

4474 +#: ref-filter.c:1447

4475 #, c-format

4476 msgid "(no branch, rebasing %s)"

4477 msgstr "（非分支，正变基 %s）"

4478

4209 -#: ref-filter.c:1427

4479 +#: ref-filter.c:1450

4480 #, c-format

4481 msgid "(no branch, rebasing detached HEAD %s)"

4482 msgstr "（非分支，正变基分离头指针 %s）"

4483

4214 -#: ref-filter.c:1430

4484 +#: ref-filter.c:1453

4485 #, c-format

4486 msgid "(no branch, bisect started on %s)"

4487 msgstr "（非分支，二分查找开始于 %s）"

@@ -4219,7 +4489,7 @@ msgstr "（非分支，二分查找开始于 %s）"

4489 #. TRANSLATORS: make sure this matches "HEAD

4490 #. detached at " in wt-status.c

4491 #.

4222 -#: ref-filter.c:1438

4492 +#: ref-filter.c:1461

4493 #, c-format

4494 msgid "(HEAD detached at %s)"

4495 msgstr "（头指针分离于 %s）"

@@ -4227,142 +4497,283 @@ msgstr "（头指针分离于 %s）"

4497 #. TRANSLATORS: make sure this matches "HEAD

4498 #. detached from " in wt-status.c

4499 #.

4230 -#: ref-filter.c:1445

4500 +#: ref-filter.c:1468

4501 #, c-format

4502 msgid "(HEAD detached from %s)"

4503 msgstr "（头指针分离自 %s）"

4504

4235 -#: ref-filter.c:1449

4505 +#: ref-filter.c:1472

4506 msgid "(no branch)"

4507 msgstr "（非分支）"

4508

4239 -#: ref-filter.c:1483 ref-filter.c:1638

4509 +#: ref-filter.c:1506 ref-filter.c:1663

4510 #, c-format

4511 msgid "missing object %s for %s"

4512 msgstr "缺失 %2$s 的对象 %1$s"

4513

4244 -#: ref-filter.c:1491

4514 +#: ref-filter.c:1516

4515 #, c-format

4516 msgid "parse_object_buffer failed on %s for %s"

4517 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"

4518

4249 -#: ref-filter.c:1857

4519 +#: ref-filter.c:1882

4520 #, c-format

4521 msgid "malformed object at '%s'"

4522 msgstr "格式错误的对象 '%s'"

4523

4254 -#: ref-filter.c:1946

4524 +#: ref-filter.c:1971

4525 #, c-format

4526 msgid "ignoring ref with broken name %s"

4527 msgstr "忽略带有错误名称 %s 的引用"

4528

4259 -#: ref-filter.c:2232

4529 +#: ref-filter.c:2257

4530 #, c-format

4531 msgid "format: %%(end) atom missing"

4532 msgstr "格式：缺少 %%(end) 元素"

4533

4264 -#: ref-filter.c:2338

4534 +#: ref-filter.c:2352

4535 +#, c-format

4536 +msgid "option `%s' is incompatible with --merged"

4537 +msgstr "选项 `%s' 和 --merged 不兼容"

4538 +

4539 +#: ref-filter.c:2355

4540 +#, c-format

4541 +msgid "option `%s' is incompatible with --no-merged"

4542 +msgstr "选项 `%s' 和 --no-merged 不兼容"

4543 +

4544 +#: ref-filter.c:2365

4545 #, c-format

4546 msgid "malformed object name %s"

4547 msgstr "格式错误的对象名 %s"

4548

4269 -#: remote.c:607

4549 +#: ref-filter.c:2370

4550 +#, c-format

4551 +msgid "option `%s' must point to a commit"

4552 +msgstr "选项 `%s' 必须指向一个提交"

4553 +

4554 +#: remote.c:363

4555 +#, c-format

4556 +msgid "config remote shorthand cannot begin with '/': %s"

4557 +msgstr "配置的远程名称不能以 '/' 开始：%s"

4558 +

4559 +#: remote.c:410

4560 +msgid "more than one receivepack given, using the first"

4561 +msgstr "提供了一个以上的 receivepack，使用第一个"

4562 +

4563 +#: remote.c:418

4564 +msgid "more than one uploadpack given, using the first"

4565 +msgstr "提供了一个以上的 uploadpack，使用第一个"

4566 +

4567 +#: remote.c:608

4568 #, c-format

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

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

4571

4274 -#: remote.c:611

4572 +#: remote.c:612

4573 #, c-format

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

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

4576

4279 -#: remote.c:615

4577 +#: remote.c:616

4578 #, c-format

4579 msgid "%s tracks both %s and %s"

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

4581

4284 -#: remote.c:623

4285 -msgid "Internal error"

4286 -msgstr "内部错误"

4582 +#: remote.c:684

4583 +#, c-format

4584 +msgid "key '%s' of pattern had no '*'"

4585 +msgstr "模式的键 '%s' 没有 '*'"

4586 +

4587 +#: remote.c:694

4588 +#, c-format

4589 +msgid "value '%s' of pattern has no '*'"

4590 +msgstr "模式的值 '%s' 没有 '*'"

4591 +

4592 +#

4593 +#: remote.c:1000

4594 +#, c-format

4595 +msgid "src refspec %s does not match any"

4596 +msgstr "源引用表达式 %s 没有匹配"

4597 +

4598 +#: remote.c:1005

4599 +#, c-format

4600 +msgid "src refspec %s matches more than one"

4601 +msgstr "源引用表达式 %s 匹配超过一个"

4602 +

4603 +#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push

4604 +#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

4605 +#. the <src>.

4606 +#.

4607 +#: remote.c:1020

4608 +#, c-format

4609 +msgid ""

4610 +"The destination you provided is not a full refname (i.e.,\n"

4611 +"starting with \"refs/\"). We tried to guess what you meant by:\n"

4612 +"\n"

4613 +"- Looking for a ref that matches '%s' on the remote side.\n"

4614 +"- Checking if the <src> being pushed ('%s')\n"

4615 +" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"

4616 +" refs/{heads,tags}/ prefix on the remote side.\n"

4617 +"\n"

4618 +"Neither worked, so we gave up. You must fully qualify the ref."

4619 +msgstr ""

4620 +"您提供的目标不是一个完整的引用名称（即以 \"refs/\" 开头）。我们\n"

4621 +"试着猜测您的想法：\n"

4622 +"\n"

4623 +"- 在远端查询和 '%s' 匹配的引用。\n"

4624 +"- 检查要推送的 <src>（'%s'）是不是在 \"refs/{heads,tags}/\" 中的\n"

4625 +" 引用。如果是，我们会在对应的远端添加 refs/{heads,tags}/ 前缀。\n"

4626 +"\n"

4627 +"都不行，所以我们已放弃。您必须给出完整的引用。"

4628 +

4629 +#: remote.c:1040

4630 +#, c-format

4631 +msgid ""

4632 +"The <src> part of the refspec is a commit object.\n"

4633 +"Did you mean to create a new branch by pushing to\n"

4634 +"'%s:refs/heads/%s'?"

4635 +msgstr ""

4636 +"引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"

4637 +"'%s:refs/heads/%s' 推送么？"

4638 +

4639 +#: remote.c:1045

4640 +#, c-format

4641 +msgid ""

4642 +"The <src> part of the refspec is a tag object.\n"

4643 +"Did you mean to create a new tag by pushing to\n"

4644 +"'%s:refs/tags/%s'?"

4645 +msgstr ""

4646 +"引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"

4647 +"'%s:refs/tags/%s' 推送么？"

4648 +

4649 +#: remote.c:1050

4650 +#, c-format

4651 +msgid ""

4652 +"The <src> part of the refspec is a tree object.\n"

4653 +"Did you mean to tag a new tree by pushing to\n"

4654 +"'%s:refs/tags/%s'?"

4655 +msgstr ""

4656 +"引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"

4657 +"'%s:refs/tags/%s' 推送么？"

4658 +

4659 +#: remote.c:1055

4660 +#, c-format

4661 +msgid ""

4662 +"The <src> part of the refspec is a blob object.\n"

4663 +"Did you mean to tag a new blob by pushing to\n"

4664 +"'%s:refs/tags/%s'?"

4665 +msgstr ""

4666 +"引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"

4667 +"'%s:refs/tags/%s' 推送么？"

4668 +

4669 +#: remote.c:1091

4670 +#, c-format

4671 +msgid "%s cannot be resolved to branch"

4672 +msgstr "%s 无法被解析为分支"

4673 +

4674 +#: remote.c:1102

4675 +#, c-format

4676 +msgid "unable to delete '%s': remote ref does not exist"

4677 +msgstr "无法删除 '%s'：远程分支不存在"

4678 +

4679 +#: remote.c:1114

4680 +#, c-format

4681 +msgid "dst refspec %s matches more than one"

4682 +msgstr "目标引用表达式 %s 匹配超过一个"

4683 +

4684 +#: remote.c:1121

4685 +#, c-format

4686 +msgid "dst ref %s receives from more than one src"

4687 +msgstr "目标引用 %s 接收超过一个源"

4688

4288 -#: remote.c:1569 remote.c:1670

4689 +#: remote.c:1624 remote.c:1725

4690 msgid "HEAD does not point to a branch"

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

4692

4292 -#: remote.c:1578

4693 +#: remote.c:1633

4694 #, c-format

4695 msgid "no such branch: '%s'"

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

4697

4297 -#: remote.c:1581

4698 +#: remote.c:1636

4699 #, c-format

4700 msgid "no upstream configured for branch '%s'"

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

4702

4302 -#: remote.c:1587

4703 +#: remote.c:1642

4704 #, c-format

4705 msgid "upstream branch '%s' not stored as a remote-tracking branch"

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

4707

4307 -#: remote.c:1602

4708 +#: remote.c:1657

4709 #, c-format

4710 msgid "push destination '%s' on remote '%s' has no local tracking branch"

4711 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

4712

4312 -#: remote.c:1614

4713 +#: remote.c:1669

4714 #, c-format

4715 msgid "branch '%s' has no remote for pushing"

4716 msgstr "分支 '%s' 没有设置要推送的远程服务器"

4717

4317 -#: remote.c:1624

4718 +#: remote.c:1679

4719 #, c-format

4720 msgid "push refspecs for '%s' do not include '%s'"

4721 msgstr "向 '%s' 推送引用规格未包含 '%s'"

4722

4322 -#: remote.c:1637

4723 +#: remote.c:1692

4724 msgid "push has no destination (push.default is 'nothing')"

4725 msgstr "推送无目标（push.default 是 'nothing'）"

4726

4326 -#: remote.c:1659

4727 +#: remote.c:1714

4728 msgid "cannot resolve 'simple' push to a single destination"

4729 msgstr "无法解析 'simple' 推送至一个单独的目标"

4730

4330 -#: remote.c:1935

4731 +#: remote.c:1840

4732 +#, c-format

4733 +msgid "couldn't find remote ref %s"

4734 +msgstr "无法发现远程引用 %s"

4735 +

4736 +#: remote.c:1853

4737 +#, c-format

4738 +msgid "* Ignoring funny ref '%s' locally"

4739 +msgstr "* 在本地忽略可笑的引用 '%s'"

4740 +

4741 +#: remote.c:1990

4742 #, c-format

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

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

4745

4335 -#: remote.c:1939

4746 +#: remote.c:1994

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

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

4749

4339 -#: remote.c:1942

4750 +#: remote.c:1997

4751 #, c-format

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

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

4754

4344 -#: remote.c:1946

4755 +#: remote.c:2001

4756 #, c-format

4757 msgid "Your branch and '%s' refer to different commits.\n"

4758 msgstr "您的分支和 '%s' 指向不同的提交。\n"

4759

4349 -#: remote.c:1949

4760 +#: remote.c:2004

4761 #, c-format

4762 msgid " (use \"%s\" for details)\n"

4763 msgstr " （使用 \"%s\" 查看详情）\n"

4764

4354 -#: remote.c:1953

4765 +#: remote.c:2008

4766 #, c-format

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

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

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

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

4771

4361 -#: remote.c:1959

4772 +#: remote.c:2014

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

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

4775

4365 -#: remote.c:1962

4776 +#: remote.c:2017

4777 #, c-format

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

4779 msgid_plural ""

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

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

4783

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

4374 -#: remote.c:1970

4785 +#: remote.c:2025

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

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

4788

4378 -#: remote.c:1973

4789 +#: remote.c:2028

4790 #, c-format

4791 msgid ""

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

@@ -4391,10 +4802,15 @@ msgstr[1] ""

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

4803

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

4394 -#: remote.c:1983

4805 +#: remote.c:2038

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

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

4808

4809 +#: remote.c:2221

4810 +#, c-format

4811 +msgid "cannot parse expected object name '%s'"

4812 +msgstr "无法解析期望的对象名 '%s'"

4813 +

4814 #: replace-object.c:21

4815 #, c-format

4816 msgid "bad replace ref name: %s"

@@ -4418,7 +4834,8 @@ msgstr "损坏的 MERGE_RR"

4834 msgid "unable to write rerere record"

4835 msgstr "无法写入 rerere 记录"

4836

4421 -#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162

4837 +#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212

4838 +#: builtin/fsck.c:314

4839 #, c-format

4840 msgid "could not write '%s'"

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

@@ -4473,8 +4890,8 @@ msgstr "不能删除 stray '%s'"

4890 msgid "Recorded preimage for '%s'"

4891 msgstr "为 '%s' 记录 preimage"

4892

4476 -#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413

4477 -#: builtin/submodule--helper.c:1423

4893 +#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417

4894 +#: builtin/submodule--helper.c:1427

4895 #, c-format

4896 msgid "could not create directory '%s'"

4897 msgstr "不能创建目录 '%s'"

@@ -4508,29 +4925,29 @@ msgstr "忘记 '%s' 的解决方案\n"

4925 msgid "unable to open rr-cache directory"

4926 msgstr "不能打开 rr-cache 目录"

4927

4511 -#: revision.c:2324

4928 +#: revision.c:2484

4929 msgid "your current branch appears to be broken"

4930 msgstr "您的当前分支好像被损坏"

4931

4515 -#: revision.c:2327

4932 +#: revision.c:2487

4933 #, c-format

4934 msgid "your current branch '%s' does not have any commits yet"

4935 msgstr "您的当前分支 '%s' 尚无任何提交"

4936

4520 -#: revision.c:2523

4937 +#: revision.c:2684

4938 msgid "--first-parent is incompatible with --bisect"

4939 msgstr "--first-parent 与 --bisect 不兼容"

4940

4524 -#: run-command.c:740

4941 +#: run-command.c:742

4942 msgid "open /dev/null failed"

4943 msgstr "不能打开 /dev/null"

4944

4528 -#: run-command.c:1229

4945 +#: run-command.c:1231

4946 #, c-format

4947 msgid "cannot create async thread: %s"

4948 msgstr "不能创建 async 线程：%s"

4949

4533 -#: run-command.c:1293

4950 +#: run-command.c:1295

4951 #, c-format

4952 msgid ""

4953 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -4539,70 +4956,70 @@ msgstr ""

4956 "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"

4957 "配置 `git config advice.ignoredHook false` 来关闭这条警告。"

4958

4542 -#: send-pack.c:142

4959 +#: send-pack.c:141

4960 msgid "unexpected flush packet while reading remote unpack status"

4961 msgstr "读取远程解包状态时收到意外的 flush 包"

4962

4546 -#: send-pack.c:144

4963 +#: send-pack.c:143

4964 #, c-format

4965 msgid "unable to parse remote unpack status: %s"

4966 msgstr "不能解析远程解包状态：%s"

4967

4551 -#: send-pack.c:146

4968 +#: send-pack.c:145

4969 #, c-format

4970 msgid "remote unpack failed: %s"

4971 msgstr "远程解包失败：%s"

4972

4556 -#: send-pack.c:308

4973 +#: send-pack.c:306

4974 msgid "failed to sign the push certificate"

4975 msgstr "为推送证书签名失败"

4976

4560 -#: send-pack.c:421

4977 +#: send-pack.c:420

4978 msgid "the receiving end does not support --signed push"

4979 msgstr "接收端不支持签名推送"

4980

4564 -#: send-pack.c:423

4981 +#: send-pack.c:422

4982 msgid ""

4983 "not sending a push certificate since the receiving end does not support --"

4984 "signed push"

4985 msgstr "未发送推送证书，因为接收端不支持签名推送"

4986

4570 -#: send-pack.c:435

4987 +#: send-pack.c:434

4988 msgid "the receiving end does not support --atomic push"

4989 msgstr "接收端不支持原子推送"

4990

4574 -#: send-pack.c:440

4991 +#: send-pack.c:439

4992 msgid "the receiving end does not support push options"

4993 msgstr "接收端不支持推送选项"

4994

4578 -#: sequencer.c:183

4995 +#: sequencer.c:184

4996 #, c-format

4997 msgid "invalid commit message cleanup mode '%s'"

4998 msgstr "无效的提交信息清理模式 '%s'"

4999

4583 -#: sequencer.c:287

5000 +#: sequencer.c:288

5001 #, c-format

5002 msgid "could not delete '%s'"

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

5004

4588 -#: sequencer.c:313

5005 +#: sequencer.c:314

5006 msgid "revert"

5007 msgstr "还原"

5008

4592 -#: sequencer.c:315

5009 +#: sequencer.c:316

5010 msgid "cherry-pick"

5011 msgstr "拣选"

5012

4596 -#: sequencer.c:317

5013 +#: sequencer.c:318

5014 msgid "rebase -i"

5015 msgstr "rebase -i"

5016

4600 -#: sequencer.c:319

5017 +#: sequencer.c:320

5018 #, c-format

5019 msgid "unknown action: %d"

5020 msgstr "未知动作：%d"

5021

4605 -#: sequencer.c:376

5022 +#: sequencer.c:378

5023 msgid ""

5024 "after resolving the conflicts, mark the corrected paths\n"

5025 "with 'git add <paths>' or 'git rm <paths>'"

@@ -4610,7 +5027,7 @@ msgstr ""

5027 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

5028 "命令标记修正后的文件"

5029

4613 -#: sequencer.c:379

5030 +#: sequencer.c:381

5031 msgid ""

5032 "after resolving the conflicts, mark the corrected paths\n"

5033 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -4619,39 +5036,39 @@ msgstr ""

5036 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"

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

5038

4622 -#: sequencer.c:392 sequencer.c:2632

5039 +#: sequencer.c:394 sequencer.c:2671

5040 #, c-format

5041 msgid "could not lock '%s'"

5042 msgstr "不能锁定 '%s'"

5043

4627 -#: sequencer.c:399

5044 +#: sequencer.c:401

5045 #, c-format

5046 msgid "could not write eol to '%s'"

5047 msgstr "不能将换行符写入 '%s'"

5048

4632 -#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652

4633 -#: sequencer.c:2885

5049 +#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691

5050 +#: sequencer.c:2931

5051 #, c-format

5052 msgid "failed to finalize '%s'"

5053 msgstr "无法完成 '%s'"

5054

4638 -#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535

4639 -#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746

4640 -#: builtin/merge.c:1084 builtin/rebase.c:152

5055 +#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574

5056 +#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748

5057 +#: builtin/merge.c:1085 builtin/rebase.c:154

5058 #, c-format

5059 msgid "could not read '%s'"

5060 msgstr "不能读取 '%s'"

5061

4645 -#: sequencer.c:453

5062 +#: sequencer.c:455

5063 #, c-format

5064 msgid "your local changes would be overwritten by %s."

5065 msgstr "您的本地修改将被%s覆盖。"

5066

4650 -#: sequencer.c:457

5067 +#: sequencer.c:459

5068 msgid "commit your changes or stash them to proceed."

5069 msgstr "提交您的修改或贮藏后再继续。"

5070

4654 -#: sequencer.c:486

5071 +#: sequencer.c:491

5072 #, c-format

5073 msgid "%s: fast-forward"

5074 msgstr "%s：快进"

@@ -4659,70 +5076,70 @@ msgstr "%s：快进"

5076 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

5077 #. "rebase -i".

5078 #.

4662 -#: sequencer.c:575

5079 +#: sequencer.c:582

5080 #, c-format

5081 msgid "%s: Unable to write new index file"

5082 msgstr "%s：无法写入新索引文件"

5083

4667 -#: sequencer.c:591

5084 +#: sequencer.c:598

5085 msgid "unable to update cache tree"

5086 msgstr "不能更新缓存树"

5087

4671 -#: sequencer.c:604

5088 +#: sequencer.c:612

5089 msgid "could not resolve HEAD commit"

5090 msgstr "不能解析 HEAD 提交"

5091

4675 -#: sequencer.c:684

5092 +#: sequencer.c:692

5093 #, c-format

5094 msgid "no key present in '%.*s'"

5095 msgstr "在 '%.*s' 中没有 key"

5096

4680 -#: sequencer.c:695

5097 +#: sequencer.c:703

5098 #, c-format

5099 msgid "unable to dequote value of '%s'"

5100 msgstr "无法为 '%s' 的值去引号"

5101

4685 -#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719

4686 -#: builtin/am.c:811 builtin/merge.c:1081

5102 +#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704

5103 +#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617

5104 #, c-format

5105 msgid "could not open '%s' for reading"

5106 msgstr "无法打开 '%s' 进行读取"

5107

4691 -#: sequencer.c:742

5108 +#: sequencer.c:750

5109 msgid "'GIT_AUTHOR_NAME' already given"

5110 msgstr "已经给出 'GIT_AUTHOR_NAME'"

5111

4695 -#: sequencer.c:747

5112 +#: sequencer.c:755

5113 msgid "'GIT_AUTHOR_EMAIL' already given"

5114 msgstr "已经给出 'GIT_AUTHOR_EMAIL'"

5115

4699 -#: sequencer.c:752

5116 +#: sequencer.c:760

5117 msgid "'GIT_AUTHOR_DATE' already given"

5118 msgstr "已经给出 'GIT_AUTHOR_DATE'"

5119

4703 -#: sequencer.c:756

5120 +#: sequencer.c:764

5121 #, c-format

5122 msgid "unknown variable '%s'"

5123 msgstr "未知变量 '%s'"

5124

4708 -#: sequencer.c:761

5125 +#: sequencer.c:769

5126 msgid "missing 'GIT_AUTHOR_NAME'"

5127 msgstr "缺少 'GIT_AUTHOR_NAME'"

5128

4712 -#: sequencer.c:763

5129 +#: sequencer.c:771

5130 msgid "missing 'GIT_AUTHOR_EMAIL'"

5131 msgstr "缺少 'GIT_AUTHOR_EMAIL'"

5132

4716 -#: sequencer.c:765

5133 +#: sequencer.c:773

5134 msgid "missing 'GIT_AUTHOR_DATE'"

5135 msgstr "缺少 'GIT_AUTHOR_DATE'"

5136

4720 -#: sequencer.c:825

5137 +#: sequencer.c:833

5138 #, c-format

5139 msgid "invalid date format '%s' in '%s'"

5140 msgstr "'%2$s' 中无效的日期格式 '%1$s'"

5141

4725 -#: sequencer.c:842

5142 +#: sequencer.c:850

5143 #, c-format

5144 msgid ""

5145 "you have staged changes in your working tree\n"

@@ -4751,15 +5168,15 @@ msgstr ""

5168 "\n"

5169 " git rebase --continue\n"

5170

4754 -#: sequencer.c:935

5171 +#: sequencer.c:945

5172 msgid "writing root commit"

5173 msgstr "写根提交"

5174

4758 -#: sequencer.c:1142

5175 +#: sequencer.c:1155

5176 msgid "'prepare-commit-msg' hook failed"

5177 msgstr "'prepare-commit-msg' 钩子失败"

5178

4762 -#: sequencer.c:1149

5179 +#: sequencer.c:1162

5180 msgid ""

5181 "Your name and email address were configured automatically based\n"

5182 "on your username and hostname. Please check that they are accurate.\n"

@@ -4783,7 +5200,7 @@ msgstr ""

5200 "\n"

5201 " git commit --amend --reset-author\n"

5202

4786 -#: sequencer.c:1162

5203 +#: sequencer.c:1175

5204 msgid ""

5205 "Your name and email address were configured automatically based\n"

5206 "on your username and hostname. Please check that they are accurate.\n"

@@ -4806,300 +5223,295 @@ msgstr ""

5223 "\n"

5224 " git commit --amend --reset-author\n"

5225

4809 -#: sequencer.c:1202

5226 +#: sequencer.c:1217

5227 msgid "couldn't look up newly created commit"

5228 msgstr "无法找到新创建的提交"

5229

4813 -#: sequencer.c:1204

5230 +#: sequencer.c:1219

5231 msgid "could not parse newly created commit"

5232 msgstr "不能解析新创建的提交"

5233

4817 -#: sequencer.c:1250

5234 +#: sequencer.c:1265

5235 msgid "unable to resolve HEAD after creating commit"

5236 msgstr "创建提交后，不能解析 HEAD"

5237

4821 -#: sequencer.c:1252

5238 +#: sequencer.c:1267

5239 msgid "detached HEAD"

5240 msgstr "分离头指针"

5241

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

4826 -#: sequencer.c:1256

5243 +#: sequencer.c:1271

5244 msgid " (root-commit)"

5245 msgstr "（根提交）"

5246

4830 -#: sequencer.c:1277

5247 +#: sequencer.c:1292

5248 msgid "could not parse HEAD"

5249 msgstr "不能解析 HEAD"

5250

4834 -#: sequencer.c:1279

5251 +#: sequencer.c:1294

5252 #, c-format

5253 msgid "HEAD %s is not a commit!"

5254 msgstr "HEAD %s 不是一个提交！"

5255

4839 -#: sequencer.c:1283 builtin/commit.c:1543

5256 +#: sequencer.c:1298 builtin/commit.c:1546

5257 msgid "could not parse HEAD commit"

5258 msgstr "不能解析 HEAD 提交"

5259

4843 -#: sequencer.c:1334 sequencer.c:1934

5260 +#: sequencer.c:1350 sequencer.c:1964

5261 msgid "unable to parse commit author"

5262 msgstr "不能解析提交作者"

5263

4847 -#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677

5264 +#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678

5265 msgid "git write-tree failed to write a tree"

5266 msgstr "git write-tree 无法写入树对象"

5267

4851 -#: sequencer.c:1361 sequencer.c:1416

5268 +#: sequencer.c:1377 sequencer.c:1433

5269 #, c-format

5270 msgid "unable to read commit message from '%s'"

5271 msgstr "不能从 '%s' 读取提交说明"

5272

4856 -#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858

4857 -#: builtin/merge.c:883

5273 +#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859

5274 +#: builtin/merge.c:884

5275 msgid "failed to write commit object"

5276 msgstr "写提交对象失败"

5277

4861 -#: sequencer.c:1443

5278 +#: sequencer.c:1460

5279 #, c-format

5280 msgid "could not parse commit %s"

5281 msgstr "不能解析提交 %s"

5282

4866 -#: sequencer.c:1448

5283 +#: sequencer.c:1465

5284 #, c-format

5285 msgid "could not parse parent commit %s"

5286 msgstr "不能解析父提交 %s"

5287

4871 -#: sequencer.c:1546 sequencer.c:1654

5288 +#: sequencer.c:1565 sequencer.c:1675

5289 #, c-format

5290 msgid "unknown command: %d"

5291 msgstr "未知命令：%d"

5292

4876 -#: sequencer.c:1601 sequencer.c:1626

5293 +#: sequencer.c:1622 sequencer.c:1647

5294 #, c-format

5295 msgid "This is a combination of %d commits."

5296 msgstr "这是一个 %d 个提交的组合。"

5297

4881 -#: sequencer.c:1611 sequencer.c:4744

5298 +#: sequencer.c:1632 sequencer.c:4808

5299 msgid "need a HEAD to fixup"

5300 msgstr "需要一个 HEAD 来修复"

5301

4885 -#: sequencer.c:1613 sequencer.c:2912

5302 +#: sequencer.c:1634 sequencer.c:2958

5303 msgid "could not read HEAD"

5304 msgstr "不能读取 HEAD"

5305

4889 -#: sequencer.c:1615

5306 +#: sequencer.c:1636

5307 msgid "could not read HEAD's commit message"

5308 msgstr "不能读取 HEAD 的提交说明"

5309

4893 -#: sequencer.c:1621

5310 +#: sequencer.c:1642

5311 #, c-format

5312 msgid "cannot write '%s'"

5313 msgstr "不能写 '%s'"

5314

4898 -#: sequencer.c:1628 git-rebase--preserve-merges.sh:441

5315 +#: sequencer.c:1649 git-rebase--preserve-merges.sh:441

5316 msgid "This is the 1st commit message:"

5317 msgstr "这是第一个提交说明："

5318

4902 -#: sequencer.c:1636

5319 +#: sequencer.c:1657

5320 #, c-format

5321 msgid "could not read commit message of %s"

5322 msgstr "不能读取 %s 的提交说明"

5323

4907 -#: sequencer.c:1643

5324 +#: sequencer.c:1664

5325 #, c-format

5326 msgid "This is the commit message #%d:"

5327 msgstr "这是提交说明 #%d："

5328

4912 -#: sequencer.c:1649

5329 +#: sequencer.c:1670

5330 #, c-format

5331 msgid "The commit message #%d will be skipped:"

5332 msgstr "提交说明 #%d 将被跳过："

5333

4917 -#: sequencer.c:1732

5334 +#: sequencer.c:1758

5335 msgid "your index file is unmerged."

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

5337

4921 -#: sequencer.c:1739

5338 +#: sequencer.c:1765

5339 msgid "cannot fixup root commit"

5340 msgstr "不能修复根提交"

5341

4925 -#: sequencer.c:1758

5342 +#: sequencer.c:1784

5343 #, c-format

5344 msgid "commit %s is a merge but no -m option was given."

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

5346

4930 -#: sequencer.c:1766

5347 +#: sequencer.c:1792 sequencer.c:1800

5348 #, c-format

5349 msgid "commit %s does not have parent %d"

5350 msgstr "提交 %s 没有第 %d 个父提交"

5351

4935 -#: sequencer.c:1770

4936 -#, c-format

4937 -msgid "mainline was specified but commit %s is not a merge."

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

4939 -

4940 -#: sequencer.c:1776

5352 +#: sequencer.c:1806

5353 #, c-format

5354 msgid "cannot get commit message for %s"

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

5356

5357 #. TRANSLATORS: The first %s will be a "todo" command like

5358 #. "revert" or "pick", the second %s a SHA1.

4947 -#: sequencer.c:1795

5359 +#: sequencer.c:1825

5360 #, c-format

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

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

5363

4952 -#: sequencer.c:1860

5364 +#: sequencer.c:1890

5365 #, c-format

5366 msgid "could not rename '%s' to '%s'"

5367 msgstr "不能将 '%s' 重命名为 '%s'"

5368

4957 -#: sequencer.c:1915

5369 +#: sequencer.c:1945

5370 #, c-format

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

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

5373

4962 -#: sequencer.c:1916

5374 +#: sequencer.c:1946

5375 #, c-format

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

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

5378

4967 -#: sequencer.c:1974

5379 +#: sequencer.c:2005

5380 #, c-format

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

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

5383

4972 -#: sequencer.c:1981

5384 +#: sequencer.c:2012

5385 #, c-format

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

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

5388

4977 -#: sequencer.c:2062

5389 +#: sequencer.c:2094

5390 #, c-format

5391 msgid "%s does not accept arguments: '%s'"

5392 msgstr "%s 不接受参数：'%s'"

5393

4982 -#: sequencer.c:2071

5394 +#: sequencer.c:2103

5395 #, c-format

5396 msgid "missing arguments for %s"

5397 msgstr "缺少 %s 的参数"

5398

4987 -#: sequencer.c:2130

5399 +#: sequencer.c:2163

5400 #, c-format

5401 msgid "invalid line %d: %.*s"

5402 msgstr "无效行 %d：%.*s"

5403

4992 -#: sequencer.c:2138

5404 +#: sequencer.c:2171

5405 #, c-format

5406 msgid "cannot '%s' without a previous commit"

5407 msgstr "没有父提交的情况下不能 '%s'"

5408

4997 -#: sequencer.c:2209

5409 +#: sequencer.c:2243

5410 msgid "please fix this using 'git rebase --edit-todo'."

5411 msgstr "请用 'git rebase --edit-todo' 来修改。"

5412

5001 -#: sequencer.c:2211

5413 +#: sequencer.c:2245

5414 #, c-format

5415 msgid "unusable instruction sheet: '%s'"

5416 msgstr "不可用的指令清单：'%s'"

5417

5006 -#: sequencer.c:2216

5418 +#: sequencer.c:2250

5419 msgid "no commits parsed."

5420 msgstr "没有解析提交。"

5421

5010 -#: sequencer.c:2227

5422 +#: sequencer.c:2261

5423 msgid "cannot cherry-pick during a revert."

5424 msgstr "不能在回退中执行拣选。"

5425

5014 -#: sequencer.c:2229

5426 +#: sequencer.c:2263

5427 msgid "cannot revert during a cherry-pick."

5428 msgstr "不能在拣选中执行回退。"

5429

5018 -#: sequencer.c:2299

5430 +#: sequencer.c:2333

5431 #, c-format

5432 msgid "invalid value for %s: %s"

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

5434

5023 -#: sequencer.c:2380

5435 +#: sequencer.c:2420

5436 msgid "unusable squash-onto"

5437 msgstr "不可用的 squash-onto"

5438

5027 -#: sequencer.c:2396

5439 +#: sequencer.c:2436

5440 #, c-format

5441 msgid "malformed options sheet: '%s'"

5442 msgstr "格式错误的选项清单：'%s'"

5443

5032 -#: sequencer.c:2479 sequencer.c:4005

5444 +#: sequencer.c:2518 sequencer.c:4067

5445 msgid "empty commit set passed"

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

5447

5036 -#: sequencer.c:2487

5448 +#: sequencer.c:2526

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

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

5451

5040 -#: sequencer.c:2488

5452 +#: sequencer.c:2527

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

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

5455

5044 -#: sequencer.c:2491

5456 +#: sequencer.c:2530

5457 #, c-format

5458 msgid "could not create sequencer directory '%s'"

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

5460

5049 -#: sequencer.c:2505

5461 +#: sequencer.c:2544

5462 msgid "could not lock HEAD"

5463 msgstr "不能锁定 HEAD"

5464

5053 -#: sequencer.c:2560 sequencer.c:3761

5465 +#: sequencer.c:2599 sequencer.c:3819

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

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

5468

5057 -#: sequencer.c:2562

5469 +#: sequencer.c:2601

5470 msgid "cannot resolve HEAD"

5471 msgstr "不能解析 HEAD"

5472

5061 -#: sequencer.c:2564 sequencer.c:2599

5473 +#: sequencer.c:2603 sequencer.c:2638

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

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

5476

5065 -#: sequencer.c:2585 builtin/grep.c:721

5477 +#: sequencer.c:2624 builtin/grep.c:732

5478 #, c-format

5479 msgid "cannot open '%s'"

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

5481

5070 -#: sequencer.c:2587

5482 +#: sequencer.c:2626

5483 #, c-format

5484 msgid "cannot read '%s': %s"

5485 msgstr "不能读取 '%s'：%s"

5486

5075 -#: sequencer.c:2588

5487 +#: sequencer.c:2627

5488 msgid "unexpected end of file"

5489 msgstr "意外的文件结束"

5490

5079 -#: sequencer.c:2594

5491 +#: sequencer.c:2633

5492 #, c-format

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

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

5495

5084 -#: sequencer.c:2605

5496 +#: sequencer.c:2644

5497 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

5498 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"

5499

5088 -#: sequencer.c:2709 sequencer.c:3679

5500 +#: sequencer.c:2750 sequencer.c:3735

5501 #, c-format

5502 msgid "could not update %s"

5503 msgstr "不能更新 %s"

5504

5093 -#: sequencer.c:2747 sequencer.c:3659

5505 +#: sequencer.c:2788 sequencer.c:3715

5506 msgid "cannot read HEAD"

5507 msgstr "不能读取 HEAD"

5508

5097 -#: sequencer.c:2762

5509 +#: sequencer.c:2805

5510 #, c-format

5511 msgid "unable to copy '%s' to '%s'"

5512 msgstr "无法拷贝 '%s' 至 '%s'"

5513

5102 -#: sequencer.c:2770

5514 +#: sequencer.c:2813

5515 #, c-format

5516 msgid ""

5517 "You can amend the commit now, with\n"

@@ -5118,28 +5530,28 @@ msgstr ""

5530 "\n"

5531 " git rebase --continue\n"

5532

5121 -#: sequencer.c:2780

5533 +#: sequencer.c:2823

5534 #, c-format

5535 msgid "Could not apply %s... %.*s"

5536 msgstr "不能应用 %s... %.*s"

5537

5126 -#: sequencer.c:2787

5538 +#: sequencer.c:2830

5539 #, c-format

5540 msgid "Could not merge %.*s"

5541 msgstr "不能合并 %.*s"

5542

5131 -#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640

5543 +#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641

5544 #, c-format

5545 msgid "could not copy '%s' to '%s'"

5546 msgstr "不能拷贝 '%s' 至 '%s'"

5547

5136 -#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:1019

5137 -#: builtin/rebase.c:1372 builtin/rebase.c:1426

5548 +#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230

5549 +#: builtin/rebase.c:1591 builtin/rebase.c:1646

5550 msgid "could not read index"

5551 msgstr "不能读取索引"

5552

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

5142 -#: sequencer.c:2829

5554 +#: sequencer.c:2875

5555 #, c-format

5556 msgid ""

5557 "execution failed: %s\n"

@@ -5154,11 +5566,11 @@ msgstr ""

5566 " git rebase --continue\n"

5567 "\n"

5568

5157 -#: sequencer.c:2835

5569 +#: sequencer.c:2881

5570 msgid "and made changes to the index and/or the working tree\n"

5571 msgstr "并且修改索引和/或工作区\n"

5572

5161 -#: sequencer.c:2841

5573 +#: sequencer.c:2887

5574 #, c-format

5575 msgid ""

5576 "execution succeeded: %s\n"

@@ -5175,76 +5587,76 @@ msgstr ""

5587 " git rebase --continue\n"

5588 "\n"

5589

5178 -#: sequencer.c:2902

5590 +#: sequencer.c:2948

5591 #, c-format

5592 msgid "illegal label name: '%.*s'"

5593 msgstr "非法的标签名称：'%.*s'"

5594

5183 -#: sequencer.c:2954

5595 +#: sequencer.c:3002

5596 msgid "writing fake root commit"

5597 msgstr "写伪根提交"

5598

5187 -#: sequencer.c:2959

5599 +#: sequencer.c:3007

5600 msgid "writing squash-onto"

5601 msgstr "写入 squash-onto"

5602

5191 -#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:591

5603 +#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435

5604 #, c-format

5605 msgid "failed to find tree of %s"

5606 msgstr "无法找到 %s 指向的树。"

5607

5196 -#: sequencer.c:3015 builtin/rebase.c:604

5608 +#: sequencer.c:3063 builtin/rebase.c:448

5609 msgid "could not write index"

5610 msgstr "不能写入索引"

5611

5200 -#: sequencer.c:3042

5612 +#: sequencer.c:3090

5613 #, c-format

5614 msgid "could not resolve '%s'"

5615 msgstr "无法解析 '%s'"

5616

5205 -#: sequencer.c:3068

5617 +#: sequencer.c:3118

5618 msgid "cannot merge without a current revision"

5619 msgstr "没有当前版本不能合并"

5620

5209 -#: sequencer.c:3090

5621 +#: sequencer.c:3140

5622 #, c-format

5623 msgid "unable to parse '%.*s'"

5624 msgstr "无法解析 '%.*s'"

5625

5214 -#: sequencer.c:3099

5626 +#: sequencer.c:3149

5627 #, c-format

5628 msgid "nothing to merge: '%.*s'"

5629 msgstr "无可用合并：'%.*s'"

5630

5219 -#: sequencer.c:3111

5631 +#: sequencer.c:3161

5632 msgid "octopus merge cannot be executed on top of a [new root]"

5633 msgstr "章鱼合并不能在一个新的根提交上执行"

5634

5223 -#: sequencer.c:3126

5635 +#: sequencer.c:3176

5636 #, c-format

5637 msgid "could not get commit message of '%s'"

5638 msgstr "不能获取 '%s' 的提交说明"

5639

5228 -#: sequencer.c:3274

5640 +#: sequencer.c:3325

5641 #, c-format

5642 msgid "could not even attempt to merge '%.*s'"

5643 msgstr "甚至不能尝试合并 '%.*s'"

5644

5233 -#: sequencer.c:3290

5645 +#: sequencer.c:3341

5646 msgid "merge: Unable to write new index file"

5647 msgstr "合并：无法写入新索引文件"

5648

5237 -#: sequencer.c:3358 builtin/rebase.c:268

5649 +#: sequencer.c:3409 builtin/rebase.c:298

5650 #, c-format

5651 msgid "Applied autostash.\n"

5652 msgstr "已应用 autostash。\n"

5653

5242 -#: sequencer.c:3370

5654 +#: sequencer.c:3421

5655 #, c-format

5656 msgid "cannot store %s"

5657 msgstr "不能存储 %s"

5658

5247 -#: sequencer.c:3373 builtin/rebase.c:284

5659 +#: sequencer.c:3424 builtin/rebase.c:314

5660 #, c-format

5661 msgid ""

5662 "Applying autostash resulted in conflicts.\n"

@@ -5255,31 +5667,31 @@ msgstr ""

5667 "您的修改安全地保存在贮藏区中。\n"

5668 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"

5669

5258 -#: sequencer.c:3427

5670 +#: sequencer.c:3478

5671 #, c-format

5672 msgid "could not checkout %s"

5673 msgstr "不能检出 %s"

5674

5263 -#: sequencer.c:3441

5675 +#: sequencer.c:3492

5676 #, c-format

5677 msgid "%s: not a valid OID"

5266 -msgstr "%s：不是一个有效的 OID"

5678 +msgstr "%s：不是一个有效的对象ID"

5679

5268 -#: sequencer.c:3446 git-rebase--preserve-merges.sh:724

5680 +#: sequencer.c:3497 git-rebase--preserve-merges.sh:724

5681 msgid "could not detach HEAD"

5682 msgstr "不能分离头指针"

5683

5272 -#: sequencer.c:3461

5684 +#: sequencer.c:3512

5685 #, c-format

5686 msgid "Stopped at HEAD\n"

5687 msgstr "停止在 HEAD\n"

5688

5277 -#: sequencer.c:3463

5689 +#: sequencer.c:3514

5690 #, c-format

5691 msgid "Stopped at %s\n"

5692 msgstr "停止在 %s\n"

5693

5282 -#: sequencer.c:3471

5694 +#: sequencer.c:3522

5695 #, c-format

5696 msgid ""

5697 "Could not execute the todo command\n"

@@ -5299,48 +5711,48 @@ msgstr ""

5711 " git rebase --edit-todo\n"

5712 " git rebase --continue\n"

5713

5302 -#: sequencer.c:3543

5714 +#: sequencer.c:3597

5715 #, c-format

5716 msgid "Stopped at %s... %.*s\n"

5717 msgstr "停止在 %s... %.*s\n"

5718

5307 -#: sequencer.c:3622

5719 +#: sequencer.c:3677

5720 #, c-format

5721 msgid "unknown command %d"

5722 msgstr "未知命令 %d"

5723

5312 -#: sequencer.c:3667

5724 +#: sequencer.c:3723

5725 msgid "could not read orig-head"

5726 msgstr "不能读取 orig-head"

5727

5316 -#: sequencer.c:3672 sequencer.c:4741

5728 +#: sequencer.c:3728 sequencer.c:4805

5729 msgid "could not read 'onto'"

5730 msgstr "不能读取 'onto'"

5731

5320 -#: sequencer.c:3686

5732 +#: sequencer.c:3742

5733 #, c-format

5734 msgid "could not update HEAD to %s"

5735 msgstr "不能更新 HEAD 为 %s"

5736

5325 -#: sequencer.c:3772

5737 +#: sequencer.c:3831

5738 msgid "cannot rebase: You have unstaged changes."

5739 msgstr "不能变基：您有未暂存的变更。"

5740

5329 -#: sequencer.c:3781

5741 +#: sequencer.c:3840

5742 msgid "cannot amend non-existing commit"

5743 msgstr "不能修补不存在的提交"

5744

5333 -#: sequencer.c:3783

5745 +#: sequencer.c:3842

5746 #, c-format

5747 msgid "invalid file: '%s'"

5748 msgstr "无效文件：'%s'"

5749

5338 -#: sequencer.c:3785

5750 +#: sequencer.c:3844

5751 #, c-format

5752 msgid "invalid contents: '%s'"

5753 msgstr "无效内容：'%s'"

5754

5343 -#: sequencer.c:3788

5755 +#: sequencer.c:3847

5756 msgid ""

5757 "\n"

5758 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -5349,53 +5761,53 @@ msgstr ""

5761 "\n"

5762 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"

5763

5352 -#: sequencer.c:3824 sequencer.c:3862

5764 +#: sequencer.c:3883 sequencer.c:3921

5765 #, c-format

5766 msgid "could not write file: '%s'"

5767 msgstr "不能写入文件：'%s'"

5768

5357 -#: sequencer.c:3877

5769 +#: sequencer.c:3936

5770 msgid "could not remove CHERRY_PICK_HEAD"

5771 msgstr "不能删除 CHERRY_PICK_HEAD"

5772

5361 -#: sequencer.c:3884

5773 +#: sequencer.c:3943

5774 msgid "could not commit staged changes."

5775 msgstr "不能提交暂存的修改。"

5776

5365 -#: sequencer.c:3982

5777 +#: sequencer.c:4044

5778 #, c-format

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

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

5781

5370 -#: sequencer.c:3986

5782 +#: sequencer.c:4048

5783 #, c-format

5784 msgid "%s: bad revision"

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

5786

5375 -#: sequencer.c:4021

5787 +#: sequencer.c:4083

5788 msgid "can't revert as initial commit"

5789 msgstr "不能作为初始提交回退"

5790

5379 -#: sequencer.c:4466

5791 +#: sequencer.c:4529

5792 msgid "make_script: unhandled options"

5793 msgstr "make_script：有未能处理的选项"

5794

5383 -#: sequencer.c:4469

5795 +#: sequencer.c:4532

5796 msgid "make_script: error preparing revisions"

5797 msgstr "make_script：准备版本时错误"

5798

5387 -#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840

5799 +#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904

5800 #, c-format

5801 msgid "unusable todo list: '%s'"

5802 msgstr "不可用的待办列表：'%s'"

5803

5392 -#: sequencer.c:4620

5804 +#: sequencer.c:4684

5805 #, c-format

5806 msgid ""

5807 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5808 msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"

5809

5398 -#: sequencer.c:4690

5810 +#: sequencer.c:4754

5811 #, c-format

5812 msgid ""

5813 "Warning: some commits may have been dropped accidentally.\n"

@@ -5404,7 +5816,7 @@ msgstr ""

5816 "警告：一些提交可能被意外丢弃。\n"

5817 "丢弃的提交（从新到旧）：\n"

5818

5407 -#: sequencer.c:4697

5819 +#: sequencer.c:4761

5820 #, c-format

5821 msgid ""

5822 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -5420,7 +5832,7 @@ msgstr ""

5832 "可选值有：ignore、warn、error。\n"

5833 "\n"

5834

5423 -#: sequencer.c:4710

5835 +#: sequencer.c:4774

5836 #, c-format

5837 msgid ""

5838 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -5430,31 +5842,31 @@ msgstr ""

5842 "您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"

5843 "或者您可以用 'git rebase --abort' 终止变基。\n"

5844

5433 -#: sequencer.c:4848 sequencer.c:4886

5845 +#: sequencer.c:4912 sequencer.c:4950

5846 msgid "nothing to do"

5847 msgstr "无事可做"

5848

5437 -#: sequencer.c:4852

5849 +#: sequencer.c:4916

5850 #, c-format

5851 msgid "Rebase %s onto %s (%d command)"

5852 msgid_plural "Rebase %s onto %s (%d commands)"

5853 msgstr[0] "变基 %s 到 %s（%d 个提交）"

5854 msgstr[1] "变基 %s 到 %s（%d 个提交）"

5855

5444 -#: sequencer.c:4864

5856 +#: sequencer.c:4928

5857 #, c-format

5858 msgid "could not copy '%s' to '%s'."

5859 msgstr "不能拷贝 '%s' 至 '%s'。"

5860

5449 -#: sequencer.c:4868 sequencer.c:4897

5861 +#: sequencer.c:4932 sequencer.c:4961

5862 msgid "could not transform the todo list"

5863 msgstr "无法改变待办列表"

5864

5453 -#: sequencer.c:4900

5865 +#: sequencer.c:4964

5866 msgid "could not skip unnecessary pick commands"

5867 msgstr "无法跳过不必要的拣选"

5868

5457 -#: sequencer.c:4983

5869 +#: sequencer.c:5047

5870 msgid "the script was already rearranged."

5871 msgstr "脚本已经重新编排。"

5872

@@ -5561,30 +5973,30 @@ msgstr "不是一个 git 仓库：'%s'"

5973 msgid "cannot chdir to '%s'"

5974 msgstr "不能切换目录到 '%s'"

5975

5564 -#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839

5976 +#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824

5977 msgid "cannot come back to cwd"

5978 msgstr "无法返回当前工作目录"

5979

5568 -#: setup.c:837

5569 -#, c-format

5570 -msgid "not a git repository (or any of the parent directories): %s"

5571 -msgstr "不是一个 git 仓库（或者任何父目录）：%s"

5572 -

5573 -#: setup.c:848

l10n: zh_CN: for git v2.21.0 l10n round 1~2