8278f87022 · matheusbsbs/matheus-bagliano

@@ -292,8 +292,8 @@ msgid ""

292 msgstr ""

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

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

295 -"POT-Creation-Date: 2020-12-21 07:10+0800\n"

296 -"PO-Revision-Date: 2020-12-23 22:30+0800\n"

295 +"POT-Creation-Date: 2021-03-04 22:41+0800\n"

296 +"PO-Revision-Date: 2021-03-06 02:21+0800\n"

297 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"

298 "Language-Team: Chinese (Traditional) <zh-l10n@lists.linux.org.tw>\n"

299 "Language: zh_TW\n"

@@ -310,9 +310,9 @@ msgstr ""

310 msgid "Huh (%s)?"

311 msgstr "嗯（%s）？"

312

313 -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284

314 -#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532

315 -#: builtin/rebase.c:1955

313 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292

314 +#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538

315 +#: builtin/rebase.c:1963

316 msgid "could not read index"

317 msgstr "無法讀取索引"

318

@@ -340,7 +340,7 @@ msgstr "更新"

340 msgid "could not stage '%s'"

341 msgstr "無法暫存「%s」"

342

343 -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478

343 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486

344 msgid "could not write index"

345 msgstr "無法寫入索引"

346

@@ -353,7 +353,7 @@ msgstr[0] "已更新 %d 個路徑\n"

353 #: add-interactive.c:724 git-add--interactive.perl:676

354 #, c-format, perl-format

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

356 -msgstr "註：%s 現已不再追蹤。\n"

356 +msgstr "注意：%s 現已不再追蹤。\n"

357

358 #: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295

359 #: builtin/reset.c:145

@@ -495,7 +495,7 @@ msgstr "未快取"

495

496 #: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257

497 #: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124

498 -#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190

498 +#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190

499 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818

500 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326

501 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572

@@ -1055,7 +1055,7 @@ msgstr ""

1055 msgid "Exiting because of an unresolved conflict."

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

1057

1058 -#: advice.c:281 builtin/merge.c:1369

1058 +#: advice.c:281 builtin/merge.c:1370

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

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

1061

@@ -1344,7 +1344,8 @@ msgstr "打修補檔失敗：%s:%ld"

1344 msgid "cannot checkout %s"

1345 msgstr "不能檢出 %s"

1346

1347 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308

1347 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213

1348 +#: setup.c:308

1349 #, c-format

1350 msgid "failed to read %s"

1351 msgstr "無法讀取 %s"

@@ -1503,7 +1504,7 @@ msgstr "不能為建立檔案 %s 建立後端儲存"

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

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

1506

1506 -#: apply.c:4374 builtin/bisect--helper.c:524

1507 +#: apply.c:4374 builtin/bisect--helper.c:523

1508 #, c-format

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

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

@@ -1538,7 +1539,7 @@ msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..."

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

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

1541

1541 -#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228

1542 +#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334

1543 #, c-format

1544 msgid "cannot open %s"

1545 msgstr "不能開啟 %s"

@@ -1589,7 +1590,7 @@ msgid "%d line applied after fixing whitespace errors."

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

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

1592

1592 -#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406

1593 +#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406

1594 msgid "Unable to write new index file"

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

1596

@@ -1657,7 +1658,7 @@ msgstr "如果一個修補檔不能應用則嘗試三方合併"

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

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

1660

1660 -#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525

1661 +#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540

1662 msgid "paths are separated with NUL character"

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

1664

@@ -1667,7 +1668,7 @@ msgstr "確保至少符合 <n> 行上下文"

1668

1669 #: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98

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

1670 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1346

1671 +#: builtin/pack-objects.c:3577 builtin/rebase.c:1352

1672 msgid "action"

1673 msgstr "動作"

1674

@@ -1695,9 +1696,9 @@ msgstr "將拒絕的修補檔片段儲存在對應的 *.rej 檔案中"

1696 msgid "allow overlapping hunks"

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

1698

1698 -#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22

1699 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775

1700 -#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128

1699 +#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22

1700 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757

1701 +#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128

1702 msgid "be verbose"

1703 msgstr "詳細輸出"

1704

@@ -1773,25 +1774,25 @@ msgstr "git archive --list"

1774 msgid ""

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

1776 msgstr ""

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

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

1778

1779 #: archive.c:17

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

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

1781 +msgstr "git archive --remote <版本庫> [--exec <命令>] --list"

1782

1783 #: archive.c:192

1784 #, c-format

1785 msgid "cannot read %s"

1786 msgstr "不能讀取 %s"

1787

1787 -#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886

1788 -#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786

1789 -#: builtin/merge.c:1138

1788 +#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894

1789 +#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786

1790 +#: builtin/merge.c:1139

1791 #, c-format

1792 msgid "could not read '%s'"

1793 msgstr "不能讀取 '%s'"

1794

1794 -#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315

1795 +#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315

1796 #, c-format

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

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

@@ -1833,7 +1834,7 @@ msgstr "格式"

1834 msgid "archive format"

1835 msgstr "歸檔格式"

1836

1836 -#: archive.c:556 builtin/log.c:1765

1837 +#: archive.c:556 builtin/log.c:1764

1838 msgid "prefix"

1839 msgstr "前綴"

1840

@@ -1841,11 +1842,11 @@ msgstr "前綴"

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

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

1844

1844 -#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890

1845 -#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135

1845 +#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888

1846 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135

1847 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209

1847 -#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105

1848 -#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412

1848 +#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105

1849 +#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412

1850 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190

1851 msgid "file"

1852 msgstr "檔案"

@@ -1944,7 +1945,7 @@ msgstr "檔案 '%s' 包含錯誤的引用格式：%s"

1945 #: bisect.c:699

1946 #, c-format

1947 msgid "We cannot bisect more!\n"

1947 -msgstr "我們無法進行更多的二分尋找！\n"

1948 +msgstr "我們無法進行更多的二分搜尋！\n"

1949

1950 #: bisect.c:766

1951 #, c-format

@@ -1986,7 +1987,7 @@ msgid ""

1987 "Maybe you mistook %s and %s revs?\n"

1988 msgstr ""

1989 "一些 %s 版本不是 %s 版本的祖先。\n"

1989 -"這種情況下 git 二分尋找無法正常工作。\n"

1990 +"這種情況下 git 二分搜尋無法正常工作。\n"

1991 "您可能弄錯了 %s 和 %s 版本？\n"

1992

1993 #: bisect.c:822

@@ -2003,26 +2004,26 @@ msgstr ""

2004 #: bisect.c:861

2005 #, c-format

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

2006 -msgstr "二分尋找中：合併基礎必須是經過測試的\n"

2007 +msgstr "二分搜尋中：合併基礎必須是經過測試的\n"

2008

2009 #: bisect.c:911

2010 #, c-format

2011 msgid "a %s revision is needed"

2012 msgstr "需要一個 %s 版本"

2013

2013 -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255

2014 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287

2015 #, c-format

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

2017 msgstr "不能建立檔案 '%s'"

2018

2018 -#: bisect.c:987 builtin/merge.c:152

2019 +#: bisect.c:987 builtin/merge.c:153

2020 #, c-format

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

2022 msgstr "不能讀取檔案 '%s'"

2023

2024 #: bisect.c:1027

2025 msgid "reading bisect refs failed"

2025 -msgstr "讀取二分尋找引用失敗"

2026 +msgstr "讀取二分搜尋引用失敗"

2027

2028 #: bisect.c:1057

2029 #, c-format

@@ -2033,10 +2034,10 @@ msgstr "%s 同時為 %s 和 %s\n"

2034 #, c-format

2035 msgid ""

2036 "No testable commit found.\n"

2036 -"Maybe you started with bad path parameters?\n"

2037 +"Maybe you started with bad path arguments?\n"

2038 msgstr ""

2038 -"沒有發現可測試的提交。\n"

2039 -"可能您在執行時使用了錯誤的路徑參數？\n"

2039 +"沒找到能夠測試的提交。\n"

2040 +"可能是執行傳入的路徑引數是錯誤的？\n"

2041

2042 #: bisect.c:1095

2043 #, c-format

@@ -2051,7 +2052,7 @@ msgstr[0] "（大概 %d 步）"

2052 #, c-format

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

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

2054 -msgstr[0] "二分尋找中：在此之後，還剩 %d 個版本待測試 %s\n"

2055 +msgstr[0] "二分搜尋中：在此之後，還剩 %d 個版本待測試 %s\n"

2056

2057 #: blame.c:2777

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

@@ -2065,11 +2066,11 @@ msgstr "不能將 --contents 和最終的提交物件名共用"

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

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

2068

2068 -#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138

2069 -#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409

2070 -#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336

2071 -#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395

2072 -#: builtin/shortlog.c:267

2069 +#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146

2070 +#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411

2071 +#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335

2072 +#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410

2073 +#: builtin/shortlog.c:255

2074 msgid "revision walk setup failed"

2075 msgstr "版本遍歷設定失敗"

2076

@@ -2241,7 +2242,7 @@ msgstr "'%s' 不像是一個 v2 或 v3 版本的包檔案"

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

2243 msgstr "無法識別的包頭：%s%s (%d)"

2244

2244 -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176

2245 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184

2246 #: builtin/commit.c:814

2247 #, c-format

2248 msgid "could not open '%s'"

@@ -2283,293 +2284,308 @@ msgstr "不能生成 pack-objects 進程"

2284 msgid "pack-objects died"

2285 msgstr "pack-objects 終止"

2286

2286 -#: bundle.c:379

2287 -msgid "rev-list died"

2288 -msgstr "rev-list 終止"

2289 -

2290 -#: bundle.c:428

2287 +#: bundle.c:386

2288 #, c-format

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

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

2291

2295 -#: bundle.c:498

2292 +#: bundle.c:490

2293 #, c-format

2294 msgid "unsupported bundle version %d"

2295 msgstr "不支援的包版本 %d"

2296

2300 -#: bundle.c:500

2297 +#: bundle.c:492

2298 #, c-format

2299 msgid "cannot write bundle version %d with algorithm %s"

2300 msgstr "無法寫入 %2$s 演算法的包版本 %1$d"

2301

2305 -#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408

2302 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396

2303 #, c-format

2304 msgid "unrecognized argument: %s"

2305 msgstr "無法識別的參數：%s"

2306

2310 -#: bundle.c:530

2307 +#: bundle.c:539

2308 msgid "Refusing to create empty bundle."

2309 msgstr "不能建立空包。"

2310

2314 -#: bundle.c:540

2311 +#: bundle.c:549

2312 #, c-format

2313 msgid "cannot create '%s'"

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

2315

2319 -#: bundle.c:565

2316 +#: bundle.c:574

2317 msgid "index-pack died"

2318 msgstr "index-pack 終止"

2319

2320 +#: chunk-format.c:113

2321 +msgid "terminating chunk id appears earlier than expected"

2322 +msgstr "終止區塊 id 出現的時間早於預期"

2323 +

2324 +#: chunk-format.c:122

2325 +#, c-format

2326 +msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"

2327 +msgstr "不正確的區塊偏移 %<PRIx64> 及 %<PRIx64>"

2328 +

2329 +#: chunk-format.c:129

2330 +#, c-format

2331 +msgid "duplicate chunk ID %<PRIx32> found"

2332 +msgstr "找到重複的區塊 ID %<PRIx32>"

2333 +

2334 +#: chunk-format.c:143

2335 +#, c-format

2336 +msgid "final chunk has non-zero id %<PRIx32>"

2337 +msgstr "最終區塊有非零 ID %<PRIx32>"

2338 +

2339 #: color.c:329

2340 #, c-format

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

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

2343

2328 -#: commit-graph.c:188 midx.c:47

2344 +#: commit-graph.c:197 midx.c:46

2345 msgid "invalid hash version"

2346 msgstr "無效的雜湊版本"

2347

2332 -#: commit-graph.c:246

2348 +#: commit-graph.c:255

2349 msgid "commit-graph file is too small"

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

2351

2336 -#: commit-graph.c:311

2352 +#: commit-graph.c:348

2353 #, c-format

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

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

2356

2341 -#: commit-graph.c:318

2357 +#: commit-graph.c:355

2358 #, c-format

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

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

2361

2346 -#: commit-graph.c:325

2362 +#: commit-graph.c:362

2363 #, c-format

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

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

2366

2351 -#: commit-graph.c:342

2367 +#: commit-graph.c:379

2368 #, c-format

2369 msgid "commit-graph file is too small to hold %u chunks"

2370 msgstr "commit-graph 檔案不夠放置 %u 個區塊"

2371

2356 -#: commit-graph.c:361

2357 -#, c-format

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

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

2360 -

2361 -#: commit-graph.c:433

2362 -#, c-format

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

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

2365 -

2366 -#: commit-graph.c:499

2372 +#: commit-graph.c:472

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

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

2375

2370 -#: commit-graph.c:509

2376 +#: commit-graph.c:482

2377 msgid "commit-graph chain does not match"

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

2379

2374 -#: commit-graph.c:557

2380 +#: commit-graph.c:530

2381 #, c-format

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

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

2384

2379 -#: commit-graph.c:581

2385 +#: commit-graph.c:554

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

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

2388

2383 -#: commit-graph.c:721 commit-graph.c:785

2389 +#: commit-graph.c:735 commit-graph.c:772

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

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

2392

2387 -#: commit-graph.c:742

2393 +#: commit-graph.c:756

2394 #, c-format

2395 msgid "could not find commit %s"

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

2397

2392 -#: commit-graph.c:1036 builtin/am.c:1292

2398 +#: commit-graph.c:789

2399 +msgid "commit-graph requires overflow generation data but has none"

2400 +msgstr ""

2401 +

2402 +#: commit-graph.c:1065 builtin/am.c:1292

2403 #, c-format

2404 msgid "unable to parse commit %s"

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

2406

2397 -#: commit-graph.c:1252 builtin/pack-objects.c:2864

2407 +#: commit-graph.c:1327 builtin/pack-objects.c:2872

2408 #, c-format

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

2410 msgstr "無法獲得物件 %s 類型"

2411

2402 -#: commit-graph.c:1283

2412 +#: commit-graph.c:1358

2413 msgid "Loading known commits in commit graph"

2414 msgstr "正在載入提交圖中的已知提交"

2415

2406 -#: commit-graph.c:1300

2416 +#: commit-graph.c:1375

2417 msgid "Expanding reachable commits in commit graph"

2418 msgstr "正在擴展提交圖中的可以取得提交"

2419

2410 -#: commit-graph.c:1320

2420 +#: commit-graph.c:1395

2421 msgid "Clearing commit marks in commit graph"

2422 msgstr "正在清除提交圖中的提交標記"

2423

2414 -#: commit-graph.c:1339

2424 +#: commit-graph.c:1414

2425 +#, fuzzy

2426 +#| msgid "Computing commit graph generation numbers"

2427 +msgid "Computing commit graph topological levels"

2428 +msgstr "正在計算提交圖世代數字"

2429 +

2430 +#: commit-graph.c:1467

2431 msgid "Computing commit graph generation numbers"

2432 msgstr "正在計算提交圖世代數字"

2433

2418 -#: commit-graph.c:1406

2434 +#: commit-graph.c:1548

2435 msgid "Computing commit changed paths Bloom filters"

2436 msgstr "正在計算提交變更路徑的布隆過濾器"

2437

2422 -#: commit-graph.c:1483

2438 +#: commit-graph.c:1625

2439 msgid "Collecting referenced commits"

2440 msgstr "正在收集引用提交"

2441

2426 -#: commit-graph.c:1508

2442 +#: commit-graph.c:1650

2443 #, c-format

2444 msgid "Finding commits for commit graph in %d pack"

2445 msgid_plural "Finding commits for commit graph in %d packs"

2446 msgstr[0] "正在 %d 個包中尋找提交圖的提交"

2447

2432 -#: commit-graph.c:1521

2448 +#: commit-graph.c:1663

2449 #, c-format

2450 msgid "error adding pack %s"

2451 msgstr "新增包 %s 發生錯誤"

2452

2437 -#: commit-graph.c:1525

2453 +#: commit-graph.c:1667

2454 #, c-format

2455 msgid "error opening index for %s"

2456 msgstr "為 %s 開啟索引發生錯誤"

2457

2442 -#: commit-graph.c:1562

2458 +#: commit-graph.c:1704

2459 msgid "Finding commits for commit graph among packed objects"

2460 msgstr "正在打包物件中尋找提交圖的提交"

2461

2446 -#: commit-graph.c:1580

2462 +#: commit-graph.c:1722

2463 msgid "Finding extra edges in commit graph"

2464 msgstr "正在尋找提交圖中額外的邊"

2465

2450 -#: commit-graph.c:1628

2466 +#: commit-graph.c:1771

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

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

2469

2454 -#: commit-graph.c:1670 midx.c:819

2470 +#: commit-graph.c:1802 midx.c:794

2471 #, c-format

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

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

2474

2459 -#: commit-graph.c:1683

2475 +#: commit-graph.c:1815

2476 msgid "unable to create temporary graph layer"

2477 msgstr "無法建立暫時的圖形層"

2478

2463 -#: commit-graph.c:1688

2479 +#: commit-graph.c:1820

2480 #, c-format

2481 msgid "unable to adjust shared permissions for '%s'"

2482 msgstr "無法調整「%s」的共用權限"

2483

2468 -#: commit-graph.c:1758

2484 +#: commit-graph.c:1879

2485 #, c-format

2486 msgid "Writing out commit graph in %d pass"

2487 msgid_plural "Writing out commit graph in %d passes"

2488 msgstr[0] "正在用 %d 步寫出提交圖"

2489

2474 -#: commit-graph.c:1803

2490 +#: commit-graph.c:1915

2491 msgid "unable to open commit-graph chain file"

2492 msgstr "無法開啟提交圖形鏈檔案"

2493

2478 -#: commit-graph.c:1819

2494 +#: commit-graph.c:1931

2495 msgid "failed to rename base commit-graph file"

2496 msgstr "無法重新命名基礎提交圖形檔案"

2497

2482 -#: commit-graph.c:1839

2498 +#: commit-graph.c:1951

2499 msgid "failed to rename temporary commit-graph file"

2500 msgstr "無法重新命名暫時提交圖形檔案"

2501

2486 -#: commit-graph.c:1965

2502 +#: commit-graph.c:2084

2503 msgid "Scanning merged commits"

2504 msgstr "正在掃描合併提交"

2505

2490 -#: commit-graph.c:2009

2506 +#: commit-graph.c:2128

2507 msgid "Merging commit-graph"

2508 msgstr "正在合併提交圖形"

2509

2494 -#: commit-graph.c:2115

2510 +#: commit-graph.c:2235

2511 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

2512 msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用。"

2513

2498 -#: commit-graph.c:2214

2514 +#: commit-graph.c:2342

2515 msgid "too many commits to write graph"

2516 msgstr "提交太多不能畫圖"

2517

2502 -#: commit-graph.c:2307

2518 +#: commit-graph.c:2440

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

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

2521

2506 -#: commit-graph.c:2317

2522 +#: commit-graph.c:2450

2523 #, c-format

2524 msgid "commit-graph has incorrect OID order: %s then %s"

2525 msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"

2526

2511 -#: commit-graph.c:2327 commit-graph.c:2342

2527 +#: commit-graph.c:2460 commit-graph.c:2475

2528 #, c-format

2529 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

2530 msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"

2531

2516 -#: commit-graph.c:2334

2532 +#: commit-graph.c:2467

2533 #, c-format

2534 msgid "failed to parse commit %s from commit-graph"

2535 msgstr "無法從提交圖形中解析提交 %s"

2536

2521 -#: commit-graph.c:2352

2537 +#: commit-graph.c:2485

2538 msgid "Verifying commits in commit graph"

2539 msgstr "正在驗證提交圖中的提交"

2540

2525 -#: commit-graph.c:2367

2541 +#: commit-graph.c:2500

2542 #, c-format

2543 msgid "failed to parse commit %s from object database for commit-graph"

2544 msgstr "無法從提交圖形的物件庫中解析提交 %s"

2545

2530 -#: commit-graph.c:2374

2546 +#: commit-graph.c:2507

2547 #, c-format

2548 msgid "root tree OID for commit %s in commit-graph is %s != %s"

2549 msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"

2550

2535 -#: commit-graph.c:2384

2551 +#: commit-graph.c:2517

2552 #, c-format

2553 msgid "commit-graph parent list for commit %s is too long"

2554 msgstr "提交 %s 的提交圖形父提交列表太長了"

2555

2540 -#: commit-graph.c:2393

2556 +#: commit-graph.c:2526

2557 #, c-format

2558 msgid "commit-graph parent for %s is %s != %s"

2559 msgstr "%s 的提交圖形父提交是 %s != %s"

2560

2545 -#: commit-graph.c:2407

2561 +#: commit-graph.c:2540

2562 #, c-format

2563 msgid "commit-graph parent list for commit %s terminates early"

2564 msgstr "提交 %s 的提交圖形父提交列表過早終止"

2565

2550 -#: commit-graph.c:2412

2566 +#: commit-graph.c:2545

2567 #, c-format

2568 msgid ""

2569 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

2570 msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"

2571

2556 -#: commit-graph.c:2416

2572 +#: commit-graph.c:2549

2573 #, c-format

2574 msgid ""

2575 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

2576 msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"

2577

2562 -#: commit-graph.c:2432

2578 +#: commit-graph.c:2566

2579 #, c-format

2564 -msgid "commit-graph generation for commit %s is %u != %u"

2565 -msgstr "提交圖形中的提交 %s 的世代號是 %u != %u"

2580 +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

2581 +msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"

2582

2567 -#: commit-graph.c:2438

2583 +#: commit-graph.c:2572

2584 #, c-format

2585 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

2586 msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"

2587

2572 -#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403

2588 +#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403

2589 #: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457

2590 #, c-format

2591 msgid "could not parse %s"

@@ -2600,27 +2616,27 @@ msgstr ""

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

2617 "可關閉本消息"

2618

2603 -#: commit.c:1172

2619 +#: commit.c:1223

2620 #, c-format

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

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

2623

2608 -#: commit.c:1176

2624 +#: commit.c:1227

2625 #, c-format

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

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

2628

2613 -#: commit.c:1179

2629 +#: commit.c:1230

2630 #, c-format

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

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

2633

2618 -#: commit.c:1182

2634 +#: commit.c:1233

2635 #, c-format

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

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

2638

2623 -#: commit.c:1436

2639 +#: commit.c:1487

2640 msgid ""

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

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

@@ -2634,7 +2650,7 @@ msgstr ""

2650 msgid "memory exhausted"

2651 msgstr "記憶體耗盡"

2652

2637 -#: config.c:125

2653 +#: config.c:126

2654 #, c-format

2655 msgid ""

2656 "exceeded maximum include depth (%d) while including\n"

@@ -2649,289 +2665,333 @@ msgstr ""

2665 "\t%2$s\n"

