13185fd241 · matheusbsbs/matheus-bagliano

@@ -142,50 +142,532 @@ msgid ""

142 msgstr ""

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

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

145 -"POT-Creation-Date: 2019-10-28 13:19+0800\n"

146 -"PO-Revision-Date: 2019-11-16 22:26+0800\n"

145 +"POT-Creation-Date: 2019-12-30 08:48+0800\n"

146 +"PO-Revision-Date: 2019-12-31 21:06+0800\n"

147 "Last-Translator: pan93412 <pan93412@gmail.com>\n"

148 "Language-Team: Chinese <chinese-l10n@googlegroups.com>\n"

149 "Language: zh_CN\n"

150 "MIME-Version: 1.0\n"

151 "Content-Type: text/plain; charset=UTF-8\n"

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

153 -"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"

154 -"zhconvert.org\n"

153 +"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 |"

154 +" https://zhconvert.org\n"

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

156 -"X-Generator: Lokalize 19.08.3\n"

156 +"X-Generator: Lokalize 19.12.0\n"

157

158 -#: advice.c:109

158 +#: add-interactive.c:347

159 +#, c-format

160 +#| msgid "Huh (%s)?\n"

161 +msgid "Huh (%s)?"

162 +msgstr "嗯（%s）？"

163 +

164 +#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216

165 +#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643

166 +#: builtin/rebase.c:2019 builtin/rebase.c:2063

167 +msgid "could not read index"

168 +msgstr "不能讀取索引"

169 +

170 +#: add-interactive.c:555 git-add--interactive.perl:269

171 +#: git-add--interactive.perl:294

172 +msgid "binary"

173 +msgstr "二進位"

174 +

175 +#: add-interactive.c:613 git-add--interactive.perl:278

176 +#: git-add--interactive.perl:332

177 +msgid "nothing"

178 +msgstr "無"

179 +

180 +#: add-interactive.c:614 git-add--interactive.perl:314

181 +#: git-add--interactive.perl:329

182 +msgid "unchanged"

183 +msgstr "沒有修改"

184 +

185 +#: add-interactive.c:651 git-add--interactive.perl:643

186 +msgid "Update"

187 +msgstr "更新"

188 +

189 +#: add-interactive.c:668 add-interactive.c:856

190 +#, c-format

191 +#| msgid "could not stat '%s'"

192 +msgid "could not stage '%s'"

193 +msgstr "不能暫存 '%s'"

194 +

195 +#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409

196 +#: builtin/rebase.c:895

197 +msgid "could not write index"

198 +msgstr "不能寫入索引"

199 +

200 +#: add-interactive.c:677 git-add--interactive.perl:628

201 +#, c-format, perl-format

202 +msgid "updated %d path\n"

203 +msgid_plural "updated %d paths\n"

204 +msgstr[0] "更新了 %d 個路徑\n"

205 +msgstr[1] "更新了 %d 個路徑\n"

206 +

207 +#: add-interactive.c:695 git-add--interactive.perl:678

208 +#, c-format, perl-format

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

210 +msgstr "說明：%s 現已成為未追蹤的。\n"

211 +

212 +#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281

213 +#: builtin/reset.c:144

214 +#, c-format

215 +msgid "make_cache_entry failed for path '%s'"

216 +msgstr "對路徑 '%s' 的 make_cache_entry 動作失敗"

217 +

218 +#: add-interactive.c:730 git-add--interactive.perl:655

219 +msgid "Revert"

220 +msgstr "還原"

221 +

222 +#: add-interactive.c:746

223 +#| msgid "could not parse HEAD"

224 +msgid "Could not parse HEAD^{tree}"

225 +msgstr "不能解析 HEAD^{樹}"

226 +

227 +#: add-interactive.c:784 git-add--interactive.perl:631

228 +#, c-format, perl-format

229 +msgid "reverted %d path\n"

230 +msgid_plural "reverted %d paths\n"

231 +msgstr[0] "還原了 %d 個路徑\n"

232 +msgstr[1] "還原了 %d 個路徑\n"

233 +

234 +#: add-interactive.c:835 git-add--interactive.perl:695

235 +#, c-format

236 +msgid "No untracked files.\n"

237 +msgstr "沒有未追蹤的檔案。\n"

238 +

239 +#: add-interactive.c:839 git-add--interactive.perl:689

240 +msgid "Add untracked"

241 +msgstr "新增未追蹤的"

242 +

243 +#: add-interactive.c:866 git-add--interactive.perl:625

244 +#, c-format, perl-format

245 +msgid "added %d path\n"

246 +msgid_plural "added %d paths\n"

247 +msgstr[0] "增加了 %d 個路徑\n"

248 +msgstr[1] "增加了 %d 個路徑\n"

249 +

250 +#: add-interactive.c:896

251 +#, c-format

252 +#| msgid "ignoring unmerged: %s\n"

253 +msgid "ignoring unmerged: %s"

254 +msgstr "忽略未合併：%s"

255 +

256 +#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366

257 +#, c-format

258 +msgid "Only binary files changed.\n"

259 +msgstr "只有二進位檔案被修改。\n"

260 +

261 +#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368

262 +#, c-format

263 +msgid "No changes.\n"

264 +msgstr "沒有修改。\n"

265 +

266 +#: add-interactive.c:914 git-add--interactive.perl:1376

267 +msgid "Patch update"

268 +msgstr "修補檔更新"

269 +

270 +#: add-interactive.c:953 git-add--interactive.perl:1754

271 +msgid "Review diff"

272 +msgstr "檢視 diff"

273 +

274 +#: add-interactive.c:981

275 +#| msgid "show matching files in the pager"

276 +msgid "show paths with changes"

277 +msgstr "顯示有變更的路徑"

278 +

279 +#: add-interactive.c:983

280 +msgid "add working tree state to the staged set of changes"

281 +msgstr "加入工作區狀態至暫存列表"

282 +

283 +#: add-interactive.c:985

284 +msgid "revert staged set of changes back to the HEAD version"

285 +msgstr "還原修改的暫存集至 HEAD 版本"

286 +

287 +#: add-interactive.c:987

288 +#| msgid "select hunks interactively"

289 +msgid "pick hunks and update selectively"

290 +msgstr "挑選區塊並選擇性更新"

291 +

292 +#: add-interactive.c:989

293 +#| msgid "reset HEAD and index"

294 +msgid "view diff between HEAD and index"

295 +msgstr "檢視 HEAD 及索引之間的差異"

296 +

297 +#: add-interactive.c:991

298 +msgid "add contents of untracked files to the staged set of changes"

299 +msgstr "加入未追蹤檔案的內容至暫存列表"

300 +

301 +#: add-interactive.c:999 add-interactive.c:1048

302 +msgid "Prompt help:"

303 +msgstr "提示說明："

304 +

305 +#: add-interactive.c:1001

306 +#| msgid "select mainline parent"

307 +msgid "select a single item"

308 +msgstr "選擇單一項目"

309 +

310 +#: add-interactive.c:1003

311 +#| msgid "select handling of signed tags"

312 +msgid "select a range of items"

313 +msgstr "選擇項目範圍"

314 +

315 +#: add-interactive.c:1005

316 +#| msgid "%s has multiple values"

317 +msgid "select multiple ranges"

318 +msgstr "選擇多個範圍"

319 +

320 +#: add-interactive.c:1007 add-interactive.c:1052

321 +msgid "select item based on unique prefix"

322 +msgstr "基於唯一前綴選擇項目"

323 +

324 +#: add-interactive.c:1009

325 +#| msgid "use specified template file"

326 +msgid "unselect specified items"

327 +msgstr "取消選擇指定項目"

328 +

329 +#: add-interactive.c:1011

330 +#| msgid "choose a diff algorithm"

331 +msgid "choose all items"

332 +msgstr "選擇所有項目"

333 +

334 +#: add-interactive.c:1013

335 +msgid "(empty) finish selecting"

336 +msgstr "（空）完成選取"

337 +

338 +#: add-interactive.c:1050

339 +#| msgid "%s expects a numerical value"

340 +msgid "select a numbered item"

341 +msgstr "選擇編號過的項目"

342 +

343 +#: add-interactive.c:1054

344 +#| msgid "empty exec command"

345 +msgid "(empty) select nothing"

346 +msgstr "（空）全不選取"

347 +

348 +#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851

349 +msgid "*** Commands ***"

350 +msgstr "*** 指令 ***"

351 +

352 +#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848

353 +msgid "What now"

354 +msgstr "請選擇"

355 +

356 +#: add-interactive.c:1115 git-add--interactive.perl:213

357 +msgid "staged"

358 +msgstr "快取"

359 +

360 +#: add-interactive.c:1115 git-add--interactive.perl:213

361 +msgid "unstaged"

362 +msgstr "未快取"

363 +

364 +#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197

365 +#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144

366 +#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409

367 +#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382

368 +#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878

369 +#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213

370 +msgid "path"

371 +msgstr "路徑"

372 +

373 +#: add-interactive.c:1122

374 +#| msgid "could not read index"

375 +msgid "could not refresh index"

376 +msgstr "無法重新整理索引"

377 +

378 +#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765

379 +#, c-format

380 +msgid "Bye.\n"

381 +msgstr "再見。\n"

382 +

383 +#: add-patch.c:15

384 +#, c-format

385 +#| msgid "Stage mode change [y,n,q,a,d%s,?]? "

386 +msgid "Stage mode change [y,n,a,q,d%s,?]? "

387 +msgstr "暫存模式變更 [y,n,a,q,d%s,?]？"

388 +

389 +#: add-patch.c:16

390 +#, c-format

391 +#| msgid "Stage deletion [y,n,q,a,d%s,?]? "

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

393 +msgstr "暫存刪除動作 [y,n,a,q,d%s,?]？"

394 +

395 +#: add-patch.c:17

396 +#, c-format

397 +#| msgid "Stage this hunk [y,n,q,a,d%s,?]? "

398 +msgid "Stage this hunk [y,n,a,q,d%s,?]? "

399 +msgstr "暫存此區塊 [y,n,a,q,d%s,?]？"

400 +

401 +#: add-patch.c:111

402 +#, c-format

403 +#| msgid "could not parse git header '%.*s'"

404 +msgid "could not parse hunk header '%.*s'"

405 +msgstr "無法解析區塊標頭 '%.*s'"

406 +

407 +#: add-patch.c:130 add-patch.c:134

408 +#, c-format

409 +#| msgid "could not parse git header '%.*s'"

410 +msgid "could not parse colored hunk header '%.*s'"

411 +msgstr "無法解析上色過的區塊標頭 '%.*s'"

412 +

413 +#: add-patch.c:176

414 +#| msgid "could not parse %s"

415 +msgid "could not parse diff"

416 +msgstr "無法解析差異 (diff)"

417 +

418 +#: add-patch.c:194

419 +#| msgid "could not parse commit %s"

420 +msgid "could not parse colored diff"

421 +msgstr "無法解析上色過的差異 (diff)"

422 +

423 +#: add-patch.c:508

424 +#, c-format

425 +#| msgid "bad config line %d in %s"

426 +msgid ""

427 +"expected context line #%d in\n"

428 +"%.*s"

429 +msgstr ""

430 +"應有上下文行 #%d 於\n"

431 +"%.*s"

432 +

433 +#: add-patch.c:523

434 +#, c-format

435 +msgid ""

436 +"hunks do not overlap:\n"

437 +"%.*s\n"

438 +"\tdoes not end with:\n"

439 +"%.*s"

440 +msgstr ""

441 +"區塊未重疊：\n"

442 +"%.*s\n"

443 +"\t不以下述結尾：\n"

444 +"%.*s"

445 +

446 +#: add-patch.c:799 git-add--interactive.perl:1112

447 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"

448 +msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n"

449 +

450 +#: add-patch.c:803

451 +#, c-format

452 +#| msgid ""

453 +#| "---\n"

454 +#| "To remove '%s' lines, make them ' ' lines (context).\n"

455 +#| "To remove '%s' lines, delete them.\n"

456 +#| "Lines starting with %s will be removed.\n"

457 +msgid ""

458 +"---\n"

459 +"To remove '%c' lines, make them ' ' lines (context).\n"

460 +"To remove '%c' lines, delete them.\n"

461 +"Lines starting with %c will be removed.\n"

462 +msgstr ""

463 +"---\n"

464 +"要刪除 '%c' 開始的行，使其成為 ' ' 開始的行（上下文）。\n"

465 +"要刪除 '%c' 開始的行，刪除它們。\n"

466 +"以 %c 開始的行將被刪除。\n"

467 +

468 +#: add-patch.c:810

469 +#| msgid ""

470 +#| "If the patch applies cleanly, the edited hunk will immediately be\n"

471 +#| "marked for staging."

472 +msgid ""

473 +"If the patch applies cleanly, the edited hunk will immediately be\n"

474 +"marked for staging.\n"

475 +msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為暫存。\n"

476 +

477 +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

478 +#: add-patch.c:818 git-add--interactive.perl:1126

479 +msgid ""

480 +"If it does not apply cleanly, you will be given an opportunity to\n"

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

482 +"aborted and the hunk is left unchanged.\n"

483 +msgstr ""

484 +"如果不能乾淨地套用，您將有機會重新編輯。如果此區塊的全部內容刪除，則\n"

485 +"此次編輯被終止，此區塊不會被修改。\n"

486 +

487 +#: add-patch.c:851

488 +#| msgid "could not parse git header '%.*s'"

489 +msgid "could not parse hunk header"

490 +msgstr "無法解析區塊標頭"

491 +

492 +#: add-patch.c:895 add-patch.c:1294

493 +msgid "'git apply --cached' failed"

494 +msgstr "「git apply --cached」失敗"

495 +

496 +#. TRANSLATORS: do not translate [y/n]

497 +#. The program will only accept that input at this point.

498 +#. Consider translating (saying "no" discards!) as

499 +#. (saying "n" for "no" discards!) if the translation

500 +#. of the word "no" does not start with n.

501 +#.

502 +#. TRANSLATORS: do not translate [y/n]

503 +#. The program will only accept that input

504 +#. at this point.

505 +#. Consider translating (saying "no" discards!) as

506 +#. (saying "n" for "no" discards!) if the translation

507 +#. of the word "no" does not start with n.

508 +#: add-patch.c:952 git-add--interactive.perl:1239

509 +msgid ""

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

511 +msgstr "您的編輯塊不能被應用。重新編輯（選擇 \"no\" 捨棄！） [y/n]? "

512 +

513 +#: add-patch.c:1009

514 +#| msgid ""

515 +#| "y - stage this hunk\n"

516 +#| "n - do not stage this hunk\n"

517 +#| "q - quit; do not stage this hunk or any of the remaining ones\n"

518 +#| "a - stage this hunk and all later hunks in the file\n"

519 +#| "d - do not stage this hunk or any of the later hunks in the file"

520 +msgid ""

521 +"y - stage this hunk\n"

522 +"n - do not stage this hunk\n"

523 +"q - quit; do not stage this hunk or any of the remaining ones\n"

524 +"a - stage this and all the remaining hunks\n"

525 +"d - do not stage this hunk nor any of the remaining hunks\n"

526 +msgstr ""

527 +"y - 暫存此區塊\n"

528 +"n - 不要暫存此區塊\n"

529 +"q - 離開。不暫存此區塊及後面的全部區塊\n"

530 +"a - 暫存這個區塊及所有剩餘區塊\n"

531 +"d - 不暫存這個區塊及任何剩餘區塊\n"

532 +

533 +#: add-patch.c:1016

534 +#| msgid ""

535 +#| "g - select a hunk to go to\n"

536 +#| "/ - search for a hunk matching the given regex\n"

537 +#| "j - leave this hunk undecided, see next undecided hunk\n"

538 +#| "J - leave this hunk undecided, see next hunk\n"

539 +#| "k - leave this hunk undecided, see previous undecided hunk\n"

540 +#| "K - leave this hunk undecided, see previous hunk\n"

541 +#| "s - split the current hunk into smaller hunks\n"

542 +#| "e - manually edit the current hunk\n"

543 +#| "? - print help\n"

544 +msgid ""

545 +"j - leave this hunk undecided, see next undecided hunk\n"

546 +"J - leave this hunk undecided, see next hunk\n"

547 +"k - leave this hunk undecided, see previous undecided hunk\n"

548 +"K - leave this hunk undecided, see previous hunk\n"

549 +"g - select a hunk to go to\n"

550 +"/ - search for a hunk matching the given regex\n"

551 +"s - split the current hunk into smaller hunks\n"

552 +"e - manually edit the current hunk\n"

553 +"? - print help\n"

554 +msgstr ""

555 +"j - 維持此區塊未決狀態，檢視下一個未決定區塊\n"

556 +"J - 維持此區塊未決狀態，檢視下一個區塊\n"

557 +"k - 維持此區塊未決狀態，檢視上一個未決定區塊\n"

558 +"K - 維持此區塊未決狀態，檢視上一個區塊\n"

559 +"g - 選擇要跳轉至的區塊\n"

560 +"/ - 尋找符合提供之正規表示式的區塊\n"

561 +"s - 分割目前區塊為更小的區塊\n"

562 +"e - 手動編輯目前區塊\n"

563 +"? - 顯示說明\n"

564 +

565 +#: add-patch.c:1137 add-patch.c:1147

566 +#| msgid "No previous hunk\n"

567 +msgid "No previous hunk"

568 +msgstr "沒有上一個區塊"

569 +

570 +#: add-patch.c:1142 add-patch.c:1152

571 +#| msgid "No next hunk\n"

572 +msgid "No next hunk"

573 +msgstr "沒有下一個區塊"

574 +

575 +#: add-patch.c:1158

576 +#| msgid "No other hunks to goto\n"

577 +msgid "No other hunks to goto"

578 +msgstr "沒有其它可供跳轉的區塊"

579 +

580 +#: add-patch.c:1169 git-add--interactive.perl:1577

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

582 +msgstr "跳轉到哪個區塊（<Enter> 檢視更多）？ "

583 +

584 +#: add-patch.c:1170 git-add--interactive.perl:1579

585 +msgid "go to which hunk? "

586 +msgstr "跳轉到哪個區塊？"

587 +

588 +#: add-patch.c:1181

589 +#, c-format

590 +#| msgid "Invalid number: '%s'\n"

591 +msgid "Invalid number: '%s'"

592 +msgstr "無效數字：'%s'"

593 +

594 +#: add-patch.c:1186

595 +#, c-format

596 +#| msgid "Sorry, only %d hunk available.\n"

597 +#| msgid_plural "Sorry, only %d hunks available.\n"

598 +msgid "Sorry, only %d hunk available."

599 +msgid_plural "Sorry, only %d hunks available."

600 +msgstr[0] "對不起，只有 %d 個可用區塊。"

601 +msgstr[1] "對不起，只有 %d 個可用區塊。"

602 +

603 +#: add-patch.c:1195

604 +#| msgid "No other hunks to search\n"

605 +msgid "No other hunks to search"

606 +msgstr "沒有其它可供尋找的區塊"

607 +

608 +#: add-patch.c:1201 git-add--interactive.perl:1623

609 +msgid "search for regex? "

610 +msgstr "使用正規表示式搜尋？"

611 +

612 +#: add-patch.c:1216

613 +#, c-format

614 +#| msgid "Malformed search regexp %s: %s\n"

615 +msgid "Malformed search regexp %s: %s"

616 +msgstr "錯誤的正規表示式 %s：%s"

617 +

618 +#: add-patch.c:1233

619 +#| msgid "No hunk matches the given pattern\n"

620 +msgid "No hunk matches the given pattern"

621 +msgstr "沒有和提供模式相符合的區塊"

622 +

623 +#: add-patch.c:1240

624 +#| msgid "Sorry, cannot split this hunk\n"

625 +msgid "Sorry, cannot split this hunk"

626 +msgstr "對不起，不能分割這個區塊"

627 +

628 +#: add-patch.c:1244

629 +#, c-format

630 +#| msgid "Split into %d hunk.\n"

631 +#| msgid_plural "Split into %d hunks.\n"

632 +msgid "Split into %d hunks."

633 +msgstr "分割為 %d 塊。"

634 +

635 +#: add-patch.c:1248

636 +#| msgid "Sorry, cannot edit this hunk\n"

637 +msgid "Sorry, cannot edit this hunk"

638 +msgstr "對不起，不能編輯這個區塊"

639 +

640 +#: advice.c:111

641 #, c-format

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

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

644

163 -#: advice.c:162

645 +#: advice.c:164

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

647 msgstr "無法揀選，因為您有未合併的檔案。"

648

167 -#: advice.c:164

649 +#: advice.c:166

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

651 msgstr "無法提交，因為您有未合併的檔案。"

652

171 -#: advice.c:166

653 +#: advice.c:168

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

655 msgstr "無法合併，因為您有未合併的檔案。"

656

175 -#: advice.c:168

657 +#: advice.c:170

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

659 msgstr "無法拉取，因為您有未合併的檔案。"

660

179 -#: advice.c:170

661 +#: advice.c:172

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

663 msgstr "無法還原提交，因為您有未合併的檔案。"

664

183 -#: advice.c:172

665 +#: advice.c:174

666 #, c-format

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

668 msgstr "無法 %s，因為您有未合併的檔案。"

669

188 -#: advice.c:180

670 +#: advice.c:182

671 msgid ""

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

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

@@ -193,23 +675,23 @@ msgstr ""

675 "請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n"

676 "解決方案並提交。"

677

196 -#: advice.c:188

678 +#: advice.c:190

679 msgid "Exiting because of an unresolved conflict."

680 msgstr "因為存在未解決的衝突而離開。"

681

200 -#: advice.c:193 builtin/merge.c:1332

682 +#: advice.c:195 builtin/merge.c:1332

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

684 msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。"

685

204 -#: advice.c:195

686 +#: advice.c:197

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

688 msgstr "請在合併前先提交您的修改。"

689

208 -#: advice.c:196

690 +#: advice.c:198

691 msgid "Exiting because of unfinished merge."

692 msgstr "因為存在未完成的合併而離開。"

693

212 -#: advice.c:202

694 +#: advice.c:204

695 #, c-format

696 msgid ""

697 "Note: switching to '%s'.\n"