2666 "這可能是因為循環包含。"

2667

2652 -#: config.c:141

2668 +#: config.c:142

2669 #, c-format

2670 msgid "could not expand include path '%s'"

2671 msgstr "無法擴展包含路徑 '%s'"

2672

2657 -#: config.c:152

2673 +#: config.c:153

2674 msgid "relative config includes must come from files"

2675 msgstr "相對路徑的設定檔案引用必須來自於檔案"

2676

2661 -#: config.c:198

2677 +#: config.c:199

2678 msgid "relative config include conditionals must come from files"

2679 msgstr "相對路徑的設定檔案條件引用必須來自於檔案"

2680

2665 -#: config.c:378

2681 +#: config.c:396

2682 +#, c-format

2683 +msgid "invalid config format: %s"

2684 +msgstr "無效的設定檔格式：%s"

2685 +

2686 +#: config.c:400

2687 +#, c-format

2688 +msgid "missing environment variable name for configuration '%.*s'"

2689 +msgstr "缺少「%.*s」組態設定的環境變數名稱"

2690 +

2691 +#: config.c:405

2692 +#, c-format

2693 +msgid "missing environment variable '%s' for configuration '%.*s'"

2694 +msgstr "缺少環境變數「%s」（於「%.*s」組態設定）"

2695 +

2696 +#: config.c:442

2697 #, c-format

2698 msgid "key does not contain a section: %s"

2699 msgstr "鍵名沒有包含一個小節名稱：%s"

2700

2670 -#: config.c:384

2701 +#: config.c:448

2702 #, c-format

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

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

2705

2675 -#: config.c:408 sequencer.c:2580

2706 +#: config.c:472 sequencer.c:2588

2707 #, c-format

2708 msgid "invalid key: %s"

2709 msgstr "無效鍵名：%s"

2710

2680 -#: config.c:414

2711 +#: config.c:478

2712 #, c-format

2713 msgid "invalid key (newline): %s"

2714 msgstr "無效鍵名（有換行符號）：%s"

2715

2685 -#: config.c:450 config.c:462

2716 +#: config.c:511

2717 +msgid "empty config key"

2718 +msgstr "空白設定鍵"

2719 +

2720 +#: config.c:529 config.c:541

2721 #, c-format

2722 msgid "bogus config parameter: %s"

2723 msgstr "偽設定參數：%s"

2724

2690 -#: config.c:497

2725 +#: config.c:555 config.c:572 config.c:579 config.c:588

2726 #, c-format

2727 msgid "bogus format in %s"

2728 msgstr "%s 中格式錯誤"

2729

2695 -#: config.c:836

2730 +#: config.c:622

2731 +#, c-format

2732 +msgid "bogus count in %s"

2733 +msgstr "%s 中有偽計數"

2734 +

2735 +#: config.c:626

2736 +#, c-format

2737 +msgid "too many entries in %s"

2738 +msgstr "%s 中的項目過多"

2739 +

2740 +#: config.c:636

2741 +#, c-format

2742 +msgid "missing config key %s"

2743 +msgstr "缺少 %s 設定鍵"

2744 +

2745 +#: config.c:644

2746 +#, c-format

2747 +msgid "missing config value %s"

2748 +msgstr "缺少 %s 設定值"

2749 +

2750 +#: config.c:995

2751 #, c-format

2752 msgid "bad config line %d in blob %s"

2753 msgstr "資料物件 %2$s 中錯誤的設定行 %1$d"

2754

2700 -#: config.c:840

2755 +#: config.c:999

2756 #, c-format

2757 msgid "bad config line %d in file %s"

2758 msgstr "檔案 %2$s 中錯誤的設定行 %1$d"

2759

2705 -#: config.c:844

2760 +#: config.c:1003

2761 #, c-format

2762 msgid "bad config line %d in standard input"

2763 msgstr "標準輸入中錯誤的設定行 %d"

2764

2710 -#: config.c:848

2765 +#: config.c:1007

2766 #, c-format

2767 msgid "bad config line %d in submodule-blob %s"

2768 msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d"

2769

2715 -#: config.c:852

2770 +#: config.c:1011

2771 #, c-format

2772 msgid "bad config line %d in command line %s"

2773 msgstr "指令列 %2$s 中錯誤的設定行 %1$d"

2774

2720 -#: config.c:856

2775 +#: config.c:1015

2776 #, c-format

2777 msgid "bad config line %d in %s"

2778 msgstr "在 %2$s 中錯誤的設定行 %1$d"

2779

2725 -#: config.c:993

2780 +#: config.c:1152

2781 msgid "out of range"

2782 msgstr "超出範圍"

2783

2729 -#: config.c:993

2784 +#: config.c:1152

2785 msgid "invalid unit"

2786 msgstr "無效的單位"

2787

2733 -#: config.c:994

2788 +#: config.c:1153

2789 #, c-format

2790 msgid "bad numeric config value '%s' for '%s': %s"

2791 msgstr "設定變數 '%2$s' 的數字取值 '%1$s' 設定錯誤：%3$s"

2792

2738 -#: config.c:1013

2793 +#: config.c:1163

2794 #, c-format

2795 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

2796 msgstr "資料物件 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"

2797

2743 -#: config.c:1016

2798 +#: config.c:1166

2799 #, c-format

2800 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

2801 msgstr "檔案 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"

2802

2748 -#: config.c:1019

2803 +#: config.c:1169

2804 #, c-format

2805 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

2806 msgstr "標準輸入中設定變數 '%2$s' 錯誤的取值 '%1$s'：%3$s"

2807

2753 -#: config.c:1022

2808 +#: config.c:1172

2809 #, c-format

2810 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

2811 msgstr "子模組資料 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"

2812

2758 -#: config.c:1025

2813 +#: config.c:1175

2814 #, c-format

2815 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

2816 msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"

2817

2763 -#: config.c:1028

2818 +#: config.c:1178

2819 #, c-format

2820 msgid "bad numeric config value '%s' for '%s' in %s: %s"

2821 msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"

2822

2768 -#: config.c:1123

2823 +#: config.c:1194

2824 +#, c-format

2825 +msgid "bad boolean config value '%s' for '%s'"

2826 +msgstr "「%2$s」的「%1$s」布林設定值無效"

2827 +

2828 +#: config.c:1289

2829 #, c-format

2830 msgid "failed to expand user dir in: '%s'"

2831 msgstr "無法擴展使用者目錄：'%s'"

2832

2773 -#: config.c:1132

2833 +#: config.c:1298

2834 #, c-format

2835 msgid "'%s' for '%s' is not a valid timestamp"

2836 msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳"

2837

2778 -#: config.c:1223

2838 +#: config.c:1391

2839 #, c-format

2840 msgid "abbrev length out of range: %d"

2841 msgstr "縮寫長度超出範圍：%d"

2842

2783 -#: config.c:1237 config.c:1248

2843 +#: config.c:1405 config.c:1416

2844 #, c-format

2845 msgid "bad zlib compression level %d"

2846 msgstr "錯誤的 zlib 壓縮級別 %d"

2847

2788 -#: config.c:1340

2848 +#: config.c:1508

2849 msgid "core.commentChar should only be one character"

2850 msgstr "core.commentChar 應該是一個字元"

2851

2792 -#: config.c:1373

2852 +#: config.c:1541

2853 #, c-format

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

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

2856

2797 -#: config.c:1445

2857 +#: config.c:1613

2858 #, c-format

2859 msgid "malformed value for %s"

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

2861

2802 -#: config.c:1471

2862 +#: config.c:1639

2863 #, c-format

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

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

2866

2807 -#: config.c:1472

2867 +#: config.c:1640

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

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

2870

2811 -#: config.c:1533 builtin/pack-objects.c:3649

2871 +#: config.c:1701 builtin/pack-objects.c:3666

2872 #, c-format

2873 msgid "bad pack compression level %d"

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

2875

2816 -#: config.c:1655

2876 +#: config.c:1823

2877 #, c-format

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

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

2880

2821 -#: config.c:1658

2881 +#: config.c:1826

2882 #, c-format

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

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

2885

2826 -#: config.c:1675

2886 +#: config.c:1843

2887 #, c-format

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

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

2890

2831 -#: config.c:1705

2891 +#: config.c:1873

2892 #, c-format

2893 msgid "failed to parse %s"

2894 msgstr "解析 %s 失敗"

2895

2836 -#: config.c:1759

2896 +#: config.c:1927

2897 msgid "unable to parse command-line config"

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

2899

2840 -#: config.c:2122

2900 +#: config.c:2290

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

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

2903

2844 -#: config.c:2296

2904 +#: config.c:2464

2905 #, c-format

2906 msgid "Invalid %s: '%s'"

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

2908

2849 -#: config.c:2341

2909 +#: config.c:2509

2910 #, c-format

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

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

2913

2854 -#: config.c:2387

2914 +#: config.c:2555

2915 #, c-format

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

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

2918

2859 -#: config.c:2389

2919 +#: config.c:2557

2920 #, c-format

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

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

2923

2864 -#: config.c:2473

2924 +#: config.c:2641

2925 #, c-format

2926 msgid "invalid section name '%s'"

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

2928

2869 -#: config.c:2505

2929 +#: config.c:2673

2930 #, c-format

2931 msgid "%s has multiple values"

2932 msgstr "%s 有多個取值"

2933

2874 -#: config.c:2534

2934 +#: config.c:2702

2935 #, c-format

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

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

2938

2879 -#: config.c:2786 config.c:3112

2939 +#: config.c:2954 config.c:3280

2940 #, c-format

2941 msgid "could not lock config file %s"

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

2943

2884 -#: config.c:2797

2944 +#: config.c:2965

2945 #, c-format

2946 msgid "opening %s"

2947 msgstr "開啟 %s"

2948

2889 -#: config.c:2834 builtin/config.c:361

2949 +#: config.c:3002 builtin/config.c:361

2950 #, c-format

2951 msgid "invalid pattern: %s"

2952 msgstr "無效模式：%s"

2953

2894 -#: config.c:2859

2954 +#: config.c:3027

2955 #, c-format

2956 msgid "invalid config file %s"

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

2958

2899 -#: config.c:2872 config.c:3125

2959 +#: config.c:3040 config.c:3293

2960 #, c-format

2961 msgid "fstat on %s failed"

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

2963

2904 -#: config.c:2883

2964 +#: config.c:3051

2965 #, c-format

2966 msgid "unable to mmap '%s'"

2967 msgstr "不能 mmap '%s'"

2968

2909 -#: config.c:2892 config.c:3130

2969 +#: config.c:3060 config.c:3298

2970 #, c-format

2971 msgid "chmod on %s failed"

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

2973

2914 -#: config.c:2977 config.c:3227

2974 +#: config.c:3145 config.c:3395

2975 #, c-format

2976 msgid "could not write config file %s"

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

2978

2919 -#: config.c:3011

2979 +#: config.c:3179

2980 #, c-format

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

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

2983

2924 -#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2984 +#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2985 #, c-format

2986 msgid "could not unset '%s'"

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

2988

2929 -#: config.c:3103

2989 +#: config.c:3271

2990 #, c-format

2991 msgid "invalid section name: %s"

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

2993

2934 -#: config.c:3270

2994 +#: config.c:3438

2995 #, c-format

2996 msgid "missing value for '%s'"

2997 msgstr "%s 的取值缺少"

@@ -2992,45 +3052,45 @@ msgstr "無效封包"

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

3053 msgstr "協定錯誤：意外的 '%s'"

3054

2995 -#: connect.c:473

3055 +#: connect.c:497

3056 #, c-format

3057 msgid "unknown object format '%s' specified by server"

3058 msgstr "伺服器指定的「%s」物件格式無效"

3059

3000 -#: connect.c:500

3060 +#: connect.c:526

3061 #, c-format

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

3063 msgstr "無效的 ls-refs 回應：%s"

3064

3005 -#: connect.c:504

3065 +#: connect.c:530

3066 msgid "expected flush after ref listing"

3067 msgstr "在引用列表之後應該有一個 flush 包"

3068

3009 -#: connect.c:507

3069 +#: connect.c:533

3070 msgid "expected response end packet after ref listing"

3071 msgstr "在引用列表後預期要有回應結束封包"

3072

3013 -#: connect.c:640

3073 +#: connect.c:666

3074 #, c-format

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

3076 msgstr "不支援 '%s' 協定"

3077

3018 -#: connect.c:691

3078 +#: connect.c:717

3079 msgid "unable to set SO_KEEPALIVE on socket"

3080 msgstr "無法為 socket 設定 SO_KEEPALIVE"

3081

3022 -#: connect.c:731 connect.c:794

3082 +#: connect.c:757 connect.c:820

3083 #, c-format

3084 msgid "Looking up %s ... "

3085 msgstr "尋找 %s ... "

3086

3027 -#: connect.c:735

3087 +#: connect.c:761

3088 #, c-format

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

3090 msgstr "無法尋找 %s（埠 %s）（%s）"

3091

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

3033 -#: connect.c:739 connect.c:810

3093 +#: connect.c:765 connect.c:836

3094 #, c-format

3095 msgid ""

3096 "done.\n"

@@ -3039,7 +3099,7 @@ msgstr ""

3099 "完成。\n"

3100 "連線到 %s（埠 %s）... "

3101

3042 -#: connect.c:761 connect.c:838

3102 +#: connect.c:787 connect.c:864

3103 #, c-format

3104 msgid ""

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

@@ -3049,61 +3109,65 @@ msgstr ""

3109 "%s"

3110

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

3052 -#: connect.c:767 connect.c:844

3112 +#: connect.c:793 connect.c:870

3113 msgid "done."

3114 msgstr "完成。"

3115

3056 -#: connect.c:798

3116 +#: connect.c:824

3117 #, c-format

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

3119 msgstr "無法尋找 %s（%s）"

3120

3061 -#: connect.c:804

3121 +#: connect.c:830

3122 #, c-format

3123 msgid "unknown port %s"

3124 msgstr "未知埠 %s"

3125

3066 -#: connect.c:941 connect.c:1271

3126 +#: connect.c:967 connect.c:1299

3127 #, c-format

3128 msgid "strange hostname '%s' blocked"

3129 msgstr "已阻止奇怪的主機名稱 '%s'"

3130

3071 -#: connect.c:943

3131 +#: connect.c:969

3132 #, c-format

3133 msgid "strange port '%s' blocked"

3134 msgstr "已阻止奇怪的埠號 '%s'"

3135

3076 -#: connect.c:953

3136 +#: connect.c:979

3137 #, c-format

3138 msgid "cannot start proxy %s"

3139 msgstr "不能啟動代理 %s"

3140

3081 -#: connect.c:1024

3141 +#: connect.c:1050

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

3143 msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法"

3144

3085 -#: connect.c:1219

3145 +#: connect.c:1190

3146 +msgid "newline is forbidden in git:// hosts and repo paths"

3147 +msgstr "git:// 主機名稱和版本庫路徑中不能有換行"

3148 +

3149 +#: connect.c:1247

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

3151 msgstr "ssh 變體 'simple' 不支援 -4"

3152

3089 -#: connect.c:1231

3153 +#: connect.c:1259

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

3155 msgstr "ssh 變體 'simple' 不支援 -6"

3156

3093 -#: connect.c:1248

3157 +#: connect.c:1276

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

3159 msgstr "ssh 變體 'simple' 不支援設定埠"

3160

3097 -#: connect.c:1360

3161 +#: connect.c:1388

3162 #, c-format

3163 msgid "strange pathname '%s' blocked"

3164 msgstr "已阻止奇怪的路徑名 '%s'"

3165

3102 -#: connect.c:1408

3166 +#: connect.c:1436

3167 msgid "unable to fork"

3168 msgstr "無法 fork"

3169

3106 -#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45

3170 +#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45

3171 msgid "Checking connectivity"

3172 msgstr "正在檢查連通性"

3173

@@ -3353,6 +3417,11 @@ msgstr "來自 config 的資料島正規表示式有太多的捕獲組（最多

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

3418 msgstr "已標記 %d 個資料島，結束。\n"

3419

3420 +#: diff-merges.c:70

3421 +#, c-format

3422 +msgid "unknown value for --diff-merges: %s"

3423 +msgstr "--diff-merges 的值無效：%s"

3424 +

3425 #: diff-lib.c:534

3426 msgid "--merge-base does not work with ranges"

3427 msgstr "—merge-base 跟範圍無法搭配運作"

@@ -3437,30 +3506,30 @@ msgstr ""

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

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

3508

3440 -#: diff.c:4625

3509 +#: diff.c:4628

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

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

3512

3444 -#: diff.c:4628

3513 +#: diff.c:4631

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

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

3516

3448 -#: diff.c:4707

3517 +#: diff.c:4710

3518 msgid "--follow requires exactly one pathspec"

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

3520

3452 -#: diff.c:4755

3521 +#: diff.c:4758

3522 #, c-format

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

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

3525

3457 -#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303

3526 +#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306

3527 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3528 #, c-format

3529 msgid "%s expects a numerical value"

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

3531

3463 -#: diff.c:4792

3532 +#: diff.c:4795

3533 #, c-format

3534 msgid ""

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

@@ -3469,200 +3538,200 @@ msgstr ""

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

3539 "%s"

3540

3472 -#: diff.c:4877

3541 +#: diff.c:4880

3542 #, c-format

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

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

3545

3477 -#: diff.c:4901

3546 +#: diff.c:4904

3547 #, c-format

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

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

3550

3482 -#: diff.c:4915

3551 +#: diff.c:4918

3552 #, c-format

3553 msgid "unable to resolve '%s'"

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

3555

3487 -#: diff.c:4965 diff.c:4971

3556 +#: diff.c:4968 diff.c:4974

3557 #, c-format

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

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

3560

3492 -#: diff.c:4983

3561 +#: diff.c:4986

3562 #, c-format

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

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

3565

3497 -#: diff.c:5004

3566 +#: diff.c:5007

3567 #, c-format

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

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

3570

3502 -#: diff.c:5023

3571 +#: diff.c:5026

3572 #, c-format

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

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

3575

3507 -#: diff.c:5063

3576 +#: diff.c:5066

3577 msgid ""

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

3579 "\"histogram\""

3580 msgstr ""

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

3582

3514 -#: diff.c:5099 diff.c:5119

3583 +#: diff.c:5102 diff.c:5122

3584 #, c-format

3585 msgid "invalid argument to %s"

3586 msgstr "%s 的參數無效"

3587

3519 -#: diff.c:5223

3588 +#: diff.c:5226

3589 #, c-format

3590 msgid "invalid regex given to -I: '%s'"

3591 msgstr "傳入 -I 的正規表示式無效：「%s」"

3592

3524 -#: diff.c:5272

3593 +#: diff.c:5275

3594 #, c-format

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

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

3597

3529 -#: diff.c:5328

3598 +#: diff.c:5331

3599 #, c-format

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

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

3602

3534 -#: diff.c:5351

3603 +#: diff.c:5367

3604 msgid "Diff output format options"

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

3606

3538 -#: diff.c:5353 diff.c:5359

3607 +#: diff.c:5369 diff.c:5375

3608 msgid "generate patch"

3609 msgstr "生成修補檔"

3610

3542 -#: diff.c:5356 builtin/log.c:178

3611 +#: diff.c:5372 builtin/log.c:179

3612 msgid "suppress diff output"

3613 msgstr "不顯示差異輸出"

3614

3546 -#: diff.c:5361 diff.c:5475 diff.c:5482

3615 +#: diff.c:5377 diff.c:5491 diff.c:5498

3616 msgid "<n>"

3617 msgstr "<n>"

3618

3550 -#: diff.c:5362 diff.c:5365

3619 +#: diff.c:5378 diff.c:5381

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

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

3622

3554 -#: diff.c:5367

3623 +#: diff.c:5383

3624 msgid "generate the diff in raw format"

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

3626

3558 -#: diff.c:5370

3627 +#: diff.c:5386

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

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

3630

3562 -#: diff.c:5374

3631 +#: diff.c:5390

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

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

3634

3566 -#: diff.c:5378

3635 +#: diff.c:5394

3636 msgid "machine friendly --stat"

3637 msgstr "機器友好的 --stat"

3638

3570 -#: diff.c:5381

3639 +#: diff.c:5397

3640 msgid "output only the last line of --stat"

3641 msgstr "只輸出 --stat 的最後一行"

3642

3574 -#: diff.c:5383 diff.c:5391

3643 +#: diff.c:5399 diff.c:5407

3644 msgid "<param1,param2>..."

3645 msgstr "<參數1,參數2>..."

3646

3578 -#: diff.c:5384

3647 +#: diff.c:5400

3648 msgid ""

3649 "output the distribution of relative amount of changes for each sub-directory"

3650 msgstr "輸出每個子目錄相對變更的分布"

3651

3583 -#: diff.c:5388

3652 +#: diff.c:5404

3653 msgid "synonym for --dirstat=cumulative"

3654 msgstr "和 --dirstat=cumulative 同義"

3655

3587 -#: diff.c:5392

3656 +#: diff.c:5408

3657 msgid "synonym for --dirstat=files,param1,param2..."

3658 msgstr "是 --dirstat=files,param1,param2... 的同義詞"

3659

3591 -#: diff.c:5396

3660 +#: diff.c:5412

3661 msgid "warn if changes introduce conflict markers or whitespace errors"

3662 msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告"

3663

3595 -#: diff.c:5399

3664 +#: diff.c:5415

3665 msgid "condensed summary such as creations, renames and mode changes"

3666 msgstr "精簡摘要，例如建立、重新命名和模式變更"

3667

3599 -#: diff.c:5402

3668 +#: diff.c:5418

3669 msgid "show only names of changed files"

3670 msgstr "只顯示變更檔案的檔案名"

3671

3603 -#: diff.c:5405

3672 +#: diff.c:5421

3673 msgid "show only names and status of changed files"

3674 msgstr "只顯示變更檔案的檔案名和狀態"

3675

3607 -#: diff.c:5407

3676 +#: diff.c:5423

3677 msgid "<width>[,<name-width>[,<count>]]"

3678 msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"

3679

3611 -#: diff.c:5408

3680 +#: diff.c:5424

3681 msgid "generate diffstat"

3682 msgstr "生成差異統計（diffstat）"

3683

3615 -#: diff.c:5410 diff.c:5413 diff.c:5416

3684 +#: diff.c:5426 diff.c:5429 diff.c:5432

3685 msgid "<width>"

3686 msgstr "<寬度>"

3687

3619 -#: diff.c:5411

3688 +#: diff.c:5427

3689 msgid "generate diffstat with a given width"

3690 msgstr "使用提供的長度生成差異統計"

3691

3623 -#: diff.c:5414

3692 +#: diff.c:5430

3693 msgid "generate diffstat with a given name width"

3694 msgstr "使用提供的檔案名長度生成差異統計"

3695

3627 -#: diff.c:5417

3696 +#: diff.c:5433

3697 msgid "generate diffstat with a given graph width"