@@ -411,24 +893,24 @@ msgstr "無法讀取符號連結 %s"

893 msgid "unable to open or read %s"

894 msgstr "不能開啟或讀取 %s"

895

414 -#: apply.c:2926

896 +#: apply.c:2936

897 #, c-format

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

899 msgstr "無效的行首字元：'%c'"

900

419 -#: apply.c:3047

901 +#: apply.c:3057

902 #, c-format

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

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

905 msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）"

906 msgstr[1] "區塊 #%d 成功套用於 %d（位移 %d 行）"

907

426 -#: apply.c:3059

908 +#: apply.c:3069

909 #, c-format

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

911 msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔片段"

912

431 -#: apply.c:3065

913 +#: apply.c:3075

914 #, c-format

915 msgid ""

916 "while searching for:\n"

@@ -437,445 +919,431 @@ msgstr ""

919 "當查詢：\n"

920 "%.*s"

921

440 -#: apply.c:3087

922 +#: apply.c:3097

923 #, c-format

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

925 msgstr "缺少 '%s' 的二進位修補檔資料"

926

445 -#: apply.c:3095

927 +#: apply.c:3105

928 #, c-format

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

930 msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位修補檔"

931

450 -#: apply.c:3142

932 +#: apply.c:3152

933 #, c-format

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

935 msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔"

936

455 -#: apply.c:3152

937 +#: apply.c:3162

938 #, c-format

939 msgid ""

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

941 msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。"

942

461 -#: apply.c:3160

943 +#: apply.c:3170

944 #, c-format

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

946 msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案"

947

466 -#: apply.c:3178

948 +#: apply.c:3188

949 #, c-format

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

951 msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s"

952

471 -#: apply.c:3191

953 +#: apply.c:3201

954 #, c-format

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

956 msgstr "二進位修補檔未套用到 '%s'"

957

476 -#: apply.c:3197

958 +#: apply.c:3207

959 #, c-format

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

961 msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）"

962

481 -#: apply.c:3218

963 +#: apply.c:3228

964 #, c-format

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

966 msgstr "打修補檔失敗：%s:%ld"

967

486 -#: apply.c:3341

968 +#: apply.c:3351

969 #, c-format

970 msgid "cannot checkout %s"

971 msgstr "不能簽出 %s"

972

491 -#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280

973 +#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280

974 #, c-format

975 msgid "failed to read %s"

976 msgstr "無法讀取 %s"

977

496 -#: apply.c:3401

978 +#: apply.c:3411

979 #, c-format

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

981 msgstr "讀取位於符號連結中的 '%s'"

982

501 -#: apply.c:3430 apply.c:3673

983 +#: apply.c:3440 apply.c:3683

984 #, c-format

985 msgid "path %s has been renamed/deleted"

986 msgstr "路徑 %s 已經被重新命名/刪除"

987

506 -#: apply.c:3516 apply.c:3688

988 +#: apply.c:3526 apply.c:3698

989 #, c-format

990 msgid "%s: does not exist in index"

991 msgstr "%s：不存在於索引中"

992

511 -#: apply.c:3525 apply.c:3696

993 +#: apply.c:3535 apply.c:3706

994 #, c-format

995 msgid "%s: does not match index"

996 msgstr "%s：和索引不符合"

997

516 -#: apply.c:3560

998 +#: apply.c:3570

999 msgid "repository lacks the necessary blob to fall back on 3-way merge."

1000 msgstr "版本庫缺乏必要的資料物件以進行三方合併。"

1001

520 -#: apply.c:3563

1002 +#: apply.c:3573

1003 #, c-format

1004 msgid "Falling back to three-way merge...\n"

1005 msgstr "回落到三方合併...\n"

1006

525 -#: apply.c:3579 apply.c:3583

1007 +#: apply.c:3589 apply.c:3593

1008 #, c-format

1009 msgid "cannot read the current contents of '%s'"

1010 msgstr "無法讀取 '%s' 的目前內容"

1011

530 -#: apply.c:3595

1012 +#: apply.c:3605

1013 #, c-format

1014 msgid "Failed to fall back on three-way merge...\n"

1015 msgstr "無法回落到三方合併...\n"

1016

535 -#: apply.c:3609

1017 +#: apply.c:3619

1018 #, c-format

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

1020 msgstr "套用修補檔到 '%s' 存在衝突。\n"

1021

540 -#: apply.c:3614

1022 +#: apply.c:3624

1023 #, c-format

1024 msgid "Applied patch to '%s' cleanly.\n"

1025 msgstr "成功套用修補檔到 '%s'。\n"

1026

545 -#: apply.c:3640

1027 +#: apply.c:3650

1028 msgid "removal patch leaves file contents"

1029 msgstr "移除修補檔仍留下了檔案內容"

1030

549 -#: apply.c:3713

1031 +#: apply.c:3723

1032 #, c-format

1033 msgid "%s: wrong type"

1034 msgstr "%s：錯誤類型"

1035

554 -#: apply.c:3715

1036 +#: apply.c:3725

1037 #, c-format

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

1039 msgstr "%s 的類型是 %o，應為 %o"

1040

559 -#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856

560 -#: read-cache.c:1309

1041 +#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856

1042 +#: read-cache.c:1320

1043 #, c-format

1044 msgid "invalid path '%s'"

1045 msgstr "無效路徑 '%s'"

1046

565 -#: apply.c:3924

1047 +#: apply.c:3934

1048 #, c-format

1049 msgid "%s: already exists in index"

1050 msgstr "%s：已經存在於索引中"

1051

570 -#: apply.c:3927

1052 +#: apply.c:3937

1053 #, c-format

1054 msgid "%s: already exists in working directory"

1055 msgstr "%s：已經存在於工作區中"

1056

575 -#: apply.c:3947

1057 +#: apply.c:3957

1058 #, c-format

1059 msgid "new mode (%o) of %s does not match old mode (%o)"

1060 msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合"

1061

580 -#: apply.c:3952

1062 +#: apply.c:3962

1063 #, c-format

1064 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

1065 msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符合"

1066

585 -#: apply.c:3972

1067 +#: apply.c:3982

1068 #, c-format

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

1070 msgstr "受影響的檔案 '%s' 位於符號連結中"

1071

590 -#: apply.c:3976

1072 +#: apply.c:3986

1073 #, c-format

1074 msgid "%s: patch does not apply"

1075 msgstr "%s：修補檔未套用"

1076

595 -#: apply.c:3991

1077 +#: apply.c:4001

1078 #, c-format

1079 msgid "Checking patch %s..."

1080 msgstr "正在檢查修補檔 %s..."

1081

600 -#: apply.c:4083

1082 +#: apply.c:4093

1083 #, c-format

1084 msgid "sha1 information is lacking or useless for submodule %s"

1085 msgstr "子模組 %s 的 sha1 訊息缺少或無效"

1086

605 -#: apply.c:4090

1087 +#: apply.c:4100

1088 #, c-format

1089 msgid "mode change for %s, which is not in current HEAD"

1090 msgstr "%s 的模式變更，但它不在目前 HEAD 中"

1091

610 -#: apply.c:4093

1092 +#: apply.c:4103

1093 #, c-format

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

1095 msgstr "sha1 訊息缺少或無效（%s）。"

1096

615 -#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143

616 -#, c-format

617 -msgid "make_cache_entry failed for path '%s'"

618 -msgstr "對路徑 '%s' 的 make_cache_entry 動作失敗"

619 -

620 -#: apply.c:4102

1097 +#: apply.c:4112

1098 #, c-format

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

1100 msgstr "不能在暫時索引中新增 %s"

1101

625 -#: apply.c:4112

1102 +#: apply.c:4122

1103 #, c-format

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

1105 msgstr "不能把暫時索引寫入到 %s"

1106

630 -#: apply.c:4250

1107 +#: apply.c:4260

1108 #, c-format

1109 msgid "unable to remove %s from index"

1110 msgstr "不能從索引中移除 %s"

1111

635 -#: apply.c:4284

1112 +#: apply.c:4294

1113 #, c-format

1114 msgid "corrupt patch for submodule %s"

1115 msgstr "子模組 %s 損壞的修補檔"

1116

640 -#: apply.c:4290

1117 +#: apply.c:4300

1118 #, c-format

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

1120 msgstr "不能對建立檔案 '%s' 呼叫 stat"

1121

645 -#: apply.c:4298

1122 +#: apply.c:4308

1123 #, c-format

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

1125 msgstr "不能為建立檔案 %s 建立後端儲存"

1126

650 -#: apply.c:4304 apply.c:4449

1127 +#: apply.c:4314 apply.c:4459

1128 #, c-format

1129 msgid "unable to add cache entry for %s"

1130 msgstr "無法為 %s 新增快取條目"

1131

655 -#: apply.c:4347

1132 +#: apply.c:4357

1133 #, c-format

1134 msgid "failed to write to '%s'"

1135 msgstr "寫入 '%s' 失敗"

1136

660 -#: apply.c:4351

1137 +#: apply.c:4361

1138 #, c-format

1139 msgid "closing file '%s'"

1140 msgstr "關閉檔案 '%s'"

1141

665 -#: apply.c:4421

1142 +#: apply.c:4431

1143 #, c-format

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

1145 msgstr "不能寫入檔案 '%s' 權限 %o"

1146

670 -#: apply.c:4519

1147 +#: apply.c:4529

1148 #, c-format

1149 msgid "Applied patch %s cleanly."

1150 msgstr "成功套用修補檔 %s。"

1151

675 -#: apply.c:4527

1152 +#: apply.c:4537

1153 msgid "internal error"

1154 msgstr "內部錯誤"

1155

679 -#: apply.c:4530

1156 +#: apply.c:4540

1157 #, c-format

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

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

1160 msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..."

1161 msgstr[1] "套用 %%s 個修補檔，其中 %d 個被拒絕..."

1162

686 -#: apply.c:4541

1163 +#: apply.c:4551

1164 #, c-format

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

1166 msgstr "截短 .rej 檔案名為 %.*s.rej"

1167

691 -#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194

1168 +#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192

1169 #, c-format

1170 msgid "cannot open %s"

1171 msgstr "不能開啟 %s"

1172

696 -#: apply.c:4563

1173 +#: apply.c:4573

1174 #, c-format

1175 msgid "Hunk #%d applied cleanly."

1176 msgstr "第 #%d 個片段成功應用。"

1177

701 -#: apply.c:4567

1178 +#: apply.c:4577

1179 #, c-format

1180 msgid "Rejected hunk #%d."

1181 msgstr "拒絕第 #%d 個片段。"

1182

706 -#: apply.c:4686

1183 +#: apply.c:4696

1184 #, c-format

1185 msgid "Skipped patch '%s'."

1186 msgstr "略過修補檔 '%s'。"

1187

711 -#: apply.c:4694

1188 +#: apply.c:4704

1189 msgid "unrecognized input"

1190 msgstr "未能識別的輸入"

1191

715 -#: apply.c:4714

1192 +#: apply.c:4724

1193 msgid "unable to read index file"

1194 msgstr "無法讀取索引檔案"

1195

719 -#: apply.c:4871

1196 +#: apply.c:4881

1197 #, c-format

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

1199 msgstr "不能開啟修補檔 '%s'：%s"

1200

724 -#: apply.c:4898

1201 +#: apply.c:4908

1202 #, c-format

1203 msgid "squelched %d whitespace error"

1204 msgid_plural "squelched %d whitespace errors"

1205 msgstr[0] "抑制下仍有 %d 個空白字元誤用"

1206 msgstr[1] "抑制下仍有 %d 個空白字元誤用"

1207

731 -#: apply.c:4904 apply.c:4919

1208 +#: apply.c:4914 apply.c:4929

1209 #, c-format

1210 msgid "%d line adds whitespace errors."

1211 msgid_plural "%d lines add whitespace errors."

1212 msgstr[0] "%d 行新增了空白字元誤用。"

1213 msgstr[1] "%d 行新增了空白字元誤用。"

1214

738 -#: apply.c:4912

1215 +#: apply.c:4922

1216 #, c-format

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

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

1219 msgstr[0] "修復空白錯誤後，應用了 %d 行。"

1220 msgstr[1] "修復空白錯誤後，應用了 %d 行。"

1221

745 -#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

1222 +#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390

1223 msgid "Unable to write new index file"

1224 msgstr "無法寫入新索引檔案"

1225

749 -#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200

750 -#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273

751 -#: builtin/pull.c:209 builtin/submodule--helper.c:407

752 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370

753 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853

754 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211

755 -msgid "path"

756 -msgstr "路徑"

757 -

758 -#: apply.c:4956

1226 +#: apply.c:4966

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

1228 msgstr "不要應用與給出路徑向符合的變更"

1229

762 -#: apply.c:4959

1230 +#: apply.c:4969

1231 msgid "apply changes matching the given path"

1232 msgstr "應用與給出路徑向符合的變更"

1233

766 -#: apply.c:4961 builtin/am.c:2206

1234 +#: apply.c:4971 builtin/am.c:2206

1235 msgid "num"

1236 msgstr "數字"

1237

770 -#: apply.c:4962

1238 +#: apply.c:4972

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

1240 msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線"

1241

774 -#: apply.c:4965

1242 +#: apply.c:4975

1243 msgid "ignore additions made by the patch"

1244 msgstr "忽略修補檔中的新增的檔案"

1245

778 -#: apply.c:4967

1246 +#: apply.c:4977

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

1248 msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）"

1249

782 -#: apply.c:4971

1250 +#: apply.c:4981

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

1252 msgstr "以十進位數顯示新增和刪除的行數"

1253

786 -#: apply.c:4973

1254 +#: apply.c:4983

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

1256 msgstr "不套用修補檔，而是顯示輸入的概要"

1257

790 -#: apply.c:4975

1258 +#: apply.c:4985

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

1260 msgstr "不套用修補檔，而是檢視修補檔是否可應用"

1261

794 -#: apply.c:4977

1262 +#: apply.c:4987

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

1264 msgstr "確認修補檔可以套用到目前索引"

1265

798 -#: apply.c:4979

1266 +#: apply.c:4989

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

1268 msgstr "使用指令 `git add --intent-to-add` 標記新增檔案"

1269

802 -#: apply.c:4981

1270 +#: apply.c:4991

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

1272 msgstr "套用修補檔而不修改工作區"

1273

806 -#: apply.c:4983

1274 +#: apply.c:4993

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

1276 msgstr "接受修改工作區之外檔案的修補檔"

1277

810 -#: apply.c:4986

1278 +#: apply.c:4996

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

1280 msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）"

1281

814 -#: apply.c:4988

1282 +#: apply.c:4998

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

1284 msgstr "如果一個修補檔不能應用則嘗試三方合併"

1285

818 -#: apply.c:4990

1286 +#: apply.c:5000

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

1288 msgstr "建立一個暫時索引基於嵌入的索引訊息"

1289

822 -#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524

1290 +#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524

1291 msgid "paths are separated with NUL character"

1292 msgstr "路徑以 NUL 字元分隔"

1293

826 -#: apply.c:4995

1294 +#: apply.c:5005

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

1296 msgstr "確保至少符合 <n> 行上下文"

1297

830 -#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98

1298 +#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98

1299 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

832 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1445

1300 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1474

1301 msgid "action"

1302 msgstr "動作"

1303

836 -#: apply.c:4997

1304 +#: apply.c:5007

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

1306 msgstr "檢查新增和修改的行中間的空白字元濫用"

1307

840 -#: apply.c:5000 apply.c:5003

1308 +#: apply.c:5010 apply.c:5013

1309 msgid "ignore changes in whitespace when finding context"

1310 msgstr "尋找上下文時忽略空白字元的變更"

1311

844 -#: apply.c:5006

1312 +#: apply.c:5016

1313 msgid "apply the patch in reverse"

1314 msgstr "反向套用修補檔"

1315

848 -#: apply.c:5008

1316 +#: apply.c:5018

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

1318 msgstr "無需至少一行上下文"

1319

852 -#: apply.c:5010

1320 +#: apply.c:5020

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

1322 msgstr "將拒絕的修補檔片段儲存在對應的 *.rej 檔案中"

1323

856 -#: apply.c:5012

1324 +#: apply.c:5022

1325 msgid "allow overlapping hunks"

1326 msgstr "允許重疊的修補檔片段"

1327

860 -#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22

861 -#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786

862 -#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128

1328 +#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22

1329 +#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774

1330 +#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128

1331 msgid "be verbose"

1332 msgstr "詳細輸出"

1333

866 -#: apply.c:5015

1334 +#: apply.c:5025

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

1336 msgstr "允許不正確的檔案末尾換行符號"

1337

870 -#: apply.c:5018

1338 +#: apply.c:5028

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

1340 msgstr "不信任修補檔片段的標頭訊息中的行號"

1341

874 -#: apply.c:5020 builtin/am.c:2194

1342 +#: apply.c:5030 builtin/am.c:2194

1343 msgid "root"

1344 msgstr "根目錄"

1345

878 -#: apply.c:5021

1346 +#: apply.c:5031

1347 msgid "prepend <root> to all filenames"

1348 msgstr "為所有檔案名前新增 <根目錄>"

1349

@@ -890,14 +1358,13 @@ msgstr "git archive --list"

1358 #: archive.c:16

1359 msgid ""

1360 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"

893 -msgstr ""

894 -"git archive --remote <版本庫> [--exec <指令>] [<選項>] <樹或提交> [<路徑>...]"

1361 +msgstr "git archive --remote <版本庫> [--exec <指令>] [<選項>] <樹或提交> [<路徑>...]"

1362

1363 #: archive.c:17

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

1365 msgstr "git archive --remote <版本庫> [--exec <指令>] --list"

1366

900 -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299

1367 +#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299

1368 #, c-format

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

1370 msgstr "路徑規格 '%s' 未符合任何檔案"

@@ -929,7 +1396,7 @@ msgstr "格式"

1396 msgid "archive format"

1397 msgstr "歸檔格式"

1398

932 -#: archive.c:458 builtin/log.c:1581

1399 +#: archive.c:458 builtin/log.c:1653

1400 msgid "prefix"

1401 msgstr "前綴"

1402

@@ -937,12 +1404,12 @@ msgstr "前綴"

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

1405 msgstr "為歸檔中每個路徑名加上前綴"

1406

940 -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874

1407 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1408 #: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162

1409 #: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899

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

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

945 -#: parse-options.h:186

1412 +#: parse-options.h:190

1413 msgid "file"

1414 msgstr "檔案"

1415

@@ -974,8 +1441,8 @@ msgstr "壓縮效果更好"

1441 msgid "list supported archive formats"

1442 msgstr "列出支援的歸檔格式"

1443

977 -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115

978 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859

1444 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1445 +#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884

1446 msgid "repo"

1447 msgstr "版本庫"

1448

@@ -1014,17 +1481,17 @@ msgstr "未知歸檔格式 '%s'"

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

1482 msgstr "參數不支援此格式 '%s'：-%d"

1483

1017 -#: archive-tar.c:125 archive-zip.c:345

1484 +#: archive-tar.c:125 archive-zip.c:350

1485 #, c-format

1486 msgid "cannot stream blob %s"

1487 msgstr "不能開啟資料物件 %s"

1488

1022 -#: archive-tar.c:266 archive-zip.c:363

1489 +#: archive-tar.c:266 archive-zip.c:368

1490 #, c-format

1491 msgid "unsupported file mode: 0%o (SHA1: %s)"

1492 msgstr "不支援的檔案模式：0%o (SHA1: %s)"

1493

1027 -#: archive-tar.c:293 archive-zip.c:353

1494 +#: archive-tar.c:293 archive-zip.c:358

1495 #, c-format

1496 msgid "cannot read %s"

1497 msgstr "不能讀取 %s"

@@ -1043,42 +1510,42 @@ msgstr "無法重定向描述符"

1510 msgid "'%s' filter reported error"

1511 msgstr "'%s' 過濾器報告了錯誤"

1512

1046 -#: archive-zip.c:314

1513 +#: archive-zip.c:319

1514 #, c-format

1515 msgid "path is not valid UTF-8: %s"

1516 msgstr "路徑不是有效的 UTF-8：%s"

1517

1051 -#: archive-zip.c:318

1518 +#: archive-zip.c:323

1519 #, c-format

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

1521 msgstr "路徑太長（%d 字元，SHA1：%s）：%s"

1522

1056 -#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233

1523 +#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233

1524 #, c-format

1525 msgid "deflate error (%d)"

1526 msgstr "壓縮錯誤 (%d)"

1527

1061 -#: archive-zip.c:609

1528 +#: archive-zip.c:614

1529 #, c-format

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

1531 msgstr "對於本系統時間戳太大：%<PRIuMAX>"

1532

1066 -#: attr.c:213

1533 +#: attr.c:212

1534 #, c-format

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

1536 msgstr "%.*s 不是一個有效的屬性名"

1537

1071 -#: attr.c:370

1538 +#: attr.c:369

1539 #, c-format

1540 msgid "%s not allowed: %s:%d"

1541 msgstr "不允許 %s：%s:%d"

1542

1076 -#: attr.c:410

1543 +#: attr.c:409

1544 msgid ""

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

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

1547 msgstr ""

1081 -"負值範本在 git attributes 中被忽略\n"

1548 +"反向模式在 git attributes 中被忽略\n"

1549 "當字串確實要以驚嘆號開始時，使用 '\\!'。"

1550

1551 #: bisect.c:468

@@ -1212,9 +1679,9 @@ msgstr "不能將 --contents 和最終的提交物件名共用"

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

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

1681

1215 -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971

1216 -#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964

1217 -#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411

1682 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093

1683 +#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991

1684 +#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411

1685 #: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143

1686 #: builtin/shortlog.c:192

1687 msgid "revision walk setup failed"

@@ -1378,8 +1845,8 @@ msgstr "'%s' 不像是一個 v2 版本的包檔案"

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

1846 msgstr "未能識別的包頭：%s%s (%d)"

1847

1381 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962

1382 -#: builtin/commit.c:791

1848 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108

1849 +#: builtin/commit.c:811

1850 #, c-format

1851 msgid "could not open '%s'"

1852 msgstr "不能開啟 '%s'"

@@ -1390,7 +1857,7 @@ msgstr "版本庫中缺少這些必備的提交："

1857

1858 #: bundle.c:146

1859 msgid "need a repository to verify a bundle"

1393 -msgstr "需要一個版本庫來校驗一個包"

1860 +msgstr "需要版本庫驗證一個包"

1861

1862 #: bundle.c:197

1863 #, c-format

@@ -1410,42 +1877,42 @@ msgid_plural "The bundle requires these %d refs:"

1877 msgstr[0] "這個包需要這個引用："

1878 msgstr[1] "這個包需要 %d 個引用："

1879

1413 -#: bundle.c:272

1880 +#: bundle.c:273

1881 msgid "unable to dup bundle descriptor"

1882 msgstr "無法複製 bundle 描述符"

1883

1417 -#: bundle.c:279

1884 +#: bundle.c:280

1885 msgid "Could not spawn pack-objects"

1886 msgstr "不能生成 pack-objects 進程"

1887

1421 -#: bundle.c:290

1888 +#: bundle.c:291

1889 msgid "pack-objects died"

1890 msgstr "pack-objects 終止"

1891

1425 -#: bundle.c:332

1892 +#: bundle.c:333

1893 msgid "rev-list died"

1894 msgstr "rev-list 終止"

1895

1429 -#: bundle.c:381

1896 +#: bundle.c:382

1897 #, c-format

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

1899 msgstr "引用 '%s' 被 rev-list 選項排除"

1900

1434 -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306

1901 +#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306

1902 #, c-format

1903 msgid "unrecognized argument: %s"

1904 msgstr "未能識別的參數：%s"

1905

1439 -#: bundle.c:468

1906 +#: bundle.c:469

1907 msgid "Refusing to create empty bundle."

1908 msgstr "不能建立空包。"

1909

1443 -#: bundle.c:478

1910 +#: bundle.c:479

1911 #, c-format

1912 msgid "cannot create '%s'"

1913 msgstr "不能建立 '%s'"

1914

1448 -#: bundle.c:503

1915 +#: bundle.c:504

1916 msgid "index-pack died"

1917 msgstr "index-pack 終止"

1918

@@ -1454,18 +1921,18 @@ msgstr "index-pack 終止"

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

1922 msgstr "無效的顏色值：%.*s"

1923

1457 -#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398

1924 +#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398

1925 #: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456

1926 #, c-format

1927 msgid "could not parse %s"

1928 msgstr "不能解析 %s"

1929

1463 -#: commit.c:52

1930 +#: commit.c:53

1931 #, c-format

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

1933 msgstr "%s %s 不是一個提交！"

1934

1468 -#: commit.c:192

1935 +#: commit.c:193

1936 msgid ""

1937 "Support for <GIT_DIR>/info/grafts is deprecated\n"

1938 "and will be removed in a future Git version.\n"

@@ -1485,27 +1952,27 @@ msgstr ""

1952 "設定 \"git config advice.graftFileDeprecated false\"\n"

1953 "可關閉本消息"

1954

1488 -#: commit.c:1128

1955 +#: commit.c:1152

1956 #, c-format

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

1958 msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"

1959

1493 -#: commit.c:1131

1960 +#: commit.c:1155

1961 #, c-format

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

1963 msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"

1964

1498 -#: commit.c:1134

1965 +#: commit.c:1158

1966 #, c-format

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

1968 msgstr "提交 %s 沒有 GPG 簽名。"

1969

1503 -#: commit.c:1137

1970 +#: commit.c:1161

1971 #, c-format

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

1973 msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"

1974

1508 -#: commit.c:1391

1975 +#: commit.c:1415

1976 msgid ""

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

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

@@ -1515,75 +1982,70 @@ msgstr ""

1982 "您可以透過修補提交來改正提交說明，或者將設定變數 i18n.commitencoding\n"

1983 "設定為您項目所用的字元編碼。\n"

1984

1518 -#: commit-graph.c:127

1985 +#: commit-graph.c:130

1986 msgid "commit-graph file is too small"

1987 msgstr "提交圖形檔案太小"

1988

1522 -#: commit-graph.c:192

1989 +#: commit-graph.c:195

1990 #, c-format

1991 msgid "commit-graph signature %X does not match signature %X"

1992 msgstr "提交圖形簽名 %X 和簽名 %X 不符合"

1993

1527 -#: commit-graph.c:199

1994 +#: commit-graph.c:202

1995 #, c-format

1996 msgid "commit-graph version %X does not match version %X"

1997 msgstr "提交圖形版本 %X 和版本 %X 不符合"

1998

1532 -#: commit-graph.c:206

1999 +#: commit-graph.c:209

2000 #, c-format

2001 msgid "commit-graph hash version %X does not match version %X"

2002 msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合"

2003

1537 -#: commit-graph.c:229

2004 +#: commit-graph.c:232

2005 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"

2006 msgstr "提交圖形區塊尋找表條目遺失，檔案可能不完整"

2007

1541 -#: commit-graph.c:240

2008 +#: commit-graph.c:243

2009 #, c-format

2010 msgid "commit-graph improper chunk offset %08x%08x"

2011 msgstr "提交圖形不正確的區塊位移 %08x%08x"

2012

1546 -#: commit-graph.c:283

2013 +#: commit-graph.c:286

2014 #, c-format

2015 msgid "commit-graph chunk id %08x appears multiple times"

2016 msgstr "提交圖形區塊 id %08x 出現了多次"

2017

1551 -#: commit-graph.c:347

2018 +#: commit-graph.c:350

2019 msgid "commit-graph has no base graphs chunk"

2020 msgstr "提交圖形沒有基礎圖形區塊"

2021

1555 -#: commit-graph.c:357

2022 +#: commit-graph.c:360

2023 msgid "commit-graph chain does not match"

2024 msgstr "提交圖形鏈不符合"

2025

1559 -#: commit-graph.c:404

2026 +#: commit-graph.c:407

2027 #, c-format

2028 msgid "invalid commit-graph chain: line '%s' not a hash"

2029 msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"

2030

1564 -#: commit-graph.c:430

2031 +#: commit-graph.c:433

2032 msgid "unable to find all commit-graph files"

2033 msgstr "無法找到所有提交圖形檔案"

2034

1568 -#: commit-graph.c:561 commit-graph.c:621

2035 +#: commit-graph.c:564 commit-graph.c:624

2036 msgid "invalid commit position. commit-graph is likely corrupt"

2037 msgstr "無效的提交位置。提交圖形可能已損壞"

2038

1572 -#: commit-graph.c:582

2039 +#: commit-graph.c:585

2040 #, c-format

2041 msgid "could not find commit %s"

2042 msgstr "無法找到提交 %s"

2043

1577 -#: commit-graph.c:855 builtin/am.c:1287

2044 +#: commit-graph.c:858 builtin/am.c:1287

2045 #, c-format

2046 msgid "unable to parse commit %s"

2047 msgstr "不能解析提交 %s"

2048

1582 -#: commit-graph.c:859

1583 -#, c-format

1584 -msgid "unable to get tree for %s"

1585 -msgstr "無法得到 %s 的樹狀物件"

1586 -

2049 #: commit-graph.c:1017 builtin/pack-objects.c:2641

2050 #, c-format

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

@@ -1650,12 +2112,12 @@ msgstr "正在尋找提交圖中額外的邊"

2112 msgid "failed to write correct number of base graph ids"

2113 msgstr "無法寫入正確數量的基礎圖形 ID"

2114

1653 -#: commit-graph.c:1379 midx.c:810

2115 +#: commit-graph.c:1379 midx.c:814

2116 #, c-format

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

2118 msgstr "不能為 %s 建立先導目錄"

2119

1658 -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241

2120 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248

2121 #, c-format

2122 msgid "unable to create '%s'"

2123 msgstr "不能建立 '%s'"

@@ -1703,7 +2165,7 @@ msgstr "提交太多不能畫圖"

2165

2166 #: commit-graph.c:1961

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

1706 -msgstr "提交圖檔案的校驗碼錯誤，可能已經損壞"

2168 +msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"

2169

2170 #: commit-graph.c:1971

2171 #, c-format

@@ -1722,7 +2184,7 @@ msgstr "無法從提交圖形中解析提交 %s"

2184

2185 #: commit-graph.c:2006

2186 msgid "Verifying commits in commit graph"

1725 -msgstr "正在校驗提交圖中的提交"

2187 +msgstr "正在驗證提交圖中的提交"

2188

2189 #: commit-graph.c:2020

2190 #, c-format

@@ -1813,7 +2275,7 @@ msgstr "鍵名沒有包含一個小節名稱：%s"

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

2276 msgstr "鍵名沒有包含變數名：%s"

2277

1816 -#: config.c:406 sequencer.c:2401

2278 +#: config.c:406 sequencer.c:2530

2279 #, c-format

2280 msgid "invalid key: %s"

2281 msgstr "無效鍵名：%s"

@@ -1935,144 +2397,144 @@ msgstr "core.commentChar 應該是一個字元"

2397 msgid "invalid mode for object creation: %s"

2398 msgstr "無效的物件建立模式：%s"

2399

1938 -#: config.c:1425

2400 +#: config.c:1430

2401 #, c-format

2402 msgid "malformed value for %s"

2403 msgstr "%s 的取值格式錯誤"

2404

1943 -#: config.c:1451

2405 +#: config.c:1456

2406 #, c-format

2407 msgid "malformed value for %s: %s"

2408 msgstr "%s 的取值格式錯誤：%s"

2409

1948 -#: config.c:1452

2410 +#: config.c:1457

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

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

2413

1952 -#: config.c:1513 builtin/pack-objects.c:3394

2414 +#: config.c:1518 builtin/pack-objects.c:3394

2415 #, c-format

2416 msgid "bad pack compression level %d"

2417 msgstr "錯誤的打包壓縮級別 %d"

2418

1957 -#: config.c:1634

2419 +#: config.c:1639

2420 #, c-format

2421 msgid "unable to load config blob object '%s'"

2422 msgstr "無法從資料物件 '%s' 載入設定"

2423

1962 -#: config.c:1637

2424 +#: config.c:1642

2425 #, c-format

2426 msgid "reference '%s' does not point to a blob"

2427 msgstr "引用 '%s' 沒有指向一個資料物件"

2428

1967 -#: config.c:1654

2429 +#: config.c:1659

2430 #, c-format

2431 msgid "unable to resolve config blob '%s'"

2432 msgstr "不能解析設定物件 '%s'"

2433

1972 -#: config.c:1684

2434 +#: config.c:1689

2435 #, c-format

2436 msgid "failed to parse %s"

2437 msgstr "解析 %s 失敗"

2438

1977 -#: config.c:1740

2439 +#: config.c:1745

2440 msgid "unable to parse command-line config"

2441 msgstr "無法解析指令列中的設定"

2442

1981 -#: config.c:2091

2443 +#: config.c:2096

2444 msgid "unknown error occurred while reading the configuration files"

2445 msgstr "在讀取設定檔案時遇到未知錯誤"

2446

1985 -#: config.c:2261

2447 +#: config.c:2266

2448 #, c-format

2449 msgid "Invalid %s: '%s'"

2450 msgstr "無效 %s：'%s'"

2451

1990 -#: config.c:2306

2452 +#: config.c:2311

2453 #, c-format

2454 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

2455 msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間"

2456

1995 -#: config.c:2352

2457 +#: config.c:2357

2458 #, c-format

2459 msgid "unable to parse '%s' from command-line config"

2460 msgstr "無法解析指令列設定中的 '%s'"

2461

2000 -#: config.c:2354

2462 +#: config.c:2359

2463 #, c-format

2464 msgid "bad config variable '%s' in file '%s' at line %d"

2465 msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'"

2466

2005 -#: config.c:2435

2467 +#: config.c:2440

2468 #, c-format

2469 msgid "invalid section name '%s'"

2470 msgstr "無效的小節名稱 '%s'"

2471

2010 -#: config.c:2467

2472 +#: config.c:2472

2473 #, c-format

2474 msgid "%s has multiple values"

2475 msgstr "%s 有多個取值"

2476

2015 -#: config.c:2496

2477 +#: config.c:2501

2478 #, c-format

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

2480 msgstr "寫入新的設定檔案 %s 失敗"

2481

2020 -#: config.c:2748 config.c:3072

2482 +#: config.c:2753 config.c:3077

2483 #, c-format

2484 msgid "could not lock config file %s"

2485 msgstr "不能鎖定設定檔案 %s"

2486

2025 -#: config.c:2759

2487 +#: config.c:2764

2488 #, c-format

2489 msgid "opening %s"

2490 msgstr "開啟 %s"

2491

2030 -#: config.c:2794 builtin/config.c:328

2492 +#: config.c:2799 builtin/config.c:328

2493 #, c-format

2494 msgid "invalid pattern: %s"

2495 msgstr "無效模式：%s"

2496

2035 -#: config.c:2819

2497 +#: config.c:2824

2498 #, c-format

2499 msgid "invalid config file %s"

2500 msgstr "無效的設定檔案 %s"

2501

2040 -#: config.c:2832 config.c:3085

2502 +#: config.c:2837 config.c:3090

2503 #, c-format

2504 msgid "fstat on %s failed"

2505 msgstr "對 %s 呼叫 fstat 失敗"

2506

2045 -#: config.c:2843

2507 +#: config.c:2848

2508 #, c-format

2509 msgid "unable to mmap '%s'"

2510 msgstr "不能 mmap '%s'"

2511

2050 -#: config.c:2852 config.c:3090

2512 +#: config.c:2857 config.c:3095

2513 #, c-format

2514 msgid "chmod on %s failed"

2515 msgstr "對 %s 呼叫 chmod 失敗"

2516

2055 -#: config.c:2937 config.c:3187

2517 +#: config.c:2942 config.c:3192

2518 #, c-format

2519 msgid "could not write config file %s"

2520 msgstr "不能寫入設定檔案 %s"

2521

2060 -#: config.c:2971

2522 +#: config.c:2976

2523 #, c-format

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

2525 msgstr "不能設定 '%s' 為 '%s'"

2526

2065 -#: config.c:2973 builtin/remote.c:782

2527 +#: config.c:2978 builtin/remote.c:781

2528 #, c-format

2529 msgid "could not unset '%s'"

2530 msgstr "不能取消設定 '%s'"

2531

2070 -#: config.c:3063

2532 +#: config.c:3068

2533 #, c-format

2534 msgid "invalid section name: %s"

2535 msgstr "無效的小節名稱：%s"

2536

2075 -#: config.c:3230

2537 +#: config.c:3235

2538 #, c-format

2539 msgid "missing value for '%s'"

2540 msgstr "%s 的取值缺少"

@@ -2235,19 +2697,19 @@ msgstr "已阻止奇怪的路徑名 '%s'"

2697 msgid "unable to fork"

2698 msgstr "無法 fork"

2699

2238 -#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43

2700 +#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43

2701 msgid "Checking connectivity"

2702 msgstr "正在檢查連通性"

2703

2242 -#: connected.c:100

2704 +#: connected.c:101

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

2706 msgstr "不能執行 'git rev-list'"

2707

2246 -#: connected.c:120

2708 +#: connected.c:121

2709 msgid "failed write to rev-list"

2710 msgstr "寫入 rev-list 失敗"

2711

2250 -#: connected.c:127

2712 +#: connected.c:128

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

2714 msgstr "關閉 rev-list 的標準輸入失敗"

2715

@@ -2284,25 +2746,27 @@ msgstr ""

2746 "%s 中的 LF 將被 CRLF 取代。\n"

2747 "在工作區中該檔案仍保持原有的換行符號"

2748

2287 -#: convert.c:280

2749 +#: convert.c:284

2750 #, c-format

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

2752 msgstr "如果使用 %2$s 編碼，禁止在 '%1$s' 中使用 BOM"

2753

2292 -#: convert.c:287

2754 +#: convert.c:291

2755 #, c-format

2756 +#| msgid ""

2757 +#| "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as "

2758 +#| "working-tree-encoding."

2759 msgid ""

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

2296 -"tree-encoding."

2297 -msgstr ""

2298 -"檔案 '%s' 包含一個位元組順序標記（BOM）。請使用 UTF-%s 作為工作區編碼。"

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

2761 +"working-tree-encoding."

2762 +msgstr "檔案 '%s' 包含位元組順序標記（BOM）。請使用 UTF-%.*s 作為工作區編碼。"

2763

2300 -#: convert.c:305

2764 +#: convert.c:304

2765 #, c-format

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

2767 msgstr "如果編碼為 %2$s，需要在 '%1$s' 中使用 BOM"

2768

2305 -#: convert.c:307

2769 +#: convert.c:306

2770 #, c-format

2771 msgid ""

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

@@ -2311,66 +2775,66 @@ msgstr ""

2775 "檔案 '%s' 缺少一個位元組順序標記（BOM）。請使用 UTF-%sBE or UTF-%sLE（取決於"

2776 "字節序）作為工作區編碼。"

2777

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

2778 +#: convert.c:419 convert.c:490

2779 #, c-format

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

2781 msgstr "無法對 '%s' 進行從 %s 到 %s 的編碼"

2782

2319 -#: convert.c:468

2783 +#: convert.c:462

2784 #, c-format

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

2786 msgstr "將'%s' 的編碼從 %s 到 %s 來迴轉換不一致"

2787

2324 -#: convert.c:674

2788 +#: convert.c:668

2789 #, c-format

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

2791 msgstr "不能 fork 以執行外部過濾器 '%s'"

2792

2329 -#: convert.c:694

2793 +#: convert.c:688

2794 #, c-format

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

2796 msgstr "不能將輸入傳遞給外部過濾器 '%s'"

2797

2334 -#: convert.c:701

2798 +#: convert.c:695

2799 #, c-format

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

2801 msgstr "外部過濾器 '%s' 失敗碼 %d"

2802

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

2803 +#: convert.c:730 convert.c:733

2804 #, c-format

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

2806 msgstr "從外部過濾器 '%s' 讀取失敗"

2807

2344 -#: convert.c:742 convert.c:797

2808 +#: convert.c:736 convert.c:791

2809 #, c-format

2810 msgid "external filter '%s' failed"

2811 msgstr "外部過濾器 '%s' 失敗"

2812

2349 -#: convert.c:845

2813 +#: convert.c:839

2814 msgid "unexpected filter type"

2815 msgstr "意外的過濾類型"

2816

2353 -#: convert.c:856

2817 +#: convert.c:850

2818 msgid "path name too long for external filter"

2819 msgstr "外部過濾器的路徑名太長"

2820

2357 -#: convert.c:930

2821 +#: convert.c:924

2822 #, c-format

2823 msgid ""

2824 "external filter '%s' is not available anymore although not all paths have "

2825 "been filtered"

2826 msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾"

2827

2364 -#: convert.c:1229

2828 +#: convert.c:1223

2829 msgid "true/false are no valid working-tree-encodings"

2830 msgstr "true/false 不是有效的工作區編碼"

2831

2368 -#: convert.c:1417 convert.c:1451

2832 +#: convert.c:1411 convert.c:1445

2833 #, c-format

2834 msgid "%s: clean filter '%s' failed"

2835 msgstr "%s：clean 過濾器 '%s' 失敗"

2836

2373 -#: convert.c:1495

2837 +#: convert.c:1489

2838 #, c-format

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

2840 msgstr "%s：smudge 過濾器 %s 失敗"

@@ -2535,35 +2999,35 @@ msgstr ""

2999 "發現設定變數 'diff.dirstat' 中的錯誤：\n"

3000 "%s"

3001

2538 -#: diff.c:4218

3002 +#: diff.c:4202

3003 #, c-format

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

3005 msgstr "外部 diff 離開，停止在 %s"

3006

2543 -#: diff.c:4563

3007 +#: diff.c:4547

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

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

3010

2547 -#: diff.c:4566

3011 +#: diff.c:4550

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

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

3014

2551 -#: diff.c:4644

3015 +#: diff.c:4628

3016 msgid "--follow requires exactly one pathspec"

3017 msgstr "--follow 明確要求只跟一個路徑規格"

3018

2555 -#: diff.c:4692

3019 +#: diff.c:4676

3020 #, c-format

3021 msgid "invalid --stat value: %s"

3022 msgstr "無效的 --stat 值：%s"

3023

2560 -#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225

3024 +#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209

3025 #: parse-options.c:199 parse-options.c:203

3026 #, c-format

3027 msgid "%s expects a numerical value"

3028 msgstr "%s 期望一個數字值"

3029

2566 -#: diff.c:4729

3030 +#: diff.c:4713

3031 #, c-format

3032 msgid ""

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

@@ -2572,195 +3036,194 @@ msgstr ""

3036 "無法解析 --dirstat/-X 選項的參數：\n"

3037 "%s"

3038

2575 -#: diff.c:4814

3039 +#: diff.c:4798

3040 #, c-format

3041 msgid "unknown change class '%c' in --diff-filter=%s"

3042 msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"

3043

2580 -#: diff.c:4838

3044 +#: diff.c:4822

3045 #, c-format

3046 msgid "unknown value after ws-error-highlight=%.*s"

3047 msgstr "ws-error-highlight=%.*s 之後未知的值"

3048

2585 -#: diff.c:4852

3049 +#: diff.c:4836

3050 #, c-format

3051 msgid "unable to resolve '%s'"

3052 msgstr "不能解析 '%s'"

3053

2590 -#: diff.c:4902 diff.c:4908

3054 +#: diff.c:4886 diff.c:4892

3055 #, c-format

3056 msgid "%s expects <n>/<m> form"

3057 msgstr "%s 期望 <n>/<m> 格式"

3058

2595 -#: diff.c:4920

3059 +#: diff.c:4904

3060 #, c-format

3061 msgid "%s expects a character, got '%s'"

3062 msgstr "%s 期望一個字元，得到 '%s'"

3063

2600 -#: diff.c:4941

3064 +#: diff.c:4925

3065 #, c-format

3066 msgid "bad --color-moved argument: %s"

3067 msgstr "壞的 --color-moved 參數：%s"

3068

2605 -#: diff.c:4960

3069 +#: diff.c:4944

3070 #, c-format