3698 msgstr "使用提供的圖形長度生成差異統計"

3699

3631 -#: diff.c:5419

3700 +#: diff.c:5435

3701 msgid "<count>"

3702 msgstr "<次數>"

3703

3635 -#: diff.c:5420

3704 +#: diff.c:5436

3705 msgid "generate diffstat with limited lines"

3706 msgstr "生成有限行數的差異統計"

3707

3639 -#: diff.c:5423

3708 +#: diff.c:5439

3709 msgid "generate compact summary in diffstat"

3710 msgstr "生成差異統計的簡潔摘要"

3711

3643 -#: diff.c:5426

3712 +#: diff.c:5442

3713 msgid "output a binary diff that can be applied"

3714 msgstr "輸出一個可以應用的二進位差異"

3715

3647 -#: diff.c:5429

3716 +#: diff.c:5445

3717 msgid "show full pre- and post-image object names on the \"index\" lines"

3718 msgstr "在 \"index\" 行顯示完整的前後物件名稱"

3719

3651 -#: diff.c:5431

3720 +#: diff.c:5447

3721 msgid "show colored diff"

3722 msgstr "顯示帶顏色的差異"

3723

3655 -#: diff.c:5432

3724 +#: diff.c:5448

3725 msgid "<kind>"

3726 msgstr "<類型>"

3727

3659 -#: diff.c:5433

3728 +#: diff.c:5449

3729 msgid ""

3730 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3731 "diff"

3732 msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元"

3733

3665 -#: diff.c:5436

3734 +#: diff.c:5452

3735 msgid ""

3736 "do not munge pathnames and use NULs as output field terminators in --raw or "

3737 "--numstat"

@@ -3670,299 +3739,311 @@ msgstr ""

3739 "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"

3740 "符"

3741

3673 -#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554

3742 +#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570

3743 msgid "<prefix>"

3744 msgstr "<前綴>"

3745

3677 -#: diff.c:5440

3746 +#: diff.c:5456

3747 msgid "show the given source prefix instead of \"a/\""

3748 msgstr "顯示提供的源前綴取代 \"a/\""

3749

3681 -#: diff.c:5443

3750 +#: diff.c:5459

3751 msgid "show the given destination prefix instead of \"b/\""

3752 msgstr "顯示提供的目標前綴取代 \"b/\""

3753

3685 -#: diff.c:5446

3754 +#: diff.c:5462

3755 msgid "prepend an additional prefix to every line of output"

3756 msgstr "輸出的每一行附加前綴"

3757

3689 -#: diff.c:5449

3758 +#: diff.c:5465

3759 msgid "do not show any source or destination prefix"

3760 msgstr "不顯示任何源和目標前綴"

3761

3693 -#: diff.c:5452

3762 +#: diff.c:5468

3763 msgid "show context between diff hunks up to the specified number of lines"

3764 msgstr "顯示指定行數的差異區塊間的上下文"

3765

3697 -#: diff.c:5456 diff.c:5461 diff.c:5466

3766 +#: diff.c:5472 diff.c:5477 diff.c:5482

3767 msgid "<char>"

3768 msgstr "<字元>"

3769

3701 -#: diff.c:5457

3770 +#: diff.c:5473

3771 msgid "specify the character to indicate a new line instead of '+'"

3772 msgstr "指定一個字元取代 '+' 來表示新的一行"

3773

3705 -#: diff.c:5462

3774 +#: diff.c:5478

3775 msgid "specify the character to indicate an old line instead of '-'"

3776 msgstr "指定一個字元取代 '-' 來表示舊的一行"

3777

3709 -#: diff.c:5467

3778 +#: diff.c:5483

3779 msgid "specify the character to indicate a context instead of ' '"

3780 msgstr "指定一個字元取代 ' ' 來表示一行上下文"

3781

3713 -#: diff.c:5470

3782 +#: diff.c:5486

3783 msgid "Diff rename options"

3784 msgstr "差異重新命名選項"

3785

3717 -#: diff.c:5471

3786 +#: diff.c:5487

3787 msgid "<n>[/<m>]"

3788 msgstr "<n>[/<m>]"

3789

3721 -#: diff.c:5472

3790 +#: diff.c:5488

3791 msgid "break complete rewrite changes into pairs of delete and create"

3792 msgstr "將完全重寫的變更打破為成對的刪除和建立"

3793

3725 -#: diff.c:5476

3794 +#: diff.c:5492

3795 msgid "detect renames"

3796 msgstr "檢測重新命名"

3797

3729 -#: diff.c:5480

3798 +#: diff.c:5496

3799 msgid "omit the preimage for deletes"

3800 msgstr "省略刪除變更的差異輸出"

3801

3733 -#: diff.c:5483

3802 +#: diff.c:5499

3803 msgid "detect copies"

3804 msgstr "檢測複製"

3805

3737 -#: diff.c:5487

3806 +#: diff.c:5503

3807 msgid "use unmodified files as source to find copies"

3808 msgstr "使用未修改的檔案做為發現複製的源"

3809

3741 -#: diff.c:5489

3810 +#: diff.c:5505

3811 msgid "disable rename detection"

3812 msgstr "停用重新命名偵測"

3813

3745 -#: diff.c:5492

3814 +#: diff.c:5508

3815 msgid "use empty blobs as rename source"

3816 msgstr "使用空的資料物件做為重新命名的源"

3817

3749 -#: diff.c:5494

3818 +#: diff.c:5510

3819 msgid "continue listing the history of a file beyond renames"

3820 msgstr "繼續列出檔案重新命名以外的歷史記錄"

3821

3753 -#: diff.c:5497

3822 +#: diff.c:5513

3823 msgid ""

3824 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3825 "given limit"

3826 msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"

3827

3759 -#: diff.c:5499

3828 +#: diff.c:5515

3829 msgid "Diff algorithm options"

3830 msgstr "差異演算法選項"

3831

3763 -#: diff.c:5501

3832 +#: diff.c:5517

3833 msgid "produce the smallest possible diff"

3834 msgstr "生成儘可能小的差異"

3835

3767 -#: diff.c:5504

3836 +#: diff.c:5520

3837 msgid "ignore whitespace when comparing lines"

3838 msgstr "行比較時忽略空白字元"

3839

3771 -#: diff.c:5507

3840 +#: diff.c:5523

3841 msgid "ignore changes in amount of whitespace"

3842 msgstr "忽略空白字元的變更"

3843

3775 -#: diff.c:5510

3844 +#: diff.c:5526

3845 msgid "ignore changes in whitespace at EOL"

3846 msgstr "忽略行尾的空白字元變更"

3847

3779 -#: diff.c:5513

3848 +#: diff.c:5529

3849 msgid "ignore carrier-return at the end of line"

3850 msgstr "忽略行尾的Enter符（CR）"

3851

3783 -#: diff.c:5516

3852 +#: diff.c:5532

3853 msgid "ignore changes whose lines are all blank"

3854 msgstr "忽略整行都是空白的變更"

3855

3787 -#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588

3856 +#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604

3857 msgid "<regex>"

3858 msgstr "<正則>"

3859

3791 -#: diff.c:5519

3860 +#: diff.c:5535

3861 msgid "ignore changes whose all lines match <regex>"

3862 msgstr "忽略整行符合 <regex> 的變更"

3863

3795 -#: diff.c:5522

3864 +#: diff.c:5538

3865 msgid "heuristic to shift diff hunk boundaries for easy reading"

3866 msgstr "啟發式轉換差異邊界以便閱讀"

3867

3799 -#: diff.c:5525

3868 +#: diff.c:5541

3869 msgid "generate diff using the \"patience diff\" algorithm"

3870 msgstr "使用 \"patience diff\" 演算法生成差異"

3871

3803 -#: diff.c:5529

3872 +#: diff.c:5545

3873 msgid "generate diff using the \"histogram diff\" algorithm"

3874 msgstr "使用 \"histogram diff\" 演算法生成差異"

3875

3807 -#: diff.c:5531

3876 +#: diff.c:5547

3877 msgid "<algorithm>"

3878 msgstr "<演算法>"

3879

3811 -#: diff.c:5532

3880 +#: diff.c:5548

3881 msgid "choose a diff algorithm"

3882 msgstr "選擇一個差異演算法"

3883

3815 -#: diff.c:5534

3884 +#: diff.c:5550

3885 msgid "<text>"

3886 msgstr "<文字>"

3887

3819 -#: diff.c:5535

3888 +#: diff.c:5551

3889 msgid "generate diff using the \"anchored diff\" algorithm"

3890 msgstr "使用 \"anchored diff\" 演算法生成差異"

3891

3823 -#: diff.c:5537 diff.c:5546 diff.c:5549

3892 +#: diff.c:5553 diff.c:5562 diff.c:5565

3893 msgid "<mode>"

3894 msgstr "<模式>"

3895

3827 -#: diff.c:5538

3896 +#: diff.c:5554

3897 msgid "show word diff, using <mode> to delimit changed words"

3898 msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞"

3899

3831 -#: diff.c:5541

3900 +#: diff.c:5557

3901 msgid "use <regex> to decide what a word is"

3902 msgstr "使用 <正規表示式> 確定何為一個詞"

3903

3835 -#: diff.c:5544

3904 +#: diff.c:5560

3905 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3906 msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"

3907

3839 -#: diff.c:5547

3908 +#: diff.c:5563

3909 msgid "moved lines of code are colored differently"

3910 msgstr "移動的程式碼行用不同方式著色"

3911

3843 -#: diff.c:5550

3912 +#: diff.c:5566

3913 msgid "how white spaces are ignored in --color-moved"

3914 msgstr "在 --color-moved 下如何忽略空白字元"

3915

3847 -#: diff.c:5553

3916 +#: diff.c:5569

3917 msgid "Other diff options"

3918 msgstr "其它差異選項"

3919

3851 -#: diff.c:5555

3920 +#: diff.c:5571

3921 msgid "when run from subdir, exclude changes outside and show relative paths"

3922 msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑"

3923

3855 -#: diff.c:5559

3924 +#: diff.c:5575

3925 msgid "treat all files as text"

3926 msgstr "把所有檔案當做文字處理"

3927

3859 -#: diff.c:5561

3928 +#: diff.c:5577

3929 msgid "swap two inputs, reverse the diff"

3930 msgstr "交換兩個輸入，反轉差異"

3931

3863 -#: diff.c:5563

3932 +#: diff.c:5579

3933 msgid "exit with 1 if there were differences, 0 otherwise"

3934 msgstr "有差異時離開碼為 1，否則為 0"

3935

3867 -#: diff.c:5565

3936 +#: diff.c:5581

3937 msgid "disable all output of the program"

3938 msgstr "停用本程式的所有輸出"

3939

3871 -#: diff.c:5567

3940 +#: diff.c:5583

3941 msgid "allow an external diff helper to be executed"

3942 msgstr "允許執行一個外部的差異協助工具"

3943

3875 -#: diff.c:5569

3944 +#: diff.c:5585

3945 msgid "run external text conversion filters when comparing binary files"

3946 msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器"

3947

3879 -#: diff.c:5571

3948 +#: diff.c:5587

3949 msgid "<when>"

3950 msgstr "<何時>"

3951

3883 -#: diff.c:5572

3952 +#: diff.c:5588

3953 msgid "ignore changes to submodules in the diff generation"

3954 msgstr "在生成差異時，忽略子模組的更改"

3955

3887 -#: diff.c:5575

3956 +#: diff.c:5591

3957 msgid "<format>"

3958 msgstr "<格式>"

3959

3891 -#: diff.c:5576

3960 +#: diff.c:5592

3961 msgid "specify how differences in submodules are shown"

3962 msgstr "指定子模組的差異如何顯示"

3963

3895 -#: diff.c:5580

3964 +#: diff.c:5596

3965 msgid "hide 'git add -N' entries from the index"

3966 msgstr "隱藏索引中 'git add -N' 條目"

3967

3899 -#: diff.c:5583

3968 +#: diff.c:5599

3969 msgid "treat 'git add -N' entries as real in the index"

3970 msgstr "將索引中 'git add -N' 條目當做真實的"

3971

3903 -#: diff.c:5585

3972 +#: diff.c:5601

3973 msgid "<string>"

3974 msgstr "<字串>"

3975

3907 -#: diff.c:5586

3976 +#: diff.c:5602

3977 msgid ""

3978 "look for differences that change the number of occurrences of the specified "

3979 "string"

3980 msgstr "尋找改變了指定字串出現次數的差異"

3981

3913 -#: diff.c:5589

3982 +#: diff.c:5605

3983 msgid ""

3984 "look for differences that change the number of occurrences of the specified "

3985 "regex"

3986 msgstr "尋找改變指定正則符合出現次數的差異"

3987

3919 -#: diff.c:5592

3988 +#: diff.c:5608

3989 msgid "show all changes in the changeset with -S or -G"

3990 msgstr "顯示使用 -S 或 -G 的變更集的所有變更"

3991

3923 -#: diff.c:5595

3992 +#: diff.c:5611

3993 msgid "treat <string> in -S as extended POSIX regular expression"

3994 msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式"

3995

3927 -#: diff.c:5598

3996 +#: diff.c:5614

3997 msgid "control the order in which files appear in the output"

3998 msgstr "控制輸出中的檔案顯示順序"

3999

3931 -#: diff.c:5599

4000 +#: diff.c:5615 diff.c:5618

4001 +msgid "<path>"

4002 +msgstr "<路徑>"

4003 +

4004 +#: diff.c:5616

4005 +msgid "show the change in the specified path first"

4006 +msgstr "先顯示指定路徑的變更"

4007 +

4008 +#: diff.c:5619

4009 +msgid "skip the output to the specified path"

4010 +msgstr ""

4011 +

4012 +#: diff.c:5621

4013 msgid "<object-id>"

4014 msgstr "<物件 ID>"

4015

3935 -#: diff.c:5600

4016 +#: diff.c:5622

4017 msgid ""

4018 "look for differences that change the number of occurrences of the specified "

4019 "object"

4020 msgstr "尋找改變指定物件出現次數的差異"

4021

3941 -#: diff.c:5602

4022 +#: diff.c:5624

4023 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

4024 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

4025

3945 -#: diff.c:5603

4026 +#: diff.c:5625

4027 msgid "select files by diff type"

4028 msgstr "透過差異類型選擇檔案"

4029

3949 -#: diff.c:5605

4030 +#: diff.c:5627

4031 msgid "<file>"

4032 msgstr "<檔案>"

4033

3953 -#: diff.c:5606

4034 +#: diff.c:5628

4035 msgid "Output to a specific file"

4036 msgstr "輸出到一個指定的檔案"

4037

3957 -#: diff.c:6263

4038 +#: diff.c:6285

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

4040 msgstr "因為檔案太多，略過不嚴格的重新命名檢查。"

4041

3961 -#: diff.c:6266

4042 +#: diff.c:6288

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

4044 msgstr "因為檔案太多，只在修改的路徑中尋找複製。"

4045

3965 -#: diff.c:6269

4046 +#: diff.c:6291

4047 #, c-format

4048 msgid ""

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

@@ -3973,10 +4054,15 @@ msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令

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

4055 msgstr "讀取排序檔案 '%s' 失敗"

4056

3976 -#: diffcore-rename.c:592

4057 +#: diffcore-rename.c:786

4058 msgid "Performing inexact rename detection"

4059 msgstr "正在進行非精確的重新命名偵測"

4060

4061 +#: diffcore-rotate.c:29

4062 +#, c-format

4063 +msgid "No such path '%s' in the diff"

4064 +msgstr "diff 中沒有「%s」路徑"

4065 +

4066 #: dir.c:578

4067 #, c-format

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

@@ -4019,17 +4105,17 @@ msgstr "無法獲得核心名稱和訊息"

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

4106 msgstr "快取未追蹤檔案在本系統或位置中被停用"

4107

4022 -#: dir.c:3520

4108 +#: dir.c:3534

4109 #, c-format

4110 msgid "index file corrupt in repo %s"

4111 msgstr "版本庫 %s 中的索引檔案損壞"

4112

4027 -#: dir.c:3565 dir.c:3570

4113 +#: dir.c:3579 dir.c:3584

4114 #, c-format

4115 msgid "could not create directories for %s"

4116 msgstr "不能為 %s 建立目錄"

4117

4032 -#: dir.c:3599

4118 +#: dir.c:3613

4119 #, c-format

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

4121 msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"

@@ -4048,12 +4134,12 @@ msgstr "過濾內容"

4134 msgid "could not stat file '%s'"

4135 msgstr "不能對檔案 '%s' 呼叫 stat"

4136

4051 -#: environment.c:150

4137 +#: environment.c:152

4138 #, c-format

4139 msgid "bad git namespace path \"%s\""

4140 msgstr "錯誤的 git 名字空間路徑 \"%s\""

4141

4056 -#: environment.c:337

4142 +#: environment.c:335

4143 #, c-format

4144 msgid "could not set GIT_DIR to '%s'"

4145 msgstr "不能設定 GIT_DIR 為 '%s'"

@@ -4088,32 +4174,32 @@ msgstr "無法寫到遠端"

4174 msgid "--stateless-rpc requires multi_ack_detailed"

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

4176

4091 -#: fetch-pack.c:378 fetch-pack.c:1406

4177 +#: fetch-pack.c:378 fetch-pack.c:1457

4178 #, c-format

4179 msgid "invalid shallow line: %s"

4180 msgstr "無效的 shallow 訊息：%s"

4181

4096 -#: fetch-pack.c:384 fetch-pack.c:1412

4182 +#: fetch-pack.c:384 fetch-pack.c:1463

4183 #, c-format

4184 msgid "invalid unshallow line: %s"

4185 msgstr "無效的 unshallow 訊息：%s"

4186

4101 -#: fetch-pack.c:386 fetch-pack.c:1414

4187 +#: fetch-pack.c:386 fetch-pack.c:1465

4188 #, c-format

4189 msgid "object not found: %s"

4190 msgstr "物件未找到：%s"

4191

4106 -#: fetch-pack.c:389 fetch-pack.c:1417

4192 +#: fetch-pack.c:389 fetch-pack.c:1468

4193 #, c-format

4194 msgid "error in object: %s"

4195 msgstr "物件中發生錯誤：%s"

4196

4111 -#: fetch-pack.c:391 fetch-pack.c:1419

4197 +#: fetch-pack.c:391 fetch-pack.c:1470

4198 #, c-format

4199 msgid "no shallow found: %s"

4200 msgstr "未發現 shallow：%s"

4201

4116 -#: fetch-pack.c:394 fetch-pack.c:1423

4202 +#: fetch-pack.c:394 fetch-pack.c:1474

4203 #, c-format

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

4205 msgstr "應為 shallow/unshallow，卻得到 %s"

@@ -4151,171 +4237,175 @@ msgstr "標記 %s 為完成"

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

4238 msgstr "已經有 %s（%s）"

4239

4154 -#: fetch-pack.c:827

4240 +#: fetch-pack.c:844

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

4242 msgstr "fetch-pack：無法衍生 sideband 多路輸出"

4243

4158 -#: fetch-pack.c:835

4244 +#: fetch-pack.c:852

4245 msgid "protocol error: bad pack header"

4246 msgstr "協定錯誤：壞的包頭"

4247

4162 -#: fetch-pack.c:919

4248 +#: fetch-pack.c:946

4249 #, c-format

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

4165 -msgstr "fetch-pack：無法衍生進程 %s"

4251 +msgstr "fetch-pack：無法 fork %s 處理程序"

4252 +

4253 +#: fetch-pack.c:952

4254 +msgid "fetch-pack: invalid index-pack output"

4255 +msgstr "fetch-pack：無效的 index-pack 輸出"

4256

4167 -#: fetch-pack.c:937

4257 +#: fetch-pack.c:969

4258 #, c-format

4259 msgid "%s failed"

4260 msgstr "%s 失敗"

4261

4172 -#: fetch-pack.c:939

4262 +#: fetch-pack.c:971

4263 msgid "error in sideband demultiplexer"

4264 msgstr "sideband 多路輸出發生錯誤"

4265

4176 -#: fetch-pack.c:982

4266 +#: fetch-pack.c:1031

4267 #, c-format

4268 msgid "Server version is %.*s"

4269 msgstr "伺服器版本 %.*s"

4270

4181 -#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005

4182 -#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021

4183 -#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037

4184 -#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059

4271 +#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054

4272 +#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070

4273 +#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086

4274 +#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108

4275 #, c-format

4276 msgid "Server supports %s"

4277 msgstr "伺服器支援 %s"

4278

4189 -#: fetch-pack.c:992

4279 +#: fetch-pack.c:1041

4280 msgid "Server does not support shallow clients"

4281 msgstr "伺服器不支援 shalllow 用戶端"

4282

4193 -#: fetch-pack.c:1052

4283 +#: fetch-pack.c:1101

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

4285 msgstr "伺服器不支援 --shallow-since"

4286

4197 -#: fetch-pack.c:1057

4287 +#: fetch-pack.c:1106

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

4289 msgstr "伺服器不支援 --shallow-exclude"

4290

4201 -#: fetch-pack.c:1061

4291 +#: fetch-pack.c:1110

4292 msgid "Server does not support --deepen"

4293 msgstr "伺服器不支援 --deepen"

4294

4205 -#: fetch-pack.c:1063

4295 +#: fetch-pack.c:1112

4296 msgid "Server does not support this repository's object format"

4297 msgstr "伺服器不支援此版本庫的物件格式"

4298

4209 -#: fetch-pack.c:1076

4299 +#: fetch-pack.c:1125

4300 msgid "no common commits"

4301 msgstr "沒有共同的提交"

4302

4213 -#: fetch-pack.c:1088 fetch-pack.c:1628

4303 +#: fetch-pack.c:1138 fetch-pack.c:1682

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

4305 msgstr "git fetch-pack：取得失敗。"

4306

4217 -#: fetch-pack.c:1214

4307 +#: fetch-pack.c:1265

4308 #, c-format

4309 msgid "mismatched algorithms: client %s; server %s"

4310 msgstr "算法不一致：用戶端 %s；伺服器 %s"

4311

4222 -#: fetch-pack.c:1218

4312 +#: fetch-pack.c:1269

4313 #, c-format

4314 msgid "the server does not support algorithm '%s'"

4315 msgstr "伺服器不支援「%s」算法"

4316

4227 -#: fetch-pack.c:1238

4317 +#: fetch-pack.c:1289

4318 msgid "Server does not support shallow requests"

4319 msgstr "伺服器不支援 shalllow 請求"

4320

4231 -#: fetch-pack.c:1245

4321 +#: fetch-pack.c:1296

4322 msgid "Server supports filter"

4323 msgstr "伺服器支援 filter"

4324

4235 -#: fetch-pack.c:1284

4325 +#: fetch-pack.c:1335

4326 msgid "unable to write request to remote"

4327 msgstr "無法將請求寫到遠端"

4328

4239 -#: fetch-pack.c:1302

4329 +#: fetch-pack.c:1353

4330 #, c-format

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

4332 msgstr "讀取節標題 '%s' 發生錯誤"

4333

4244 -#: fetch-pack.c:1308

4334 +#: fetch-pack.c:1359

4335 #, c-format

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

4337 msgstr "預期 '%s'，得到 '%s'"

4338

4249 -#: fetch-pack.c:1369

4339 +#: fetch-pack.c:1420

4340 #, c-format

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

4342 msgstr "意外的確認行：'%s'"

4343

4254 -#: fetch-pack.c:1374

4344 +#: fetch-pack.c:1425

4345 #, c-format

4346 msgid "error processing acks: %d"

4347 msgstr "處理 ack 發生錯誤：%d"

4348

4259 -#: fetch-pack.c:1384

4349 +#: fetch-pack.c:1435

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

4351 msgstr "預期在 'ready' 之後傳送 packfile"

4352

4263 -#: fetch-pack.c:1386

4353 +#: fetch-pack.c:1437

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

4355 msgstr "在沒有 'ready' 不應該傳送其它小節"

4356

4267 -#: fetch-pack.c:1428

4357 +#: fetch-pack.c:1479

4358 #, c-format

4359 msgid "error processing shallow info: %d"

4360 msgstr "處理淺複製訊息發生錯誤：%d"

4361

4272 -#: fetch-pack.c:1475

4362 +#: fetch-pack.c:1526

4363 #, c-format

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

4365 msgstr "預期 wanted-ref，得到 '%s'"

4366

4277 -#: fetch-pack.c:1480

4367 +#: fetch-pack.c:1531

4368 #, c-format

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

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

4371

4282 -#: fetch-pack.c:1485

4372 +#: fetch-pack.c:1536

4373 #, c-format

4374 msgid "error processing wanted refs: %d"

4375 msgstr "處理要取得的引用發生錯誤：%d"

4376

4287 -#: fetch-pack.c:1515

4377 +#: fetch-pack.c:1566

4378 msgid "git fetch-pack: expected response end packet"

4379 msgstr "git fetch-pack: 預期要有回應結束封包"

4380

4291 -#: fetch-pack.c:1897

4381 +#: fetch-pack.c:1960

4382 msgid "no matching remote head"

4383 msgstr "沒有符合的遠端分支"

4384

4295 -#: fetch-pack.c:1920 builtin/clone.c:693

4385 +#: fetch-pack.c:1983 builtin/clone.c:693

4386 msgid "remote did not send all necessary objects"

4387 msgstr "遠端沒有傳送所有必需的物件"

4388

4299 -#: fetch-pack.c:1947

4389 +#: fetch-pack.c:2010

4390 #, c-format

4391 msgid "no such remote ref %s"

4392 msgstr "沒有這樣的遠端引用 %s"

4393

4304 -#: fetch-pack.c:1950

4394 +#: fetch-pack.c:2013

4395 #, c-format

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

4397 msgstr "伺服器不允許請求未公開的物件 %s"

4398

4309 -#: gpg-interface.c:272

4399 +#: gpg-interface.c:273

4400 msgid "could not create temporary file"

4401 msgstr "不能建立暫存檔"

4402

4313 -#: gpg-interface.c:275

4403 +#: gpg-interface.c:276

4404 #, c-format

4405 msgid "failed writing detached signature to '%s'"

4406 msgstr "無法將分離式簽名寫入 '%s'"

4407

4318 -#: gpg-interface.c:457

4408 +#: gpg-interface.c:470

4409 msgid "gpg failed to sign the data"

4410 msgstr "gpg 無法為資料簽名"

4411

@@ -4324,7 +4414,7 @@ msgstr "gpg 無法為資料簽名"

4414 msgid "ignore invalid color '%.*s' in log.graphColors"

4415 msgstr "忽略 log.graphColors 中無效的顏色 '%.*s'"

4416

4327 -#: grep.c:640

4417 +#: grep.c:543

4418 msgid ""

4419 "given pattern contains NULL byte (via -f <file>). This is only supported "

4420 "with -P under PCRE v2"

@@ -4332,18 +4422,18 @@ msgstr ""

4422 "提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此"

4423 "功能"

4424

4335 -#: grep.c:2100

4425 +#: grep.c:1906

4426 #, c-format

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

4428 msgstr "'%s'：無法讀取 %s"

4429

4340 -#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89

4430 +#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90

4431 #: builtin/rm.c:135

4432 #, c-format

4433 msgid "failed to stat '%s'"

4434 msgstr "對 '%s' 呼叫 stat 失敗"

4435

4346 -#: grep.c:2128

4436 +#: grep.c:1934

4437 #, c-format

4438 msgid "'%s': short read"

4439 msgstr "'%s'：讀取不完整"

@@ -4413,7 +4503,7 @@ msgstr "在 $PATH 路徑中的其他地方可用的 git 指令"

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

4504 msgstr "這些是各種場合常見的 Git 指令："

4505

4416 -#: help.c:365 git.c:99

4506 +#: help.c:365 git.c:100

4507 #, c-format

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

4509 msgstr "不支援的指令列表類型 '%s'"

@@ -4642,122 +4732,50 @@ msgstr ""

4732 msgid "Unable to create '%s.lock': %s"

4733 msgstr "不能建立 '%s.lock'：%s"

4734

4645 -#: ls-refs.c:109

4646 -msgid "expected flush after ls-refs arguments"

4647 -msgstr "在 ls-refs 引數之後應該有一個 flush 包"

4648 -

4649 -#: merge-ort-wrappers.c:13 merge-recursive.c:3672

4650 -#, c-format

4651 -msgid ""

4652 -"Your local changes to the following files would be overwritten by merge:\n"

4653 -" %s"

4654 -msgstr ""

4655 -"您對下列檔案的本機修改將被合併動作覆蓋：\n"

4656 -" %s"

4657 -

4658 -#: merge-ort-wrappers.c:33 merge-recursive.c:3436

4659 -#, c-format

4660 -msgid "Already up to date!"

4661 -msgstr "已經是最新的！"

4662 -

4663 -#: merge-recursive.c:356

4664 -msgid "(bad commit)\n"

4665 -msgstr "（壞提交）\n"

4666 -

4667 -#: merge-recursive.c:379

4668 -#, c-format

4669 -msgid "add_cacheinfo failed for path '%s'; merge aborting."

4670 -msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。"

4671 -

4672 -#: merge-recursive.c:388

4673 -#, c-format

4674 -msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

4675 -msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。"

4676 -

4677 -#: merge-recursive.c:874

4678 -#, c-format

4679 -msgid "failed to create path '%s'%s"

4680 -msgstr "建立路徑 '%s'%s 失敗"

4681 -

4682 -#: merge-recursive.c:885

4683 -#, c-format

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

4685 -msgstr "刪除 %s 以便為子目錄留出空間\n"

4686 -

4687 -#: merge-recursive.c:899 merge-recursive.c:918

4688 -msgid ": perhaps a D/F conflict?"

4689 -msgstr "：可能是一個目錄/檔案衝突？"

4690 -

4691 -#: merge-recursive.c:908

4692 -#, c-format

4693 -msgid "refusing to lose untracked file at '%s'"

4694 -msgstr "拒絕捨棄 '%s' 中的未追蹤檔案"

4695 -

4696 -#: merge-recursive.c:949 builtin/cat-file.c:41

4697 -#, c-format

4698 -msgid "cannot read object %s '%s'"

4699 -msgstr "不能讀取物件 %s '%s'"

4700 -

4701 -#: merge-recursive.c:954

4702 -#, c-format

4703 -msgid "blob expected for %s '%s'"

4704 -msgstr "%s '%s' 應為資料物件"

4705 -

4706 -#: merge-recursive.c:979

4707 -#, c-format

4708 -msgid "failed to open '%s': %s"

4709 -msgstr "開啟 '%s' 失敗：%s"

4710 -

4711 -#: merge-recursive.c:990

4735 +#: ls-refs.c:37

4736 #, c-format

4713 -msgid "failed to symlink '%s': %s"

4714 -msgstr "建立符號連結 '%s' 失敗：%s"

4737 +msgid "invalid value '%s' for lsrefs.unborn"

4738 +msgstr "lsrefs.unborn 的值「%s」無效"

4739

4716 -#: merge-recursive.c:995

4717 -#, c-format

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

4719 -msgstr "不知道如何處理 %06o %s '%s'"

4740 +#: ls-refs.c:167

4741 +msgid "expected flush after ls-refs arguments"

4742 +msgstr "在 ls-refs 引數之後應該有一個 flush 包"

4743

4721 -#: merge-recursive.c:1191

4744 +#: merge-ort.c:888 merge-recursive.c:1191

4745 #, c-format

4746 msgid "Failed to merge submodule %s (not checked out)"

4747 msgstr "無法合併子模組 %s （沒有檢出）"

4748

4726 -#: merge-recursive.c:1198

4749 +#: merge-ort.c:897 merge-recursive.c:1198

4750 #, c-format

4751 msgid "Failed to merge submodule %s (commits not present)"

4752 msgstr "無法合併子模組 %s（提交不存在）"

4753

4731 -#: merge-recursive.c:1205

4754 +#: merge-ort.c:906 merge-recursive.c:1205

4755 #, c-format

4756 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4757 msgstr "無法合併子模組 %s （提交未跟隨合併基礎）"

4758

4736 -#: merge-recursive.c:1213 merge-recursive.c:1225

4737 -#, c-format

4738 -msgid "Fast-forwarding submodule %s to the following commit:"

4739 -msgstr "子模組 %s 快轉到如下提交："

4740 -

4741 -#: merge-recursive.c:1216 merge-recursive.c:1228

4759 +#: merge-ort.c:916 merge-ort.c:923

4760 #, c-format

4743 -msgid "Fast-forwarding submodule %s"

4744 -msgstr "快轉子模組 %s"

4761 +msgid "Note: Fast-forwarding submodule %s to %s"

4762 +msgstr "注意：正在將 %s 子模組快轉到 %s"

4763

4746 -#: merge-recursive.c:1251

4764 +#: merge-ort.c:944

4765 #, c-format

4748 -msgid "Failed to merge submodule %s (merge following commits not found)"

4749 -msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）"

4766 +msgid "Failed to merge submodule %s"

4767 +msgstr "無法合併 %s 子模組"

4768

4751 -#: merge-recursive.c:1255

4769 +#: merge-ort.c:951

4770 #, c-format

4753 -msgid "Failed to merge submodule %s (not fast-forward)"

4754 -msgstr "無法合併子模組 %s（非快轉）"

4755 -

4756 -#: merge-recursive.c:1256

4757 -msgid "Found a possible merge resolution for the submodule:\n"

4758 -msgstr "找到子模組的一個可能的合併方案：\n"

4771 +msgid ""

4772 +"Failed to merge submodule %s, but a possible merge resolution exists:\n"

4773 +"%s\n"

4774 +msgstr ""

4775 +"無法合併 %s 子模組，但有找到一個可行的合併方案：\n"

4776 +"%s\n"

4777

4760 -#: merge-recursive.c:1259

4778 +#: merge-ort.c:955 merge-recursive.c:1259

4779 #, c-format

4780 msgid ""

4781 "If this is correct simply add it to the index for example\n"

@@ -4773,67 +4791,328 @@ msgstr ""

4791 "\n"

4792 "以接受此建議。\n"

4793

4776 -#: merge-recursive.c:1268

4794 +#: merge-ort.c:968

4795 #, c-format

4778 -msgid "Failed to merge submodule %s (multiple merges found)"

4779 -msgstr "無法合併子模組 %s （發現多個合併）"

4796 +msgid ""

4797 +"Failed to merge submodule %s, but multiple possible merges exist:\n"

4798 +"%s"

4799 +msgstr ""

4800 +"無法合併 %s 子模組，但有找到幾個可行的合併方案：\n"

4801 +"%s"

4802

4781 -#: merge-recursive.c:1341

4803 +#: merge-ort.c:1127 merge-recursive.c:1341

4804 msgid "Failed to execute internal merge"

4805 msgstr "無法執行內部合併"

4806

4785 -#: merge-recursive.c:1346

4807 +#: merge-ort.c:1132 merge-recursive.c:1346

4808 #, c-format

4809 msgid "Unable to add %s to database"

4810 msgstr "不能新增 %s 至物件庫"

4811

4790 -#: merge-recursive.c:1378

4812 +#: merge-ort.c:1139 merge-recursive.c:1378

4813 #, c-format

4814 msgid "Auto-merging %s"

4815 msgstr "自動合併 %s"

4816

4795 -#: merge-recursive.c:1402

4817 +#: merge-ort.c:1278 merge-recursive.c:2100

4818 #, c-format

4797 -msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

4798 -msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。"

4819 +msgid ""

4820 +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

4821 +"implicit directory rename(s) putting the following path(s) there: %s."

4822 +msgstr ""

4823 +"衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑"

4824 +"放在：%s。"

4825

4800 -#: merge-recursive.c:1474

4826 +#: merge-ort.c:1288 merge-recursive.c:2110

4827 #, c-format

4828 msgid ""

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

4804 -"in tree."

4829 +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

4830 +"implicit directory renames tried to put these paths there: %s"

4831 msgstr ""

4806 -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

4807 -"本被保留。"

4832 +"衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這"

4833 +"些路徑放置於此：%s"

4834

4809 -#: merge-recursive.c:1479

4810 -#, c-format

4835 +#: merge-ort.c:1471

4836 +#, fuzzy, c-format

4837 +#| msgid ""

4838 +#| "CONFLICT (directory rename split): Unclear where to place %s because "

4839 +#| "directory %s was renamed to multiple other directories, with no "

4840 +#| "destination getting a majority of the files."

4841 msgid ""

4812 -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

4813 -"left in tree."

4842 +"CONFLICT (directory rename split): Unclear where to rename %s to; it was "

4843 +"renamed to multiple other directories, with no destination getting a "

4844 +"majority of the files."

4845 msgstr ""

4815 -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

4816 -"%7$s 版本被保留。"

4846 +"衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到"

4847 +"多個其它目錄，沒有目錄包含大部分檔案。"

4848

4818 -#: merge-recursive.c:1486

4849 +#: merge-ort.c:1637 merge-recursive.c:2447

4850 #, c-format

4851 msgid ""

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

4822 -"in tree at %s."

4823 -msgstr ""

4824 -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

4825 -"本保留在 %8$s 中。"

4852 +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

4853 +"renamed."

4854 +msgstr "警告：避免應用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。"

4855

4827 -#: merge-recursive.c:1491

4856 +#: merge-ort.c:1781 merge-recursive.c:3215

4857 #, c-format

4858 msgid ""

4830 -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

4831 -"left in tree at %s."

4859 +"Path updated: %s added in %s inside a directory that was renamed in %s; "

4860 +"moving it to %s."

4861 msgstr ""

4833 -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

4834 -"%7$s 版本保留在 %9$s 中。"

4862 +"路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"

4863

4836 -#: merge-recursive.c:1526

4864 +#: merge-ort.c:1788 merge-recursive.c:3222

4865 +#, c-format

4866 +msgid ""

4867 +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

4868 +"%s; moving it to %s."

4869 +msgstr ""

4870 +"路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將"

4871 +"其移動到 %5$s。"

4872 +

4873 +#: merge-ort.c:1801 merge-recursive.c:3218

4874 +#, c-format

4875 +msgid ""

4876 +"CONFLICT (file location): %s added in %s inside a directory that was renamed "

4877 +"in %s, suggesting it should perhaps be moved to %s."

4878 +msgstr ""

4879 +"衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移"

4880 +"動到 %s。"

4881 +

4882 +#: merge-ort.c:1809 merge-recursive.c:3225

4883 +#, c-format

4884 +msgid ""

4885 +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

4886 +"was renamed in %s, suggesting it should perhaps be moved to %s."

4887 +msgstr ""

4888 +"衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s "

4889 +"中，建議將其移動到 %5$s。"

4890 +

4891 +#: merge-ort.c:1952

4892 +#, fuzzy, c-format

4893 +#| msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

4894 +msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."

4895 +msgstr ""

4896 +"衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 "

4897 +"%4$s->%5$s"

4898 +

4899 +#: merge-ort.c:2047

4900 +#, c-format

4901 +msgid ""

4902 +"CONFLICT (rename involved in collision): rename of %s -> %s has content "

4903 +"conflicts AND collides with another path; this may result in nested conflict "

4904 +"markers."

4905 +msgstr ""

4906 +

4907 +#: merge-ort.c:2066 merge-ort.c:2090

4908 +#, fuzzy, c-format

4909 +#| msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

4910 +msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

4911 +msgstr ""

4912 +"衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"

4913 +

4914 +#: merge-ort.c:2735

4915 +#, c-format

4916 +msgid ""

4917 +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "

4918 +"%s instead."

4919 +msgstr ""

4920 +

4921 +#: merge-ort.c:2808

4922 +#, c-format

4923 +msgid ""

4924 +"CONFLICT (distinct types): %s had different types on each side; renamed %s "

4925 +"of them so each can be recorded somewhere."

4926 +msgstr ""

4927 +

4928 +#: merge-ort.c:2812

4929 +msgid "both"

4930 +msgstr "雙方"

4931 +

4932 +#: merge-ort.c:2812

4933 +msgid "one"

4934 +msgstr "一方"

4935 +

4936 +#: merge-ort.c:2907 merge-recursive.c:3052

4937 +msgid "content"

4938 +msgstr "內容"

4939 +

4940 +#: merge-ort.c:2909 merge-recursive.c:3056

4941 +msgid "add/add"

4942 +msgstr "新增/新增"

4943 +

4944 +#: merge-ort.c:2911 merge-recursive.c:3101

4945 +msgid "submodule"

4946 +msgstr "子模組"

4947 +

4948 +#: merge-ort.c:2913 merge-recursive.c:3102

4949 +#, c-format

4950 +msgid "CONFLICT (%s): Merge conflict in %s"

4951 +msgstr "衝突（%s）：合併衝突於 %s"

4952 +

4953 +#: merge-ort.c:2938

4954 +#, fuzzy, c-format

4955 +#| msgid ""

4956 +#| "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s "

4957 +#| "left in tree."

4958 +msgid ""

4959 +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

4960 +"of %s left in tree."

4961 +msgstr ""

4962 +"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

4963 +"本被保留。"

4964 +

4965 +#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

4966 +#. base, and 2-3) the trees for the two trees we're merging.

4967 +#.

4968 +#: merge-ort.c:3406

4969 +#, c-format

4970 +msgid "collecting merge info failed for trees %s, %s, %s"

4971 +msgstr "%s, %s, %s 樹的合併資訊收集失敗"

4972 +

4973 +#: merge-ort-wrappers.c:13 merge-recursive.c:3661

4974 +#, c-format

4975 +msgid ""

4976 +"Your local changes to the following files would be overwritten by merge:\n"

4977 +" %s"

4978 +msgstr ""

4979 +"您對下列檔案的本機修改將被合併動作覆蓋：\n"

4980 +" %s"

4981 +

4982 +#: merge-ort-wrappers.c:33 merge-recursive.c:3436

4983 +#, c-format

4984 +msgid "Already up to date!"

4985 +msgstr "已經是最新的！"

4986 +

4987 +#: merge-recursive.c:356

4988 +msgid "(bad commit)\n"

4989 +msgstr "（壞提交）\n"

4990 +

4991 +#: merge-recursive.c:379

4992 +#, c-format

4993 +msgid "add_cacheinfo failed for path '%s'; merge aborting."

4994 +msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。"

4995 +

4996 +#: merge-recursive.c:388

4997 +#, c-format

4998 +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

4999 +msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。"

5000 +

5001 +#: merge-recursive.c:874

5002 +#, c-format

5003 +msgid "failed to create path '%s'%s"

5004 +msgstr "建立路徑 '%s'%s 失敗"

5005 +

5006 +#: merge-recursive.c:885

5007 +#, c-format

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

5009 +msgstr "刪除 %s 以便為子目錄留出空間\n"

5010 +

5011 +#: merge-recursive.c:899 merge-recursive.c:918

5012 +msgid ": perhaps a D/F conflict?"

5013 +msgstr "：可能是一個目錄/檔案衝突？"

5014 +

5015 +#: merge-recursive.c:908

5016 +#, c-format

5017 +msgid "refusing to lose untracked file at '%s'"

5018 +msgstr "拒絕捨棄 '%s' 中的未追蹤檔案"

5019 +

5020 +#: merge-recursive.c:949 builtin/cat-file.c:41

5021 +#, c-format

5022 +msgid "cannot read object %s '%s'"

5023 +msgstr "不能讀取物件 %s '%s'"

5024 +

5025 +#: merge-recursive.c:954

5026 +#, c-format

5027 +msgid "blob expected for %s '%s'"

5028 +msgstr "%s '%s' 應為資料物件"

5029 +

5030 +#: merge-recursive.c:979

5031 +#, c-format

5032 +msgid "failed to open '%s': %s"

5033 +msgstr "開啟 '%s' 失敗：%s"

5034 +

5035 +#: merge-recursive.c:990

5036 +#, c-format

5037 +msgid "failed to symlink '%s': %s"

5038 +msgstr "建立符號連結 '%s' 失敗：%s"

5039 +

5040 +#: merge-recursive.c:995

5041 +#, c-format

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

5043 +msgstr "不知道如何處理 %06o %s '%s'"

5044 +

5045 +#: merge-recursive.c:1213 merge-recursive.c:1225

5046 +#, c-format

5047 +msgid "Fast-forwarding submodule %s to the following commit:"

5048 +msgstr "子模組 %s 快轉到如下提交："

5049 +

5050 +#: merge-recursive.c:1216 merge-recursive.c:1228

5051 +#, c-format

5052 +msgid "Fast-forwarding submodule %s"

5053 +msgstr "快轉子模組 %s"

5054 +

5055 +#: merge-recursive.c:1251

5056 +#, c-format

5057 +msgid "Failed to merge submodule %s (merge following commits not found)"

5058 +msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）"

5059 +

5060 +#: merge-recursive.c:1255

5061 +#, c-format

5062 +msgid "Failed to merge submodule %s (not fast-forward)"

5063 +msgstr "無法合併子模組 %s（非快轉）"

5064 +

5065 +#: merge-recursive.c:1256

5066 +msgid "Found a possible merge resolution for the submodule:\n"

5067 +msgstr "找到子模組的一個可能的合併方案：\n"

5068 +

5069 +#: merge-recursive.c:1268

5070 +#, c-format

5071 +msgid "Failed to merge submodule %s (multiple merges found)"

5072 +msgstr "無法合併子模組 %s （發現多個合併）"

5073 +

5074 +#: merge-recursive.c:1402

5075 +#, c-format

5076 +msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

5077 +msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。"

5078 +

5079 +#: merge-recursive.c:1474

5080 +#, c-format

5081 +msgid ""

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

5083 +"in tree."