3071 msgid "invalid mode '%s' in --color-moved-ws"

3072 msgstr "--color-moved-ws 中的無效模式 '%s' "

3073

2610 -#: diff.c:5000

3074 +#: diff.c:4984

3075 msgid ""

3076 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3077 "\"histogram\""

2614 -msgstr ""

2615 -"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""

3078 +msgstr "diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""

3079

2617 -#: diff.c:5036 diff.c:5056

3080 +#: diff.c:5020 diff.c:5040

3081 #, c-format

3082 msgid "invalid argument to %s"

3083 msgstr "%s 的參數無效"

3084

2622 -#: diff.c:5194

3085 +#: diff.c:5178

3086 #, c-format

3087 msgid "failed to parse --submodule option parameter: '%s'"

3088 msgstr "無法解析 --submodule 選項的參數：'%s'"

3089

2627 -#: diff.c:5250

3090 +#: diff.c:5234

3091 #, c-format

3092 msgid "bad --word-diff argument: %s"

3093 msgstr "壞的 --word-diff 參數：%s"

3094

2632 -#: diff.c:5273

3095 +#: diff.c:5257

3096 msgid "Diff output format options"

3097 msgstr "差異輸出格式化選項"

3098

2636 -#: diff.c:5275 diff.c:5281

3099 +#: diff.c:5259 diff.c:5265

3100 msgid "generate patch"

3101 msgstr "生成修補檔"

3102

2640 -#: diff.c:5278 builtin/log.c:172

3103 +#: diff.c:5262 builtin/log.c:173

3104 msgid "suppress diff output"

3105 msgstr "不顯示差異輸出"

3106

2644 -#: diff.c:5283 diff.c:5397 diff.c:5404

3107 +#: diff.c:5267 diff.c:5381 diff.c:5388

3108 msgid "<n>"

3109 msgstr "<n>"

3110

2648 -#: diff.c:5284 diff.c:5287

3111 +#: diff.c:5268 diff.c:5271

3112 msgid "generate diffs with <n> lines context"

3113 msgstr "生成含 <n> 行上下文的差異"

3114

2652 -#: diff.c:5289

3115 +#: diff.c:5273

3116 msgid "generate the diff in raw format"

3117 msgstr "生成原始格式的差異"

3118

2656 -#: diff.c:5292

3119 +#: diff.c:5276

3120 msgid "synonym for '-p --raw'"

3121 msgstr "和 '-p --raw' 同義"

3122

2660 -#: diff.c:5296

3123 +#: diff.c:5280

3124 msgid "synonym for '-p --stat'"

3125 msgstr "和 '-p --stat' 同義"

3126

2664 -#: diff.c:5300

3127 +#: diff.c:5284

3128 msgid "machine friendly --stat"

3129 msgstr "機器友好的 --stat"

3130

2668 -#: diff.c:5303

3131 +#: diff.c:5287

3132 msgid "output only the last line of --stat"

3133 msgstr "只輸出 --stat 的最後一行"

3134

2672 -#: diff.c:5305 diff.c:5313

3135 +#: diff.c:5289 diff.c:5297

3136 msgid "<param1,param2>..."

3137 msgstr "<參數1,參數2>..."

3138

2676 -#: diff.c:5306

3139 +#: diff.c:5290

3140 msgid ""

3141 "output the distribution of relative amount of changes for each sub-directory"

3142 msgstr "輸出每個子目錄相對變更的分布"

3143

2681 -#: diff.c:5310

3144 +#: diff.c:5294

3145 msgid "synonym for --dirstat=cumulative"

3146 msgstr "和 --dirstat=cumulative 同義"

3147

2685 -#: diff.c:5314

3148 +#: diff.c:5298

3149 msgid "synonym for --dirstat=files,param1,param2..."

3150 msgstr "是 --dirstat=files,param1,param2... 的同義詞"

3151

2689 -#: diff.c:5318

3152 +#: diff.c:5302

3153 msgid "warn if changes introduce conflict markers or whitespace errors"

3154 msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告"

3155

2693 -#: diff.c:5321

3156 +#: diff.c:5305

3157 msgid "condensed summary such as creations, renames and mode changes"

3158 msgstr "精簡摘要，例如建立、重新命名和模式變更"

3159

2697 -#: diff.c:5324

3160 +#: diff.c:5308

3161 msgid "show only names of changed files"

3162 msgstr "只顯示變更檔案的檔案名"

3163

2701 -#: diff.c:5327

3164 +#: diff.c:5311

3165 msgid "show only names and status of changed files"

3166 msgstr "只顯示變更檔案的檔案名和狀態"

3167

2705 -#: diff.c:5329

3168 +#: diff.c:5313

3169 msgid "<width>[,<name-width>[,<count>]]"

3170 msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"

3171

2709 -#: diff.c:5330

3172 +#: diff.c:5314

3173 msgid "generate diffstat"

3174 msgstr "生成差異統計（diffstat）"

3175

2713 -#: diff.c:5332 diff.c:5335 diff.c:5338

3176 +#: diff.c:5316 diff.c:5319 diff.c:5322

3177 msgid "<width>"

3178 msgstr "<寬度>"

3179

2717 -#: diff.c:5333

3180 +#: diff.c:5317

3181 msgid "generate diffstat with a given width"

3182 msgstr "使用提供的長度生成差異統計"

3183

2721 -#: diff.c:5336

3184 +#: diff.c:5320

3185 msgid "generate diffstat with a given name width"

3186 msgstr "使用提供的檔案名長度生成差異統計"

3187

2725 -#: diff.c:5339

3188 +#: diff.c:5323

3189 msgid "generate diffstat with a given graph width"

3190 msgstr "使用提供的圖形長度生成差異統計"

3191

2729 -#: diff.c:5341

3192 +#: diff.c:5325

3193 msgid "<count>"

3194 msgstr "<次數>"

3195

2733 -#: diff.c:5342

3196 +#: diff.c:5326

3197 msgid "generate diffstat with limited lines"

3198 msgstr "生成有限行數的差異統計"

3199

2737 -#: diff.c:5345

3200 +#: diff.c:5329

3201 msgid "generate compact summary in diffstat"

3202 msgstr "生成差異統計的簡潔摘要"

3203

2741 -#: diff.c:5348

3204 +#: diff.c:5332

3205 msgid "output a binary diff that can be applied"

3206 msgstr "輸出一個可以應用的二進位差異"

3207

2745 -#: diff.c:5351

3208 +#: diff.c:5335

3209 msgid "show full pre- and post-image object names on the \"index\" lines"

3210 msgstr "在 \"index\" 行顯示完整的前後物件名稱"

3211

2749 -#: diff.c:5353

3212 +#: diff.c:5337

3213 msgid "show colored diff"

3214 msgstr "顯示帶顏色的差異"

3215

2753 -#: diff.c:5354

3216 +#: diff.c:5338

3217 msgid "<kind>"

3218 msgstr "<類型>"

3219

2757 -#: diff.c:5355

3220 +#: diff.c:5339

3221 msgid ""

3222 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3223 "diff"

3224 msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元"

3225

2763 -#: diff.c:5358

3226 +#: diff.c:5342

3227 msgid ""

3228 "do not munge pathnames and use NULs as output field terminators in --raw or "

3229 "--numstat"

@@ -2768,334 +3231,355 @@ msgstr ""

3231 "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"

3232 "符"

3233

2771 -#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473

3234 +#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457

3235 msgid "<prefix>"

3236 msgstr "<前綴>"

3237

2775 -#: diff.c:5362

3238 +#: diff.c:5346

3239 msgid "show the given source prefix instead of \"a/\""

3240 msgstr "顯示提供的源前綴取代 \"a/\""

3241

2779 -#: diff.c:5365

3242 +#: diff.c:5349

3243 msgid "show the given destination prefix instead of \"b/\""

3244 msgstr "顯示提供的目標前綴取代 \"b/\""

3245

2783 -#: diff.c:5368

3246 +#: diff.c:5352

3247 msgid "prepend an additional prefix to every line of output"

3248 msgstr "輸出的每一行附加前綴"

3249

2787 -#: diff.c:5371

3250 +#: diff.c:5355

3251 msgid "do not show any source or destination prefix"

3252 msgstr "不顯示任何源和目標前綴"

3253

2791 -#: diff.c:5374

3254 +#: diff.c:5358

3255 msgid "show context between diff hunks up to the specified number of lines"

3256 msgstr "顯示指定行數的差異區塊間的上下文"

3257

2795 -#: diff.c:5378 diff.c:5383 diff.c:5388

3258 +#: diff.c:5362 diff.c:5367 diff.c:5372

3259 msgid "<char>"

3260 msgstr "<字元>"

3261

2799 -#: diff.c:5379

3262 +#: diff.c:5363

3263 msgid "specify the character to indicate a new line instead of '+'"

3264 msgstr "指定一個字元取代 '+' 來表示新的一行"

3265

2803 -#: diff.c:5384

3266 +#: diff.c:5368

3267 msgid "specify the character to indicate an old line instead of '-'"

3268 msgstr "指定一個字元取代 '-' 來表示舊的一行"

3269

2807 -#: diff.c:5389

3270 +#: diff.c:5373

3271 msgid "specify the character to indicate a context instead of ' '"

3272 msgstr "指定一個字元取代 ' ' 來表示一行上下文"

3273

2811 -#: diff.c:5392

3274 +#: diff.c:5376

3275 msgid "Diff rename options"

3276 msgstr "差異重新命名選項"

3277

2815 -#: diff.c:5393

3278 +#: diff.c:5377

3279 msgid "<n>[/<m>]"

3280 msgstr "<n>[/<m>]"

3281

2819 -#: diff.c:5394

3282 +#: diff.c:5378

3283 msgid "break complete rewrite changes into pairs of delete and create"

3284 msgstr "將完全重寫的變更打破為成對的刪除和建立"

3285

2823 -#: diff.c:5398

3286 +#: diff.c:5382

3287 msgid "detect renames"

3288 msgstr "檢測重新命名"

3289

2827 -#: diff.c:5402

3290 +#: diff.c:5386

3291 msgid "omit the preimage for deletes"

3292 msgstr "省略刪除動作的差異輸出"

3293

2831 -#: diff.c:5405

3294 +#: diff.c:5389

3295 msgid "detect copies"

3296 msgstr "檢測複製"

3297

2835 -#: diff.c:5409

3298 +#: diff.c:5393

3299 msgid "use unmodified files as source to find copies"

3300 msgstr "使用未修改的檔案做為發現複製的源"

3301

2839 -#: diff.c:5411

3302 +#: diff.c:5395

3303 msgid "disable rename detection"

3304 msgstr "禁用重新命名偵測"

3305

2843 -#: diff.c:5414

3306 +#: diff.c:5398

3307 msgid "use empty blobs as rename source"

3308 msgstr "使用空的資料物件做為重新命名的源"

3309

2847 -#: diff.c:5416

3310 +#: diff.c:5400

3311 msgid "continue listing the history of a file beyond renames"

3312 msgstr "繼續列出檔案重新命名以外的歷史記錄"

3313

2851 -#: diff.c:5419

3314 +#: diff.c:5403

3315 msgid ""

3316 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3317 "given limit"

3318 msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"

3319

2857 -#: diff.c:5421

3320 +#: diff.c:5405

3321 msgid "Diff algorithm options"

3322 msgstr "差異演算法選項"

3323

2861 -#: diff.c:5423

3324 +#: diff.c:5407

3325 msgid "produce the smallest possible diff"

3326 msgstr "生成儘可能小的差異"

3327

2865 -#: diff.c:5426

3328 +#: diff.c:5410

3329 msgid "ignore whitespace when comparing lines"

3330 msgstr "行比較時忽略空白字元"

3331

2869 -#: diff.c:5429

3332 +#: diff.c:5413

3333 msgid "ignore changes in amount of whitespace"

3334 msgstr "忽略空白字元的變更"

3335

2873 -#: diff.c:5432

3336 +#: diff.c:5416

3337 msgid "ignore changes in whitespace at EOL"

3338 msgstr "忽略行尾的空白字元變更"

3339

2877 -#: diff.c:5435

3340 +#: diff.c:5419

3341 msgid "ignore carrier-return at the end of line"

3342 msgstr "忽略行尾的Enter符（CR）"

3343

2881 -#: diff.c:5438

3344 +#: diff.c:5422

3345 msgid "ignore changes whose lines are all blank"

3346 msgstr "忽略整行都是空白的變更"

3347

2885 -#: diff.c:5441

3348 +#: diff.c:5425

3349 msgid "heuristic to shift diff hunk boundaries for easy reading"

3350 msgstr "啟發式轉換差異邊界以便閱讀"

3351

2889 -#: diff.c:5444

3352 +#: diff.c:5428

3353 msgid "generate diff using the \"patience diff\" algorithm"

3354 msgstr "使用 \"patience diff\" 演算法生成差異"

3355

2893 -#: diff.c:5448

3356 +#: diff.c:5432

3357 msgid "generate diff using the \"histogram diff\" algorithm"

3358 msgstr "使用 \"histogram diff\" 演算法生成差異"

3359

2897 -#: diff.c:5450

3360 +#: diff.c:5434

3361 msgid "<algorithm>"

3362 msgstr "<演算法>"

3363

2901 -#: diff.c:5451

3364 +#: diff.c:5435

3365 msgid "choose a diff algorithm"

3366 msgstr "選擇一個差異演算法"

3367

2905 -#: diff.c:5453

3368 +#: diff.c:5437

3369 msgid "<text>"

3370 msgstr "<文字>"

3371

2909 -#: diff.c:5454

3372 +#: diff.c:5438

3373 msgid "generate diff using the \"anchored diff\" algorithm"

3374 msgstr "使用 \"anchored diff\" 演算法生成差異"

3375

2913 -#: diff.c:5456 diff.c:5465 diff.c:5468

3376 +#: diff.c:5440 diff.c:5449 diff.c:5452

3377 msgid "<mode>"

3378 msgstr "<模式>"

3379

2917 -#: diff.c:5457

3380 +#: diff.c:5441

3381 msgid "show word diff, using <mode> to delimit changed words"

3382 msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞"

3383

2921 -#: diff.c:5459 diff.c:5462 diff.c:5507

3384 +#: diff.c:5443 diff.c:5446 diff.c:5491

3385 msgid "<regex>"

3386 msgstr "<正則>"

3387

2925 -#: diff.c:5460

3388 +#: diff.c:5444

3389 msgid "use <regex> to decide what a word is"

3390 msgstr "使用 <正規表示式> 確定何為一個詞"

3391

2929 -#: diff.c:5463

3392 +#: diff.c:5447

3393 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3394 msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"

3395

2933 -#: diff.c:5466

3396 +#: diff.c:5450

3397 msgid "moved lines of code are colored differently"

3398 msgstr "移動的程式碼行用不同方式著色"

3399

2937 -#: diff.c:5469

3400 +#: diff.c:5453

3401 msgid "how white spaces are ignored in --color-moved"

3402 msgstr "在 --color-moved 下如何忽略空白字元"

3403

2941 -#: diff.c:5472

3404 +#: diff.c:5456

3405 msgid "Other diff options"

3406 msgstr "其它差異選項"

3407

2945 -#: diff.c:5474

3408 +#: diff.c:5458

3409 msgid "when run from subdir, exclude changes outside and show relative paths"

3410 msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑"

3411

2949 -#: diff.c:5478

3412 +#: diff.c:5462

3413 msgid "treat all files as text"

3414 msgstr "把所有檔案當做文字處理"

3415

2953 -#: diff.c:5480

3416 +#: diff.c:5464

3417 msgid "swap two inputs, reverse the diff"

3418 msgstr "交換兩個輸入，反轉差異"

3419

2957 -#: diff.c:5482

3420 +#: diff.c:5466

3421 msgid "exit with 1 if there were differences, 0 otherwise"

3422 msgstr "有差異時離開碼為 1，否則為 0"

3423

2961 -#: diff.c:5484

3424 +#: diff.c:5468

3425 msgid "disable all output of the program"

3426 msgstr "禁用本程式的所有輸出"

3427

2965 -#: diff.c:5486

3428 +#: diff.c:5470

3429 msgid "allow an external diff helper to be executed"

3430 msgstr "允許執行一個外部的差異助手"

3431

2969 -#: diff.c:5488

3432 +#: diff.c:5472

3433 msgid "run external text conversion filters when comparing binary files"

3434 msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器"

3435

2973 -#: diff.c:5490

3436 +#: diff.c:5474

3437 msgid "<when>"

3438 msgstr "<何時>"

3439

2977 -#: diff.c:5491

3440 +#: diff.c:5475

3441 msgid "ignore changes to submodules in the diff generation"

3442 msgstr "在生成差異時，忽略子模組的更改"

3443

2981 -#: diff.c:5494

3444 +#: diff.c:5478

3445 msgid "<format>"

3446 msgstr "<格式>"

3447

2985 -#: diff.c:5495

3448 +#: diff.c:5479

3449 msgid "specify how differences in submodules are shown"

3450 msgstr "指定子模組的差異如何顯示"

3451

2989 -#: diff.c:5499

3452 +#: diff.c:5483

3453 msgid "hide 'git add -N' entries from the index"

3454 msgstr "隱藏索引中 'git add -N' 條目"

3455

2993 -#: diff.c:5502

3456 +#: diff.c:5486

3457 msgid "treat 'git add -N' entries as real in the index"

3458 msgstr "將索引中 'git add -N' 條目當做真實的"

3459

2997 -#: diff.c:5504

3460 +#: diff.c:5488

3461 msgid "<string>"

3462 msgstr "<字串>"

3463

3001 -#: diff.c:5505

3464 +#: diff.c:5489

3465 msgid ""

3466 "look for differences that change the number of occurrences of the specified "

3467 "string"

3468 msgstr "尋找改變了指定字串出現次數的差異"

3469

3007 -#: diff.c:5508

3470 +#: diff.c:5492

3471 msgid ""

3472 "look for differences that change the number of occurrences of the specified "

3473 "regex"

3474 msgstr "尋找改變指定正則符合出現次數的差異"

3475

3013 -#: diff.c:5511

3476 +#: diff.c:5495

3477 msgid "show all changes in the changeset with -S or -G"

3478 msgstr "顯示使用 -S 或 -G 的變更集的所有變更"

3479

3017 -#: diff.c:5514

3480 +#: diff.c:5498

3481 msgid "treat <string> in -S as extended POSIX regular expression"

3482 msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式"

3483

3021 -#: diff.c:5517

3484 +#: diff.c:5501

3485 msgid "control the order in which files appear in the output"

3486 msgstr "控制輸出中的檔案顯示順序"

3487

3025 -#: diff.c:5518

3488 +#: diff.c:5502

3489 msgid "<object-id>"

3490 msgstr "<物件 ID>"

3491

3029 -#: diff.c:5519

3492 +#: diff.c:5503

3493 msgid ""

3494 "look for differences that change the number of occurrences of the specified "

3495 "object"

3496 msgstr "尋找改變指定物件出現次數的差異"

3497

3035 -#: diff.c:5521

3498 +#: diff.c:5505

3499 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3500 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3501

3039 -#: diff.c:5522

3502 +#: diff.c:5506

3503 msgid "select files by diff type"

3504 msgstr "透過差異類型選擇檔案"

3505

3043 -#: diff.c:5524

3506 +#: diff.c:5508

3507 msgid "<file>"

3508 msgstr "<檔案>"

3509

3047 -#: diff.c:5525

3510 +#: diff.c:5509

3511 msgid "Output to a specific file"

3512 msgstr "輸出到一個指定的檔案"

3513

3051 -#: diff.c:6180

3514 +#: diff.c:6164

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

3516 msgstr "因為檔案太多，略過不嚴格的重新命名檢查。"

3517

3055 -#: diff.c:6183

3518 +#: diff.c:6167

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

3520 msgstr "因為檔案太多，只在修改的路徑中尋找複製。"

3521

3059 -#: diff.c:6186

3522 +#: diff.c:6170

3523 #, c-format

3524 msgid ""

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

3526 msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令。"

3527

3065 -#: dir.c:549

3528 +#: dir.c:554

3529 #, c-format

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

3531 msgstr "路徑規格 '%s' 未符合任何 git 已知檔案"

3532

3070 -#: dir.c:938

3533 +#: dir.c:664

3534 +#, c-format

3535 +#| msgid "unrecognized option: '%s'"

3536 +msgid "unrecognized pattern: '%s'"

3537 +msgstr "無法識別樣式：「%s」"

3538 +

3539 +#: dir.c:682 dir.c:696

3540 +#, c-format

3541 +#| msgid "unrecognized option: '%s'"

3542 +msgid "unrecognized negative pattern: '%s'"

3543 +msgstr "無法識別反向模式：「%s」"

3544 +

3545 +#: dir.c:714

3546 +#, c-format

3547 +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3548 +msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複"

3549 +

3550 +#: dir.c:724

3551 +msgid "disabling cone pattern matching"

3552 +msgstr "停用 cone 樣式符合模式"

3553 +

3554 +#: dir.c:1101

3555 #, c-format

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

3557 msgstr "不能將 %s 用作排除檔案"

3558

3075 -#: dir.c:1877

3559 +#: dir.c:2078

3560 #, c-format

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

3562 msgstr "不能開啟目錄 '%s'"

3563

3080 -#: dir.c:2128

3564 +#: dir.c:2415

3565 msgid "failed to get kernel name and information"

3566 msgstr "無法獲得核心名稱和訊息"

3567

3084 -#: dir.c:2252

3568 +#: dir.c:2539

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

3570 msgstr "快取未追蹤檔案在本系統或位置中被禁用"

3571

3088 -#: dir.c:3056

3572 +#: dir.c:3343

3573 #, c-format

3574 msgid "index file corrupt in repo %s"

3575 msgstr "版本庫 %s 中的索引檔案損壞"

3576

3093 -#: dir.c:3101 dir.c:3106

3577 +#: dir.c:3388 dir.c:3393

3578 #, c-format

3579 msgid "could not create directories for %s"

3580 msgstr "不能為 %s 建立目錄"

3581

3098 -#: dir.c:3135

3582 +#: dir.c:3422

3583 #, c-format

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