5084 +msgstr ""

5085 +"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

5086 +"本被保留。"

5087 +

5088 +#: merge-recursive.c:1479

5089 +#, c-format

5090 +msgid ""

5091 +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

5092 +"left in tree."

5093 +msgstr ""

5094 +"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

5095 +"%7$s 版本被保留。"

5096 +

5097 +#: merge-recursive.c:1486

5098 +#, c-format

5099 +msgid ""

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

5101 +"in tree at %s."

5102 +msgstr ""

5103 +"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

5104 +"本保留在 %8$s 中。"

5105 +

5106 +#: merge-recursive.c:1491

5107 +#, c-format

5108 +msgid ""

5109 +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

5110 +"left in tree at %s."

5111 +msgstr ""

5112 +"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

5113 +"%7$s 版本保留在 %9$s 中。"

5114 +

5115 +#: merge-recursive.c:1526

5116 msgid "rename"

5117 msgstr "重新命名"

5118

@@ -4897,24 +5176,6 @@ msgstr ""

5176 "衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到"

5177 "多個其它目錄，沒有目錄包含大部分檔案。"

5178

4900 -#: merge-recursive.c:2100

4901 -#, c-format

4902 -msgid ""

4903 -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

4904 -"implicit directory rename(s) putting the following path(s) there: %s."

4905 -msgstr ""

4906 -"衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑"

4907 -"放在：%s。"

4908 -

4909 -#: merge-recursive.c:2110

4910 -#, c-format

4911 -msgid ""

4912 -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

4913 -"implicit directory renames tried to put these paths there: %s"

4914 -msgstr ""

4915 -"衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這"

4916 -"些路徑放置於此：%s"

4917 -

5179 #: merge-recursive.c:2202

5180 #, c-format

5181 msgid ""

@@ -4924,13 +5185,6 @@ msgstr ""

5185 "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新"

5186 "命名目錄 %4$s->%5$s"

5187

4927 -#: merge-recursive.c:2447

4928 -#, c-format

4929 -msgid ""

4930 -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

4931 -"renamed."

4932 -msgstr "警告：避免應用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。"

4933 -

5188 #: merge-recursive.c:2973

5189 #, c-format

5190 msgid "cannot read object %s"

@@ -4949,72 +5203,20 @@ msgstr "修改"

5203 msgid "modified"

5204 msgstr "修改"

5205

4952 -#: merge-recursive.c:3052

4953 -msgid "content"

4954 -msgstr "內容"

4955 -

4956 -#: merge-recursive.c:3056

4957 -msgid "add/add"

4958 -msgstr "新增/新增"

4959 -

5206 #: merge-recursive.c:3079

5207 #, c-format

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

5209 msgstr "略過 %s（已經做過相同合併）"

5210

4965 -#: merge-recursive.c:3101

4966 -msgid "submodule"

4967 -msgstr "子模組"

4968 -

4969 -#: merge-recursive.c:3102

4970 -#, c-format

4971 -msgid "CONFLICT (%s): Merge conflict in %s"

4972 -msgstr "衝突（%s）：合併衝突於 %s"

4973 -

5211 #: merge-recursive.c:3132

5212 #, c-format

5213 msgid "Adding as %s instead"

5214 msgstr "而是以 %s 為名新增"

5215

4979 -#: merge-recursive.c:3215

5216 +#: merge-recursive.c:3339

5217 #, c-format

4981 -msgid ""

4982 -"Path updated: %s added in %s inside a directory that was renamed in %s; "

4983 -"moving it to %s."

4984 -msgstr ""

4985 -"路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"

4986 -

4987 -#: merge-recursive.c:3218

4988 -#, c-format

4989 -msgid ""

4990 -"CONFLICT (file location): %s added in %s inside a directory that was renamed "

4991 -"in %s, suggesting it should perhaps be moved to %s."

4992 -msgstr ""

4993 -"衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移"

4994 -"動到 %s。"

4995 -

4996 -#: merge-recursive.c:3222

4997 -#, c-format

4998 -msgid ""

4999 -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

5000 -"%s; moving it to %s."

5001 -msgstr ""

5002 -"路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將"

5003 -"其移動到 %5$s。"

5004 -

5005 -#: merge-recursive.c:3225

5006 -#, c-format

5007 -msgid ""

5008 -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

5009 -"was renamed in %s, suggesting it should perhaps be moved to %s."

5010 -msgstr ""

5011 -"衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s "

5012 -"中，建議將其移動到 %5$s。"

5013 -

5014 -#: merge-recursive.c:3339

5015 -#, c-format

5016 -msgid "Removing %s"

5017 -msgstr "刪除 %s"

5218 +msgid "Removing %s"

5219 +msgstr "刪除 %s"

5220

5221 #: merge-recursive.c:3362

5222 msgid "file/directory"

@@ -5044,26 +5246,27 @@ msgstr "衝突（add/add）：合併衝突於 %s"

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

5247 msgstr "無法合併樹 %s 和 %s"

5248

5047 -#: merge-recursive.c:3550

5249 +#: merge-recursive.c:3539

5250 msgid "Merging:"

5251 msgstr "合併："

5252

5051 -#: merge-recursive.c:3563

5253 +#: merge-recursive.c:3552

5254 #, c-format

5255 msgid "found %u common ancestor:"

5256 msgid_plural "found %u common ancestors:"

5257 msgstr[0] "發現 %u 個共同祖先："

5258

5057 -#: merge-recursive.c:3613

5259 +#: merge-recursive.c:3602

5260 msgid "merge returned no commit"

5261 msgstr "合併未返回提交"

5262

5061 -#: merge-recursive.c:3769

5263 +#: merge-recursive.c:3758

5264 #, c-format

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

5266 msgstr "不能解析物件 '%s'"

5267

5066 -#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895

5268 +#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896

5269 +#: builtin/stash.c:471

5270 msgid "Unable to write index."

5271 msgstr "不能寫入索引。"

5272

@@ -5071,184 +5274,178 @@ msgstr "不能寫入索引。"

5274 msgid "failed to read the cache"

5275 msgstr "讀取快取失敗"

5276

5074 -#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917

5075 -#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817

5277 +#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917

5278 +#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817

5279 #: builtin/stash.c:265

5280 msgid "unable to write new index file"

5281 msgstr "無法寫新的索引檔案"

5282

5080 -#: midx.c:80

5283 +#: midx.c:62

5284 +#, fuzzy

5285 +#| msgid "multi-pack-index version %d not recognized"

5286 +msgid "multi-pack-index OID fanout is of the wrong size"

5287 +msgstr "multi-pack-index 版本 %d 不能被識別"

5288 +

5289 +#: midx.c:93

5290 #, c-format

5291 msgid "multi-pack-index file %s is too small"

5292 msgstr "多包索引檔案 %s 太小"

5293

5085 -#: midx.c:96

5294 +#: midx.c:109

5295 #, c-format

5296 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

5297 msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合"

5298

5090 -#: midx.c:101

5299 +#: midx.c:114

5300 #, c-format

5301 msgid "multi-pack-index version %d not recognized"

5302 msgstr "multi-pack-index 版本 %d 不能被識別"

5303

5095 -#: midx.c:106

5304 +#: midx.c:119

5305 #, c-format

5306 msgid "multi-pack-index hash version %u does not match version %u"

5307 msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合"

5308

5100 -#: midx.c:123

5101 -msgid "invalid chunk offset (too large)"

5102 -msgstr "無效的區塊位移（太大）"

5103 -

5104 -#: midx.c:147

5105 -msgid "terminating multi-pack-index chunk id appears earlier than expected"

5106 -msgstr "終止多包索引區塊 id 出現時間早於預期"

5107 -

5108 -#: midx.c:160

5309 +#: midx.c:136

5310 msgid "multi-pack-index missing required pack-name chunk"

5311 msgstr "多包索引缺少必需的包名塊"

5312

5112 -#: midx.c:162

5313 +#: midx.c:138

5314 msgid "multi-pack-index missing required OID fanout chunk"

5315 msgstr "多包索引缺少必需的物件 ID 扇出塊"

5316

5116 -#: midx.c:164

5317 +#: midx.c:140

5318 msgid "multi-pack-index missing required OID lookup chunk"

5319 msgstr "多包索引缺少必需的物件 ID 查詢塊"

5320

5120 -#: midx.c:166

5321 +#: midx.c:142

5322 msgid "multi-pack-index missing required object offsets chunk"

5323 msgstr "多包索引缺少必需的物件位移塊"

5324

5124 -#: midx.c:180

5325 +#: midx.c:158

5326 #, c-format

5327 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

5328 msgstr "多包索引包名無序：'%s' 在 '%s' 之前"

5329

5129 -#: midx.c:223

5330 +#: midx.c:202

5331 #, c-format

5332 msgid "bad pack-int-id: %u (%u total packs)"

5333 msgstr "錯的 pack-int-id：%u（共有 %u 個包）"

5334

5134 -#: midx.c:273

5335 +#: midx.c:252

5336 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5337 msgstr "多包索引儲存一個64位位移，但是 off_t 太小"

5338

5138 -#: midx.c:480

5339 +#: midx.c:467

5340 #, c-format

5341 msgid "failed to add packfile '%s'"

5342 msgstr "新增 packfile '%s' 失敗"

5343

5143 -#: midx.c:486

5344 +#: midx.c:473

5345 #, c-format

5346 msgid "failed to open pack-index '%s'"

5347 msgstr "開啟包索引 '%s' 失敗"

5348

5148 -#: midx.c:546

5349 +#: midx.c:533

5350 #, c-format

5351 msgid "failed to locate object %d in packfile"

5352 msgstr "在 packfile 中定位物件 %d 失敗"

5353

5153 -#: midx.c:846

5354 +#: midx.c:821

5355 msgid "Adding packfiles to multi-pack-index"

5356 msgstr "正在新增 packfile 至多包索引"

5357

5157 -#: midx.c:879

5358 +#: midx.c:855

5359 #, c-format

5360 msgid "did not see pack-file %s to drop"

5361 msgstr "沒有看到要捨棄的包檔案 %s"

5362

5162 -#: midx.c:931

5363 +#: midx.c:904

5364 msgid "no pack files to index."

5365 msgstr "沒有要索引的 pack 檔案。"

5366

5166 -#: midx.c:982

5167 -msgid "Writing chunks to multi-pack-index"

5168 -msgstr "寫入區塊至多包索引"

5169 -

5170 -#: midx.c:1060

5367 +#: midx.c:965

5368 #, c-format

5369 msgid "failed to clear multi-pack-index at %s"

5370 msgstr "清理位於 %s 的多包索引失敗"

5371

5175 -#: midx.c:1116

5372 +#: midx.c:1021

5373 msgid "multi-pack-index file exists, but failed to parse"

5374 msgstr "有 multi-pack-index 檔案，但無法解析"

5375

5179 -#: midx.c:1124

5376 +#: midx.c:1029

5377 msgid "Looking for referenced packfiles"

5378 msgstr "正在尋找引用的 packfile"

5379

5183 -#: midx.c:1139

5380 +#: midx.c:1044

5381 #, c-format

5382 msgid ""

5383 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5384 msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5385

5189 -#: midx.c:1144

5386 +#: midx.c:1049

5387 msgid "the midx contains no oid"

5388 msgstr "midx 沒有 oid"

5389

5193 -#: midx.c:1153

5390 +#: midx.c:1058

5391 msgid "Verifying OID order in multi-pack-index"

5392 msgstr "正在驗證多包索引中的物件 ID 順序"

5393

5197 -#: midx.c:1162

5394 +#: midx.c:1067

5395 #, c-format

5396 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5397 msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]"

5398

5202 -#: midx.c:1182

5399 +#: midx.c:1087

5400 msgid "Sorting objects by packfile"

5401 msgstr "透過 packfile 為物件排序"

5402

5206 -#: midx.c:1189

5403 +#: midx.c:1094

5404 msgid "Verifying object offsets"

5405 msgstr "正在驗證物件位移"

5406

5210 -#: midx.c:1205

5407 +#: midx.c:1110

5408 #, c-format

5409 msgid "failed to load pack entry for oid[%d] = %s"

5410 msgstr "為 oid[%d] = %s 載入包條目失敗"

5411

5215 -#: midx.c:1211

5412 +#: midx.c:1116

5413 #, c-format

5414 msgid "failed to load pack-index for packfile %s"

5415 msgstr "為 packfile %s 載入包索引失敗"

5416

5220 -#: midx.c:1220

5417 +#: midx.c:1125

5418 #, c-format

5419 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5420 msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"

5421

5225 -#: midx.c:1245

5422 +#: midx.c:1150

5423 msgid "Counting referenced objects"

5424 msgstr "正在計算引用物件"

5425

5229 -#: midx.c:1255

5426 +#: midx.c:1160

5427 msgid "Finding and deleting unreferenced packfiles"

5428 msgstr "正在尋找並刪除沒有參考的 packfile"

5429

5233 -#: midx.c:1446

5430 +#: midx.c:1351

5431 msgid "could not start pack-objects"

5432 msgstr "不能開始 pack-objects"

5433

5237 -#: midx.c:1466

5434 +#: midx.c:1371

5435 msgid "could not finish pack-objects"

5436 msgstr "不能結束 pack-objects"

5437

5241 -#: name-hash.c:537

5438 +#: name-hash.c:538

5439 #, c-format

5440 msgid "unable to create lazy_dir thread: %s"

5441 msgstr "不能建立 lazy_dir 執行緒：%s"

5442

5246 -#: name-hash.c:559

5443 +#: name-hash.c:560

5444 #, c-format

5445 msgid "unable to create lazy_name thread: %s"

5446 msgstr "不能建立 lazy_name 執行緒：%s"

5447

5251 -#: name-hash.c:565

5448 +#: name-hash.c:566

5449 #, c-format

5450 msgid "unable to join lazy_name thread: %s"

5451 msgstr "不能加入 lasy_name 執行緒：%s"

@@ -5292,2929 +5489,2992 @@ msgstr "拒絕向 %s（在 refs/notes/ 之外）寫入註解"

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

5490 msgstr "壞的 %s 值：'%s'"

5491

5295 -#: object.c:53

5492 +#: object-file.c:480

5493 #, c-format

5297 -msgid "invalid object type \"%s\""

5298 -msgstr "無效的物件類型 \"%s\""

5494 +msgid "object directory %s does not exist; check .git/objects/info/alternates"

5495 +msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates"

5496

5300 -#: object.c:173

5497 +#: object-file.c:531

5498 #, c-format

5302 -msgid "object %s is a %s, not a %s"

5303 -msgstr "物件 %s 是一個 %s，不是一個 %s"

5499 +msgid "unable to normalize alternate object path: %s"

5500 +msgstr "無法規範化備用物件路徑：%s"

5501

5305 -#: object.c:233

5502 +#: object-file.c:603

5503 #, c-format

5307 -msgid "object %s has unknown type id %d"

5308 -msgstr "物件 %s 有未知的類型 id %d"

5504 +msgid "%s: ignoring alternate object stores, nesting too deep"

5505 +msgstr "%s：忽略備用物件庫，嵌套太深"

5506

5310 -#: object.c:246

5507 +#: object-file.c:610

5508 #, c-format

5312 -msgid "unable to parse object: %s"

5313 -msgstr "不能解析物件：%s"

5509 +msgid "unable to normalize object directory: %s"

5510 +msgstr "無法規範化物件目錄: %s"

5511

5315 -#: object.c:266 object.c:278

5316 -#, c-format

5317 -msgid "hash mismatch %s"

5318 -msgstr "雜湊值與 %s 不符合"

5512 +#: object-file.c:653

5513 +msgid "unable to fdopen alternates lockfile"

5514 +msgstr "無法 fdopen 取代鎖檔案"

5515

5320 -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216

5321 -#, c-format

5322 -msgid "unable to get size of %s"

5323 -msgstr "不能得到 %s 的大小"

5516 +#: object-file.c:671

5517 +msgid "unable to read alternates file"

5518 +msgstr "無法讀取替代檔案"

5519

5325 -#: packfile.c:615

5326 -msgid "offset before end of packfile (broken .idx?)"

5327 -msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"

5520 +#: object-file.c:678

5521 +msgid "unable to move new alternates file into place"

5522 +msgstr "無法將新的替代檔案移動到位"

5523

5329 -#: packfile.c:1907

5524 +#: object-file.c:713

5525 #, c-format

5331 -msgid "offset before start of pack index for %s (corrupt index?)"

5332 -msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"

5526 +msgid "path '%s' does not exist"

5527 +msgstr "路徑 '%s' 不存在"

5528

5334 -#: packfile.c:1911

5529 +#: object-file.c:734

5530 #, c-format

5336 -msgid "offset beyond end of pack index for %s (truncated index?)"

5337 -msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"

5531 +msgid "reference repository '%s' as a linked checkout is not supported yet."

5532 +msgstr "尚不支援將參考版本庫 '%s' 作為一個連結檢出。"

5533

5339 -#: parse-options-cb.c:20 parse-options-cb.c:24

5534 +#: object-file.c:740

5535 #, c-format

5341 -msgid "option `%s' expects a numerical value"

5342 -msgstr "選項 `%s' 期望一個數字值"

5536 +msgid "reference repository '%s' is not a local repository."

5537 +msgstr "參考版本庫 '%s' 不是一個本機版本庫。"

5538

5344 -#: parse-options-cb.c:41

5539 +#: object-file.c:746

5540 #, c-format

5346 -msgid "malformed expiration date '%s'"

5347 -msgstr "格式錯誤的到期時間：'%s'"

5541 +msgid "reference repository '%s' is shallow"

5542 +msgstr "參考版本庫 '%s' 是一個淺複製"

5543

5349 -#: parse-options-cb.c:54

5544 +#: object-file.c:754

5545 #, c-format

5351 -msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5352 -msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\""

5546 +msgid "reference repository '%s' is grafted"

5547 +msgstr "參考版本庫 '%s' 已被移植"

5548

5354 -#: parse-options-cb.c:132 parse-options-cb.c:149

5549 +#: object-file.c:814

5550 #, c-format

5356 -msgid "malformed object name '%s'"

5357 -msgstr "格式錯誤的物件名 '%s'"

5551 +msgid "invalid line while parsing alternate refs: %s"

5552 +msgstr "解析備用引用時無效的行：%s"

5553

5359 -#: parse-options.c:38

5554 +#: object-file.c:964

5555 #, c-format

5361 -msgid "%s requires a value"

5362 -msgstr "%s 需要一個值"

5556 +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5557 +msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>"

5558

5364 -#: parse-options.c:73

5365 -#, c-format

5366 -msgid "%s is incompatible with %s"

5367 -msgstr "%s 與 %s 不相容"

5559 +#: object-file.c:985

5560 +msgid "mmap failed"

5561 +msgstr "mmap 失敗"

5562

5369 -#: parse-options.c:78

5563 +#: object-file.c:1149

5564 #, c-format

5371 -msgid "%s : incompatible with something else"

5372 -msgstr "%s：和其它的不相容"

5565 +msgid "object file %s is empty"

5566 +msgstr "物件檔案 %s 為空"

5567

5374 -#: parse-options.c:92 parse-options.c:96 parse-options.c:317

5568 +#: object-file.c:1284 object-file.c:2477

5569 #, c-format

5376 -msgid "%s takes no value"

5377 -msgstr "%s 不取值"

5570 +msgid "corrupt loose object '%s'"

5571 +msgstr "損壞的鬆散物件 '%s'"

5572

5379 -#: parse-options.c:94

5573 +#: object-file.c:1286 object-file.c:2481

5574 #, c-format

5381 -msgid "%s isn't available"

5382 -msgstr "%s 不可用"

5575 +msgid "garbage at end of loose object '%s'"

5576 +msgstr "鬆散物件 '%s' 後面有垃圾資料"

5577

5384 -#: parse-options.c:217

5385 -#, c-format

5386 -msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

5387 -msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴"

5578 +#: object-file.c:1328

5579 +msgid "invalid object type"

5580 +msgstr "無效的物件類型"

5581

5389 -#: parse-options.c:386

5582 +#: object-file.c:1412

5583 #, c-format

5391 -msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

5392 -msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）"

5584 +msgid "unable to unpack %s header with --allow-unknown-type"

5585 +msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息"

5586

5394 -#: parse-options.c:420 parse-options.c:428

5587 +#: object-file.c:1415

5588 #, c-format

5396 -msgid "did you mean `--%s` (with two dashes)?"

5397 -msgstr "你的意思是 `--%s`（有兩個短線）嗎？"

5589 +msgid "unable to unpack %s header"

5590 +msgstr "無法解開 %s 頭部"

5591

5399 -#: parse-options.c:666 parse-options.c:971

5592 +#: object-file.c:1421

5593 #, c-format

5401 -msgid "alias of --%s"

5402 -msgstr "--%s 的別名"

5594 +msgid "unable to parse %s header with --allow-unknown-type"

5595 +msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息"

5596

5404 -#: parse-options.c:862

5597 +#: object-file.c:1424

5598 #, c-format

5406 -msgid "unknown option `%s'"

5407 -msgstr "未知選項 `%s'"

5599 +msgid "unable to parse %s header"

5600 +msgstr "無法解析 %s 頭部"

5601

5409 -#: parse-options.c:864

5602 +#: object-file.c:1651

5603 #, c-format

5411 -msgid "unknown switch `%c'"

5412 -msgstr "未知開關 `%c'"

5604 +msgid "failed to read object %s"

5605 +msgstr "讀取物件 %s 失敗"

5606

5414 -#: parse-options.c:866

5607 +#: object-file.c:1655

5608 #, c-format

5416 -msgid "unknown non-ascii option in string: `%s'"

5417 -msgstr "字串中未知的非 ascii 字元選項：`%s'"

5418 -

5419 -#: parse-options.c:890

5420 -msgid "..."

5421 -msgstr "..."

5609 +msgid "replacement %s not found for %s"

5610 +msgstr "找不到 %2$s 的替代 %1$s"

5611

5423 -#: parse-options.c:909

5612 +#: object-file.c:1659

5613 #, c-format

5425 -msgid "usage: %s"

5426 -msgstr "用法：%s"

5614 +msgid "loose object %s (stored in %s) is corrupt"

5615 +msgstr "鬆散物件 %s（儲存在 %s）已損壞"

5616

5428 -#. TRANSLATORS: the colon here should align with the

5429 -#. one in "usage: %s" translation.

5430 -#.

5431 -#: parse-options.c:915

5617 +#: object-file.c:1663

5618 #, c-format

5433 -msgid " or: %s"

5434 -msgstr " 或：%s"

5619 +msgid "packed object %s (stored in %s) is corrupt"

5620 +msgstr "打包物件 %s（儲存在 %s）已損壞"

5621

5436 -# 譯者：為保證在輸出中對齊，注意調整句中空格！

5437 -#: parse-options.c:918

5622 +#: object-file.c:1768

5623 #, c-format

5439 -msgid " %s"

5440 -msgstr " %s"

5441 -

5442 -#: parse-options.c:957

5443 -msgid "-NUM"

5444 -msgstr "-數字"

5624 +msgid "unable to write file %s"

5625 +msgstr "無法寫檔案 %s"

5626

5446 -#: path.c:915

5627 +#: object-file.c:1775

5628 #, c-format

5448 -msgid "Could not make %s writable by group"

5449 -msgstr "不能設定 %s 為組可寫"

5450 -

5451 -#: pathspec.c:130

5452 -msgid "Escape character '\\' not allowed as last character in attr value"

5453 -msgstr "跳脫字元 '\\' 不能作為屬性值的最後一個字元"

5629 +msgid "unable to set permission to '%s'"

5630 +msgstr "無法為 '%s' 設定權限"

5631

5455 -#: pathspec.c:148

5456 -msgid "Only one 'attr:' specification is allowed."

5457 -msgstr "只允許一個 'attr:' 規格。"

5632 +#: object-file.c:1782

5633 +msgid "file write error"

5634 +msgstr "檔案寫錯誤"

5635

5459 -#: pathspec.c:151

5460 -msgid "attr spec must not be empty"

5461 -msgstr "屬性規格不能為空"

5636 +#: object-file.c:1802

5637 +msgid "error when closing loose object file"

5638 +msgstr "關閉鬆散物件檔案時發生錯誤"

5639

5463 -#: pathspec.c:194

5640 +#: object-file.c:1867

5641 #, c-format

5465 -msgid "invalid attribute name %s"

5466 -msgstr "無效的屬性名 %s"

5467 -

5468 -#: pathspec.c:259

5469 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

5470 -msgstr "全域的 'glob' 和 'noglob' 路徑規格設定不相容"

5642 +msgid "insufficient permission for adding an object to repository database %s"

5643 +msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件"

5644

5472 -#: pathspec.c:266

5473 -msgid ""

5474 -"global 'literal' pathspec setting is incompatible with all other global "

5475 -"pathspec settings"

5476 -msgstr "全域的 'literal' 路徑規格設定和其它的全域路徑規格設定不相容"

5645 +#: object-file.c:1869

5646 +msgid "unable to create temporary file"

5647 +msgstr "無法建立暫存檔"

5648

5478 -#: pathspec.c:306

5479 -msgid "invalid parameter for pathspec magic 'prefix'"

5480 -msgstr "路徑規格包含無效的神奇前綴"

5649 +#: object-file.c:1893

5650 +msgid "unable to write loose object file"

5651 +msgstr "不能寫鬆散物件檔案"

5652

5482 -#: pathspec.c:327

5653 +#: object-file.c:1899

5654 #, c-format

5484 -msgid "Invalid pathspec magic '%.*s' in '%s'"

5485 -msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'"

5655 +msgid "unable to deflate new object %s (%d)"

5656 +msgstr "不能壓縮新物件 %s（%d）"

5657

5487 -#: pathspec.c:332

5658 +#: object-file.c:1903

5659 #, c-format

5489 -msgid "Missing ')' at the end of pathspec magic in '%s'"

5490 -msgstr "路徑規格 '%s' 的神奇前綴結尾少了一個 ')'"

5660 +msgid "deflateEnd on object %s failed (%d)"

5661 +msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）"

5662

5492 -#: pathspec.c:370

5663 +#: object-file.c:1907

5664 #, c-format

5494 -msgid "Unimplemented pathspec magic '%c' in '%s'"

5495 -msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'"

5665 +msgid "confused by unstable object source data for %s"

5666 +msgstr "被 %s 的不穩定物件源資料搞糊塗了"

5667

5497 -#: pathspec.c:429

5668 +#: object-file.c:1917 builtin/pack-objects.c:1097

5669 #, c-format

5499 -msgid "%s: 'literal' and 'glob' are incompatible"

5500 -msgstr "%s：'literal' 和 'glob' 不相容"

5670 +msgid "failed utime() on %s"

5671 +msgstr "在 %s 上呼叫 utime() 失敗"

5672

5502 -#: pathspec.c:445

5673 +#: object-file.c:1994

5674 #, c-format

5504 -msgid "%s: '%s' is outside repository at '%s'"

5505 -msgstr "%s：'%s' 在位於 '%s' 的版本庫之外"

5675 +msgid "cannot read object for %s"

5676 +msgstr "不能讀取物件 %s"

5677

5507 -#: pathspec.c:521

5508 -#, c-format

5509 -msgid "'%s' (mnemonic: '%c')"

5510 -msgstr "'%s'（助記符：'%c'）"

5678 +#: object-file.c:2045

5679 +msgid "corrupt commit"

5680 +msgstr "損壞的提交"

5681

5512 -#: pathspec.c:531

5513 -#, c-format

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

5515 -msgstr "%s：路徑規格神奇前綴不被此指令支援：%s"

5682 +#: object-file.c:2053

5683 +msgid "corrupt tag"

5684 +msgstr "損壞的標籤"

5685

5517 -#: pathspec.c:598

5686 +#: object-file.c:2153

5687 #, c-format

5519 -msgid "pathspec '%s' is beyond a symbolic link"

5520 -msgstr "路徑規格 '%s' 位於符號連結中"

5688 +msgid "read error while indexing %s"

5689 +msgstr "索引 %s 時讀取錯誤"

5690

5522 -#: pathspec.c:643

5691 +#: object-file.c:2156

5692 #, c-format

5524 -msgid "line is badly quoted: %s"

5525 -msgstr "某行不應該被括號括住：%s"

5526 -

5527 -#: pkt-line.c:92

5528 -msgid "unable to write flush packet"

5529 -msgstr "無法寫 flush 包"

5530 -

5531 -#: pkt-line.c:99

5532 -msgid "unable to write delim packet"

5533 -msgstr "無法寫 delim 包"

5534 -

5535 -#: pkt-line.c:106

5536 -msgid "unable to write stateless separator packet"

5537 -msgstr "無法寫入無狀態的分隔符號封包"

5538 -

5539 -#: pkt-line.c:113

5540 -msgid "flush packet write failed"

5541 -msgstr "flush 包寫錯誤"

5542 -

5543 -#: pkt-line.c:153 pkt-line.c:239

5544 -msgid "protocol error: impossibly long line"

5545 -msgstr "協定錯誤：不可能的長行"

5546 -

5547 -#: pkt-line.c:169 pkt-line.c:171

5548 -msgid "packet write with format failed"

5549 -msgstr "格式化包寫入錯誤"

5693 +msgid "short read while indexing %s"

5694 +msgstr "索引 %s 時讀入不完整"

5695

5551 -#: pkt-line.c:203

5552 -msgid "packet write failed - data exceeds max packet size"

5553 -msgstr "寫封包失敗：資料超過了包的最大長度"

5696 +#: object-file.c:2229 object-file.c:2239

5697 +#, c-format

5698 +msgid "%s: failed to insert into database"

5699 +msgstr "%s：插入資料庫失敗"

5700

5555 -#: pkt-line.c:210 pkt-line.c:217

5556 -msgid "packet write failed"

5557 -msgstr "封包寫入失敗"

5701 +#: object-file.c:2245

5702 +#, c-format

5703 +msgid "%s: unsupported file type"

5704 +msgstr "%s：不支援的檔案類型"

5705

5559 -#: pkt-line.c:302

5560 -msgid "read error"

5561 -msgstr "讀取錯誤"

5706 +#: object-file.c:2269

5707 +#, c-format

5708 +msgid "%s is not a valid object"

5709 +msgstr "%s 不是一個有效的物件"

5710

5563 -#: pkt-line.c:310

5564 -msgid "the remote end hung up unexpectedly"

5565 -msgstr "遠端意外掛斷了"

5711 +#: object-file.c:2271

5712 +#, c-format

5713 +msgid "%s is not a valid '%s' object"

5714 +msgstr "%s 不是一個有效的 '%s' 物件"

5715

5567 -#: pkt-line.c:338

5716 +#: object-file.c:2298 builtin/index-pack.c:192

5717 #, c-format

5569 -msgid "protocol error: bad line length character: %.4s"

5570 -msgstr "協定錯誤：錯誤的行長度字串：%.4s"

5718 +msgid "unable to open %s"

5719 +msgstr "不能開啟 %s"

5720

5572 -#: pkt-line.c:352 pkt-line.c:357

5721 +#: object-file.c:2488 object-file.c:2541

5722 #, c-format

5574 -msgid "protocol error: bad line length %d"

5575 -msgstr "協定錯誤：錯誤的行長度 %d"

5723 +msgid "hash mismatch for %s (expected %s)"

5724 +msgstr "%s 的雜湊值不符合（預期 %s）"

5725

5577 -#: pkt-line.c:373 sideband.c:165

5726 +#: object-file.c:2512

5727 #, c-format

5579 -msgid "remote error: %s"

5580 -msgstr "遠端錯誤：%s"

5728 +msgid "unable to mmap %s"

5729 +msgstr "不能 mmap %s"

5730

5582 -#: preload-index.c:119

5583 -msgid "Refreshing index"

5584 -msgstr "正在重新整理索引"

5731 +#: object-file.c:2517

5732 +#, c-format

5733 +msgid "unable to unpack header of %s"

5734 +msgstr "無法解壓縮 %s 的頭部"

5735

5586 -#: preload-index.c:138

5736 +#: object-file.c:2523

5737 #, c-format

5588 -msgid "unable to create threaded lstat: %s"

5589 -msgstr "無法建立執行緒 lstat：%s"

5738 +msgid "unable to parse header of %s"

5739 +msgstr "無法解析 %s 的頭部"

5740

5591 -#: pretty.c:983

5592 -msgid "unable to parse --pretty format"

5593 -msgstr "不能解析 --pretty 格式"

5741 +#: object-file.c:2534

5742 +#, c-format

5743 +msgid "unable to unpack contents of %s"

5744 +msgstr "無法解壓縮 %s 的內容"

5745

5595 -#: promisor-remote.c:30

5596 -msgid "promisor-remote: unable to fork off fetch subprocess"

5597 -msgstr "promisor-remote: 無法 fork fetch 子處理程序"

5746 +#: object-name.c:486

5747 +#, c-format

5748 +msgid "short object ID %s is ambiguous"

5749 +msgstr "短物件 ID %s 存在歧義"

5750

5599 -#: promisor-remote.c:35 promisor-remote.c:37

5600 -msgid "promisor-remote: could not write to fetch subprocess"

5601 -msgstr "promisor-remote: 無法寫入 fetch 子處理程序"

5751 +#: object-name.c:497

5752 +msgid "The candidates are:"

5753 +msgstr "候選者有："

5754

5603 -#: promisor-remote.c:41

5604 -msgid "promisor-remote: could not close stdin to fetch subprocess"

5605 -msgstr "promisor-remote: 無法關閉 fetch 子處理程序的 stdin"

5755 +#: object-name.c:796

5756 +msgid ""

5757 +"Git normally never creates a ref that ends with 40 hex characters\n"

5758 +"because it will be ignored when you just specify 40-hex. These refs\n"

5759 +"may be created by mistake. For example,\n"

5760 +"\n"

5761 +" git switch -c $br $(git rev-parse ...)\n"

5762 +"\n"

5763 +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"

5764 +"examine these refs and maybe delete them. Turn this message off by\n"

5765 +"running \"git config advice.objectNameWarning false\""

5766 +msgstr ""

5767 +"Git 通常不會建立以 40 個十六進位字元結尾的引用，\n"

5768 +"因為當您只提供 40 個十六進位字元時，其將被忽略。\n"

5769 +"這些引用可能被意外建立。例如：\n"

5770 +"\n"

5771 +" git switch -c $br $(git rev-parse ...)\n"

5772 +"\n"

5773 +"當「$br」因為某些原因空白時，會建立出 40 位十六進位的引用。\n"

5774 +"請檢查這些引用，並視需要刪除。執行\n"

5775 +"「git config advice.objectNameWarning false」命令以關閉本訊息通知"

5776

5607 -#: promisor-remote.c:53

5777 +#: object-name.c:916

5778 #, c-format

5609 -msgid "promisor remote name cannot begin with '/': %s"

5610 -msgstr "promisor 遠端名稱不能以 '/' 開始：%s"

5779 +msgid "log for '%.*s' only goes back to %s"

5780 +msgstr "'%.*s' 的日誌只能回到 %s"

5781

5612 -#: prune-packed.c:35

5613 -msgid "Removing duplicate objects"

5614 -msgstr "正在刪除重複物件"

5782 +#: object-name.c:924

5783 +#, c-format

5784 +msgid "log for '%.*s' only has %d entries"

5785 +msgstr "'%.*s' 的日誌只有 %d 個項目"

5786

5616 -#: range-diff.c:77

5617 -msgid "could not start `log`"

5618 -msgstr "不能啟動 `log`"

5787 +#: object-name.c:1702

5788 +#, c-format

5789 +msgid "path '%s' exists on disk, but not in '%.*s'"

5790 +msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'"

5791

5620 -#: range-diff.c:79

5621 -msgid "could not read `log` output"

5622 -msgstr "不能讀取 `log` 的輸出"

5792 +#: object-name.c:1708

5793 +#, c-format

5794 +msgid ""

5795 +"path '%s' exists, but not '%s'\n"

5796 +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"

5797 +msgstr ""

5798 +"'%s' 路徑存在，但不是 '%s'\n"

5799 +"提示：你在說 '%.*s:%s'，即 '%.*s:./%s' 嗎？"

5800

5624 -#: range-diff.c:98 sequencer.c:5310

5801 +#: object-name.c:1717

5802 #, c-format

5626 -msgid "could not parse commit '%s'"

5627 -msgstr "不能解析提交 '%s'"

5803 +msgid "path '%s' does not exist in '%.*s'"

5804 +msgstr "'%s' 路徑不存在於 '%.*s'"

5805

5629 -#: range-diff.c:112

5806 +#: object-name.c:1745

5807 #, c-format

5808 msgid ""

5632 -"could not parse first line of `log` output: did not start with 'commit ': "

5633 -"'%s'"

5634 -msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s」"

5809 +"path '%s' is in the index, but not at stage %d\n"

5810 +"hint: Did you mean ':%d:%s'?"

5811 +msgstr ""

5812 +"'%s' 路徑在索引，但不在 %d 暫存區\n"

5813 +"提示：你在說 ':%d:%s' 嗎？"

5814

5636 -#: range-diff.c:137

5815 +#: object-name.c:1761

5816 #, c-format

5638 -msgid "could not parse git header '%.*s'"

5639 -msgstr "無法解析 git 頭 '%.*s'"

5640 -

5641 -#: range-diff.c:299

5642 -msgid "failed to generate diff"

5643 -msgstr "生成 diff 失敗"

5817 +msgid ""

5818 +"path '%s' is in the index, but not '%s'\n"

5819 +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"

5820 +msgstr ""

5821 +"'%s' 路徑在索引，但不是 '%s'\n"

5822 +"提示：你在說 ':%d:%s'，即 ':%d:%s' 嗎？"

5823

5645 -#: range-diff.c:532 range-diff.c:534

5824 +#: object-name.c:1769

5825 #, c-format

5647 -msgid "could not parse log for '%s'"

5648 -msgstr "不能解析 '%s' 的日誌"

5826 +msgid "path '%s' exists on disk, but not in the index"

5827 +msgstr "磁碟上存在 '%s' 路徑，但不在索引中"

5828

5650 -#: read-cache.c:682

5829 +#: object-name.c:1771

5830 #, c-format

5652 -msgid "will not add file alias '%s' ('%s' already exists in index)"

5653 -msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）"

5831 +msgid "path '%s' does not exist (neither on disk nor in the index)"

5832 +msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)"

5833

5655 -#: read-cache.c:698

5656 -msgid "cannot create an empty blob in the object database"

5657 -msgstr "不能在物件資料庫中建立空的資料物件"

5834 +#: object-name.c:1784

5835 +msgid "relative path syntax can't be used outside working tree"

5836 +msgstr "相對路徑與法不能用在工作區外"

5837

5659 -#: read-cache.c:720

5838 +#: object-name.c:1922

5839 #, c-format

5661 -msgid "%s: can only add regular files, symbolic links or git-directories"

5662 -msgstr "%s：只能新增一般檔案、符號連結或 git 目錄"

5840 +msgid "invalid object name '%.*s'."

5841 +msgstr "'%.*s' 物件名稱無效。"

5842

5664 -#: read-cache.c:725

5843 +#: object.c:53

5844 #, c-format

5666 -msgid "'%s' does not have a commit checked out"

5667 -msgstr "'%s' 沒有檢出一個提交"

5845 +msgid "invalid object type \"%s\""

5846 +msgstr "無效的物件類型 \"%s\""

5847

5669 -#: read-cache.c:777

5848 +#: object.c:173

5849 #, c-format

5671 -msgid "unable to index file '%s'"

5672 -msgstr "無法索引檔案 '%s'"

5850 +msgid "object %s is a %s, not a %s"

5851 +msgstr "物件 %s 是一個 %s，不是一個 %s"

5852

5674 -#: read-cache.c:796

5853 +#: object.c:233

5854 #, c-format

5676 -msgid "unable to add '%s' to index"

5677 -msgstr "無法在索引中新增 '%s'"

5855 +msgid "object %s has unknown type id %d"

5856 +msgstr "物件 %s 有未知的類型 id %d"

5857

5679 -#: read-cache.c:807

5858 +#: object.c:246

5859 #, c-format

5681 -msgid "unable to stat '%s'"

5682 -msgstr "無法對 %s 執行 stat"

5860 +msgid "unable to parse object: %s"

5861 +msgstr "不能解析物件：%s"

5862

5684 -#: read-cache.c:1318

5863 +#: object.c:266 object.c:278

5864 #, c-format

5686 -msgid "'%s' appears as both a file and as a directory"

5687 -msgstr "'%s' 看起來既是檔案又是目錄"

5865 +msgid "hash mismatch %s"

5866 +msgstr "雜湊值與 %s 不符合"

5867

5689 -#: read-cache.c:1524

5690 -msgid "Refresh index"

5691 -msgstr "重新整理索引"

5868 +#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226

5869 +#, c-format

5870 +msgid "unable to get size of %s"

5871 +msgstr "不能得到 %s 的大小"

5872

5693 -#: read-cache.c:1639

5873 +#: pack-bitmap.c:1489 builtin/rev-list.c:92

5874 #, c-format

5695 -msgid ""

5696 -"index.version set, but the value is invalid.\n"

5697 -"Using version %i"

5698 -msgstr ""

5699 -"設定了 index.version，但是取值無效。\n"

5700 -"使用版本 %i"

5875 +msgid "unable to get disk usage of %s"

5876 +msgstr "無法取得 %s 的磁碟用量"

5877

5702 -#: read-cache.c:1649

5878 +#: pack-revindex.c:220

5879 #, c-format

5704 -msgid ""

5705 -"GIT_INDEX_VERSION set, but the value is invalid.\n"

5706 -"Using version %i"

5707 -msgstr ""

5708 -"設定了 GIT_INDEX_VERSION，但是取值無效。\n"

5709 -"使用版本 %i"

5880 +msgid "reverse-index file %s is too small"

5881 +msgstr "%s 倒排索引檔案過小"

5882

5711 -#: read-cache.c:1705

5883 +#: pack-revindex.c:225

5884 #, c-format

5713 -msgid "bad signature 0x%08x"

5714 -msgstr "壞的簽名 0x%08x"

5885 +msgid "reverse-index file %s is corrupt"

5886 +msgstr "%s 倒排索引檔案損壞"

5887

5716 -#: read-cache.c:1708

5888 +#: pack-revindex.c:233

5889 #, c-format

5718 -msgid "bad index version %d"

5719 -msgstr "壞的索引版本 %d"

5890 +msgid "reverse-index file %s has unknown signature"

5891 +msgstr "%s 倒排索引檔案有未知簽章"

5892

5721 -#: read-cache.c:1717

5722 -msgid "bad index file sha1 signature"

5723 -msgstr "壞的索引檔案 sha1 簽名"

5893 +#: pack-revindex.c:237

5894 +#, c-format

5895 +msgid "reverse-index file %s has unsupported version %<PRIu32>"

5896 +msgstr "倒排索引檔案 %s 有不支援的版本 %<PRIu32>"

5897

5725 -#: read-cache.c:1747

5898 +#: pack-revindex.c:242

5899 #, c-format

5727 -msgid "index uses %.4s extension, which we do not understand"

5728 -msgstr "索引使用不被支援的 %.4s 擴展"

5900 +msgid "reverse-index file %s has unsupported hash id %<PRIu32>"

5901 +msgstr "倒排索引檔案 %s 有不支援的雜湊 ID %<PRIu32>"

5902

5730 -#

5731 -#: read-cache.c:1749

5903 +#: pack-write.c:236

5904 +msgid "cannot both write and verify reverse index"

5905 +msgstr "無法同時寫入和驗證倒排索引"

5906 +

5907 +#: pack-write.c:257

5908 #, c-format

5733 -msgid "ignoring %.4s extension"

5734 -msgstr "忽略 %.4s 擴展"

5909 +msgid "could not stat: %s"

5910 +msgstr "無法 stat：%s"

5911

5736 -#: read-cache.c:1786

5912 +#: pack-write.c:269

5913 #, c-format

5738 -msgid "unknown index entry format 0x%08x"

5739 -msgstr "未知的索引條目格式 0x%08x"

5914 +msgid "failed to make %s readable"

5915 +msgstr "無法讓 %s 能夠寫入"

5916

5741 -#: read-cache.c:1802

5917 +#: pack-write.c:508

5918 #, c-format

5743 -msgid "malformed name field in the index, near path '%s'"

5744 -msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位"

5919 +msgid "could not write '%s' promisor file"

5920 +msgstr "無法寫入「%s」promisor 檔案"

5921

5746 -#: read-cache.c:1859

5747 -msgid "unordered stage entries in index"

5748 -msgstr "索引中有未排序的暫存條目"

5922 +#: packfile.c:625

5923 +msgid "offset before end of packfile (broken .idx?)"

5924 +msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"

5925

5750 -#: read-cache.c:1862

5926 +#: packfile.c:1934

5927 #, c-format

5752 -msgid "multiple stage entries for merged file '%s'"

5753 -msgstr "合併檔案 '%s' 有多個暫存條目"

5928 +msgid "offset before start of pack index for %s (corrupt index?)"

5929 +msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"

5930

5755 -#: read-cache.c:1865

5931 +#: packfile.c:1938

5932 #, c-format

5757 -msgid "unordered stage entries for '%s'"

5758 -msgstr "'%s' 的未排序暫存條目"

5933 +msgid "offset beyond end of pack index for %s (truncated index?)"

5934 +msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"

5935

5760 -#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111

5761 -#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181

5762 -#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991

5763 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507

5764 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290

5765 -#: builtin/submodule--helper.c:332