3585 msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"

@@ -3114,12 +3598,12 @@ msgstr "過濾內容"

3598 msgid "could not stat file '%s'"

3599 msgstr "不能對檔案 '%s' 呼叫 stat"

3600

3117 -#: environment.c:148

3601 +#: environment.c:149

3602 #, c-format

3603 msgid "bad git namespace path \"%s\""

3604 msgstr "錯誤的 git 名字空間路徑 \"%s\""

3605

3122 -#: environment.c:330

3606 +#: environment.c:331

3607 #, c-format

3608 msgid "could not set GIT_DIR to '%s'"

3609 msgstr "不能設定 GIT_DIR 為 '%s'"

@@ -3154,32 +3638,32 @@ msgstr "無法寫到遠端"

3638 msgid "--stateless-rpc requires multi_ack_detailed"

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

3640

3157 -#: fetch-pack.c:356 fetch-pack.c:1280

3641 +#: fetch-pack.c:356 fetch-pack.c:1340

3642 #, c-format

3643 msgid "invalid shallow line: %s"

3644 msgstr "無效的 shallow 訊息：%s"

3645

3162 -#: fetch-pack.c:362 fetch-pack.c:1286

3646 +#: fetch-pack.c:362 fetch-pack.c:1346

3647 #, c-format

3648 msgid "invalid unshallow line: %s"

3649 msgstr "無效的 unshallow 訊息：%s"

3650

3167 -#: fetch-pack.c:364 fetch-pack.c:1288

3651 +#: fetch-pack.c:364 fetch-pack.c:1348

3652 #, c-format

3653 msgid "object not found: %s"

3654 msgstr "物件未找到：%s"

3655

3172 -#: fetch-pack.c:367 fetch-pack.c:1291

3656 +#: fetch-pack.c:367 fetch-pack.c:1351

3657 #, c-format

3658 msgid "error in object: %s"

3659 msgstr "物件中發生錯誤：%s"

3660

3177 -#: fetch-pack.c:369 fetch-pack.c:1293

3661 +#: fetch-pack.c:369 fetch-pack.c:1353

3662 #, c-format

3663 msgid "no shallow found: %s"

3664 msgstr "未發現 shallow：%s"

3665

3182 -#: fetch-pack.c:372 fetch-pack.c:1297

3666 +#: fetch-pack.c:372 fetch-pack.c:1357

3667 #, c-format

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

3669 msgstr "應為 shallow/unshallow，卻得到 %s"

@@ -3198,7 +3682,7 @@ msgstr "無效提交 %s"

3682 msgid "giving up"

3683 msgstr "放棄"

3684

3201 -#: fetch-pack.c:475 progress.c:312

3685 +#: fetch-pack.c:475 progress.c:323

3686 msgid "done"

3687 msgstr "完成"

3688

@@ -3212,162 +3696,162 @@ msgstr "得到 %s (%d) %s"

3696 msgid "Marking %s as complete"

3697 msgstr "標記 %s 為完成"

3698

3215 -#: fetch-pack.c:742

3699 +#: fetch-pack.c:754

3700 #, c-format

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

3702 msgstr "已經有 %s（%s）"

3703

3220 -#: fetch-pack.c:781

3704 +#: fetch-pack.c:818

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

3706 msgstr "fetch-pack：無法衍生 sideband 多路輸出"

3707

3224 -#: fetch-pack.c:789

3708 +#: fetch-pack.c:826

3709 msgid "protocol error: bad pack header"

3710 msgstr "協定錯誤：壞的包頭"

3711

3228 -#: fetch-pack.c:857

3712 +#: fetch-pack.c:900

3713 #, c-format

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

3715 msgstr "fetch-pack：無法衍生進程 %s"

3716

3233 -#: fetch-pack.c:873

3717 +#: fetch-pack.c:916

3718 #, c-format

3719 msgid "%s failed"

3720 msgstr "%s 失敗"

3721

3238 -#: fetch-pack.c:875

3722 +#: fetch-pack.c:918

3723 msgid "error in sideband demultiplexer"

3724 msgstr "sideband 多路輸出發生錯誤"

3725

3242 -#: fetch-pack.c:907

3726 +#: fetch-pack.c:965

3727 #, c-format

3728 msgid "Server version is %.*s"

3729 msgstr "伺服器版本 %.*s"

3730

3247 -#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927

3248 -#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943

3249 -#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959

3250 -#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981

3731 +#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985

3732 +#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001

3733 +#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017

3734 +#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039

3735 #, c-format

3736 msgid "Server supports %s"

3737 msgstr "伺服器支援 %s"

3738

3255 -#: fetch-pack.c:914

3739 +#: fetch-pack.c:972

3740 msgid "Server does not support shallow clients"

3741 msgstr "伺服器不支援 shalllow 用戶端"

3742

3259 -#: fetch-pack.c:974

3743 +#: fetch-pack.c:1032

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

3745 msgstr "伺服器不支援 --shallow-since"

3746

3263 -#: fetch-pack.c:979

3747 +#: fetch-pack.c:1037

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

3749 msgstr "伺服器不支援 --shallow-exclude"

3750

3267 -#: fetch-pack.c:983

3751 +#: fetch-pack.c:1041

3752 msgid "Server does not support --deepen"

3753 msgstr "伺服器不支援 --deepen"

3754

3271 -#: fetch-pack.c:1000

3755 +#: fetch-pack.c:1058

3756 msgid "no common commits"

3757 msgstr "沒有共同的提交"

3758

3275 -#: fetch-pack.c:1012 fetch-pack.c:1468

3759 +#: fetch-pack.c:1070 fetch-pack.c:1536

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

3761 msgstr "git fetch-pack：取得失敗。"

3762

3279 -#: fetch-pack.c:1150

3763 +#: fetch-pack.c:1209

3764 msgid "Server does not support shallow requests"

3765 msgstr "伺服器不支援 shalllow 請求"

3766

3283 -#: fetch-pack.c:1157

3767 +#: fetch-pack.c:1216

3768 msgid "Server supports filter"

3769 msgstr "伺服器支援 filter"

3770

3287 -#: fetch-pack.c:1180

3771 +#: fetch-pack.c:1239

3772 msgid "unable to write request to remote"

3773 msgstr "無法將請求寫到遠端"

3774

3291 -#: fetch-pack.c:1198

3775 +#: fetch-pack.c:1257

3776 #, c-format

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

3778 msgstr "讀取節標題 '%s' 發生錯誤"

3779

3296 -#: fetch-pack.c:1204

3780 +#: fetch-pack.c:1263

3781 #, c-format

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

3783 msgstr "預期 '%s'，得到 '%s'"

3784

3301 -#: fetch-pack.c:1243

3785 +#: fetch-pack.c:1303

3786 #, c-format

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

3788 msgstr "意外的確認行：'%s'"

3789

3306 -#: fetch-pack.c:1248

3790 +#: fetch-pack.c:1308

3791 #, c-format

3792 msgid "error processing acks: %d"

3793 msgstr "處理 ack 發生錯誤：%d"

3794

3311 -#: fetch-pack.c:1258

3795 +#: fetch-pack.c:1318

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

3797 msgstr "預期在 'ready' 之後傳送 packfile"

3798

3315 -#: fetch-pack.c:1260

3799 +#: fetch-pack.c:1320

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

3801 msgstr "在沒有 'ready' 不應該傳送其它小節"

3802

3319 -#: fetch-pack.c:1302

3803 +#: fetch-pack.c:1362

3804 #, c-format

3805 msgid "error processing shallow info: %d"

3806 msgstr "處理淺複製訊息發生錯誤：%d"

3807

3324 -#: fetch-pack.c:1349

3808 +#: fetch-pack.c:1409

3809 #, c-format

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

3811 msgstr "預期 wanted-ref，得到 '%s'"

3812

3329 -#: fetch-pack.c:1354

3813 +#: fetch-pack.c:1414

3814 #, c-format

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

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

3817

3334 -#: fetch-pack.c:1359

3818 +#: fetch-pack.c:1419

3819 #, c-format

3820 msgid "error processing wanted refs: %d"

3821 msgstr "處理要取得的引用發生錯誤：%d"

3822

3339 -#: fetch-pack.c:1693

3823 +#: fetch-pack.c:1762

3824 msgid "no matching remote head"

3825 msgstr "沒有符合的遠端分支"

3826

3343 -#: fetch-pack.c:1716 builtin/clone.c:685

3827 +#: fetch-pack.c:1785 builtin/clone.c:688

3828 msgid "remote did not send all necessary objects"

3829 msgstr "遠端沒有傳送所有必需的物件"

3830

3347 -#: fetch-pack.c:1743

3831 +#: fetch-pack.c:1812

3832 #, c-format

3833 msgid "no such remote ref %s"

3834 msgstr "沒有這樣的遠端引用 %s"

3835

3352 -#: fetch-pack.c:1746

3836 +#: fetch-pack.c:1815

3837 #, c-format

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

3839 msgstr "伺服器不允許請求未公開的物件 %s"

3840

3357 -#: gpg-interface.c:321

3358 -msgid "gpg failed to sign the data"

3359 -msgstr "gpg 無法為資料簽名"

3360 -

3361 -#: gpg-interface.c:347

3841 +#: gpg-interface.c:223

3842 msgid "could not create temporary file"

3843 msgstr "不能建立暫存檔"

3844

3365 -#: gpg-interface.c:350

3845 +#: gpg-interface.c:226

3846 #, c-format

3847 msgid "failed writing detached signature to '%s'"

3848 msgstr "無法將分離式簽名寫入 '%s'"

3849

3370 -#: graph.c:97

3850 +#: gpg-interface.c:390

3851 +msgid "gpg failed to sign the data"

3852 +msgstr "gpg 無法為資料簽名"

3853 +

3854 +#: graph.c:98

3855 #, c-format

3856 msgid "ignore invalid color '%.*s' in log.graphColors"

3857 msgstr "忽略 log.graphColors 中無效的顏色 '%.*s'"

@@ -3385,7 +3869,7 @@ msgstr ""

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

3870 msgstr "'%s'：無法讀取 %s"

3871

3388 -#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82

3872 +#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82

3873 #: builtin/rm.c:135

3874 #, c-format

3875 msgid "failed to stat '%s'"

@@ -3441,8 +3925,9 @@ msgid "Low-level Commands / Interrogators"

3925 msgstr "低級指令/詢問者"

3926

3927 #: help.c:37

3444 -msgid "Low-level Commands / Synching Repositories"

3445 -msgstr "低級指令/同步版本庫"

3928 +#| msgid "Low-level Commands / Synching Repositories"

3929 +msgid "Low-level Commands / Syncing Repositories"

3930 +msgstr "低級指令 / 同步版本庫"

3931

3932 #: help.c:38

3933 msgid "Low-level Commands / Internal Helpers"

@@ -3605,7 +4090,7 @@ msgstr "不允許空的姓名（對於 <%s>）"

4090 msgid "name consists only of disallowed characters: %s"

4091 msgstr "姓名中僅包含禁用字元：%s"

4092

3608 -#: ident.c:436 builtin/commit.c:611

4093 +#: ident.c:436 builtin/commit.c:631

4094 #, c-format

4095 msgid "invalid date format: %s"

4096 msgstr "無效的日期格式：%s"

@@ -3689,7 +4174,7 @@ msgid "failed to read the cache"

4174 msgstr "讀取快取失敗"

4175

4176 #: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908

3692 -#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785

4177 +#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809

4178 #: builtin/stash.c:264

4179 msgid "unable to write new index file"

4180 msgstr "無法寫新的索引檔案"

@@ -3875,7 +4360,7 @@ msgstr "重新命名"

4360 msgid "renamed"

4361 msgstr "重新命名"

4362

3878 -#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117

4363 +#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175

4364 #, c-format

4365 msgid "Refusing to lose dirty file at %s"

4366 msgstr "拒絕遺失髒檔案 '%s'"

@@ -3888,8 +4373,7 @@ msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名

4373 #: merge-recursive.c:1682

4374 #, c-format

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

3891 -msgstr ""

3892 -"衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"

4376 +msgstr "衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"

4377

4378 #: merge-recursive.c:1713

4379 #, c-format

@@ -3921,7 +4405,7 @@ msgstr ""

4405 "衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 "

4406 "%4$s->%5$s"

4407

3924 -#: merge-recursive.c:2056

4408 +#: merge-recursive.c:2114

4409 #, c-format

4410 msgid ""

4411 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3931,7 +4415,7 @@ msgstr ""

4415 "衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到"

4416 "多個其它目錄，沒有目錄包含大部分檔案。"

4417

3934 -#: merge-recursive.c:2088

4418 +#: merge-recursive.c:2146

4419 #, c-format

4420 msgid ""

4421 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3940,7 +4424,7 @@ msgstr ""

4424 "衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑"

4425 "放在：%s。"

4426

3943 -#: merge-recursive.c:2098

4427 +#: merge-recursive.c:2156

4428 #, c-format

4429 msgid ""

4430 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3949,7 +4433,7 @@ msgstr ""

4433 "衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這"

4434 "些路徑放置於此：%s"

4435

3952 -#: merge-recursive.c:2190

4436 +#: merge-recursive.c:2248

4437 #, c-format

4438 msgid ""

4439 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3958,67 +4442,66 @@ msgstr ""

4442 "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新"

4443 "命名目錄 %4$s->%5$s"

4444

3961 -#: merge-recursive.c:2435

4445 +#: merge-recursive.c:2493

4446 #, c-format

4447 msgid ""

4448 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

4449 "renamed."

4450 msgstr "警告：避免應用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。"

4451

3968 -#: merge-recursive.c:2961

4452 +#: merge-recursive.c:3019

4453 #, c-format

4454 msgid "cannot read object %s"

4455 msgstr "不能讀取物件 %s"

4456

3973 -#: merge-recursive.c:2964

4457 +#: merge-recursive.c:3022

4458 #, c-format

4459 msgid "object %s is not a blob"

4460 msgstr "物件 %s 不是一個資料物件"

4461

3978 -#: merge-recursive.c:3028

4462 +#: merge-recursive.c:3086

4463 msgid "modify"

4464 msgstr "修改"

4465

3982 -#: merge-recursive.c:3028

4466 +#: merge-recursive.c:3086

4467 msgid "modified"

4468 msgstr "修改"

4469

3986 -#: merge-recursive.c:3040

4470 +#: merge-recursive.c:3098

4471 msgid "content"

4472 msgstr "內容"

4473

3990 -#: merge-recursive.c:3044

4474 +#: merge-recursive.c:3102

4475 msgid "add/add"

4476 msgstr "新增/新增"

4477

3994 -#: merge-recursive.c:3067

4478 +#: merge-recursive.c:3125

4479 #, c-format

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

4481 msgstr "略過 %s（已經做過相同合併）"

4482

3999 -#: merge-recursive.c:3089 git-submodule.sh:937

4483 +#: merge-recursive.c:3147 git-submodule.sh:993

4484 msgid "submodule"

4485 msgstr "子模組"

4486

4003 -#: merge-recursive.c:3090

4487 +#: merge-recursive.c:3148

4488 #, c-format

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

4490 msgstr "衝突（%s）：合併衝突於 %s"

4491

4008 -#: merge-recursive.c:3120

4492 +#: merge-recursive.c:3178

4493 #, c-format

4494 msgid "Adding as %s instead"

4495 msgstr "而是以 %s 為名新增"

4496

4013 -#: merge-recursive.c:3203

4497 +#: merge-recursive.c:3261

4498 #, c-format

4499 msgid ""

4500 "Path updated: %s added in %s inside a directory that was renamed in %s; "

4501 "moving it to %s."

4018 -msgstr ""

4019 -"路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"

4502 +msgstr "路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"

4503

4021 -#: merge-recursive.c:3206

4504 +#: merge-recursive.c:3264

4505 #, c-format

4506 msgid ""

4507 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4027,7 +4510,7 @@ msgstr ""

4510 "衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移"

4511 "動到 %s。"

4512

4030 -#: merge-recursive.c:3210

4513 +#: merge-recursive.c:3268

4514 #, c-format

4515 msgid ""

4516 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4036,7 +4519,7 @@ msgstr ""

4519 "路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將"

4520 "其移動到 %5$s。"

4521

4039 -#: merge-recursive.c:3213

4522 +#: merge-recursive.c:3271

4523 #, c-format

4524 msgid ""

4525 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4045,59 +4528,59 @@ msgstr ""

4528 "衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s "

4529 "中，建議將其移動到 %5$s。"

4530

4048 -#: merge-recursive.c:3327

4531 +#: merge-recursive.c:3385

4532 #, c-format

4533 msgid "Removing %s"

4534 msgstr "刪除 %s"

4535

4053 -#: merge-recursive.c:3350

4536 +#: merge-recursive.c:3408

4537 msgid "file/directory"

4538 msgstr "檔案/目錄"

4539

4057 -#: merge-recursive.c:3355

4540 +#: merge-recursive.c:3413

4541 msgid "directory/file"

4542 msgstr "目錄/檔案"

4543

4061 -#: merge-recursive.c:3362

4544 +#: merge-recursive.c:3420

4545 #, c-format

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

4547 msgstr "衝突（%1$s）：在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s"

4548

4066 -#: merge-recursive.c:3371

4549 +#: merge-recursive.c:3429

4550 #, c-format

4551 msgid "Adding %s"

4552 msgstr "新增 %s"

4553

4071 -#: merge-recursive.c:3380

4554 +#: merge-recursive.c:3438

4555 #, c-format

4556 msgid "CONFLICT (add/add): Merge conflict in %s"

4557 msgstr "衝突（add/add）：合併衝突於 %s"

4558

4076 -#: merge-recursive.c:3424

4559 +#: merge-recursive.c:3482

4560 msgid "Already up to date!"

4561 msgstr "已經是最新的！"

4562

4080 -#: merge-recursive.c:3433

4563 +#: merge-recursive.c:3491

4564 #, c-format

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

4566 msgstr "無法合併樹 %s 和 %s"

4567

4085 -#: merge-recursive.c:3537

4568 +#: merge-recursive.c:3595

4569 msgid "Merging:"

4570 msgstr "合併："

4571

4089 -#: merge-recursive.c:3550

4572 +#: merge-recursive.c:3608

4573 #, c-format

4574 msgid "found %u common ancestor:"

4575 msgid_plural "found %u common ancestors:"

4576 msgstr[0] "發現 %u 個共同祖先："

4577 msgstr[1] "發現 %u 個共同祖先："

4578

4096 -#: merge-recursive.c:3600

4579 +#: merge-recursive.c:3658

4580 msgid "merge returned no commit"

4581 msgstr "合併未返回提交"

4582

4100 -#: merge-recursive.c:3659

4583 +#: merge-recursive.c:3717

4584 #, c-format

4585 msgid ""

4586 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4106,12 +4589,12 @@ msgstr ""

4589 "您對下列檔案的本機修改將被合併動作覆蓋：\n"

4590 " %s"

4591

4109 -#: merge-recursive.c:3756

4592 +#: merge-recursive.c:3814

4593 #, c-format

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

4595 msgstr "不能解析物件 '%s'"

4596

4114 -#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874

4597 +#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874

4598 msgid "Unable to write index."

4599 msgstr "不能寫入索引。"

4600

@@ -4175,80 +4658,101 @@ msgstr "多包索引儲存一個64位位移，但是 off_t 太小"

4658

4659 #: midx.c:288

4660 msgid "error preparing packfile from multi-pack-index"

4178 -msgstr "從多包索引準備 packfile 發生錯誤"

4661 +msgstr "從多包索引準備 packfile 時發生錯誤"

4662

4180 -#: midx.c:469

4663 +#: midx.c:472

4664 #, c-format

4665 msgid "failed to add packfile '%s'"

4183 -msgstr "新增包檔案 '%s' 失敗"

4666 +msgstr "新增 packfile '%s' 失敗"

4667

4185 -#: midx.c:475

4668 +#: midx.c:478

4669 #, c-format

4670 msgid "failed to open pack-index '%s'"

4671 msgstr "開啟包索引 '%s' 失敗"

4672

4190 -#: midx.c:535

4673 +#: midx.c:538

4674 #, c-format

4675 msgid "failed to locate object %d in packfile"

4193 -msgstr "在包檔案中定位物件 %d 失敗"

4676 +msgstr "在 packfile 中定位物件 %d 失敗"

4677 +

4678 +#: midx.c:842

4679 +#| msgid "error preparing packfile from multi-pack-index"

4680 +msgid "Adding packfiles to multi-pack-index"

4681 +msgstr "正在新增 packfile 至多包索引"

4682

4195 -#: midx.c:864

4683 +#: midx.c:875

4684 #, c-format

4685 msgid "did not see pack-file %s to drop"

4686 msgstr "沒有看到要捨棄的包檔案 %s"

4687

4200 -#: midx.c:1035

4688 +#: midx.c:973

4689 +#| msgid "Write and verify multi-pack-indexes"

4690 +msgid "Writing chunks to multi-pack-index"

4691 +msgstr "寫入區塊至多包索引"

4692 +

4693 +#: midx.c:1052

4694 #, c-format

4695 msgid "failed to clear multi-pack-index at %s"

4696 msgstr "清理位於 %s 的多包索引失敗"

4697

4205 -#: midx.c:1090

4698 +#: midx.c:1108

4699 msgid "Looking for referenced packfiles"

4207 -msgstr "正在尋找引用的包檔案"

4700 +msgstr "正在尋找引用的 packfile"

4701

4209 -#: midx.c:1105

4702 +#: midx.c:1123

4703 #, c-format

4704 msgid ""

4705 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4706 msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4707

4215 -#: midx.c:1109

4216 -msgid "Verifying OID order in MIDX"

4217 -msgstr "正在校驗 MIDX 中的物件 ID 順序"

4708 +#: midx.c:1128

4709 +#| msgid "Verifying OID order in MIDX"

4710 +msgid "Verifying OID order in multi-pack-index"

4711 +msgstr "正在驗證多包索引中的物件 ID 順序"

4712

4219 -#: midx.c:1118

4713 +#: midx.c:1137

4714 #, c-format

4715 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4716 msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]"

4717

4224 -#: midx.c:1137

4718 +#: midx.c:1157