5766 -msgid "index file corrupt"

5767 -msgstr "索引檔案損壞"

5936 +#: parse-options-cb.c:20 parse-options-cb.c:24

5937 +#, c-format

5938 +msgid "option `%s' expects a numerical value"

5939 +msgstr "選項 `%s' 期望一個數字值"

5940

5769 -#: read-cache.c:2115

5941 +#: parse-options-cb.c:41

5942 #, c-format

5771 -msgid "unable to create load_cache_entries thread: %s"

5772 -msgstr "無法建立 load_cache_entries 執行緒：%s"

5943 +msgid "malformed expiration date '%s'"

5944 +msgstr "格式錯誤的到期時間：'%s'"

5945

5774 -#: read-cache.c:2128

5946 +#: parse-options-cb.c:54

5947 #, c-format

5776 -msgid "unable to join load_cache_entries thread: %s"

5777 -msgstr "無法加入 load_cache_entries 執行緒：%s"

5948 +msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5949 +msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\""

5950

5779 -#: read-cache.c:2161

5951 +#: parse-options-cb.c:132 parse-options-cb.c:149

5952 #, c-format

5781 -msgid "%s: index file open failed"

5782 -msgstr "%s：開啟索引檔案失敗"

5953 +msgid "malformed object name '%s'"

5954 +msgstr "格式錯誤的物件名 '%s'"

5955

5784 -#: read-cache.c:2165

5956 +#: parse-options.c:38

5957 #, c-format

5786 -msgid "%s: cannot stat the open index"

5787 -msgstr "%s：不能對開啟的索引執行 stat 動作"

5958 +msgid "%s requires a value"

5959 +msgstr "%s 需要一個值"

5960

5789 -#: read-cache.c:2169

5961 +#: parse-options.c:73

5962 #, c-format

5791 -msgid "%s: index file smaller than expected"

5792 -msgstr "%s：索引檔案比預期的小"

5963 +msgid "%s is incompatible with %s"

5964 +msgstr "%s 與 %s 不相容"

5965

5794 -#: read-cache.c:2173

5966 +#: parse-options.c:78

5967 #, c-format

5796 -msgid "%s: unable to map index file"

5797 -msgstr "%s：無法對索引檔案執行 map 動作"

5968 +msgid "%s : incompatible with something else"

5969 +msgstr "%s：和其它的不相容"

5970

5799 -#: read-cache.c:2215

5971 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317

5972 #, c-format

5801 -msgid "unable to create load_index_extensions thread: %s"

5802 -msgstr "無法建立 load_index_extensions 執行緒：%s"

5973 +msgid "%s takes no value"

5974 +msgstr "%s 不取值"

5975

5804 -#: read-cache.c:2242

5976 +#: parse-options.c:94

5977 #, c-format

5806 -msgid "unable to join load_index_extensions thread: %s"

5807 -msgstr "無法加入 load_index_extensions 執行緒：%s"

5978 +msgid "%s isn't available"

5979 +msgstr "%s 不可用"

5980

5809 -#: read-cache.c:2274

5981 +#: parse-options.c:217

5982 #, c-format

5811 -msgid "could not freshen shared index '%s'"

5812 -msgstr "無法重新整理共享索引 '%s'"

5983 +msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

5984 +msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴"

5985

5814 -#: read-cache.c:2321

5986 +#: parse-options.c:386

5987 #, c-format

5816 -msgid "broken index, expect %s in %s, got %s"

5817 -msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

5988 +msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

5989 +msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）"

5990

5819 -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140

5991 +#: parse-options.c:420 parse-options.c:428

5992 #, c-format

5821 -msgid "could not close '%s'"

5822 -msgstr "不能關閉 '%s'"

5993 +msgid "did you mean `--%s` (with two dashes)?"

5994 +msgstr "你的意思是 `--%s`（有兩個短線）嗎？"

5995

5824 -#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231

5996 +#: parse-options.c:666 parse-options.c:971

5997 #, c-format

5826 -msgid "could not stat '%s'"

5827 -msgstr "不能對 '%s' 呼叫 stat"

5998 +msgid "alias of --%s"

5999 +msgstr "--%s 的別名"

6000

5829 -#: read-cache.c:3133

6001 +#: parse-options.c:862

6002 #, c-format

5831 -msgid "unable to open git dir: %s"

5832 -msgstr "不能開啟 git 目錄：%s"

6003 +msgid "unknown option `%s'"

6004 +msgstr "未知選項 `%s'"

6005

5834 -#: read-cache.c:3145

6006 +#: parse-options.c:864

6007 #, c-format

5836 -msgid "unable to unlink: %s"

5837 -msgstr "無法刪除：%s"

6008 +msgid "unknown switch `%c'"

6009 +msgstr "未知開關 `%c'"

6010

5839 -#: read-cache.c:3170

6011 +#: parse-options.c:866

6012 #, c-format

5841 -msgid "cannot fix permission bits on '%s'"

5842 -msgstr "不能修復 '%s' 的權限位"

6013 +msgid "unknown non-ascii option in string: `%s'"

6014 +msgstr "字串中未知的非 ascii 字元選項：`%s'"

6015 +

6016 +#: parse-options.c:890

6017 +msgid "..."

6018 +msgstr "..."

6019

5844 -#: read-cache.c:3319

6020 +#: parse-options.c:909

6021 #, c-format

5846 -msgid "%s: cannot drop to stage #0"

5847 -msgstr "%s：不能落到暫存區 #0"

6022 +msgid "usage: %s"

6023 +msgstr "用法：%s"

6024

5849 -#: rebase-interactive.c:11

5850 -msgid ""

5851 -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

5852 -"continue'.\n"

5853 -"Or you can abort the rebase with 'git rebase --abort'.\n"

5854 -msgstr ""

5855 -"您可以用 'git rebase --edit-todo' 修正，然後執行 'git rebase --continue'。\n"

5856 -"或者您可以用 'git rebase --abort' 終止重定基底。\n"

6025 +#. TRANSLATORS: the colon here should align with the

6026 +#. one in "usage: %s" translation.

6027 +#.

6028 +#: parse-options.c:915

6029 +#, c-format

6030 +msgid " or: %s"

6031 +msgstr " 或：%s"

6032

5858 -#: rebase-interactive.c:33

6033 +# 譯者：為保證在輸出中對齊，注意調整句中空格！

6034 +#: parse-options.c:918

6035 #, c-format

5860 -msgid ""

5861 -"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5862 -msgstr "選項 rebase.missingCommitsCheck 的值 %s 無法識別。已忽略。"

6036 +msgid " %s"

6037 +msgstr " %s"

6038

5864 -#: rebase-interactive.c:42

5865 -msgid ""

5866 -"\n"

5867 -"Commands:\n"

5868 -"p, pick <commit> = use commit\n"

5869 -"r, reword <commit> = use commit, but edit the commit message\n"

5870 -"e, edit <commit> = use commit, but stop for amending\n"

5871 -"s, squash <commit> = use commit, but meld into previous commit\n"

5872 -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"

5873 -"x, exec <command> = run command (the rest of the line) using shell\n"

5874 -"b, break = stop here (continue rebase later with 'git rebase --continue')\n"

5875 -"d, drop <commit> = remove commit\n"

5876 -"l, label <label> = label current HEAD with a name\n"

5877 -"t, reset <label> = reset HEAD to a label\n"

5878 -"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

5879 -". create a merge commit using the original merge commit's\n"

5880 -". message (or the oneline, if no original merge commit was\n"

5881 -". specified). Use -c <commit> to reword the commit message.\n"

5882 -"\n"

5883 -"These lines can be re-ordered; they are executed from top to bottom.\n"

5884 -msgstr ""

5885 -"\n"

5886 -"指令:\n"

5887 -"p, pick <提交> = 使用提交\n"

5888 -"r, reword <提交> = 使用提交，但修改提交說明\n"

5889 -"e, edit <提交> = 使用提交，進入 shell 以便進行提交修補\n"

5890 -"s, squash <提交> = 使用提交，但融合到前一個提交\n"

5891 -"f, fixup <提交> = 類似於 \"squash\"，但捨棄提交說明日誌\n"

5892 -"x, exec <指令> = 使用 shell 執行指令（此行剩餘部分）\n"

5893 -"b, break = 在此處停止（使用 'git rebase --continue' 繼續重定基底）\n"

5894 -"d, drop <提交> = 刪除提交\n"

5895 -"l, label <label> = 為目前 HEAD 打上標記\n"

5896 -"t, reset <label> = 重設 HEAD 到該標記\n"

5897 -"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

5898 -". 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n"

5899 -". 原始提交，使用備註部分的 oneline 作為提交說明）。使用\n"

5900 -". -c <提交> 可以編輯提交說明。\n"

5901 -"\n"

5902 -"可以對這些行重新排序，將從上至下執行。\n"

6039 +#: parse-options.c:957

6040 +msgid "-NUM"

6041 +msgstr "-數字"

6042

5904 -#: rebase-interactive.c:63

6043 +#: path.c:915

6044 #, c-format

5906 -msgid "Rebase %s onto %s (%d command)"

5907 -msgid_plural "Rebase %s onto %s (%d commands)"

5908 -msgstr[0] "重定基底 %s 到 %s（%d 個提交）"

6045 +msgid "Could not make %s writable by group"

6046 +msgstr "不能設定 %s 為組可寫"

6047

5910 -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218

5911 -msgid ""

5912 -"\n"

5913 -"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

5914 -msgstr ""

5915 -"\n"

5916 -"不要刪除任意一行。使用 'drop' 顯式地刪除一個提交。\n"

6048 +#: pathspec.c:130

6049 +msgid "Escape character '\\' not allowed as last character in attr value"

6050 +msgstr "跳脫字元 '\\' 不能作為屬性值的最後一個字元"

6051

5918 -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222

5919 -msgid ""

5920 -"\n"

5921 -"If you remove a line here THAT COMMIT WILL BE LOST.\n"

5922 -msgstr ""

5923 -"\n"

5924 -"如果您在這裡刪除一行，對應的提交將會遺失。\n"

6052 +#: pathspec.c:148

6053 +msgid "Only one 'attr:' specification is allowed."

6054 +msgstr "只允許一個 'attr:' 規格。"

6055

5926 -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861

5927 -msgid ""

5928 -"\n"

5929 -"You are editing the todo file of an ongoing interactive rebase.\n"

5930 -"To continue rebase after editing, run:\n"

5931 -" git rebase --continue\n"

5932 -"\n"

5933 -msgstr ""

5934 -"\n"

5935 -"您正在修改進行中的互動式重定基底待辦列表。若要在編輯結束後繼續重定基底，\n"

5936 -"請執行：\n"

5937 -" git rebase --continue\n"

5938 -"\n"

6056 +#: pathspec.c:151

6057 +msgid "attr spec must not be empty"

6058 +msgstr "屬性規格不能為空"

6059

5940 -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938

6060 +#: pathspec.c:194

6061 +#, c-format

6062 +msgid "invalid attribute name %s"

6063 +msgstr "無效的屬性名 %s"

6064 +

6065 +#: pathspec.c:259

6066 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

6067 +msgstr "全域的 'glob' 和 'noglob' 路徑規格設定不相容"

6068 +

6069 +#: pathspec.c:266

6070 msgid ""

5942 -"\n"

5943 -"However, if you remove everything, the rebase will be aborted.\n"

5944 -"\n"

5945 -msgstr ""

5946 -"\n"

5947 -"然而，如果您刪除全部內容，重定基底動作將會終止。\n"

5948 -"\n"

6071 +"global 'literal' pathspec setting is incompatible with all other global "

6072 +"pathspec settings"

6073 +msgstr "全域的 'literal' 路徑規格設定和其它的全域路徑規格設定不相容"

6074 +

6075 +#: pathspec.c:306

6076 +msgid "invalid parameter for pathspec magic 'prefix'"

6077 +msgstr "路徑規格包含無效的神奇前綴"

6078

5950 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607

5951 -#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270

6079 +#: pathspec.c:327

6080 #, c-format

5953 -msgid "could not write '%s'"

5954 -msgstr "不能寫入 '%s'"

6081 +msgid "Invalid pathspec magic '%.*s' in '%s'"

6082 +msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'"

6083

5956 -#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228

5957 -#: builtin/rebase.c:252

6084 +#: pathspec.c:332

6085 #, c-format

5959 -msgid "could not write '%s'."

5960 -msgstr "不能寫入 '%s'。"

6086 +msgid "Missing ')' at the end of pathspec magic in '%s'"

6087 +msgstr "路徑規格 '%s' 的神奇前綴結尾少了一個 ')'"

6088

5962 -#: rebase-interactive.c:193

6089 +#: pathspec.c:370

6090 #, c-format

5964 -msgid ""

5965 -"Warning: some commits may have been dropped accidentally.\n"

5966 -"Dropped commits (newer to older):\n"

5967 -msgstr ""

5968 -"警告：一些提交可能被意外捨棄。\n"

5969 -"捨棄的提交（從新到舊）：\n"

6091 +msgid "Unimplemented pathspec magic '%c' in '%s'"

6092 +msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'"

6093

5971 -#: rebase-interactive.c:200

6094 +#: pathspec.c:429

6095 #, c-format

5973 -msgid ""

5974 -"To avoid this message, use \"drop\" to explicitly remove a commit.\n"

5975 -"\n"

5976 -"Use 'git config rebase.missingCommitsCheck' to change the level of "

5977 -"warnings.\n"

5978 -"The possible behaviours are: ignore, warn, error.\n"

5979 -"\n"

5980 -msgstr ""

5981 -"為避免這條訊息，使用 \"drop\" 指令顯式地刪除一個提交。\n"

5982 -"\n"

5983 -"使用 'git config rebase.missingCommitsCheck' 來修改警告級別。\n"

5984 -"可選值有：ignore、warn、error。\n"

5985 -"\n"

6096 +msgid "%s: 'literal' and 'glob' are incompatible"

6097 +msgstr "%s：'literal' 和 'glob' 不相容"

6098

5987 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394

5988 -#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239

5989 -#: builtin/rebase.c:264

6099 +#: pathspec.c:445

6100 #, c-format

5991 -msgid "could not read '%s'."

5992 -msgstr "不能讀取 '%s'。"

5993 -

5994 -#: ref-filter.c:42 wt-status.c:1973

5995 -msgid "gone"

5996 -msgstr "遺失"

6101 +msgid "%s: '%s' is outside repository at '%s'"

6102 +msgstr "%s：'%s' 在位於 '%s' 的版本庫之外"

6103

5998 -#: ref-filter.c:43

6104 +#: pathspec.c:521

6105 #, c-format

6000 -msgid "ahead %d"

6001 -msgstr "領先 %d"

6106 +msgid "'%s' (mnemonic: '%c')"

6107 +msgstr "'%s'（助記符：'%c'）"

6108

6003 -#: ref-filter.c:44

6109 +#: pathspec.c:531

6110 #, c-format

6005 -msgid "behind %d"

6006 -msgstr "落後 %d"

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

6112 +msgstr "%s：路徑規格神奇前綴不被此指令支援：%s"

6113

6008 -#: ref-filter.c:45

6114 +#: pathspec.c:598

6115 #, c-format

6010 -msgid "ahead %d, behind %d"

6011 -msgstr "領先 %d，落後 %d"

6116 +msgid "pathspec '%s' is beyond a symbolic link"

6117 +msgstr "路徑規格 '%s' 位於符號連結中"

6118

6013 -#: ref-filter.c:169

6119 +#: pathspec.c:643

6120 #, c-format

6015 -msgid "expected format: %%(color:<color>)"

6016 -msgstr "期望的格式：%%(color:<顏色>)"

6121 +msgid "line is badly quoted: %s"

6122 +msgstr "某行不應該被括號括住：%s"

6123

6018 -#: ref-filter.c:171

6019 -#, c-format

6020 -msgid "unrecognized color: %%(color:%s)"

6021 -msgstr "無法識別的顏色：%%(color:%s)"

6124 +#: pkt-line.c:92

6125 +msgid "unable to write flush packet"

6126 +msgstr "無法寫 flush 包"

6127

6023 -#: ref-filter.c:193

6024 -#, c-format

6025 -msgid "Integer value expected refname:lstrip=%s"

6026 -msgstr "期望整數值 refname:lstrip=%s"

6128 +#: pkt-line.c:99

6129 +msgid "unable to write delim packet"

6130 +msgstr "無法寫 delim 包"

6131

6028 -#: ref-filter.c:197

6029 -#, c-format

6030 -msgid "Integer value expected refname:rstrip=%s"

6031 -msgstr "期望整數值 refname:rstrip=%s"

6132 +#: pkt-line.c:106

6133 +msgid "unable to write stateless separator packet"

6134 +msgstr "無法寫入無狀態的分隔符號封包"

6135

6033 -#: ref-filter.c:199

6034 -#, c-format

6035 -msgid "unrecognized %%(%s) argument: %s"

6036 -msgstr "無法識別的 %%(%s) 參數：%s"

6136 +#: pkt-line.c:113

6137 +msgid "flush packet write failed"

6138 +msgstr "flush 包寫錯誤"

6139

6038 -#: ref-filter.c:254

6039 -#, c-format

6040 -msgid "%%(objecttype) does not take arguments"

6041 -msgstr "%%(objecttype) 不帶參數"

6140 +#: pkt-line.c:153 pkt-line.c:239

6141 +msgid "protocol error: impossibly long line"

6142 +msgstr "協定錯誤：不可能的長行"

6143

6043 -#: ref-filter.c:276

6044 -#, c-format

6045 -msgid "unrecognized %%(objectsize) argument: %s"

6046 -msgstr "無法識別的 %%(objectsize) 參數：%s"

6144 +#: pkt-line.c:169 pkt-line.c:171

6145 +msgid "packet write with format failed"

6146 +msgstr "格式化包寫入錯誤"

6147

6048 -#: ref-filter.c:284

6049 -#, c-format

6050 -msgid "%%(deltabase) does not take arguments"

6051 -msgstr "%%(deltabase) 不帶參數"

6148 +#: pkt-line.c:203

6149 +msgid "packet write failed - data exceeds max packet size"

6150 +msgstr "寫封包失敗：資料超過了包的最大長度"

6151

6053 -#: ref-filter.c:296

6054 -#, c-format

6055 -msgid "%%(body) does not take arguments"

6056 -msgstr "%%(body) 不帶參數"

6152 +#: pkt-line.c:210 pkt-line.c:217

6153 +msgid "packet write failed"

6154 +msgstr "封包寫入失敗"

6155

6058 -#: ref-filter.c:309

6059 -#, c-format

6060 -msgid "unrecognized %%(subject) argument: %s"

6061 -msgstr "無法識別的 %%(subject) 引數：%s"

6156 +#: pkt-line.c:302

6157 +msgid "read error"

6158 +msgstr "讀取錯誤"

6159

6063 -#: ref-filter.c:330

6064 -#, c-format

6065 -msgid "unknown %%(trailers) argument: %s"

6066 -msgstr "未知的 %%(trailers) 參數：%s"

6160 +#: pkt-line.c:310

6161 +msgid "the remote end hung up unexpectedly"

6162 +msgstr "遠端意外掛斷了"

6163

6068 -#: ref-filter.c:363

6164 +#: pkt-line.c:338

6165 #, c-format

6070 -msgid "positive value expected contents:lines=%s"

6071 -msgstr "期望一個正數 contents:lines=%s"

6166 +msgid "protocol error: bad line length character: %.4s"

6167 +msgstr "協定錯誤：錯誤的行長度字串：%.4s"

6168

6073 -#: ref-filter.c:365

6169 +#: pkt-line.c:352 pkt-line.c:357

6170 #, c-format

6075 -msgid "unrecognized %%(contents) argument: %s"

6076 -msgstr "無法識別的 %%(contents) 參數：%s"

6171 +msgid "protocol error: bad line length %d"

6172 +msgstr "協定錯誤：錯誤的行長度 %d"

6173

6078 -#: ref-filter.c:380

6174 +#: pkt-line.c:373 sideband.c:165

6175 #, c-format

6080 -msgid "positive value expected '%s' in %%(%s)"

6081 -msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值"

6176 +msgid "remote error: %s"

6177 +msgstr "遠端錯誤：%s"

6178

6083 -#: ref-filter.c:384

6084 -#, c-format

6085 -msgid "unrecognized argument '%s' in %%(%s)"

6086 -msgstr "無法識別 %%(%2$s) 中的 '%1$s' 參數"

6179 +#: preload-index.c:125

6180 +msgid "Refreshing index"

6181 +msgstr "正在重新整理索引"

6182

6088 -#: ref-filter.c:398

6183 +#: preload-index.c:144

6184 #, c-format

6090 -msgid "unrecognized email option: %s"

6091 -msgstr "無法識別的 email 選項：%s"

6185 +msgid "unable to create threaded lstat: %s"

6186 +msgstr "無法建立執行緒 lstat：%s"

6187

6093 -#: ref-filter.c:428

6094 -#, c-format

6095 -msgid "expected format: %%(align:<width>,<position>)"

6096 -msgstr "期望的格式：%%(align:<寬度>,<位置>)"

6188 +#: pretty.c:984

6189 +msgid "unable to parse --pretty format"

6190 +msgstr "不能解析 --pretty 格式"

6191

6098 -#: ref-filter.c:440

6099 -#, c-format

6100 -msgid "unrecognized position:%s"

6101 -msgstr "無法識別的位置：%s"

6192 +#: promisor-remote.c:30

6193 +msgid "promisor-remote: unable to fork off fetch subprocess"

6194 +msgstr "promisor-remote: 無法 fork fetch 子處理程序"

6195

6103 -#: ref-filter.c:447

6104 -#, c-format

6105 -msgid "unrecognized width:%s"

6106 -msgstr "無法識別的寬度：%s"

6196 +#: promisor-remote.c:35 promisor-remote.c:37

6197 +msgid "promisor-remote: could not write to fetch subprocess"

6198 +msgstr "promisor-remote: 無法寫入 fetch 子處理程序"

6199

6108 -#: ref-filter.c:456

6109 -#, c-format

6110 -msgid "unrecognized %%(align) argument: %s"

6111 -msgstr "無法識別的 %%(align) 參數：%s"

6200 +#: promisor-remote.c:41

6201 +msgid "promisor-remote: could not close stdin to fetch subprocess"

6202 +msgstr "promisor-remote: 無法關閉 fetch 子處理程序的 stdin"

6203

6113 -#: ref-filter.c:464

6204 +#: promisor-remote.c:53

6205 #, c-format

6115 -msgid "positive width expected with the %%(align) atom"

6116 -msgstr "元素 %%(align) 需要一個正數的寬度"

6206 +msgid "promisor remote name cannot begin with '/': %s"

6207 +msgstr "promisor 遠端名稱不能以 '/' 開始：%s"

6208

6118 -#: ref-filter.c:482

6119 -#, c-format

6120 -msgid "unrecognized %%(if) argument: %s"