4719 msgid "Sorting objects by packfile"

4226 -msgstr "透過包檔案為物件排序"

4720 +msgstr "透過 packfile 為物件排序"

4721

4228 -#: midx.c:1143

4722 +#: midx.c:1164

4723 msgid "Verifying object offsets"

4230 -msgstr "校驗物件位移"

4724 +msgstr "正在驗證物件位移"

4725

4232 -#: midx.c:1159

4726 +#: midx.c:1180

4727 #, c-format

4728 msgid "failed to load pack entry for oid[%d] = %s"

4729 msgstr "為 oid[%d] = %s 載入包條目失敗"

4730

4237 -#: midx.c:1165

4731 +#: midx.c:1186

4732 #, c-format

4733 msgid "failed to load pack-index for packfile %s"

4240 -msgstr "為包檔案 %s 載入包索引失敗"

4734 +msgstr "為 packfile %s 載入包索引失敗"

4735

4242 -#: midx.c:1174

4736 +#: midx.c:1195

4737 #, c-format

4738 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4739 msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"

4740

4247 -#: midx.c:1349

4741 +#: midx.c:1220

4742 +#| msgid "prune unreferenced objects"

4743 +msgid "Counting referenced objects"

4744 +msgstr "正在計算引用物件"

4745 +

4746 +#: midx.c:1230

4747 +#| msgid "Looking for referenced packfiles"

4748 +msgid "Finding and deleting unreferenced packfiles"

4749 +msgstr "正在尋找並刪除沒有參考的 packfile"

4750 +

4751 +#: midx.c:1388

4752 msgid "could not start pack-objects"

4753 msgstr "不能開始 pack-objects"

4754

4251 -#: midx.c:1368

4755 +#: midx.c:1407

4756 msgid "could not finish pack-objects"

4757 msgstr "不能結束 pack-objects"

4758

@@ -4333,14 +4837,14 @@ msgstr "雜湊值與 %s 不符合"

4837

4838 #: packfile.c:641

4839 msgid "offset before end of packfile (broken .idx?)"

4336 -msgstr "位移量在包檔案結束之前（損壞的 .idx？）"

4840 +msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"

4841

4338 -#: packfile.c:1887

4842 +#: packfile.c:1888

4843 #, c-format

4844 msgid "offset before start of pack index for %s (corrupt index?)"

4845 msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"

4846

4343 -#: packfile.c:1891

4847 +#: packfile.c:1892

4848 #, c-format

4849 msgid "offset beyond end of pack index for %s (truncated index?)"

4850 msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"

@@ -4452,82 +4956,87 @@ msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\""

4956 msgid "malformed object name '%s'"

4957 msgstr "格式錯誤的物件名 '%s'"

4958

4455 -#: path.c:897

4959 +#: path.c:915

4960 #, c-format

4961 msgid "Could not make %s writable by group"

4962 msgstr "不能設定 %s 為組可寫"

4963

4460 -#: pathspec.c:128

4964 +#: pathspec.c:130

4965 msgid "Escape character '\\' not allowed as last character in attr value"

4966 msgstr "跳脫字元 '\\' 不能作為屬性值的最後一個字元"

4967

4464 -#: pathspec.c:146

4968 +#: pathspec.c:148

4969 msgid "Only one 'attr:' specification is allowed."

4970 msgstr "只允許一個 'attr:' 規格。"

4971

4468 -#: pathspec.c:149

4972 +#: pathspec.c:151

4973 msgid "attr spec must not be empty"

4974 msgstr "屬性規格不能為空"

4975

4472 -#: pathspec.c:192

4976 +#: pathspec.c:194

4977 #, c-format

4978 msgid "invalid attribute name %s"

4979 msgstr "無效的屬性名 %s"

4980

4477 -#: pathspec.c:257

4981 +#: pathspec.c:259

4982 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

4983 msgstr "全域的 'glob' 和 'noglob' 路徑規格設定不相容"

4984

4481 -#: pathspec.c:264

4985 +#: pathspec.c:266

4986 msgid ""

4987 "global 'literal' pathspec setting is incompatible with all other global "

4988 "pathspec settings"

4989 msgstr "全域的 'literal' 路徑規格設定和其它的全域路徑規格設定不相容"

4990

4487 -#: pathspec.c:304

4991 +#: pathspec.c:306

4992 msgid "invalid parameter for pathspec magic 'prefix'"

4993 msgstr "路徑規格包含無效的神奇前綴"

4994

4491 -#: pathspec.c:325

4995 +#: pathspec.c:327

4996 #, c-format

4997 msgid "Invalid pathspec magic '%.*s' in '%s'"

4998 msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'"

4999

4496 -#: pathspec.c:330

5000 +#: pathspec.c:332

5001 #, c-format

5002 msgid "Missing ')' at the end of pathspec magic in '%s'"

5003 msgstr "路徑規格 '%s' 的神奇前綴結尾少了一個 ')'"

5004

4501 -#: pathspec.c:368

5005 +#: pathspec.c:370

5006 #, c-format

5007 msgid "Unimplemented pathspec magic '%c' in '%s'"

5008 msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'"

5009

4506 -#: pathspec.c:427

5010 +#: pathspec.c:429

5011 #, c-format

5012 msgid "%s: 'literal' and 'glob' are incompatible"

5013 msgstr "%s：'literal' 和 'glob' 不相容"

5014

4511 -#: pathspec.c:440

5015 +#: pathspec.c:442

5016 #, c-format

5017 msgid "%s: '%s' is outside repository"

5018 msgstr "%s：'%s' 在版本庫之外"

5019

4516 -#: pathspec.c:514

5020 +#: pathspec.c:516

5021 #, c-format

5022 msgid "'%s' (mnemonic: '%c')"

5023 msgstr "'%s'（助記符：'%c'）"

5024

4521 -#: pathspec.c:524

5025 +#: pathspec.c:526

5026 #, c-format

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

5028 msgstr "%s：路徑規格神奇前綴不被此指令支援：%s"

5029

4526 -#: pathspec.c:591

5030 +#: pathspec.c:593

5031 #, c-format

5032 msgid "pathspec '%s' is beyond a symbolic link"

5033 msgstr "路徑規格 '%s' 位於符號連結中"

5034

5035 +#: pathspec.c:638

5036 +#, c-format

5037 +msgid "line is badly quoted: %s"

5038 +msgstr "某行不應該被括號括住：%s"

5039 +

5040 #: pkt-line.c:92

5041 msgid "unable to write flush packet"

5042 msgstr "無法寫 flush 包"

@@ -4588,42 +5097,42 @@ msgstr "正在重新整理索引"

5097 msgid "unable to create threaded lstat: %s"

5098 msgstr "無法建立執行緒 lstat：%s"

5099

4591 -#: pretty.c:966

5100 +#: pretty.c:981

5101 msgid "unable to parse --pretty format"

5102 msgstr "不能解析 --pretty 格式"

5103

4595 -#: promisor-remote.c:25

5104 +#: promisor-remote.c:23

5105 msgid "Remote with no URL"

5106 msgstr "遠端未設定 URL"

5107

4599 -#: promisor-remote.c:61

5108 +#: promisor-remote.c:58

5109 #, c-format

5110 msgid "promisor remote name cannot begin with '/': %s"

5111 msgstr "promisor 遠端名稱不能以 '/' 開始：%s"

5112

4604 -#: range-diff.c:71

5113 +#: range-diff.c:75

5114 msgid "could not start `log`"

5115 msgstr "不能啟動 `log`"

5116

4608 -#: range-diff.c:73

5117 +#: range-diff.c:77

5118 msgid "could not read `log` output"

5119 msgstr "不能讀取 `log` 的輸出"

5120

4612 -#: range-diff.c:92 sequencer.c:4985

5121 +#: range-diff.c:96 sequencer.c:5163

5122 #, c-format

5123 msgid "could not parse commit '%s'"

5124 msgstr "不能解析提交 '%s'"

5125

4617 -#: range-diff.c:118

5126 +#: range-diff.c:122

5127 #, c-format

5128 msgid "could not parse git header '%.*s'"

5129 msgstr "無法解析 git 頭 '%.*s'"

5130

4622 -#: range-diff.c:275

5131 +#: range-diff.c:285

5132 msgid "failed to generate diff"

5133 msgstr "生成 diff 失敗"

5134

4626 -#: range-diff.c:507 range-diff.c:509

5135 +#: range-diff.c:518 range-diff.c:520

5136 #, c-format

5137 msgid "could not parse log for '%s'"

5138 msgstr "不能解析 '%s' 的日誌"

@@ -4662,16 +5171,16 @@ msgstr "無法在索引中新增 '%s'"

5171 msgid "unable to stat '%s'"

5172 msgstr "無法對 %s 執行 stat"

5173

4665 -#: read-cache.c:1314

5174 +#: read-cache.c:1325

5175 #, c-format

5176 msgid "'%s' appears as both a file and as a directory"

5177 msgstr "'%s' 看起來既是檔案又是目錄"

5178

4670 -#: read-cache.c:1520

5179 +#: read-cache.c:1531

5180 msgid "Refresh index"

5181 msgstr "重新整理索引"

5182

4674 -#: read-cache.c:1635

5183 +#: read-cache.c:1646

5184 #, c-format

5185 msgid ""

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

@@ -4680,7 +5189,7 @@ msgstr ""

5189 "設定了 index.version，但是取值無效。\n"

5190 "使用版本 %i"

5191

4683 -#: read-cache.c:1645

5192 +#: read-cache.c:1656

5193 #, c-format

5194 msgid ""

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

@@ -4689,139 +5198,139 @@ msgstr ""

5198 "設定了 GIT_INDEX_VERSION，但是取值無效。\n"

5199 "使用版本 %i"

5200

4692 -#: read-cache.c:1701

5201 +#: read-cache.c:1712

5202 #, c-format

5203 msgid "bad signature 0x%08x"

5204 msgstr "壞的簽名 0x%08x"

5205

4697 -#: read-cache.c:1704

5206 +#: read-cache.c:1715

5207 #, c-format

5208 msgid "bad index version %d"

5209 msgstr "壞的索引版本 %d"

5210

4702 -#: read-cache.c:1713

5211 +#: read-cache.c:1724

5212 msgid "bad index file sha1 signature"

5213 msgstr "壞的索引檔案 sha1 簽名"

5214

4706 -#: read-cache.c:1743

5215 +#: read-cache.c:1754

5216 #, c-format

5217 msgid "index uses %.4s extension, which we do not understand"

5218 msgstr "索引使用不被支援的 %.4s 擴展"

5219

5220 #

4712 -#: read-cache.c:1745

5221 +#: read-cache.c:1756

5222 #, c-format

5223 msgid "ignoring %.4s extension"

5224 msgstr "忽略 %.4s 擴展"

5225

4717 -#: read-cache.c:1782

5226 +#: read-cache.c:1793

5227 #, c-format

5228 msgid "unknown index entry format 0x%08x"

5229 msgstr "未知的索引條目格式 0x%08x"

5230

4722 -#: read-cache.c:1798

5231 +#: read-cache.c:1809

5232 #, c-format

5233 msgid "malformed name field in the index, near path '%s'"

5234 msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位"

5235

4727 -#: read-cache.c:1855

5236 +#: read-cache.c:1866

5237 msgid "unordered stage entries in index"

5238 msgstr "索引中有未排序的暫存條目"

5239

4731 -#: read-cache.c:1858

5240 +#: read-cache.c:1869

5241 #, c-format

5242 msgid "multiple stage entries for merged file '%s'"

5243 msgstr "合併檔案 '%s' 有多個暫存條目"

5244

4736 -#: read-cache.c:1861

5245 +#: read-cache.c:1872

5246 #, c-format

5247 msgid "unordered stage entries for '%s'"

5248 msgstr "'%s' 的未排序暫存條目"

5249

4741 -#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111

4742 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468

4743 -#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347

5250 +#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111

5251 +#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470

5252 +#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367

5253 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145

4745 -#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330

5254 +#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332

5255 msgid "index file corrupt"

5256 msgstr "索引檔案損壞"

5257

4749 -#: read-cache.c:2108

5258 +#: read-cache.c:2119

5259 #, c-format

5260 msgid "unable to create load_cache_entries thread: %s"

5261 msgstr "無法建立 load_cache_entries 執行緒：%s"

5262

4754 -#: read-cache.c:2121

5263 +#: read-cache.c:2132

5264 #, c-format

5265 msgid "unable to join load_cache_entries thread: %s"

5266 msgstr "無法加入 load_cache_entries 執行緒：%s"

5267

4759 -#: read-cache.c:2154

5268 +#: read-cache.c:2165

5269 #, c-format

5270 msgid "%s: index file open failed"

5271 msgstr "%s：開啟索引檔案失敗"

5272

4764 -#: read-cache.c:2158

5273 +#: read-cache.c:2169

5274 #, c-format

5275 msgid "%s: cannot stat the open index"

5276 msgstr "%s：不能對開啟的索引執行 stat 動作"

5277

4769 -#: read-cache.c:2162

5278 +#: read-cache.c:2173

5279 #, c-format

5280 msgid "%s: index file smaller than expected"

5281 msgstr "%s：索引檔案比預期的小"

5282

4774 -#: read-cache.c:2166

5283 +#: read-cache.c:2177

5284 #, c-format

5285 msgid "%s: unable to map index file"

5286 msgstr "%s：無法對索引檔案執行 map 動作"

5287

4779 -#: read-cache.c:2208

5288 +#: read-cache.c:2219

5289 #, c-format

5290 msgid "unable to create load_index_extensions thread: %s"

5291 msgstr "無法建立 load_index_extensions 執行緒：%s"

5292

4784 -#: read-cache.c:2235

5293 +#: read-cache.c:2246

5294 #, c-format

5295 msgid "unable to join load_index_extensions thread: %s"

5296 msgstr "無法加入 load_index_extensions 執行緒：%s"

5297

4789 -#: read-cache.c:2267

5298 +#: read-cache.c:2278

5299 #, c-format

5300 msgid "could not freshen shared index '%s'"

5301 msgstr "無法重新整理共享索引 '%s'"

5302

4794 -#: read-cache.c:2314

5303 +#: read-cache.c:2325

5304 #, c-format

5305 msgid "broken index, expect %s in %s, got %s"

5306 msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

5307

4799 -#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119

5308 +#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119

5309 #, c-format

5310 msgid "could not close '%s'"

5311 msgstr "不能關閉 '%s'"

5312

4804 -#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917

5313 +#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069

5314 #, c-format

5315 msgid "could not stat '%s'"

5316 msgstr "不能對 '%s' 呼叫 stat"

5317

4809 -#: read-cache.c:3126

5318 +#: read-cache.c:3137

5319 #, c-format

5320 msgid "unable to open git dir: %s"

5321 msgstr "不能開啟 git 目錄：%s"

5322

4814 -#: read-cache.c:3138

5323 +#: read-cache.c:3149

5324 #, c-format

5325 msgid "unable to unlink: %s"

5326 msgstr "無法刪除：%s"

5327

4819 -#: read-cache.c:3163

5328 +#: read-cache.c:3174

5329 #, c-format

5330 msgid "cannot fix permission bits on '%s'"

5331 msgstr "不能修復 '%s' 的權限位"

5332

4824 -#: read-cache.c:3312

5333 +#: read-cache.c:3323

5334 #, c-format

5335 msgid "%s: cannot drop to stage #0"

5336 msgstr "%s：不能落到暫存區 #0"

@@ -4923,8 +5432,8 @@ msgstr ""

5432 msgid "Note that empty commits are commented out"

5433 msgstr "注意空提交已被備註掉"

5434

4926 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388

4927 -#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235

5435 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536

5436 +#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254

5437 #, c-format

5438 msgid "could not write '%s'"

5439 msgstr "不能寫入 '%s'"

@@ -4994,14 +5503,15 @@ msgstr "引用 '%s' 已經存在"

5503 msgid "unexpected object ID when writing '%s'"

5504 msgstr "寫入 '%s' 時意外的物件 ID"

5505

4997 -#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851

4998 -#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620

5506 +#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997

5507 +#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142

5508 +#: wrapper.c:620

5509 #, c-format

5510 msgid "could not write to '%s'"

5511 msgstr "不能寫入 '%s'"

5512

5003 -#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5004 -#: builtin/rebase.c:1004

5513 +#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714

5514 +#: builtin/rebase.c:1031

5515 #, c-format

5516 msgid "could not open '%s' for writing"

5517 msgstr "無法開啟 '%s' 進行寫入"

@@ -5657,8 +6167,8 @@ msgstr "不能刪除 stray '%s'"

6167 msgid "Recorded preimage for '%s'"

6168 msgstr "為 '%s' 記錄 preimage"

6169

5660 -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790

5661 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428

6170 +#: rerere.c:881 submodule.c:2067 builtin/log.c:1871

6171 +#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448

6172 #, c-format

6173 msgid "could not create directory '%s'"

6174 msgstr "不能建立目錄 '%s'"

@@ -5692,33 +6202,33 @@ msgstr "忘記 '%s' 的解決方案\n"

6202 msgid "unable to open rr-cache directory"

6203 msgstr "不能開啟 rr-cache 目錄"

6204

5695 -#: revision.c:2509

6205 +#: revision.c:2497

6206 msgid "your current branch appears to be broken"

6207 msgstr "您的目前分支好像被損壞"

6208

5699 -#: revision.c:2512

6209 +#: revision.c:2500

6210 #, c-format

6211 msgid "your current branch '%s' does not have any commits yet"

6212 msgstr "您的目前分支 '%s' 尚無任何提交"

6213

5704 -#: revision.c:2720

6214 +#: revision.c:2708

6215 msgid "--first-parent is incompatible with --bisect"

6216 msgstr "--first-parent 與 --bisect 不相容"

6217

5708 -#: revision.c:2724

6218 +#: revision.c:2712

6219 msgid "-L does not yet support diff formats besides -p and -s"

6220 msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"

6221

5712 -#: run-command.c:763

6222 +#: run-command.c:762

6223 msgid "open /dev/null failed"

6224 msgstr "不能開啟 /dev/null"

6225

5716 -#: run-command.c:1269

6226 +#: run-command.c:1268

6227 #, c-format

6228 msgid "cannot create async thread: %s"

6229 msgstr "不能建立 async 執行緒：%s"

6230

5721 -#: run-command.c:1333

6231 +#: run-command.c:1332

6232 #, c-format

6233 msgid ""

6234 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -5727,75 +6237,75 @@ msgstr ""

6237 "因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n"

6238 "設定 `git config advice.ignoredHook false` 來關閉這條警告。"

6239

5730 -#: send-pack.c:142

6240 +#: send-pack.c:144

6241 msgid "unexpected flush packet while reading remote unpack status"

6242 msgstr "讀取遠端解包狀態時收到意外的 flush 包"

6243

5734 -#: send-pack.c:144

6244 +#: send-pack.c:146

6245 #, c-format

6246 msgid "unable to parse remote unpack status: %s"

6247 msgstr "不能解析遠端解包狀態：%s"

6248

5739 -#: send-pack.c:146

6249 +#: send-pack.c:148

6250 #, c-format

6251 msgid "remote unpack failed: %s"

6252 msgstr "遠端解包失敗：%s"

6253

5744 -#: send-pack.c:307

6254 +#: send-pack.c:309

6255 msgid "failed to sign the push certificate"

6256 msgstr "為推送證書籤名失敗"

6257

5748 -#: send-pack.c:421

6258 +#: send-pack.c:423

6259 msgid "the receiving end does not support --signed push"

6260 msgstr "接收端不支援簽名推送"

6261

5752 -#: send-pack.c:423

6262 +#: send-pack.c:425

6263 msgid ""

6264 "not sending a push certificate since the receiving end does not support --"

6265 "signed push"

6266 msgstr "未傳送推送證書，因為接收端不支援簽名推送"

6267

5758 -#: send-pack.c:435

6268 +#: send-pack.c:437

6269 msgid "the receiving end does not support --atomic push"

6270 msgstr "接收端不支援原子推送"

6271

5762 -#: send-pack.c:440

6272 +#: send-pack.c:442

6273 msgid "the receiving end does not support push options"

6274 msgstr "接收端不支援推送選項"

6275

5766 -#: sequencer.c:187

6276 +#: sequencer.c:189

6277 #, c-format

6278 msgid "invalid commit message cleanup mode '%s'"

6279 msgstr "無效的提交訊息清理模式 '%s'"

6280

5771 -#: sequencer.c:292

6281 +#: sequencer.c:294

6282 #, c-format

6283 msgid "could not delete '%s'"

6284 msgstr "無法刪除 '%s'"

6285

5776 -#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369

6286 +#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369

6287 #, c-format

6288 msgid "could not remove '%s'"

6289 msgstr "無法刪除 '%s'"

6290

5781 -#: sequencer.c:321

6291 +#: sequencer.c:323

6292 msgid "revert"

6293 msgstr "還原"

6294

5785 -#: sequencer.c:323

6295 +#: sequencer.c:325

6296 msgid "cherry-pick"

6297 msgstr "揀選"

6298

5789 -#: sequencer.c:325

6299 +#: sequencer.c:327

6300 msgid "rebase -i"

6301 msgstr "rebase -i"

6302

5793 -#: sequencer.c:327

6303 +#: sequencer.c:329

6304 #, c-format

6305 msgid "unknown action: %d"

6306 msgstr "未知動作：%d"

6307

5798 -#: sequencer.c:385

6308 +#: sequencer.c:387

6309 msgid ""

6310 "after resolving the conflicts, mark the corrected paths\n"

6311 "with 'git add <paths>' or 'git rm <paths>'"

@@ -5803,7 +6313,7 @@ msgstr ""

6313 "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"

6314 "指令標記修正後的檔案"

6315

5806 -#: sequencer.c:388

6316 +#: sequencer.c:390

6317 msgid ""

6318 "after resolving the conflicts, mark the corrected paths\n"

6319 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -5812,44 +6322,44 @@ msgstr ""

6322 "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"

6323 "對修正後的檔案做標記，然後用 'git commit' 提交"

6324

5815 -#: sequencer.c:401 sequencer.c:2847

6325 +#: sequencer.c:403 sequencer.c:2993

6326 #, c-format

6327 msgid "could not lock '%s'"

6328 msgstr "不能鎖定 '%s'"

6329

5820 -#: sequencer.c:408

6330 +#: sequencer.c:410

6331 #, c-format

6332 msgid "could not write eol to '%s'"

6333 msgstr "不能將換行符號寫入 '%s'"

6334

5825 -#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867

5826 -#: sequencer.c:3130

6335 +#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013

6336 +#: sequencer.c:3277

6337 #, c-format

6338 msgid "failed to finalize '%s'"

6339 msgstr "無法完成 '%s'"

6340

5831 -#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112

5832 -#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117

5833 -#: builtin/rebase.c:568

6341 +#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259

6342 +#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117

6343 +#: builtin/rebase.c:589

6344 #, c-format

6345 msgid "could not read '%s'"

6346 msgstr "不能讀取 '%s'"

6347

5838 -#: sequencer.c:462

6348 +#: sequencer.c:464

6349 #, c-format

6350 msgid "your local changes would be overwritten by %s."

6351 msgstr "您的本機修改將被%s覆蓋。"

6352

5843 -#: sequencer.c:466

6353 +#: sequencer.c:468

6354 msgid "commit your changes or stash them to proceed."

6355 msgstr "提交您的修改或儲藏後再繼續。"

6356

5847 -#: sequencer.c:498

6357 +#: sequencer.c:500

6358 #, c-format

6359 msgid "%s: fast-forward"

6360 msgstr "%s：快轉"

6361

5852 -#: sequencer.c:537 builtin/tag.c:565

6362 +#: sequencer.c:539 builtin/tag.c:565

6363 #, c-format

6364 msgid "Invalid cleanup mode %s"

6365 msgstr "無效的清理模式 %s"

@@ -5857,65 +6367,70 @@ msgstr "無效的清理模式 %s"

6367 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

6368 #. "rebase -i".

6369 #.

5860 -#: sequencer.c:631

6370 +#: sequencer.c:633

6371 #, c-format

6372 msgid "%s: Unable to write new index file"

6373 msgstr "%s：無法寫入新索引檔案"

6374

5865 -#: sequencer.c:648

6375 +#: sequencer.c:650

6376 msgid "unable to update cache tree"

6377 msgstr "不能更新快取樹"

6378

5869 -#: sequencer.c:662

6379 +#: sequencer.c:664

6380 msgid "could not resolve HEAD commit"

6381 msgstr "不能解析 HEAD 提交"

6382

5873 -#: sequencer.c:742

6383 +#: sequencer.c:744

6384 #, c-format

6385 msgid "no key present in '%.*s'"

6386 msgstr "在 '%.*s' 中沒有 key"

6387

5878 -#: sequencer.c:753

6388 +#: sequencer.c:755

6389 #, c-format

6390 msgid "unable to dequote value of '%s'"

6391 msgstr "無法為 '%s' 的值去引號"

6392

5883 -#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705

5884 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046

6393 +#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705

6394 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074

6395 #, c-format

6396 msgid "could not open '%s' for reading"

6397 msgstr "無法開啟 '%s' 進行讀取"

6398

5889 -#: sequencer.c:800

6399 +#: sequencer.c:802

6400 msgid "'GIT_AUTHOR_NAME' already given"

6401 msgstr "已經給出 'GIT_AUTHOR_NAME'"

6402

5893 -#: sequencer.c:805

6403 +#: sequencer.c:807

6404 msgid "'GIT_AUTHOR_EMAIL' already given"

6405 msgstr "已經給出 'GIT_AUTHOR_EMAIL'"

6406

5897 -#: sequencer.c:810

6407 +#: sequencer.c:812

6408 msgid "'GIT_AUTHOR_DATE' already given"

6409 msgstr "已經給出 'GIT_AUTHOR_DATE'"

6410

5901 -#: sequencer.c:814

6411 +#: sequencer.c:816

6412 #, c-format

6413 msgid "unknown variable '%s'"

6414 msgstr "未知變數 '%s'"

6415

5906 -#: sequencer.c:819

6416 +#: sequencer.c:821

6417 msgid "missing 'GIT_AUTHOR_NAME'"

6418 msgstr "缺少 'GIT_AUTHOR_NAME'"

6419

5910 -#: sequencer.c:821

6420 +#: sequencer.c:823

6421 msgid "missing 'GIT_AUTHOR_EMAIL'"

6422 msgstr "缺少 'GIT_AUTHOR_EMAIL'"

6423

5914 -#: sequencer.c:823

6424 +#: sequencer.c:825

6425 msgid "missing 'GIT_AUTHOR_DATE'"

6426 msgstr "缺少 'GIT_AUTHOR_DATE'"

6427

5918 -#: sequencer.c:872

6428 +#: sequencer.c:902 sequencer.c:1427

6429 +#| msgid "malformed input line: '%s'."

6430 +msgid "malformed ident line"

6431 +msgstr "識別行的格式錯誤"

6432 +

6433 +#: sequencer.c:925

6434 #, c-format

6435 msgid ""

6436 "you have staged changes in your working tree\n"

@@ -5944,11 +6459,11 @@ msgstr ""

6459 "\n"

6460 " git rebase --continue\n"

6461

5947 -#: sequencer.c:1146

6462 +#: sequencer.c:1218

6463 msgid "'prepare-commit-msg' hook failed"

6464 msgstr "'prepare-commit-msg' 掛鉤失敗"

6465

5951 -#: sequencer.c:1153

6466 +#: sequencer.c:1224

6467 msgid ""

6468 "Your name and email address were configured automatically based\n"

6469 "on your username and hostname. Please check that they are accurate.\n"

@@ -5962,7 +6477,7 @@ msgid ""

6477 "\n"

6478 " git commit --amend --reset-author\n"

6479 msgstr ""

5965 -"您的姓名和信件位址基於登入名和主機名稱進行了自動設定。請檢查它們正確\n"

6480 +"您的姓名和信件位址基於登入名稱和主機名稱自動設定。請檢查它們正確\n"

6481 "與否。您可以對其進行設定以免再出現本提示訊息。執行如下指令在編輯器\n"

6482 "中編輯您的設定檔案：\n"

6483 "\n"

@@ -5972,7 +6487,7 @@ msgstr ""

6487 "\n"

6488 " git commit --amend --reset-author\n"

6489

5975 -#: sequencer.c:1166

6490 +#: sequencer.c:1237

6491 msgid ""

6492 "Your name and email address were configured automatically based\n"

6493 "on your username and hostname. Please check that they are accurate.\n"

@@ -5985,7 +6500,7 @@ msgid ""

6500 "\n"

6501 " git commit --amend --reset-author\n"

6502 msgstr ""

5988 -"您的姓名和信件位址基於登入名和主機名稱進行了自動設定。請檢查它們正確\n"

6503 +"您的姓名和信件位址基於登入名稱和主機名稱自動設定。請檢查它們正確\n"

6504 "與否。您可以對其進行設定以免再出現本提示訊息：\n"

6505 "\n"

6506 " git config --global user.name \"Your Name\"\n"

@@ -5995,326 +6510,331 @@ msgstr ""

6510 "\n"

6511 " git commit --amend --reset-author\n"

6512

5998 -#: sequencer.c:1208

6513 +#: sequencer.c:1279

6514 msgid "couldn't look up newly created commit"

6515 msgstr "無法找到新建立的提交"

6516

6002 -#: sequencer.c:1210

6517 +#: sequencer.c:1281

6518 msgid "could not parse newly created commit"

6519 msgstr "不能解析新建立的提交"

6520

6006 -#: sequencer.c:1256

6521 +#: sequencer.c:1327

6522 msgid "unable to resolve HEAD after creating commit"

6523 msgstr "建立提交後，不能解析 HEAD"

6524

6010 -#: sequencer.c:1258

6525 +#: sequencer.c:1329

6526 msgid "detached HEAD"

6527 msgstr "分離開頭指標"

6528

6529 # 譯者：中文字串拼接，可刪除前導空格

6015 -#: sequencer.c:1262

6530 +#: sequencer.c:1333

6531 msgid " (root-commit)"

6532 msgstr " (根提交)"

6533

6019 -#: sequencer.c:1283

6534 +#: sequencer.c:1354

6535 msgid "could not parse HEAD"

6536 msgstr "不能解析 HEAD"

6537

6023 -#: sequencer.c:1285

6538 +#: sequencer.c:1356

6539 #, c-format

6540 msgid "HEAD %s is not a commit!"

6541 msgstr "HEAD %s 不是一個提交！"

6542

6028 -#: sequencer.c:1289 builtin/commit.c:1571

6543 +#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569

6544 msgid "could not parse HEAD commit"

6545 msgstr "不能解析 HEAD 提交"

6546

6032 -#: sequencer.c:1341 sequencer.c:1933

6547 +#: sequencer.c:1411 sequencer.c:2055

6548 msgid "unable to parse commit author"

6549 msgstr "不能解析提交作者"

6550

6036 -#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684

6551 +#: sequencer.c:1431

6552 +#| msgid "refresh stat information"

6553 +msgid "corrupted author without date information"

6554 +msgstr ""

6555 +

6556 +#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684

6557 msgid "git write-tree failed to write a tree"

6558 msgstr "git write-tree 無法寫入樹狀物件"

6559

6040 -#: sequencer.c:1369 sequencer.c:1429

6560 +#: sequencer.c:1480 sequencer.c:1550

6561 #, c-format

6562 msgid "unable to read commit message from '%s'"

6563 msgstr "不能從 '%s' 讀取提交說明"

6564

6045 -#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883

6565 +#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883

6566 #: builtin/merge.c:908

6567 msgid "failed to write commit object"

6568 msgstr "寫提交物件失敗"

6569

6050 -#: sequencer.c:1456

6570 +#: sequencer.c:1577

6571 #, c-format

6572 msgid "could not parse commit %s"

6573 msgstr "不能解析提交 %s"

6574

6055 -#: sequencer.c:1461

6575 +#: sequencer.c:1582

6576 #, c-format

6577 msgid "could not parse parent commit %s"

6578 msgstr "不能解析父提交 %s"

6579

6060 -#: sequencer.c:1535 sequencer.c:1645

6580 +#: sequencer.c:1656 sequencer.c:1767

6581 #, c-format

6582 msgid "unknown command: %d"

6583 msgstr "未知指令：%d"

6584

6065 -#: sequencer.c:1592 sequencer.c:1617

6585 +#: sequencer.c:1714 sequencer.c:1739

6586 #, c-format

6587 msgid "This is a combination of %d commits."

6588 msgstr "這是一個 %d 個提交的組合。"

6589

6070 -#: sequencer.c:1602

6590 +#: sequencer.c:1724

6591 msgid "need a HEAD to fixup"

6592 msgstr "需要一個 HEAD 來修復"

6593

6074 -#: sequencer.c:1604 sequencer.c:3157

6594 +#: sequencer.c:1726 sequencer.c:3304

6595 msgid "could not read HEAD"

6596 msgstr "不能讀取 HEAD"

6597

6078 -#: sequencer.c:1606

6598 +#: sequencer.c:1728

6599 msgid "could not read HEAD's commit message"

6600 msgstr "不能讀取 HEAD 的提交說明"

6601

6082 -#: sequencer.c:1612

6602 +#: sequencer.c:1734

6603 #, c-format

6604 msgid "cannot write '%s'"

6605 msgstr "不能寫 '%s'"

6606

6087 -#: sequencer.c:1619 git-rebase--preserve-merges.sh:496

6607 +#: sequencer.c:1741 git-rebase--preserve-merges.sh:496

6608 msgid "This is the 1st commit message:"

6609 msgstr "這是第一個提交說明："

6610

6091 -#: sequencer.c:1627

6611 +#: sequencer.c:1749

6612 #, c-format

6613 msgid "could not read commit message of %s"

6614 msgstr "不能讀取 %s 的提交說明"

6615

6096 -#: sequencer.c:1634

6616 +#: sequencer.c:1756

6617 #, c-format

6618 msgid "This is the commit message #%d:"

6619 msgstr "這是提交說明 #%d："

6620

6101 -#: sequencer.c:1640

6621 +#: sequencer.c:1762

6622 #, c-format

6623 msgid "The commit message #%d will be skipped:"

6624 msgstr "提交說明 #%d 將被跳過："

6625

6106 -#: sequencer.c:1728

6626 +#: sequencer.c:1850

6627 msgid "your index file is unmerged."

6628 msgstr "您的索引檔案未完成合併。"

6629

6110 -#: sequencer.c:1735

6630 +#: sequencer.c:1857

6631 msgid "cannot fixup root commit"

6632 msgstr "不能修復根提交"

6633

6114 -#: sequencer.c:1754

6634 +#: sequencer.c:1876

6635 #, c-format

6636 msgid "commit %s is a merge but no -m option was given."

6637 msgstr "提交 %s 是一個合併提交但未提供 -m 選項。"

6638

6119 -#: sequencer.c:1762 sequencer.c:1770

6639 +#: sequencer.c:1884 sequencer.c:1892

6640 #, c-format

6641 msgid "commit %s does not have parent %d"

6642 msgstr "提交 %s 沒有第 %d 個父提交"

6643

6124 -#: sequencer.c:1776

6644 +#: sequencer.c:1898

6645 #, c-format

6646 msgid "cannot get commit message for %s"

6647 msgstr "不能得到 %s 的提交說明"

6648

6649 #. TRANSLATORS: The first %s will be a "todo" command like

6650 #. "revert" or "pick", the second %s a SHA1.

6131 -#: sequencer.c:1795

6651 +#: sequencer.c:1917

6652 #, c-format

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

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

6655

6136 -#: sequencer.c:1860

6656 +#: sequencer.c:1982

6657 #, c-format

6658 msgid "could not rename '%s' to '%s'"

6659 msgstr "不能將 '%s' 重新命名為 '%s'"

6660

6141 -#: sequencer.c:1915

6661 +#: sequencer.c:2037

6662 #, c-format

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

6664 msgstr "不能還原 %s... %s"

6665

6146 -#: sequencer.c:1916

6666 +#: sequencer.c:2038

6667 #, c-format

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

6669 msgstr "不能應用 %s... %s"

6670

6151 -#: sequencer.c:1983

6671 +#: sequencer.c:2105

6672 #, c-format

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

6674 msgstr "git %s：無法讀取索引"

6675

6156 -#: sequencer.c:1990

6676 +#: sequencer.c:2112

6677 #, c-format

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

6679 msgstr "git %s：無法重新整理索引"

6680

6161 -#: sequencer.c:2066

6681 +#: sequencer.c:2189

6682 #, c-format

6683 msgid "%s does not accept arguments: '%s'"

6684 msgstr "%s 不接受參數：'%s'"

6685

6166 -#: sequencer.c:2075

6686 +#: sequencer.c:2198

6687 #, c-format

6688 msgid "missing arguments for %s"

6689 msgstr "缺少 %s 的參數"

6690

6171 -#: sequencer.c:2112

6691 +#: sequencer.c:2235

6692 #, c-format

6693 msgid "could not parse '%.*s'"

6694 msgstr "無法解析 '%.*s'"

6695

6176 -#: sequencer.c:2166

6696 +#: sequencer.c:2289

6697 #, c-format

6698 msgid "invalid line %d: %.*s"

6699 msgstr "無效行 %d：%.*s"

6700

6181 -#: sequencer.c:2177

6701 +#: sequencer.c:2300

6702 #, c-format

6703 msgid "cannot '%s' without a previous commit"

6704 msgstr "沒有父提交的情況下不能 '%s'"

6705

6186 -#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178

6187 -#: builtin/rebase.c:204 builtin/rebase.c:229

6706 +#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197

6707 +#: builtin/rebase.c:223 builtin/rebase.c:248

6708 #, c-format

6709 msgid "could not read '%s'."

6710 msgstr "不能讀取 '%s'。"

6711

6192 -#: sequencer.c:2261

6712 +#: sequencer.c:2384

6713 msgid "cancelling a cherry picking in progress"

6714 msgstr "正在取消一個進行中的揀選"

6715

6196 -#: sequencer.c:2268

6716 +#: sequencer.c:2391

6717 msgid "cancelling a revert in progress"

6718 msgstr "正在取消一個進行中的還原"

6719

6200 -#: sequencer.c:2302

6720 +#: sequencer.c:2435

6721 msgid "please fix this using 'git rebase --edit-todo'."

6722 msgstr "請用 'git rebase --edit-todo' 來修改。"

6723

6204 -#: sequencer.c:2304

6724 +#: sequencer.c:2437

6725 #, c-format

6726 msgid "unusable instruction sheet: '%s'"

6727 msgstr "不可用的指令清單：'%s'"

6728

6209 -#: sequencer.c:2309

6729 +#: sequencer.c:2442

6730 msgid "no commits parsed."

6731 msgstr "沒有解析提交。"

6732

6213 -#: sequencer.c:2320

6733 +#: sequencer.c:2453

6734 msgid "cannot cherry-pick during a revert."

6735 msgstr "不能在還原提交中執行揀選。"

6736

6217 -#: sequencer.c:2322

6737 +#: sequencer.c:2455

6738 msgid "cannot revert during a cherry-pick."

6739 msgstr "不能在揀選中執行還原提交。"

6740

6221 -#: sequencer.c:2404

6741 +#: sequencer.c:2533

6742 #, c-format

6743 msgid "invalid value for %s: %s"

6744 msgstr "%s 的值無效：%s"

6745

6226 -#: sequencer.c:2491

6746 +#: sequencer.c:2630

6747 msgid "unusable squash-onto"

6748 msgstr "不可用的 squash-onto"

6749

6230 -#: sequencer.c:2507

6750 +#: sequencer.c:2646

6751 #, c-format

6752 msgid "malformed options sheet: '%s'"

6753 msgstr "格式錯誤的選項清單：'%s'"

6754

6235 -#: sequencer.c:2590 sequencer.c:4308

6755 +#: sequencer.c:2736 sequencer.c:4463

6756 msgid "empty commit set passed"

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

6758

6239 -#: sequencer.c:2606

6759 +#: sequencer.c:2752

6760 msgid "revert is already in progress"

6761 msgstr "一個還原動作已在進行"

6762

6243 -#: sequencer.c:2608

6763 +#: sequencer.c:2754

6764 #, c-format

6765 msgid "try \"git revert (--continue | %s--abort | --quit)\""

6766 msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\""

6767

6248 -#: sequencer.c:2611

6768 +#: sequencer.c:2757

6769 msgid "cherry-pick is already in progress"

6770 msgstr "揀選動作已在進行"

6771

6252 -#: sequencer.c:2613

6772 +#: sequencer.c:2759

6773 #, c-format

6774 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

6775 msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\""

6776

6257 -#: sequencer.c:2627

6777 +#: sequencer.c:2773

6778 #, c-format

6779 msgid "could not create sequencer directory '%s'"

6780 msgstr "不能建立序列目錄 '%s'"

6781

6262 -#: sequencer.c:2642

6782 +#: sequencer.c:2788

6783 msgid "could not lock HEAD"

6784 msgstr "不能鎖定 HEAD"

6785

6266 -#: sequencer.c:2702 sequencer.c:4057

6786 +#: sequencer.c:2848 sequencer.c:4209

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

6788 msgstr "揀選或還原動作並未進行"

6789

6270 -#: sequencer.c:2704 sequencer.c:2715

6790 +#: sequencer.c:2850 sequencer.c:2861

6791 msgid "cannot resolve HEAD"

6792 msgstr "不能解析 HEAD"

6793

6274 -#: sequencer.c:2706 sequencer.c:2750

6794 +#: sequencer.c:2852 sequencer.c:2896

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

6796 msgstr "不能從尚未建立的分支終止"

6797

6278 -#: sequencer.c:2736 builtin/grep.c:736

6798 +#: sequencer.c:2882 builtin/grep.c:736

6799 #, c-format

6800 msgid "cannot open '%s'"

6801 msgstr "不能開啟 '%s'"

6802

6283 -#: sequencer.c:2738

6803 +#: sequencer.c:2884

6804 #, c-format

6805 msgid "cannot read '%s': %s"

6806 msgstr "不能讀取 '%s'：%s"

6807

6288 -#: sequencer.c:2739

6808 +#: sequencer.c:2885

6809 msgid "unexpected end of file"

6810 msgstr "意外的檔案結束"

6811

6292 -#: sequencer.c:2745

6812 +#: sequencer.c:2891

6813 #, c-format

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

6815 msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞"

6816

6297 -#: sequencer.c:2756

6817 +#: sequencer.c:2902

6818 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

6819 msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！"

6820

6301 -#: sequencer.c:2797

6821 +#: sequencer.c:2943

6822 msgid "no revert in progress"

6823 msgstr "沒有正在進行的還原"

6824

6305 -#: sequencer.c:2805

6825 +#: sequencer.c:2951

6826 msgid "no cherry-pick in progress"

6827 msgstr "沒有正在進行的揀選"

6828

6309 -#: sequencer.c:2815

6829 +#: sequencer.c:2961

6830 msgid "failed to skip the commit"

6831 msgstr "無法跳過這個提交"

6832

6313 -#: sequencer.c:2822

6833 +#: sequencer.c:2968

6834 msgid "there is nothing to skip"

6835 msgstr "沒有要跳過的"

6836

6317 -#: sequencer.c:2825

6837 +#: sequencer.c:2971

6838 #, c-format

6839 msgid ""

6840 "have you committed already?\n"

@@ -6323,21 +6843,21 @@ msgstr ""

6843 "您已經提交了嗎？\n"

6844 "試試 \"git %s --continue\""

6845

6326 -#: sequencer.c:2949 sequencer.c:3969

6846 +#: sequencer.c:3095 sequencer.c:4121

6847 #, c-format

6848 msgid "could not update %s"

6849 msgstr "不能更新 %s"

6850

6331 -#: sequencer.c:2987 sequencer.c:3949

6851 +#: sequencer.c:3134 sequencer.c:4101

6852 msgid "cannot read HEAD"

6853 msgstr "不能讀取 HEAD"

6854

6335 -#: sequencer.c:3004

6855 +#: sequencer.c:3151