6121 -msgstr "無法識別的 %%(if) 參數：%s"

6209 +#: prune-packed.c:35

6210 +msgid "Removing duplicate objects"

6211 +msgstr "正在刪除重複物件"

6212

6123 -#: ref-filter.c:584

6124 -#, c-format

6125 -msgid "malformed field name: %.*s"

6126 -msgstr "格式錯誤的欄位名：%.*s"

6213 +#: range-diff.c:78

6214 +msgid "could not start `log`"

6215 +msgstr "不能啟動 `log`"

6216 +

6217 +#: range-diff.c:80

6218 +msgid "could not read `log` output"

6219 +msgstr "不能讀取 `log` 的輸出"

6220

6128 -#: ref-filter.c:611

6221 +#: range-diff.c:101 sequencer.c:5318

6222 #, c-format

6130 -msgid "unknown field name: %.*s"

6131 -msgstr "未知的欄位名：%.*s"

6223 +msgid "could not parse commit '%s'"

6224 +msgstr "不能解析提交 '%s'"

6225

6133 -#: ref-filter.c:615

6226 +#: range-diff.c:115

6227 #, c-format

6228 msgid ""

6136 -"not a git repository, but the field '%.*s' requires access to object data"

6137 -msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料"

6229 +"could not parse first line of `log` output: did not start with 'commit ': "

6230 +"'%s'"

6231 +msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s」"

6232

6139 -#: ref-filter.c:739

6233 +#: range-diff.c:140

6234 #, c-format

6141 -msgid "format: %%(if) atom used without a %%(then) atom"

6142 -msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素"

6235 +msgid "could not parse git header '%.*s'"

6236 +msgstr "無法解析 git 頭 '%.*s'"

6237

6144 -#: ref-filter.c:802

6145 -#, c-format

6146 -msgid "format: %%(then) atom used without an %%(if) atom"

6147 -msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素"

6238 +#: range-diff.c:306

6239 +msgid "failed to generate diff"

6240 +msgstr "生成 diff 失敗"

6241

6149 -#: ref-filter.c:804

6150 -#, c-format

6151 -msgid "format: %%(then) atom used more than once"

6152 -msgstr "格式：%%(then) 元素用了多次"

6242 +#: range-diff.c:558

6243 +msgid "--left-only and --right-only are mutually exclusive"

6244 +msgstr "--left-only 和 --right-only 互斥"

6245

6154 -#: ref-filter.c:806

6246 +#: range-diff.c:561 range-diff.c:563

6247 #, c-format

6156 -msgid "format: %%(then) atom used after %%(else)"

6157 -msgstr "格式：%%(then) 元素用在了 %%(else) 之後"

6248 +msgid "could not parse log for '%s'"

6249 +msgstr "不能解析 '%s' 的日誌"

6250

6159 -#: ref-filter.c:834

6251 +#: read-cache.c:682

6252 #, c-format

6161 -msgid "format: %%(else) atom used without an %%(if) atom"

6162 -msgstr "格式：使用了 %%(else) 元素而沒有 %%(if) 元素"

6253 +msgid "will not add file alias '%s' ('%s' already exists in index)"

6254 +msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）"

6255

6164 -#: ref-filter.c:836

6165 -#, c-format

6166 -msgid "format: %%(else) atom used without a %%(then) atom"

6167 -msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素"

6256 +#: read-cache.c:698

6257 +msgid "cannot create an empty blob in the object database"

6258 +msgstr "不能在物件資料庫中建立空的資料物件"

6259

6169 -#: ref-filter.c:838

6260 +#: read-cache.c:720

6261 #, c-format

6171 -msgid "format: %%(else) atom used more than once"

6172 -msgstr "格式：%%(else) 元素用了多次"

6262 +msgid "%s: can only add regular files, symbolic links or git-directories"

6263 +msgstr "%s：只能新增一般檔案、符號連結或 git 目錄"

6264

6174 -#: ref-filter.c:853

6265 +#: read-cache.c:725

6266 #, c-format

6176 -msgid "format: %%(end) atom used without corresponding atom"

6177 -msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素"

6267 +msgid "'%s' does not have a commit checked out"

6268 +msgstr "'%s' 沒有檢出一個提交"

6269

6179 -#: ref-filter.c:910

6270 +#: read-cache.c:777

6271 #, c-format

6181 -msgid "malformed format string %s"

6182 -msgstr "錯誤的格式化字串 %s"

6272 +msgid "unable to index file '%s'"

6273 +msgstr "無法索引檔案 '%s'"

6274

6184 -#: ref-filter.c:1549

6275 +#: read-cache.c:796

6276 #, c-format

6186 -msgid "no branch, rebasing %s"

6187 -msgstr "非分支，正重定基底 %s"

6277 +msgid "unable to add '%s' to index"

6278 +msgstr "無法在索引中新增 '%s'"

6279

6189 -#: ref-filter.c:1552

6280 +#: read-cache.c:807

6281 #, c-format

6191 -msgid "no branch, rebasing detached HEAD %s"

6192 -msgstr "非分支，正重定基底分離開頭指標 %s"

6282 +msgid "unable to stat '%s'"

6283 +msgstr "無法對 %s 執行 stat"

6284

6194 -#: ref-filter.c:1555

6285 +#: read-cache.c:1318

6286 #, c-format

6196 -msgid "no branch, bisect started on %s"

6197 -msgstr "非分支，二分尋找開始於 %s"

6198 -

6199 -#: ref-filter.c:1565

6200 -msgid "no branch"

6201 -msgstr "非分支"

6287 +msgid "'%s' appears as both a file and as a directory"

6288 +msgstr "'%s' 看起來既是檔案又是目錄"

6289

6203 -#: ref-filter.c:1599 ref-filter.c:1808

6204 -#, c-format

6205 -msgid "missing object %s for %s"

6206 -msgstr "缺少 %2$s 的物件 %1$s"

6290 +#: read-cache.c:1532

6291 +msgid "Refresh index"

6292 +msgstr "重新整理索引"

6293

6208 -#: ref-filter.c:1609

6294 +#: read-cache.c:1657

6295 #, c-format

6210 -msgid "parse_object_buffer failed on %s for %s"

6211 -msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"

6296 +msgid ""

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

6298 +"Using version %i"

6299 +msgstr ""

6300 +"設定了 index.version，但是取值無效。\n"

6301 +"使用版本 %i"

6302

6213 -#: ref-filter.c:2062

6303 +#: read-cache.c:1667

6304 #, c-format

6215 -msgid "malformed object at '%s'"

6216 -msgstr "格式錯誤的物件 '%s'"

6217 -

6218 -#: ref-filter.c:2151

6219 -#, c-format

6220 -msgid "ignoring ref with broken name %s"

6221 -msgstr "忽略帶有錯誤名稱 %s 的引用"

6305 +msgid ""

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

6307 +"Using version %i"

6308 +msgstr ""

6309 +"設定了 GIT_INDEX_VERSION，但是取值無效。\n"

6310 +"使用版本 %i"

6311

6223 -#: ref-filter.c:2156 refs.c:676

6312 +#: read-cache.c:1723

6313 #, c-format

6225 -msgid "ignoring broken ref %s"

6226 -msgstr "忽略損壞的引用 %s"

6314 +msgid "bad signature 0x%08x"

6315 +msgstr "壞的簽名 0x%08x"

6316

6228 -#: ref-filter.c:2472

6317 +#: read-cache.c:1726

6318 #, c-format

6230 -msgid "format: %%(end) atom missing"

6231 -msgstr "格式：缺少 %%(end) 元素"

6319 +msgid "bad index version %d"

6320 +msgstr "壞的索引版本 %d"

6321

6233 -#: ref-filter.c:2571

6234 -#, c-format

6235 -msgid "malformed object name %s"

6236 -msgstr "格式錯誤的物件名 %s"

6322 +#: read-cache.c:1735

6323 +msgid "bad index file sha1 signature"

6324 +msgstr "壞的索引檔案 sha1 簽名"

6325

6238 -#: ref-filter.c:2576

6326 +#: read-cache.c:1765

6327 #, c-format

6240 -msgid "option `%s' must point to a commit"

6241 -msgstr "選項 `%s' 必須指向一個提交"

6328 +msgid "index uses %.4s extension, which we do not understand"

6329 +msgstr "索引使用不被支援的 %.4s 擴展"

6330

6243 -#: refs.c:264

6331 +#

6332 +#: read-cache.c:1767

6333 #, c-format

6245 -msgid "%s does not point to a valid object!"

6246 -msgstr "%s 沒有指向一個有效的物件！"

6334 +msgid "ignoring %.4s extension"

6335 +msgstr "忽略 %.4s 擴展"

6336

6248 -#: refs.c:566

6337 +#: read-cache.c:1804

6338 #, c-format

6250 -msgid ""

6251 -"Using '%s' as the name for the initial branch. This default branch name\n"

6252 -"is subject to change. To configure the initial branch name to use in all\n"

6253 -"of your new repositories, which will suppress this warning, call:\n"

6254 -"\n"

6255 -"\tgit config --global init.defaultBranch <name>\n"

6256 -"\n"

6257 -"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"

6258 -"'development'. The just-created branch can be renamed via this command:\n"

6259 -"\n"

6260 -"\tgit branch -m <name>\n"

6261 -msgstr ""

6262 -"將「%s」設定為初始分支的名稱。這個預設分支名稱可以變更。\n"

6263 -"如果要設定所有新版本庫要使用的初始分支名稱，\n"

6264 -"請呼叫（會隱藏這個警告）：\n"

6265 -"\n"

6266 -"\tgit config —global init.defaultBranch <name>\n"

6267 -"\n"

6268 -"除了 ‘master’ 外，常用的分支名稱有 ‘main’, ‘trunk’ 以及\n"

6269 -"‘development’。剛建立的分支可以用這個命令重新命名：\n"

6270 -"\n"

6271 -"\tgit branch -m <name>\n"

6339 +msgid "unknown index entry format 0x%08x"

6340 +msgstr "未知的索引條目格式 0x%08x"

6341

6273 -#: refs.c:588

6342 +#: read-cache.c:1820

6343 #, c-format

6275 -msgid "could not retrieve `%s`"

6276 -msgstr "無法擷取「%s」"

6344 +msgid "malformed name field in the index, near path '%s'"

6345 +msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位"

6346

6278 -#: refs.c:598

6279 -#, c-format

6280 -msgid "invalid branch name: %s = %s"

6281 -msgstr "分支名稱無效：%s = %s"

6347 +#: read-cache.c:1877

6348 +msgid "unordered stage entries in index"

6349 +msgstr "索引中有未排序的暫存條目"

6350

6283 -#: refs.c:674

6351 +#: read-cache.c:1880

6352 #, c-format

6285 -msgid "ignoring dangling symref %s"

6286 -msgstr "忽略懸空符號引用 %s"

6353 +msgid "multiple stage entries for merged file '%s'"

6354 +msgstr "合併檔案 '%s' 有多個暫存條目"

6355

6288 -#: refs.c:911

6356 +#: read-cache.c:1883

6357 #, c-format

6290 -msgid "log for ref %s has gap after %s"

6291 -msgstr "引用 %s 的日誌在 %s 之後有缺口"

6358 +msgid "unordered stage entries for '%s'"

6359 +msgstr "'%s' 的未排序暫存條目"

6360

6293 -#: refs.c:917

6294 -#, c-format

6295 -msgid "log for ref %s unexpectedly ended on %s"

6296 -msgstr "引用 %s 的日誌意外終止於 %s"

6361 +#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095

6362 +#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181

6363 +#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991

6364 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505

6365 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290

6366 +#: builtin/submodule--helper.c:332

6367 +msgid "index file corrupt"

6368 +msgstr "索引檔案損壞"

6369

6298 -#: refs.c:976

6370 +#: read-cache.c:2133

6371 #, c-format

6300 -msgid "log for %s is empty"

6301 -msgstr "%s 的日誌為空"

6372 +msgid "unable to create load_cache_entries thread: %s"

6373 +msgstr "無法建立 load_cache_entries 執行緒：%s"

6374

6303 -#: refs.c:1068

6375 +#: read-cache.c:2146

6376 #, c-format

6305 -msgid "refusing to update ref with bad name '%s'"

6306 -msgstr "拒絕更新有錯誤名稱 '%s' 的引用"

6377 +msgid "unable to join load_cache_entries thread: %s"

6378 +msgstr "無法加入 load_cache_entries 執行緒：%s"

6379

6308 -#: refs.c:1139

6380 +#: read-cache.c:2179

6381 #, c-format

6310 -msgid "update_ref failed for ref '%s': %s"

6311 -msgstr "對引用 '%s' 執行 update_ref 失敗：%s"

6382 +msgid "%s: index file open failed"

6383 +msgstr "%s：開啟索引檔案失敗"

6384

6313 -#: refs.c:1963

6385 +#: read-cache.c:2183

6386 #, c-format

6315 -msgid "multiple updates for ref '%s' not allowed"

6316 -msgstr "不允許對引用 '%s' 多次更新"

6317 -

6318 -#: refs.c:2043

6319 -msgid "ref updates forbidden inside quarantine environment"

6320 -msgstr "在隔離環境中禁止更新引用"

6321 -

6322 -#: refs.c:2054

6323 -msgid "ref updates aborted by hook"

6324 -msgstr "引用更新被掛鉤拒絕"

6387 +msgid "%s: cannot stat the open index"

6388 +msgstr "%s：不能對開啟的索引執行 stat 動作"

6389

6326 -#: refs.c:2154 refs.c:2184

6390 +#: read-cache.c:2187

6391 #, c-format

6328 -msgid "'%s' exists; cannot create '%s'"

6329 -msgstr "'%s' 已存在，無法建立 '%s'"

6392 +msgid "%s: index file smaller than expected"

6393 +msgstr "%s：索引檔案比預期的小"

6394

6331 -#: refs.c:2160 refs.c:2195

6395 +#: read-cache.c:2191

6396 #, c-format

6333 -msgid "cannot process '%s' and '%s' at the same time"

6334 -msgstr "無法同時處理 '%s' 和 '%s'"

6397 +msgid "%s: unable to map index file"

6398 +msgstr "%s：無法對索引檔案執行 map 動作"

6399

6336 -#: refs/files-backend.c:1228

6400 +#: read-cache.c:2233

6401 #, c-format

6338 -msgid "could not remove reference %s"

6339 -msgstr "無法刪除引用 %s"

6402 +msgid "unable to create load_index_extensions thread: %s"

6403 +msgstr "無法建立 load_index_extensions 執行緒：%s"

6404

6341 -#: refs/files-backend.c:1242 refs/packed-backend.c:1542

6342 -#: refs/packed-backend.c:1552

6405 +#: read-cache.c:2260

6406 #, c-format

6344 -msgid "could not delete reference %s: %s"

6345 -msgstr "無法刪除引用 %s：%s"

6407 +msgid "unable to join load_index_extensions thread: %s"

6408 +msgstr "無法加入 load_index_extensions 執行緒：%s"

6409

6347 -#: refs/files-backend.c:1245 refs/packed-backend.c:1555

6410 +#: read-cache.c:2292

6411 #, c-format

6349 -msgid "could not delete references: %s"

6350 -msgstr "無法刪除引用：%s"

6412 +msgid "could not freshen shared index '%s'"

6413 +msgstr "無法重新整理共享索引 '%s'"

6414

6352 -#: refspec.c:170

6415 +#: read-cache.c:2339

6416 #, c-format

6354 -msgid "invalid refspec '%s'"

6355 -msgstr "無效的引用表達式：'%s'"

6417 +msgid "broken index, expect %s in %s, got %s"

6418 +msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

6419

6357 -#: remote.c:351

6420 +#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141

6421 #, c-format

6359 -msgid "config remote shorthand cannot begin with '/': %s"

6360 -msgstr "設定的遠端短名稱不能以 '/' 開始：%s"

6361 -

6362 -#: remote.c:399

6363 -msgid "more than one receivepack given, using the first"

6364 -msgstr "提供了一個以上的 receivepack，使用第一個"

6365 -

6366 -#: remote.c:407

6367 -msgid "more than one uploadpack given, using the first"

6368 -msgstr "提供了一個以上的 uploadpack，使用第一個"

6422 +msgid "could not close '%s'"

6423 +msgstr "不能關閉 '%s'"

6424

6370 -#: remote.c:590

6425 +#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239

6426 #, c-format

6372 -msgid "Cannot fetch both %s and %s to %s"

6373 -msgstr "不能同時取得 %s 和 %s 至 %s"

6427 +msgid "could not stat '%s'"

6428 +msgstr "不能對 '%s' 呼叫 stat"

6429

6375 -#: remote.c:594

6430 +#: read-cache.c:3151

6431 #, c-format

6377 -msgid "%s usually tracks %s, not %s"

6378 -msgstr "%s 通常追蹤 %s，而非 %s"

6432 +msgid "unable to open git dir: %s"

6433 +msgstr "不能開啟 git 目錄：%s"

6434

6380 -#: remote.c:598

6435 +#: read-cache.c:3163

6436 #, c-format

6382 -msgid "%s tracks both %s and %s"

6383 -msgstr "%s 同時追蹤 %s 和 %s"

6437 +msgid "unable to unlink: %s"

6438 +msgstr "無法刪除：%s"

6439

6385 -#: remote.c:666

6440 +#: read-cache.c:3188

6441 #, c-format

6387 -msgid "key '%s' of pattern had no '*'"

6388 -msgstr "模式的鍵 '%s' 沒有 '*'"

6442 +msgid "cannot fix permission bits on '%s'"

6443 +msgstr "不能修復 '%s' 的權限位"

6444

6390 -#: remote.c:676

6445 +#: read-cache.c:3337

6446 #, c-format

6392 -msgid "value '%s' of pattern has no '*'"

6393 -msgstr "模式的值 '%s' 沒有 '*'"

6447 +msgid "%s: cannot drop to stage #0"

6448 +msgstr "%s：不能落到暫存區 #0"

6449

6395 -#: remote.c:1073

6396 -#, c-format

6397 -msgid "src refspec %s does not match any"

6398 -msgstr "源引用表達式 %s 沒有符合"

6450 +#: rebase-interactive.c:11

6451 +msgid ""

6452 +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

6453 +"continue'.\n"

6454 +"Or you can abort the rebase with 'git rebase --abort'.\n"

6455 +msgstr ""

6456 +"您可以用 'git rebase --edit-todo' 修正，然後執行 'git rebase --continue'。\n"

6457 +"或者您可以用 'git rebase --abort' 終止重定基底。\n"

6458

6400 -#: remote.c:1078

6459 +#: rebase-interactive.c:33

6460 #, c-format

6402 -msgid "src refspec %s matches more than one"

6403 -msgstr "源引用表達式 %s 符合超過一個"

6461 +msgid ""

6462 +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

6463 +msgstr "選項 rebase.missingCommitsCheck 的值 %s 無法識別。已忽略。"

6464

6405 -#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push

6406 -#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

6407 -#. the <src>.

6408 -#.

6409 -#: remote.c:1093

6410 -#, c-format

6465 +#: rebase-interactive.c:42

6466 msgid ""

6412 -"The destination you provided is not a full refname (i.e.,\n"

6413 -"starting with \"refs/\"). We tried to guess what you meant by:\n"

6467 "\n"

6415 -"- Looking for a ref that matches '%s' on the remote side.\n"

6416 -"- Checking if the <src> being pushed ('%s')\n"

6417 -" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"

6418 -" refs/{heads,tags}/ prefix on the remote side.\n"

6468 +"Commands:\n"

6469 +"p, pick <commit> = use commit\n"

6470 +"r, reword <commit> = use commit, but edit the commit message\n"

6471 +"e, edit <commit> = use commit, but stop for amending\n"

6472 +"s, squash <commit> = use commit, but meld into previous commit\n"

6473 +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"

6474 +"x, exec <command> = run command (the rest of the line) using shell\n"

6475 +"b, break = stop here (continue rebase later with 'git rebase --continue')\n"

6476 +"d, drop <commit> = remove commit\n"

6477 +"l, label <label> = label current HEAD with a name\n"

6478 +"t, reset <label> = reset HEAD to a label\n"

6479 +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

6480 +". create a merge commit using the original merge commit's\n"

6481 +". message (or the oneline, if no original merge commit was\n"

6482 +". specified). Use -c <commit> to reword the commit message.\n"

6483 "\n"

6420 -"Neither worked, so we gave up. You must fully qualify the ref."

6484 +"These lines can be re-ordered; they are executed from top to bottom.\n"

6485 msgstr ""

6422 -"您提供的目標不是一個完整的引用名稱（即以 \"refs/\" 開頭）。我們\n"

6423 -"試著猜測您的想法：\n"

6486 "\n"

6425 -"- 在遠端查詢和 '%s' 符合的引用。\n"

6426 -"- 檢查要推送的 <src>（'%s'）是不是在 \"refs/{heads,tags}/\" 中的\n"

6427 -" 引用。如果是，我們會在對應的遠端新增 refs/{heads,tags}/ 前綴。\n"

6487 +"指令:\n"

6488 +"p, pick <提交> = 使用提交\n"

6489 +"r, reword <提交> = 使用提交，但修改提交說明\n"

6490 +"e, edit <提交> = 使用提交，進入 shell 以便進行提交修補\n"

6491 +"s, squash <提交> = 使用提交，但融合到前一個提交\n"

6492 +"f, fixup <提交> = 類似於 \"squash\"，但捨棄提交說明日誌\n"

6493 +"x, exec <命令> = 使用 shell 執行指令（此行剩餘部分）\n"

6494 +"b, break = 在此處停止（使用 'git rebase --continue' 繼續重定基底）\n"

6495 +"d, drop <提交> = 刪除提交\n"

6496 +"l, label <label> = 為目前 HEAD 打上標記\n"

6497 +"t, reset <label> = 重設 HEAD 到該標記\n"

6498 +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

6499 +". 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n"

6500 +". 原始提交，使用備註部分的 oneline 作為提交說明）。使用\n"

6501 +". -c <提交> 可以編輯提交說明。\n"

6502 "\n"

6429 -"都不行，所以我們已放棄。您必須給出完整的引用。"

6503 +"可以對這些行重新排序，將從上至下執行。\n"

6504

6431 -#: remote.c:1113

6505 +#: rebase-interactive.c:63

6506 #, c-format

6507 +msgid "Rebase %s onto %s (%d command)"

6508 +msgid_plural "Rebase %s onto %s (%d commands)"

6509 +msgstr[0] "重定基底 %s 到 %s（%d 個提交）"

6510 +

6511 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218

6512 msgid ""

6434 -"The <src> part of the refspec is a commit object.\n"

6435 -"Did you mean to create a new branch by pushing to\n"

6436 -"'%s:refs/heads/%s'?"

6513 +"\n"

6514 +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

6515 msgstr ""

l10n: zh_TW.po: v2.31.0 round 2 (15 untranslated)