6856 #, c-format

6857 msgid "unable to copy '%s' to '%s'"

6858 msgstr "無法複製 '%s' 至 '%s'"

6859

6340 -#: sequencer.c:3012

6860 +#: sequencer.c:3159

6861 #, c-format

6862 msgid ""

6863 "You can amend the commit now, with\n"

@@ -6356,28 +6876,23 @@ msgstr ""

6876 "\n"

6877 " git rebase --continue\n"

6878

6359 -#: sequencer.c:3022

6879 +#: sequencer.c:3169

6880 #, c-format

6881 msgid "Could not apply %s... %.*s"

6882 msgstr "不能應用 %s... %.*s"

6883

6364 -#: sequencer.c:3029

6884 +#: sequencer.c:3176

6885 #, c-format

6886 msgid "Could not merge %.*s"

6887 msgstr "不能合併 %.*s"

6888

6369 -#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641

6889 +#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641

6890 #, c-format

6891 msgid "could not copy '%s' to '%s'"

6892 msgstr "不能複製 '%s' 至 '%s'"

6893

6374 -#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613

6375 -#: builtin/rebase.c:1987 builtin/rebase.c:2031

6376 -msgid "could not read index"

6377 -msgstr "不能讀取索引"

6378 -

6894 # 譯者：請維持前導空格

6380 -#: sequencer.c:3074

6895 +#: sequencer.c:3221

6896 #, c-format

6897 msgid ""

6898 "execution failed: %s\n"

@@ -6392,11 +6907,11 @@ msgstr ""

6907 " git rebase --continue\n"

6908 "\n"

6909

6395 -#: sequencer.c:3080

6910 +#: sequencer.c:3227

6911 msgid "and made changes to the index and/or the working tree\n"

6912 msgstr "並且修改索引和/或工作區\n"

6913

6399 -#: sequencer.c:3086

6914 +#: sequencer.c:3233

6915 #, c-format

6916 msgid ""

6917 "execution succeeded: %s\n"

@@ -6413,76 +6928,72 @@ msgstr ""

6928 " git rebase --continue\n"

6929 "\n"

6930

6416 -#: sequencer.c:3147

6931 +#: sequencer.c:3294

6932 #, c-format

6933 msgid "illegal label name: '%.*s'"

6934 msgstr "非法的標籤名稱：'%.*s'"

6935

6421 -#: sequencer.c:3201

6936 +#: sequencer.c:3348

6937 msgid "writing fake root commit"

6938 msgstr "寫偽根提交"

6939

6425 -#: sequencer.c:3206

6940 +#: sequencer.c:3353

6941 msgid "writing squash-onto"

6942 msgstr "寫入 squash-onto"

6943

6429 -#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861

6944 +#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882

6945 #, c-format

6946 msgid "failed to find tree of %s"

6947 msgstr "無法找到 %s 指向的樹。"

6948

6434 -#: sequencer.c:3262 builtin/rebase.c:874

6435 -msgid "could not write index"

6436 -msgstr "不能寫入索引"

6437 -

6438 -#: sequencer.c:3289

6949 +#: sequencer.c:3436

6950 #, c-format

6951 msgid "could not resolve '%s'"

6952 msgstr "無法解析 '%s'"

6953

6443 -#: sequencer.c:3320

6954 +#: sequencer.c:3467

6955 msgid "cannot merge without a current revision"

6956 msgstr "沒有目前版本不能合併"

6957

6447 -#: sequencer.c:3342

6958 +#: sequencer.c:3489

6959 #, c-format

6960 msgid "unable to parse '%.*s'"

6961 msgstr "無法解析 '%.*s'"

6962

6452 -#: sequencer.c:3351

6963 +#: sequencer.c:3498

6964 #, c-format

6965 msgid "nothing to merge: '%.*s'"

6966 msgstr "無可用合併：'%.*s'"

6967

6457 -#: sequencer.c:3363

6968 +#: sequencer.c:3510

6969 msgid "octopus merge cannot be executed on top of a [new root]"

6970 msgstr "章魚合並不能在一個新的根提交上執行"

6971

6461 -#: sequencer.c:3378

6972 +#: sequencer.c:3526

6973 #, c-format

6974 msgid "could not get commit message of '%s'"

6975 msgstr "不能取得 '%s' 的提交說明"

6976

6466 -#: sequencer.c:3538

6977 +#: sequencer.c:3688

6978 #, c-format

6979 msgid "could not even attempt to merge '%.*s'"

6980 msgstr "甚至不能嘗試合併 '%.*s'"

6981

6471 -#: sequencer.c:3554

6982 +#: sequencer.c:3704

6983 msgid "merge: Unable to write new index file"

6984 msgstr "合併：無法寫入新索引檔案"

6985

6475 -#: sequencer.c:3623 builtin/rebase.c:712

6986 +#: sequencer.c:3773 builtin/rebase.c:733

6987 #, c-format

6988 msgid "Applied autostash.\n"

6989 msgstr "已應用 autostash。\n"

6990

6480 -#: sequencer.c:3635

6991 +#: sequencer.c:3785

6992 #, c-format

6993 msgid "cannot store %s"

6994 msgstr "不能儲存 %s"

6995

6485 -#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113

6996 +#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113

6997 #, c-format

6998 msgid ""

6999 "Applying autostash resulted in conflicts.\n"

@@ -6493,31 +7004,31 @@ msgstr ""

7004 "您的修改安全地儲存在儲藏區中。\n"

7005 "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"

7006

6496 -#: sequencer.c:3699

7007 +#: sequencer.c:3849

7008 #, c-format

7009 msgid "could not checkout %s"

7010 msgstr "不能簽出 %s"

7011

6501 -#: sequencer.c:3713

7012 +#: sequencer.c:3863

7013 #, c-format

7014 msgid "%s: not a valid OID"

7015 msgstr "%s：不是一個有效的物件 ID"

7016

6506 -#: sequencer.c:3718 git-rebase--preserve-merges.sh:779

7017 +#: sequencer.c:3868 git-rebase--preserve-merges.sh:779

7018 msgid "could not detach HEAD"

7019 msgstr "不能分離開頭指標"

7020

6510 -#: sequencer.c:3733

7021 +#: sequencer.c:3883

7022 #, c-format

7023 msgid "Stopped at HEAD\n"

7024 msgstr "停止在 HEAD\n"

7025

6515 -#: sequencer.c:3735

7026 +#: sequencer.c:3885

7027 #, c-format

7028 msgid "Stopped at %s\n"

7029 msgstr "停止在 %s\n"

7030

6520 -#: sequencer.c:3743

7031 +#: sequencer.c:3893

7032 #, c-format

7033 msgid ""

7034 "Could not execute the todo command\n"

@@ -6537,48 +7048,48 @@ msgstr ""

7048 " git rebase --edit-todo\n"

7049 " git rebase --continue\n"

7050

6540 -#: sequencer.c:3827

7051 +#: sequencer.c:3979

7052 #, c-format

7053 msgid "Stopped at %s... %.*s\n"

7054 msgstr "停止在 %s... %.*s\n"

7055

6545 -#: sequencer.c:3898

7056 +#: sequencer.c:4050

7057 #, c-format

7058 msgid "unknown command %d"

7059 msgstr "未知指令 %d"

7060

6550 -#: sequencer.c:3957

7061 +#: sequencer.c:4109

7062 msgid "could not read orig-head"

7063 msgstr "不能讀取 orig-head"

7064

6554 -#: sequencer.c:3962

7065 +#: sequencer.c:4114

7066 msgid "could not read 'onto'"

7067 msgstr "不能讀取 'onto'"

7068

6558 -#: sequencer.c:3976

7069 +#: sequencer.c:4128

7070 #, c-format

7071 msgid "could not update HEAD to %s"

7072 msgstr "不能更新 HEAD 為 %s"

7073

6563 -#: sequencer.c:4069

7074 +#: sequencer.c:4221

7075 msgid "cannot rebase: You have unstaged changes."

7076 msgstr "不能重定基底：您有未暫存的變更。"

7077

6567 -#: sequencer.c:4078

7078 +#: sequencer.c:4230

7079 msgid "cannot amend non-existing commit"

7080 msgstr "不能修補不存在的提交"

7081

6571 -#: sequencer.c:4080

7082 +#: sequencer.c:4232

7083 #, c-format

7084 msgid "invalid file: '%s'"

7085 msgstr "無效檔案：'%s'"

7086

6576 -#: sequencer.c:4082

7087 +#: sequencer.c:4234

7088 #, c-format

7089 msgid "invalid contents: '%s'"

7090 msgstr "無效內容：'%s'"

7091

6581 -#: sequencer.c:4085

7092 +#: sequencer.c:4237

7093 msgid ""

7094 "\n"

7095 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -6587,42 +7098,42 @@ msgstr ""

7098 "\n"

7099 "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。"

7100

6590 -#: sequencer.c:4121 sequencer.c:4159

7101 +#: sequencer.c:4273 sequencer.c:4312

7102 #, c-format

7103 msgid "could not write file: '%s'"

7104 msgstr "不能寫入檔案：'%s'"

7105

6595 -#: sequencer.c:4174

7106 +#: sequencer.c:4327

7107 msgid "could not remove CHERRY_PICK_HEAD"

7108 msgstr "不能刪除 CHERRY_PICK_HEAD"

7109

6599 -#: sequencer.c:4181

7110 +#: sequencer.c:4334

7111 msgid "could not commit staged changes."

7112 msgstr "不能提交暫存的修改。"

7113

6603 -#: sequencer.c:4285

7114 +#: sequencer.c:4440

7115 #, c-format

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

7117 msgstr "%s：不能揀選一個%s"

7118

6608 -#: sequencer.c:4289

7119 +#: sequencer.c:4444

7120 #, c-format

7121 msgid "%s: bad revision"

7122 msgstr "%s：錯誤的版本"

7123

6613 -#: sequencer.c:4324

7124 +#: sequencer.c:4479

7125 msgid "can't revert as initial commit"

7126 msgstr "不能作為初始提交還原提交"

7127

6617 -#: sequencer.c:4774

7128 +#: sequencer.c:4952

7129 msgid "make_script: unhandled options"

7130 msgstr "make_script：有未能處理的選項"

7131

6621 -#: sequencer.c:4777

7132 +#: sequencer.c:4955

7133 msgid "make_script: error preparing revisions"

7134 msgstr "make_script：準備版本時錯誤"

7135

6625 -#: sequencer.c:4935

7136 +#: sequencer.c:5113

7137 msgid ""

7138 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

7139 "continue'.\n"

@@ -6631,15 +7142,15 @@ msgstr ""

7142 "您可以用 'git rebase --edit-todo' 修正，然後執行 'git rebase --continue'。\n"

7143 "或者您可以用 'git rebase --abort' 終止重定基底。\n"

7144

6634 -#: sequencer.c:5047 sequencer.c:5064

7145 +#: sequencer.c:5226 sequencer.c:5243

7146 msgid "nothing to do"

7147 msgstr "無事可做"

7148

6638 -#: sequencer.c:5078

7149 +#: sequencer.c:5257

7150 msgid "could not skip unnecessary pick commands"

7151 msgstr "無法跳過不必要的揀選"

7152

6642 -#: sequencer.c:5166

7153 +#: sequencer.c:5351

7154 msgid "the script was already rearranged."

7155 msgstr "腳本已經重新編排。"

7156

@@ -7135,6 +7646,12 @@ msgid_plural "%u bytes/s"

7646 msgstr[0] "%u 位元組/秒"

7647 msgstr[1] "%u 位元組/秒"

7648

7649 +#: strbuf.c:1149

7650 +#, c-format

7651 +#| msgid "could not read '%s'"

7652 +msgid "could not edit '%s'"

7653 +msgstr "無法編輯 '%s'"

7654 +

7655 #: submodule.c:114 submodule.c:143

7656 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

7657 msgstr "無法修改未合併的 .gitmodules，先解決合併衝突"

@@ -7168,7 +7685,7 @@ msgstr "路徑規格 '%s' 在子模組 '%.*s' 中"

7685 msgid "submodule entry '%s' (%s) is a %s, not a commit"

7686 msgstr "子模組條目 '%s'（%s）是一個 %s，不是一個提交"

7687

7171 -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989

7688 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016

7689 msgid "Failed to resolve HEAD as a valid ref."

7690 msgstr "無法將 HEAD 解析為有效引用。"

7691

@@ -7207,18 +7724,28 @@ msgstr "子模組 '%s' 中有髒索引"

7724 msgid "Submodule '%s' could not be updated."

7725 msgstr "子模組 '%s' 無法被更新。"

7726

7210 -#: submodule.c:2007

7727 +#: submodule.c:2027

7728 +#, c-format

7729 +msgid "submodule git dir '%s' is inside git dir '%.*s'"

7730 +msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中"

7731 +

7732 +#: submodule.c:2048

7733 #, c-format

7734 msgid ""

7735 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

7736 msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir"

7737

7216 -#: submodule.c:2019 submodule.c:2074

7738 +#: submodule.c:2060 submodule.c:2119

7739 #, c-format

7740 msgid "could not lookup name for submodule '%s'"

7741 msgstr "不能查詢子模組 '%s' 的名稱"

7742

7221 -#: submodule.c:2026

7743 +#: submodule.c:2064

7744 +#, c-format

7745 +msgid "refusing to move '%s' into an existing git dir"

7746 +msgstr "拒絕移動「%s」至現存 git 目錄"

7747 +

7748 +#: submodule.c:2071

7749 #, c-format

7750 msgid ""

7751 "Migrating git directory of '%s%s' from\n"

@@ -7229,16 +7756,16 @@ msgstr ""

7756 "'%s' 遷移至\n"

7757 "'%s'\n"

7758

7232 -#: submodule.c:2109

7759 +#: submodule.c:2154

7760 #, c-format

7761 msgid "could not recurse into submodule '%s'"

7235 -msgstr "無法遞迴進子模組路徑 '%s'"

7762 +msgstr "無法遞迴子模組路徑 '%s'"

7763

7237 -#: submodule.c:2153

7764 +#: submodule.c:2198

7765 msgid "could not start ls-files in .."

7766 msgstr "無法在 .. 中啟動 ls-files"

7767

7241 -#: submodule.c:2192

7768 +#: submodule.c:2237

7769 #, c-format

7770 msgid "ls-tree returned unexpected return code %d"

7771 msgstr "ls-tree 返回未知返回值 %d"

@@ -7257,12 +7784,12 @@ msgstr "submodule.fetchjobs 不允許為負值"

7784 msgid "ignoring '%s' which may be interpreted as a command-line option: %s"

7785 msgstr "忽略可能被解析為指令列選項的 '%s'：%s"

7786

7260 -#: submodule-config.c:490

7787 +#: submodule-config.c:498

7788 #, c-format

7789 msgid "invalid value for %s"

7790 msgstr "%s 的值無效"

7791

7265 -#: submodule-config.c:761

7792 +#: submodule-config.c:769

7793 #, c-format

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

7795 msgstr "不能更新 .gitmodules 條目 %s"

@@ -7408,7 +7935,7 @@ msgstr "正在終止。"

7935 msgid "failed to push all needed submodules"

7936 msgstr "不能推送全部需要的子模組"

7937

7411 -#: transport.c:1345 transport-helper.c:655

7938 +#: transport.c:1345 transport-helper.c:656

7939 msgid "operation not supported by protocol"

7940 msgstr "協定不支援該動作"

7941

@@ -7421,7 +7948,7 @@ msgstr "完整寫入遠端助手失敗"

7948 msgid "unable to find remote helper for '%s'"

7949 msgstr "無法為 '%s' 找到遠端助手"

7950

7424 -#: transport-helper.c:160 transport-helper.c:569

7951 +#: transport-helper.c:160 transport-helper.c:570

7952 msgid "can't dup helper output fd"

7953 msgstr "無法複製助手輸出檔案句柄"

7954

@@ -7446,90 +7973,90 @@ msgstr "%s 意外地說：'%s'"

7973 msgid "%s also locked %s"

7974 msgstr "%s 也鎖定了 %s"

7975

7449 -#: transport-helper.c:491

7976 +#: transport-helper.c:492

7977 msgid "couldn't run fast-import"

7978 msgstr "不能執行 fast-import"

7979

7453 -#: transport-helper.c:514

7980 +#: transport-helper.c:515

7981 msgid "error while running fast-import"

7982 msgstr "執行 fast-import 發生錯誤"

7983

7457 -#: transport-helper.c:543 transport-helper.c:1132

7984 +#: transport-helper.c:544 transport-helper.c:1133

7985 #, c-format

7986 msgid "could not read ref %s"

7987 msgstr "無法讀取引用 %s"

7988

7462 -#: transport-helper.c:588

7989 +#: transport-helper.c:589

7990 #, c-format

7991 msgid "unknown response to connect: %s"

7992 msgstr "連線時未知的回應：%s"

7993

7467 -#: transport-helper.c:610

7994 +#: transport-helper.c:611

7995 msgid "setting remote service path not supported by protocol"

7996 msgstr "協定不支援設定遠端服務路徑"

7997

7471 -#: transport-helper.c:612

7998 +#: transport-helper.c:613

7999 msgid "invalid remote service path"

8000 msgstr "無效的遠端服務路徑"

8001

7475 -#: transport-helper.c:658

8002 +#: transport-helper.c:659

8003 #, c-format

8004 msgid "can't connect to subservice %s"

8005 msgstr "不能連線到子服務 %s"

8006

7480 -#: transport-helper.c:734

8007 +#: transport-helper.c:735

8008 #, c-format

8009 msgid "expected ok/error, helper said '%s'"

8010 msgstr "預期 ok/error，助手說 '%s'"

8011

7485 -#: transport-helper.c:787

8012 +#: transport-helper.c:788

8013 #, c-format

8014 msgid "helper reported unexpected status of %s"

8015 msgstr "助手報告 %s 的意外狀態"

8016

7490 -#: transport-helper.c:848

8017 +#: transport-helper.c:849

8018 #, c-format

8019 msgid "helper %s does not support dry-run"

8020 msgstr "助手 %s 不支援 dry-run"

8021

7495 -#: transport-helper.c:851

8022 +#: transport-helper.c:852

8023 #, c-format

8024 msgid "helper %s does not support --signed"

8025 msgstr "助手 %s 不支援 --signed"

8026

7500 -#: transport-helper.c:854

8027 +#: transport-helper.c:855

8028 #, c-format

8029 msgid "helper %s does not support --signed=if-asked"

8030 msgstr "助手 %s 不支援 --signed=if-asked"

8031

7505 -#: transport-helper.c:859

8032 +#: transport-helper.c:860

8033 #, c-format

8034 msgid "helper %s does not support --atomic"

8035 msgstr "助手 %s 不支援 --atomic"

8036

7510 -#: transport-helper.c:865

8037 +#: transport-helper.c:866

8038 #, c-format

8039 msgid "helper %s does not support 'push-option'"

8040 msgstr "助手 %s 不支援 'push-option'"

8041

7515 -#: transport-helper.c:963

8042 +#: transport-helper.c:964

8043 msgid "remote-helper doesn't support push; refspec needed"

8044 msgstr "remote-heper 不支援 push，需要引用表達式"

8045

7519 -#: transport-helper.c:968

8046 +#: transport-helper.c:969

8047 #, c-format

8048 msgid "helper %s does not support 'force'"

8049 msgstr "助手 %s 不支援 'force'"

8050

7524 -#: transport-helper.c:1015

8051 +#: transport-helper.c:1016

8052 msgid "couldn't run fast-export"

8053 msgstr "無法執行 fast-export"

8054

7528 -#: transport-helper.c:1020

8055 +#: transport-helper.c:1021

8056 msgid "error while running fast-export"

8057 msgstr "執行 fast-export 時發生錯誤"

8058

7532 -#: transport-helper.c:1045

8059 +#: transport-helper.c:1046

8060 #, c-format

8061 msgid ""

8062 "No refs in common and none specified; doing nothing.\n"

@@ -7538,47 +8065,47 @@ msgstr ""

8065 "沒有共同的引用並且也沒有指定，什麼也不會做。\n"

8066 "可能您應該指定一個分支如 'master'。\n"

8067

7541 -#: transport-helper.c:1118

8068 +#: transport-helper.c:1119

8069 #, c-format

8070 msgid "malformed response in ref list: %s"

8071 msgstr "引用列表中格式錯誤的回應：%s"

8072

7546 -#: transport-helper.c:1270

8073 +#: transport-helper.c:1271

8074 #, c-format

8075 msgid "read(%s) failed"

8076 msgstr "讀取（%s）失敗"

8077

7551 -#: transport-helper.c:1297

8078 +#: transport-helper.c:1298

8079 #, c-format

8080 msgid "write(%s) failed"

8081 msgstr "寫（%s）失敗"

8082

7556 -#: transport-helper.c:1346

8083 +#: transport-helper.c:1347

8084 #, c-format

8085 msgid "%s thread failed"

8086 msgstr "%s 執行緒失敗"

8087

7561 -#: transport-helper.c:1350

8088 +#: transport-helper.c:1351

8089 #, c-format

8090 msgid "%s thread failed to join: %s"

8091 msgstr "%s 執行緒等待失敗：%s"

8092

7566 -#: transport-helper.c:1369 transport-helper.c:1373

8093 +#: transport-helper.c:1370 transport-helper.c:1374

8094 #, c-format

8095 msgid "can't start thread for copying data: %s"

8096 msgstr "不能啟動執行緒來複製資料：%s"

8097

7571 -#: transport-helper.c:1410

8098 +#: transport-helper.c:1411

8099 #, c-format

8100 msgid "%s process failed to wait"

8101 msgstr "%s 進程等待失敗"

8102

7576 -#: transport-helper.c:1414

8103 +#: transport-helper.c:1415

8104 #, c-format

8105 msgid "%s process failed"

8106 msgstr "%s 進程失敗"

8107

7581 -#: transport-helper.c:1432 transport-helper.c:1441

8108 +#: transport-helper.c:1433 transport-helper.c:1442

8109 msgid "can't start thread for copying data"

8110 msgstr "不能啟動執行緒來複製資料"

8111

l10n: zh_TW.po: update translation for v2.25.0 round 1