@matheusbsbs / matheus-bagliano / commits / 1fae9a4b1b
Fork 0

l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)

Revision 2. Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com>

Yi-Jyun committed Mar 14, 2020 at 01:12 UTC 1fae9a4b1bbaa4e4c1288c84df4d4e70f0ac4a09
1 file changed +289 -388
po/zh_TW.po
+289 -388
@@ -140,8 +140,8 @@ msgid ""
140 msgstr ""
141 "Project-Id-Version: Git\n"
142 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
143 -"POT-Creation-Date: 2020-03-06 14:25+0800\n"
144 -"PO-Revision-Date: 2020-03-10 01:16+0800\n"
143 +"POT-Creation-Date: 2020-03-11 15:26+0800\n"
144 +"PO-Revision-Date: 2020-03-15 01:48+0800\n"
145 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
146 "Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n"
147 "Language: zh_TW\n"
@@ -342,8 +342,8 @@ msgstr "快取"
342 msgid "unstaged"
343 msgstr "未快取"
344
345 -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2197
346 -#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144
345 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
346 +#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
347 #: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
348 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
349 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
@@ -464,7 +464,6 @@ msgstr ""
464 "q - 離開。不要不暫存此區塊及後面的全部區塊\n"
465 "a - 不暫存此區塊和本檔案中後面的全部區塊\n"
466 "d - 不要不暫存此區塊和本檔案中後面的全部區塊\n"
467 -"\v\n"
467
468 #: add-patch.c:99 git-add--interactive.perl:1443
469 #, c-format, perl-format
@@ -642,7 +641,7 @@ msgstr "interactive.diffFilter 的輸出不符"
641 msgid ""
642 "Your filter must maintain a one-to-one correspondence\n"
643 "between its input and output lines."
645 -msgstr ""
644 +msgstr "您的過濾器必須在其輸入及輸出行維持一對一的對應關係。"
645
646 #: add-patch.c:761
647 #, c-format
@@ -1393,7 +1392,7 @@ msgid "%d line applied after fixing whitespace errors."
1392 msgid_plural "%d lines applied after fixing whitespace errors."
1393 msgstr[0] "修復空白錯誤後，應用了 %d 行。"
1394
1396 -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:390
1395 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
1396 msgid "Unable to write new index file"
1397 msgstr "無法寫入新索引檔案"
1398
@@ -1405,7 +1404,7 @@ msgstr "不要應用與給出路徑向符合的變更"
1404 msgid "apply changes matching the given path"
1405 msgstr "應用與給出路徑向符合的變更"
1406
1408 -#: apply.c:4973 builtin/am.c:2206
1407 +#: apply.c:4973 builtin/am.c:2260
1408 msgid "num"
1409 msgstr "數字"
1410
@@ -1469,7 +1468,7 @@ msgstr "路徑以 NUL 字元分隔"
1468 msgid "ensure at least <n> lines of context match"
1469 msgstr "確保至少符合 <n> 行上下文"
1470
1472 -#: apply.c:5008 builtin/am.c:2185 builtin/interpret-trailers.c:98
1471 +#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
1472 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
1473 #: builtin/pack-objects.c:3457 builtin/rebase.c:1508
1474 msgid "action"
@@ -1513,7 +1512,7 @@ msgstr "允許不正確的檔案末尾換行符號"
1512 msgid "do not trust the line counts in the hunk headers"
1513 msgstr "不信任修補檔片段的標頭訊息中的行號"
1514
1516 -#: apply.c:5032 builtin/am.c:2194
1515 +#: apply.c:5032 builtin/am.c:2248
1516 msgid "root"
1517 msgstr "根目錄"
1518
@@ -1539,7 +1538,7 @@ msgstr ""
1538 msgid "git archive --remote <repo> [--exec <cmd>] --list"
1539 msgstr "git archive --remote <版本庫> [--exec <指令>] --list"
1540
1542 -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:299
1541 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
1542 #, c-format
1543 msgid "pathspec '%s' did not match any files"
1544 msgstr "路徑規格 '%s' 未符合任何檔案"
@@ -2092,8 +2091,8 @@ msgstr "index-pack 終止"
2091 msgid "invalid color value: %.*s"
2092 msgstr "無效的顏色值：%.*s"
2093
2095 -#: commit.c:51 sequencer.c:2719 builtin/am.c:354 builtin/am.c:398
2096 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:457
2094 +#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
2095 +#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
2096 #, c-format
2097 msgid "could not parse %s"
2098 msgstr "不能解析 %s"
@@ -2212,7 +2211,7 @@ msgstr "無效的提交位置。提交圖形可能已損壞"
2211 msgid "could not find commit %s"
2212 msgstr "無法找到提交 %s"
2213
2215 -#: commit-graph.c:852 builtin/am.c:1287
2214 +#: commit-graph.c:852 builtin/am.c:1292
2215 #, c-format
2216 msgid "unable to parse commit %s"
2217 msgstr "不能解析提交 %s"
@@ -3178,7 +3177,7 @@ msgid "invalid --stat value: %s"
3177 msgstr "無效的 --stat 值：%s"
3178
3179 #: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
3181 -#: parse-options.c:199 parse-options.c:203
3180 +#: parse-options.c:197 parse-options.c:201
3181 #, c-format
3182 msgid "%s expects a numerical value"
3183 msgstr "%s 期望一個數字值"
@@ -4321,9 +4320,9 @@ msgstr "不能建立 '%s.lock'：%s"
4320 msgid "failed to read the cache"
4321 msgstr "讀取快取失敗"
4322
4324 -#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
4323 +#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
4324 #: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
4326 -#: builtin/stash.c:264
4325 +#: builtin/stash.c:265
4326 msgid "unable to write new index file"
4327 msgstr "無法寫新的索引檔案"
4328
@@ -4508,33 +4507,33 @@ msgstr "重新命名"
4507 msgid "renamed"
4508 msgstr "重新命名"
4509
4511 -#: merge-recursive.c:1606 merge-recursive.c:2530 merge-recursive.c:3175
4510 +#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
4511 #, c-format
4512 msgid "Refusing to lose dirty file at %s"
4513 msgstr "拒絕遺失髒檔案 '%s'"
4514
4516 -#: merge-recursive.c:1616
4515 +#: merge-recursive.c:1587
4516 #, c-format
4517 msgid "Refusing to lose untracked file at %s, even though it's in the way."
4518 msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。"
4519
4521 -#: merge-recursive.c:1674
4520 +#: merge-recursive.c:1645
4521 #, c-format
4522 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
4523 msgstr ""
4524 "衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"
4525
4527 -#: merge-recursive.c:1705
4526 +#: merge-recursive.c:1676
4527 #, c-format
4528 msgid "%s is a directory in %s adding as %s instead"
4529 msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增"
4530
4532 -#: merge-recursive.c:1710
4531 +#: merge-recursive.c:1681
4532 #, c-format
4533 msgid "Refusing to lose untracked file at %s; adding as %s instead"
4534 msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s"
4535
4537 -#: merge-recursive.c:1737
4536 +#: merge-recursive.c:1708
4537 #, c-format
4538 msgid ""
4539 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -4543,18 +4542,18 @@ msgstr ""
4542 "衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在"
4543 "分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s"
4544
4546 -#: merge-recursive.c:1742
4545 +#: merge-recursive.c:1713
4546 msgid " (left unresolved)"
4547 msgstr "（留下未解決）"
4548
4550 -#: merge-recursive.c:1851
4549 +#: merge-recursive.c:1793
4550 #, c-format
4551 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
4552 msgstr ""
4553 "衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 "
4554 "%4$s->%5$s"
4555
4557 -#: merge-recursive.c:2114
4556 +#: merge-recursive.c:2056
4557 #, c-format
4558 msgid ""
4559 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4564,7 +4563,7 @@ msgstr ""
4563 "衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到"
4564 "多個其它目錄，沒有目錄包含大部分檔案。"
4565
4567 -#: merge-recursive.c:2146
4566 +#: merge-recursive.c:2088
4567 #, c-format
4568 msgid ""
4569 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4573,7 +4572,7 @@ msgstr ""
4572 "衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑"
4573 "放在：%s。"
4574
4576 -#: merge-recursive.c:2156
4575 +#: merge-recursive.c:2098
4576 #, c-format
4577 msgid ""
4578 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4582,7 +4581,7 @@ msgstr ""
4581 "衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這"
4582 "些路徑放置於此：%s"
4583
4585 -#: merge-recursive.c:2248
4584 +#: merge-recursive.c:2190
4585 #, c-format
4586 msgid ""
4587 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4591,59 +4590,59 @@ msgstr ""
4590 "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新"
4591 "命名目錄 %4$s->%5$s"
4592
4594 -#: merge-recursive.c:2493
4593 +#: merge-recursive.c:2435
4594 #, c-format
4595 msgid ""
4596 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4597 "renamed."
4598 msgstr "警告：避免應用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。"
4599
4601 -#: merge-recursive.c:3019
4600 +#: merge-recursive.c:2961
4601 #, c-format
4602 msgid "cannot read object %s"
4603 msgstr "不能讀取物件 %s"
4604
4606 -#: merge-recursive.c:3022
4605 +#: merge-recursive.c:2964
4606 #, c-format
4607 msgid "object %s is not a blob"
4608 msgstr "物件 %s 不是一個資料物件"
4609
4611 -#: merge-recursive.c:3086
4610 +#: merge-recursive.c:3028
4611 msgid "modify"
4612 msgstr "修改"
4613
4615 -#: merge-recursive.c:3086
4614 +#: merge-recursive.c:3028
4615 msgid "modified"
4616 msgstr "修改"
4617
4619 -#: merge-recursive.c:3098
4618 +#: merge-recursive.c:3040
4619 msgid "content"
4620 msgstr "內容"
4621
4623 -#: merge-recursive.c:3102
4622 +#: merge-recursive.c:3044
4623 msgid "add/add"
4624 msgstr "新增/新增"
4625
4627 -#: merge-recursive.c:3125
4626 +#: merge-recursive.c:3067
4627 #, c-format
4628 msgid "Skipped %s (merged same as existing)"
4629 msgstr "略過 %s（已經做過相同合併）"
4630
4632 -#: merge-recursive.c:3147 git-submodule.sh:1003
4631 +#: merge-recursive.c:3089 git-submodule.sh:1003
4632 msgid "submodule"
4633 msgstr "子模組"
4634
4636 -#: merge-recursive.c:3148
4635 +#: merge-recursive.c:3090
4636 #, c-format
4637 msgid "CONFLICT (%s): Merge conflict in %s"
4638 msgstr "衝突（%s）：合併衝突於 %s"
4639
4641 -#: merge-recursive.c:3178
4640 +#: merge-recursive.c:3120
4641 #, c-format
4642 msgid "Adding as %s instead"
4643 msgstr "而是以 %s 為名新增"
4644
4646 -#: merge-recursive.c:3261
4645 +#: merge-recursive.c:3203
4646 #, c-format
4647 msgid ""
4648 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4651,7 +4650,7 @@ msgid ""
4650 msgstr ""
4651 "路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"
4652
4654 -#: merge-recursive.c:3264
4653 +#: merge-recursive.c:3206
4654 #, c-format
4655 msgid ""
4656 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4660,7 +4659,7 @@ msgstr ""
4659 "衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移"
4660 "動到 %s。"
4661
4663 -#: merge-recursive.c:3268
4662 +#: merge-recursive.c:3210
4663 #, c-format
4664 msgid ""
4665 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4669,7 +4668,7 @@ msgstr ""
4668 "路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將"
4669 "其移動到 %5$s。"
4670
4672 -#: merge-recursive.c:3271
4671 +#: merge-recursive.c:3213
4672 #, c-format
4673 msgid ""
4674 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4678,58 +4677,58 @@ msgstr ""
4677 "衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s "
4678 "中，建議將其移動到 %5$s。"
4679
4681 -#: merge-recursive.c:3385
4680 +#: merge-recursive.c:3327
4681 #, c-format
4682 msgid "Removing %s"
4683 msgstr "刪除 %s"
4684
4686 -#: merge-recursive.c:3408
4685 +#: merge-recursive.c:3350
4686 msgid "file/directory"
4687 msgstr "檔案/目錄"
4688
4690 -#: merge-recursive.c:3413
4689 +#: merge-recursive.c:3355
4690 msgid "directory/file"
4691 msgstr "目錄/檔案"
4692
4694 -#: merge-recursive.c:3420
4693 +#: merge-recursive.c:3362
4694 #, c-format
4695 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
4696 msgstr "衝突（%1$s）：在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s"
4697
4699 -#: merge-recursive.c:3429
4698 +#: merge-recursive.c:3371
4699 #, c-format
4700 msgid "Adding %s"
4701 msgstr "新增 %s"
4702
4704 -#: merge-recursive.c:3438
4703 +#: merge-recursive.c:3380
4704 #, c-format
4705 msgid "CONFLICT (add/add): Merge conflict in %s"
4706 msgstr "衝突（add/add）：合併衝突於 %s"
4707
4709 -#: merge-recursive.c:3482
4708 +#: merge-recursive.c:3424
4709 msgid "Already up to date!"
4710 msgstr "已經是最新的！"
4711
4713 -#: merge-recursive.c:3491
4712 +#: merge-recursive.c:3433
4713 #, c-format
4714 msgid "merging of trees %s and %s failed"
4715 msgstr "無法合併樹 %s 和 %s"
4716
4718 -#: merge-recursive.c:3595
4717 +#: merge-recursive.c:3537
4718 msgid "Merging:"
4719 msgstr "合併："
4720
4722 -#: merge-recursive.c:3608
4721 +#: merge-recursive.c:3550
4722 #, c-format
4723 msgid "found %u common ancestor:"
4724 msgid_plural "found %u common ancestors:"
4725 msgstr[0] "發現 %u 個共同祖先："
4726
4728 -#: merge-recursive.c:3658
4727 +#: merge-recursive.c:3600
4728 msgid "merge returned no commit"
4729 msgstr "合併未返回提交"
4730
4732 -#: merge-recursive.c:3717
4731 +#: merge-recursive.c:3659
4732 #, c-format
4733 msgid ""
4734 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4738,12 +4737,12 @@ msgstr ""
4737 "您對下列檔案的本機修改將被合併動作覆蓋：\n"
4738 " %s"
4739
4741 -#: merge-recursive.c:3814
4740 +#: merge-recursive.c:3756
4741 #, c-format
4742 msgid "Could not parse object '%s'"
4743 msgstr "不能解析物件 '%s'"
4744
4746 -#: merge-recursive.c:3832 builtin/merge.c:697 builtin/merge.c:877
4745 +#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
4746 msgid "Unable to write index."
4747 msgstr "不能寫入索引。"
4748
@@ -5013,7 +5012,7 @@ msgstr "%s 與 %s 不相容"
5012 msgid "%s : incompatible with something else"
5013 msgstr "%s：和其它的不相容"
5014
5016 -#: parse-options.c:92 parse-options.c:96 parse-options.c:319
5015 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317
5016 #, c-format
5017 msgid "%s takes no value"
5018 msgstr "%s 不取值"
@@ -5023,41 +5022,41 @@ msgstr "%s 不取值"
5022 msgid "%s isn't available"
5023 msgstr "%s 不可用"
5024
5026 -#: parse-options.c:219
5025 +#: parse-options.c:217
5026 #, c-format
5027 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
5028 msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴"
5029
5031 -#: parse-options.c:388
5030 +#: parse-options.c:386
5031 #, c-format
5032 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
5033 msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）"
5034
5036 -#: parse-options.c:422 parse-options.c:430
5035 +#: parse-options.c:420 parse-options.c:428
5036 #, c-format
5037 msgid "did you mean `--%s` (with two dashes)?"
5038 msgstr "你的意思是 `--%s`（有兩個短線）嗎？"
5039
5041 -#: parse-options.c:859
5040 +#: parse-options.c:857
5041 #, c-format
5042 msgid "unknown option `%s'"
5043 msgstr "未知選項 `%s'"
5044
5046 -#: parse-options.c:861
5045 +#: parse-options.c:859
5046 #, c-format
5047 msgid "unknown switch `%c'"
5048 msgstr "未知開關 `%c'"
5049
5051 -#: parse-options.c:863
5050 +#: parse-options.c:861
5051 #, c-format
5052 msgid "unknown non-ascii option in string: `%s'"
5053 msgstr "字串中未知的非 ascii 字元選項：`%s'"
5054
5056 -#: parse-options.c:887
5055 +#: parse-options.c:885
5056 msgid "..."
5057 msgstr "..."
5058
5060 -#: parse-options.c:906
5059 +#: parse-options.c:904
5060 #, c-format
5061 msgid "usage: %s"
5062 msgstr "用法：%s"
@@ -5065,22 +5064,22 @@ msgstr "用法：%s"
5064 #. TRANSLATORS: the colon here should align with the
5065 #. one in "usage: %s" translation.
5066 #.
5068 -#: parse-options.c:912
5067 +#: parse-options.c:910
5068 #, c-format
5069 msgid " or: %s"
5070 msgstr " 或：%s"
5071
5072 # 譯者：為保證在輸出中對齊，注意調整句中空格！
5074 -#: parse-options.c:915
5073 +#: parse-options.c:913
5074 #, c-format
5075 msgid " %s"
5076 msgstr " %s"
5077
5079 -#: parse-options.c:954
5078 +#: parse-options.c:952
5079 msgid "-NUM"
5080 msgstr "-數字"
5081
5083 -#: parse-options.c:968
5082 +#: parse-options.c:966
5083 #, c-format
5084 msgid "alias of --%s"
5085 msgstr "--%s 的別名"
@@ -5162,9 +5161,9 @@ msgid "%s: 'literal' and 'glob' are incompatible"
5161 msgstr "%s：'literal' 和 'glob' 不相容"
5162
5163 #: pathspec.c:442
5165 -#, fuzzy, c-format
5164 +#, c-format
5165 msgid "%s: '%s' is outside repository at '%s'"
5167 -msgstr "%s：'%s' 在 '%s' 版本庫之外"
5166 +msgstr "%s：'%s' 在位於 '%s' 的版本庫之外"
5167
5168 #: pathspec.c:517
5169 #, c-format
@@ -5400,7 +5399,7 @@ msgstr "'%s' 的未排序暫存條目"
5399 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
5400 #: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
5401 #: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
5403 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:271
5402 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
5403 #: builtin/submodule--helper.c:332
5404 msgid "index file corrupt"
5405 msgstr "索引檔案損壞"
@@ -5672,7 +5671,7 @@ msgstr "寫入 '%s' 時意外的物件 ID"
5671 msgid "could not write to '%s'"
5672 msgstr "不能寫入 '%s'"
5673
5675 -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:714
5674 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
5675 #: builtin/rebase.c:1029
5676 #, c-format
5677 msgid "could not open '%s' for writing"
@@ -6440,7 +6439,7 @@ msgstr "無效的提交訊息清理模式 '%s'"
6439 msgid "could not delete '%s'"
6440 msgstr "無法刪除 '%s'"
6441
6443 -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:369
6442 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
6443 #, c-format
6444 msgid "could not remove '%s'"
6445 msgstr "無法刪除 '%s'"
@@ -6496,7 +6495,7 @@ msgid "failed to finalize '%s'"
6495 msgstr "無法完成 '%s'"
6496
6497 #: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
6499 -#: sequencer.c:3276 builtin/am.c:244 builtin/commit.c:787 builtin/merge.c:1120
6498 +#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
6499 #: builtin/rebase.c:593
6500 #, c-format
6501 msgid "could not read '%s'"
@@ -6547,8 +6546,8 @@ msgstr "在 '%.*s' 中沒有 key"
6546 msgid "unable to dequote value of '%s'"
6547 msgstr "無法為 '%s' 的值去引號"
6548
6550 -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:705
6551 -#: builtin/am.c:797 builtin/merge.c:1117 builtin/rebase.c:1072
6549 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
6550 +#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
6551 #, c-format
6552 msgid "could not open '%s' for reading"
6553 msgstr "無法開啟 '%s' 進行讀取"
@@ -6700,7 +6699,7 @@ msgstr "不能解析 HEAD 提交"
6699 msgid "unable to parse commit author"
6700 msgstr "不能解析提交作者"
6701
6703 -#: sequencer.c:1353 builtin/am.c:1561 builtin/merge.c:687
6702 +#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
6703 msgid "git write-tree failed to write a tree"
6704 msgstr "git write-tree 無法寫入樹狀物件"
6705
@@ -6709,7 +6708,7 @@ msgstr "git write-tree 無法寫入樹狀物件"
6708 msgid "unable to read commit message from '%s'"
6709 msgstr "不能從 '%s' 讀取提交說明"
6710
6712 -#: sequencer.c:1413 builtin/am.c:1583 builtin/commit.c:1673 builtin/merge.c:886
6711 +#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
6712 #: builtin/merge.c:911
6713 msgid "failed to write commit object"
6714 msgstr "寫提交物件失敗"
@@ -7287,9 +7286,9 @@ msgid "the script was already rearranged."
7286 msgstr "腳本已經重新編排。"
7287
7288 #: setup.c:124
7290 -#, fuzzy, c-format
7289 +#, c-format
7290 msgid "'%s' is outside repository at '%s'"
7292 -msgstr "'%s' 在 '%s' 版本庫之外"
7291 +msgstr "'%s' 在位於 '%s' 的版本庫之外"
7292
7293 #: setup.c:175
7294 #, c-format
@@ -7729,12 +7728,12 @@ msgstr ""
7728 #: sha1-name.c:916
7729 #, c-format
7730 msgid "log for '%.*s' only goes back to %s"
7732 -msgstr ""
7731 +msgstr "'%.*s' 的日誌只能回到 %s"
7732
7733 #: sha1-name.c:924
7734 #, c-format
7735 msgid "log for '%.*s' only has %d entries"
7737 -msgstr ""
7736 +msgstr "'%.*s' 的日誌只有 %d 個項目"
7737
7738 #: sha1-name.c:1689
7739 #, c-format
@@ -7885,7 +7884,7 @@ msgstr "無效 --ignore-submodules 參數：%s"
7884 msgid ""
7885 "Submodule in commit %s at path: '%s' collides with a submodule named the "
7886 "same. Skipping it."
7888 -msgstr ""
7887 +msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。跳過。"
7888
7889 #: submodule.c:910
7890 #, c-format
@@ -8649,7 +8648,11 @@ msgstr "無效的埠號"
8648 msgid "invalid '..' path segment"
8649 msgstr "無效的 '..' 路徑片段"
8650
8652 -#: worktree.c:259 builtin/am.c:2084
8651 +#: walker.c:170
8652 +msgid "Fetching objects"
8653 +msgstr "正在抓取物件"
8654 +
8655 +#: worktree.c:259 builtin/am.c:2099
8656 #, c-format
8657 msgid "failed to read '%s'"
8658 msgstr "讀取 '%s' 失敗"
@@ -9298,7 +9301,7 @@ msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n"
9301
9302 #: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
9303 #: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
9301 -#: builtin/remote.c:1421 builtin/rm.c:241 builtin/send-pack.c:165
9304 +#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
9305 msgid "dry run"
9306 msgstr "測試執行"
9307
@@ -9379,8 +9382,8 @@ msgid ""
9382 "\n"
9383 "See \"git help submodule\" for more information."
9384 msgstr ""
9382 -"您在目前版本庫中新增了另外一個Git版本庫。複製外層的版本庫將不包含嵌入版本庫的"
9383 -"內容，並且不知道該如何取得它。\n"
9385 +"您在目前版本庫中新增了另外一個 Git 版本庫。複製外層的版本庫將不包含嵌入版本庫"
9386 +"的內容，並且不知道該如何取得它。\n"
9387 "如果您要新增一個子模組，使用：\n"
9388 "\n"
9389 "\tgit submodule add <url> %s\n"
@@ -9432,12 +9435,12 @@ msgid "--chmod param '%s' must be either -x or +x"
9435 msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x"
9436
9437 #: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
9435 -#: builtin/reset.c:327
9438 +#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
9439 msgid "--pathspec-from-file is incompatible with pathspec arguments"
9440 msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容"
9441
9442 #: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
9440 -#: builtin/reset.c:333
9443 +#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
9444 msgid "--pathspec-file-nul requires --pathspec-from-file"
9445 msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
9446
@@ -9456,105 +9459,105 @@ msgstr ""
9459 "如要關閉此訊息，請執行\n"
9460 "\"git config advice.addEmptyPathspec false\""
9461
9459 -#: builtin/am.c:347
9462 +#: builtin/am.c:352
9463 msgid "could not parse author script"
9464 msgstr "不能解析作者腳本"
9465
9463 -#: builtin/am.c:431
9466 +#: builtin/am.c:436
9467 #, c-format
9468 msgid "'%s' was deleted by the applypatch-msg hook"
9469 msgstr "'%s' 被 applypatch-msg 掛鉤刪除"
9470
9468 -#: builtin/am.c:473
9471 +#: builtin/am.c:478
9472 #, c-format
9473 msgid "Malformed input line: '%s'."
9474 msgstr "非法的輸入行：'%s'。"
9475
9473 -#: builtin/am.c:511
9476 +#: builtin/am.c:516
9477 #, c-format
9478 msgid "Failed to copy notes from '%s' to '%s'"
9479 msgstr "從 '%s' 複製註解到 '%s' 時失敗"
9480
9478 -#: builtin/am.c:537
9481 +#: builtin/am.c:542
9482 msgid "fseek failed"
9483 msgstr "fseek 失敗"
9484
9482 -#: builtin/am.c:725
9485 +#: builtin/am.c:730
9486 #, c-format
9487 msgid "could not parse patch '%s'"
9488 msgstr "無法解析修補檔 '%s'"
9489
9487 -#: builtin/am.c:790
9490 +#: builtin/am.c:795
9491 msgid "Only one StGIT patch series can be applied at once"
9492 msgstr "一次只能有一個 StGIT 修補檔佇列被應用"
9493
9491 -#: builtin/am.c:838
9494 +#: builtin/am.c:843
9495 msgid "invalid timestamp"
9496 msgstr "無效的時間戳"
9497
9495 -#: builtin/am.c:843 builtin/am.c:855
9498 +#: builtin/am.c:848 builtin/am.c:860
9499 msgid "invalid Date line"
9500 msgstr "無效的日期行"
9501
9499 -#: builtin/am.c:850
9502 +#: builtin/am.c:855
9503 msgid "invalid timezone offset"
9504 msgstr "無效的時區位移值"
9505
9503 -#: builtin/am.c:943
9506 +#: builtin/am.c:948
9507 msgid "Patch format detection failed."
9508 msgstr "修補檔格式偵測失敗。"
9509
9507 -#: builtin/am.c:948 builtin/clone.c:409
9510 +#: builtin/am.c:953 builtin/clone.c:409
9511 #, c-format
9512 msgid "failed to create directory '%s'"
9513 msgstr "建立目錄 '%s' 失敗"
9514
9512 -#: builtin/am.c:953
9515 +#: builtin/am.c:958
9516 msgid "Failed to split patches."
9517 msgstr "分割修補檔失敗。"
9518
9516 -#: builtin/am.c:1084
9519 +#: builtin/am.c:1089
9520 #, c-format
9521 msgid "When you have resolved this problem, run \"%s --continue\"."
9522 msgstr "當您解決這一問題，執行 \"%s --continue\"。"
9523
9521 -#: builtin/am.c:1085
9524 +#: builtin/am.c:1090
9525 #, c-format
9526 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
9527 msgstr "如果您想要跳過這一修補檔，則執行 \"%s --skip\"。"
9528
9526 -#: builtin/am.c:1086
9529 +#: builtin/am.c:1091
9530 #, c-format
9531 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
9532 msgstr "若要復原至原始分支並停止修補檔動作，執行 \"%s --abort\"。"
9533
9531 -#: builtin/am.c:1169
9534 +#: builtin/am.c:1174
9535 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
9536 msgstr "修補檔使用 format=flowed 格式傳送，行尾的空格可能會遺失。"
9537
9535 -#: builtin/am.c:1197
9538 +#: builtin/am.c:1202
9539 msgid "Patch is empty."
9540 msgstr "修補檔為空。"
9541
9539 -#: builtin/am.c:1262
9542 +#: builtin/am.c:1267
9543 #, c-format
9544 msgid "missing author line in commit %s"
9545 msgstr "在提交 %s 中缺少作者行"
9546
9544 -#: builtin/am.c:1265
9547 +#: builtin/am.c:1270
9548 #, c-format
9549 msgid "invalid ident line: %.*s"
9550 msgstr "無效的身份標記：%.*s"
9551
9549 -#: builtin/am.c:1484
9552 +#: builtin/am.c:1489
9553 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9554 msgstr "版本庫缺乏必要的資料物件以進行三方合併。"
9555
9553 -#: builtin/am.c:1486
9556 +#: builtin/am.c:1491
9557 msgid "Using index info to reconstruct a base tree..."
9558 msgstr "使用索引來重建一個（三方合併的）基礎目錄樹..."
9559
9557 -#: builtin/am.c:1505
9560 +#: builtin/am.c:1510
9561 msgid ""
9562 "Did you hand edit your patch?\n"
9563 "It does not apply to blobs recorded in its index."
@@ -9562,24 +9565,24 @@ msgstr ""
9565 "您是否曾手動編輯過您的修補檔？\n"
9566 "無法套用修補檔到索引中的資料物件上。"
9567
9565 -#: builtin/am.c:1511
9568 +#: builtin/am.c:1516
9569 msgid "Falling back to patching base and 3-way merge..."
9570 msgstr "回落到基礎版本上打修補檔及進行三方合併..."
9571
9569 -#: builtin/am.c:1537
9572 +#: builtin/am.c:1542
9573 msgid "Failed to merge in the changes."
9574 msgstr "無法合併變更。"
9575
9573 -#: builtin/am.c:1569
9576 +#: builtin/am.c:1574
9577 msgid "applying to an empty history"
9578 msgstr "正套用到一個空歷史上"
9579
9577 -#: builtin/am.c:1616 builtin/am.c:1620
9580 +#: builtin/am.c:1621 builtin/am.c:1625
9581 #, c-format
9582 msgid "cannot resume: %s does not exist."
9583 msgstr "無法繼續：%s 不存在。"
9584
9582 -#: builtin/am.c:1638
9585 +#: builtin/am.c:1643
9586 msgid "Commit Body is:"
9587 msgstr "提交內容為："
9588
@@ -9588,39 +9591,39 @@ msgstr "提交內容為："
9591 #. in your translation. The program will only accept English
9592 #. input at this point.
9593 #.
9591 -#: builtin/am.c:1648
9594 +#: builtin/am.c:1653
9595 #, c-format
9596 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
9597 msgstr "套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/應用所有[a]："
9598
9596 -#: builtin/am.c:1695 builtin/commit.c:398
9599 +#: builtin/am.c:1700 builtin/commit.c:398
9600 msgid "unable to write index file"
9601 msgstr "無法寫入索引檔案"
9602
9600 -#: builtin/am.c:1699
9603 +#: builtin/am.c:1704
9604 #, c-format
9605 msgid "Dirty index: cannot apply patches (dirty: %s)"
9606 msgstr "髒索引：不能套用修補檔（髒檔案：%s）"
9607
9605 -#: builtin/am.c:1739 builtin/am.c:1807
9608 +#: builtin/am.c:1744 builtin/am.c:1812
9609 #, c-format
9610 msgid "Applying: %.*s"
9611 msgstr "應用：%.*s"
9612
9610 -#: builtin/am.c:1756
9613 +#: builtin/am.c:1761
9614 msgid "No changes -- Patch already applied."
9615 msgstr "沒有變更 —— 修補檔已經應用過。"
9616
9614 -#: builtin/am.c:1762
9617 +#: builtin/am.c:1767
9618 #, c-format
9619 msgid "Patch failed at %s %.*s"
9620 msgstr "打修補檔失敗於 %s %.*s"
9621
9619 -#: builtin/am.c:1766
9620 -msgid "Use 'git am --show-current-patch' to see the failed patch"
9621 -msgstr "用 'git am --show-current-patch' 指令檢視失敗的修補檔"
9622 +#: builtin/am.c:1771
9623 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
9624 +msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔"
9625
9623 -#: builtin/am.c:1810
9626 +#: builtin/am.c:1815
9627 msgid ""
9628 "No changes - did you forget to use 'git add'?\n"
9629 "If there is nothing left to stage, chances are that something else\n"
@@ -9630,7 +9633,7 @@ msgstr ""
9633 "如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n"
9634 "您也許想要跳過這個修補檔。"
9635
9633 -#: builtin/am.c:1817
9636 +#: builtin/am.c:1822
9637 msgid ""
9638 "You still have unmerged paths in your index.\n"
9639 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -9641,91 +9644,101 @@ msgstr ""
9644 "您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n"
9645 "你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。"
9646
9644 -#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346
9647 +#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
9648 #: builtin/reset.c:354
9649 #, c-format
9650 msgid "Could not parse object '%s'."
9651 msgstr "不能解析物件 '%s'。"
9652
9650 -#: builtin/am.c:1976
9653 +#: builtin/am.c:1981
9654 msgid "failed to clean index"
9655 msgstr "清空索引失敗"
9656
9654 -#: builtin/am.c:2020
9657 +#: builtin/am.c:2025
9658 msgid ""
9659 "You seem to have moved HEAD since the last 'am' failure.\n"
9660 "Not rewinding to ORIG_HEAD"
9661 msgstr "您好像在上一次 'am' 失敗後移動了 HEAD。未還原至 ORIG_HEAD"
9662
9660 -#: builtin/am.c:2117
9663 +#: builtin/am.c:2132
9664 #, c-format
9665 msgid "Invalid value for --patch-format: %s"
9666 msgstr "無效的 --patch-format 值：%s"
9667
9665 -#: builtin/am.c:2153
9668 +#: builtin/am.c:2172
9669 +#, c-format
9670 +msgid "Invalid value for --show-current-patch: %s"
9671 +msgstr "無效的 --show-current-patch 值：%s"
9672 +
9673 +#: builtin/am.c:2176
9674 +#, c-format
9675 +msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
9676 +msgstr "--show-current-patch=%s 與 --show-current-patch=%s 不相容"
9677 +
9678 +#: builtin/am.c:2207
9679 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
9680 msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]"
9681
9669 -#: builtin/am.c:2154
9682 +#: builtin/am.c:2208
9683 msgid "git am [<options>] (--continue | --skip | --abort)"
9684 msgstr "git am [<選項>] (--continue | --skip | --abort)"
9685
9673 -#: builtin/am.c:2160
9686 +#: builtin/am.c:2214
9687 msgid "run interactively"
9688 msgstr "以互動式方式執行"
9689
9677 -#: builtin/am.c:2162
9690 +#: builtin/am.c:2216
9691 msgid "historical option -- no-op"
9692 msgstr "老的參數 —— 無作用"
9693
9681 -#: builtin/am.c:2164
9694 +#: builtin/am.c:2218
9695 msgid "allow fall back on 3way merging if needed"
9696 msgstr "如果必要，允許使用三方合併。"
9697
9685 -#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
9686 -#: builtin/repack.c:304 builtin/stash.c:811
9698 +#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
9699 +#: builtin/repack.c:304 builtin/stash.c:812
9700 msgid "be quiet"
9701 msgstr "靜默模式"
9702
9690 -#: builtin/am.c:2167
9703 +#: builtin/am.c:2221
9704 msgid "add a Signed-off-by line to the commit message"
9705 msgstr "在提交說明中新增一個 Signed-off-by 簽名"
9706
9694 -#: builtin/am.c:2170
9707 +#: builtin/am.c:2224
9708 msgid "recode into utf8 (default)"
9709 msgstr "使用 utf8 字元集（預設）"
9710
9698 -#: builtin/am.c:2172
9711 +#: builtin/am.c:2226
9712 msgid "pass -k flag to git-mailinfo"
9713 msgstr "向 git-mailinfo 傳遞 -k 參數"
9714
9702 -#: builtin/am.c:2174
9715 +#: builtin/am.c:2228
9716 msgid "pass -b flag to git-mailinfo"
9717 msgstr "向 git-mailinfo 傳遞 -b 參數"
9718
9706 -#: builtin/am.c:2176
9719 +#: builtin/am.c:2230
9720 msgid "pass -m flag to git-mailinfo"
9721 msgstr "向 git-mailinfo 傳遞 -m 參數"
9722
9710 -#: builtin/am.c:2178
9723 +#: builtin/am.c:2232
9724 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
9725 msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數"
9726
9714 -#: builtin/am.c:2181
9727 +#: builtin/am.c:2235
9728 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
9729 msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定"
9730
9718 -#: builtin/am.c:2184
9731 +#: builtin/am.c:2238
9732 msgid "strip everything before a scissors line"
9733 msgstr "捨棄裁切線前的所有內容"
9734
9722 -#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
9723 -#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
9724 -#: builtin/am.c:2213
9735 +#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
9736 +#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
9737 +#: builtin/am.c:2267
9738 msgid "pass it through git-apply"
9739 msgstr "傳遞給 git-apply"
9740
9728 -#: builtin/am.c:2203 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
9741 +#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
9742 #: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
9743 #: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
9744 #: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
@@ -9734,66 +9747,66 @@ msgstr "傳遞給 git-apply"
9747 msgid "n"
9748 msgstr "n"
9749
9737 -#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
9750 +#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
9751 #: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
9752 msgid "format"
9753 msgstr "格式"
9754
9742 -#: builtin/am.c:2210
9755 +#: builtin/am.c:2264
9756 msgid "format the patch(es) are in"
9757 msgstr "修補檔的格式"
9758
9746 -#: builtin/am.c:2216
9759 +#: builtin/am.c:2270
9760 msgid "override error message when patch failure occurs"
9761 msgstr "打修補檔失敗時顯示的錯誤訊息"
9762
9750 -#: builtin/am.c:2218
9763 +#: builtin/am.c:2272
9764 msgid "continue applying patches after resolving a conflict"
9765 msgstr "衝突解決後繼續套用修補檔"
9766
9754 -#: builtin/am.c:2221
9767 +#: builtin/am.c:2275
9768 msgid "synonyms for --continue"
9769 msgstr "和 --continue 同義"
9770
9758 -#: builtin/am.c:2224
9771 +#: builtin/am.c:2278
9772 msgid "skip the current patch"
9773 msgstr "跳過目前修補檔"
9774
9762 -#: builtin/am.c:2227
9775 +#: builtin/am.c:2281
9776 msgid "restore the original branch and abort the patching operation."
9777 msgstr "復原原始分支並終止打修補檔動作。"
9778
9766 -#: builtin/am.c:2230
9779 +#: builtin/am.c:2284
9780 msgid "abort the patching operation but keep HEAD where it is."
9781 msgstr "終止修補檔動作但保持 HEAD 不變。"
9782
9770 -#: builtin/am.c:2233
9771 -msgid "show the patch being applied."
9772 -msgstr "顯示正在套用的修補檔。"
9783 +#: builtin/am.c:2288
9784 +msgid "show the patch being applied"
9785 +msgstr "顯示正在套用的修補檔"
9786
9774 -#: builtin/am.c:2237
9787 +#: builtin/am.c:2293
9788 msgid "lie about committer date"
9789 msgstr "將作者日期作為提交日期"
9790
9778 -#: builtin/am.c:2239
9791 +#: builtin/am.c:2295
9792 msgid "use current timestamp for author date"
9793 msgstr "用目前時間作為作者日期"
9794
9782 -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1512
9795 +#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
9796 #: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
9797 #: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
9798 msgid "key-id"
9799 msgstr "key-id"
9800
9788 -#: builtin/am.c:2242 builtin/rebase.c:518 builtin/rebase.c:1557
9801 +#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
9802 msgid "GPG-sign commits"
9803 msgstr "使用 GPG 簽名提交"
9804
9792 -#: builtin/am.c:2245
9805 +#: builtin/am.c:2301
9806 msgid "(internal use for git-rebase)"
9807 msgstr "（內部使用，用於 git-rebase）"
9808
9796 -#: builtin/am.c:2263
9809 +#: builtin/am.c:2319
9810 msgid ""
9811 "The -b/--binary option has been a no-op for long time, and\n"
9812 "it will be removed. Please do not use it anymore."
@@ -9801,16 +9814,16 @@ msgstr ""
9814 "參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n"
9815 "請不要再使用它了。"
9816
9804 -#: builtin/am.c:2270
9817 +#: builtin/am.c:2326
9818 msgid "failed to read the index"
9819 msgstr "讀取索引失敗"
9820
9808 -#: builtin/am.c:2285
9821 +#: builtin/am.c:2341
9822 #, c-format
9823 msgid "previous rebase directory %s still exists but mbox given."
9824 msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。"
9825
9813 -#: builtin/am.c:2309
9826 +#: builtin/am.c:2365
9827 #, c-format
9828 msgid ""
9829 "Stray %s directory found.\n"
@@ -9819,11 +9832,11 @@ msgstr ""
9832 "發現了錯誤的 %s 目錄。\n"
9833 "使用 \"git am --abort\" 刪除它。"
9834
9822 -#: builtin/am.c:2315
9835 +#: builtin/am.c:2371
9836 msgid "Resolve operation not in progress, we are not resuming."
9837 msgstr "解決動作未進行，我們不會繼續。"
9838
9826 -#: builtin/am.c:2325
9839 +#: builtin/am.c:2381
9840 msgid "interactive mode requires patches on the command line"
9841 msgstr "互動式模式需要指令列上提供修補檔"
9842
@@ -11431,7 +11444,7 @@ msgstr "git checkout：--detach 不能接收路徑參數 '%s'"
11444 msgid "--pathspec-from-file is incompatible with --detach"
11445 msgstr "--pathspec-from-file 與 --detach 不相容"
11446
11434 -#: builtin/checkout.c:1681 builtin/reset.c:324
11447 +#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
11448 msgid "--pathspec-from-file is incompatible with --patch"
11449 msgstr "--pathspec-from-file 與 --patch 不相容"
11450
@@ -12100,7 +12113,7 @@ msgid "id of a parent commit object"
12113 msgstr "父提交物件 ID"
12114
12115 #: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
12103 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1472
12116 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
12117 #: builtin/tag.c:412
12118 msgid "message"
12119 msgstr "說明"
@@ -15167,7 +15180,7 @@ msgstr "未知類型：%d"
15180 #: builtin/log.c:814
15181 #, c-format
15182 msgid "%s: invalid cover from description mode"
15170 -msgstr ""
15183 +msgstr "%s：從描述產生附函的模式無效"
15184
15185 #: builtin/log.c:821
15186 msgid "format.headers without value"
@@ -15298,11 +15311,11 @@ msgstr "使用 [RFC PATCH] 代替 [PATCH]"
15311
15312 #: builtin/log.c:1651
15313 msgid "cover-from-description-mode"
15301 -msgstr ""
15314 +msgstr "從描述產生附函的模式"
15315
15316 #: builtin/log.c:1652
15317 msgid "generate parts of a cover letter based on a branch's description"
15305 -msgstr ""
15318 +msgstr "基於分支描述產生部分附函"
15319
15320 #: builtin/log.c:1654
15321 msgid "Use [<prefix>] instead of [PATCH]"
@@ -16773,7 +16786,7 @@ msgstr "註解引用"
16786 msgid "use notes from <notes-ref>"
16787 msgstr "從 <註解引用> 使用註解"
16788
16776 -#: builtin/notes.c:1034 builtin/stash.c:1610
16789 +#: builtin/notes.c:1034 builtin/stash.c:1643
16790 #, c-format
16791 msgid "unknown subcommand: %s"
16792 msgstr "未知子指令：%s"
@@ -18119,10 +18132,6 @@ msgstr "讓使用者編輯要重定基底的提交列表"
18132 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
18133 msgstr "（已棄用）嘗試重建合併提交而非忽略它們"
18134
18122 -#: builtin/rebase.c:1546
18123 -msgid "{drop,keep,ask}"
18124 -msgstr "{drop,keep,ask}"
18125 -
18135 #: builtin/rebase.c:1547
18136 msgid "how to handle commits that become empty"
18137 msgstr "處理空白提交的方式"
@@ -18681,6 +18690,9 @@ msgid ""
18690 "\t%s:%d\n"
18691 "now names the non-existent remote '%s'"
18692 msgstr ""
18693 +"位於下述位置的 %s 設定項 remote.pushDefault：\n"
18694 +"\t%s:%d\n"
18695 +"現命名成不存在的遠端分支 '%s'"
18696
18697 #: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
18698 #, c-format
@@ -19478,8 +19490,8 @@ msgstr "HEAD 現在位於 %s"
19490 msgid "Cannot do a %s reset in the middle of a merge."
19491 msgstr "在合併過程中不能做%s重設動作。"
19492
19481 -#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594
19482 -#: builtin/stash.c:618
19493 +#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
19494 +#: builtin/stash.c:619
19495 msgid "be quiet, only report errors"
19496 msgstr "安靜模式，只報告錯誤"
19497
@@ -19733,36 +19745,40 @@ msgid "the following file has local modifications:"
19745 msgid_plural "the following files have local modifications:"
19746 msgstr[0] "如下檔案有本機修改："
19747
19736 -#: builtin/rm.c:242
19748 +#: builtin/rm.c:243
19749 msgid "do not list removed files"
19750 msgstr "不列出刪除的檔案"
19751
19740 -#: builtin/rm.c:243
19752 +#: builtin/rm.c:244
19753 msgid "only remove from the index"
19754 msgstr "只從索引區刪除"
19755
19744 -#: builtin/rm.c:244
19756 +#: builtin/rm.c:245
19757 msgid "override the up-to-date check"
19758 msgstr "忽略檔案更新狀態檢查"
19759
19748 -#: builtin/rm.c:245
19760 +#: builtin/rm.c:246
19761 msgid "allow recursive removal"
19762 msgstr "允許遞迴刪除"
19763
19752 -#: builtin/rm.c:247
19764 +#: builtin/rm.c:248
19765 msgid "exit with a zero status even if nothing matched"
19766 msgstr "即使沒有符合，也以零狀態離開"
19767
19756 -#: builtin/rm.c:289
19768 +#: builtin/rm.c:282
19769 +msgid "No pathspec was given. Which files should I remove?"
19770 +msgstr "沒有提供路徑規格。我該移除哪個檔案？"
19771 +
19772 +#: builtin/rm.c:305
19773 msgid "please stage your changes to .gitmodules or stash them to proceed"
19774 msgstr "請將您的修改暫存到 .gitmodules 中或儲藏後再繼續"
19775
19760 -#: builtin/rm.c:307
19776 +#: builtin/rm.c:323
19777 #, c-format
19778 msgid "not removing '%s' recursively without -r"
19779 msgstr "未提供 -r 選項不會遞迴刪除 '%s'"
19780
19765 -#: builtin/rm.c:346
19781 +#: builtin/rm.c:362
19782 #, c-format
19783 msgid "git rm: unable to remove %s"
19784 msgstr "git rm：不能刪除 %s"
@@ -20072,15 +20088,15 @@ msgstr "停用稀疏簽出"
20088 msgid "error while refreshing working directory"
20089 msgstr "重新整理工作目錄時發生錯誤"
20090
20075 -#: builtin/stash.c:22 builtin/stash.c:37
20091 +#: builtin/stash.c:22 builtin/stash.c:38
20092 msgid "git stash list [<options>]"
20093 msgstr "git stash list [<選項>]"
20094
20079 -#: builtin/stash.c:23 builtin/stash.c:42
20095 +#: builtin/stash.c:23 builtin/stash.c:43
20096 msgid "git stash show [<options>] [<stash>]"
20097 msgstr "git stash show [<選項>] [<stash>]"
20098
20083 -#: builtin/stash.c:24 builtin/stash.c:47
20099 +#: builtin/stash.c:24 builtin/stash.c:48
20100 msgid "git stash drop [-q|--quiet] [<stash>]"
20101 msgstr "git stash drop [-q|--quiet] [<stash>]"
20102
@@ -20088,25 +20104,27 @@ msgstr "git stash drop [-q|--quiet] [<stash>]"
20104 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
20105 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
20106
20091 -#: builtin/stash.c:26 builtin/stash.c:62
20107 +#: builtin/stash.c:26 builtin/stash.c:63
20108 msgid "git stash branch <branchname> [<stash>]"
20109 msgstr "git stash branch <分支名> [<stash>]"
20110
20095 -#: builtin/stash.c:27 builtin/stash.c:67
20111 +#: builtin/stash.c:27 builtin/stash.c:68
20112 msgid "git stash clear"
20113 msgstr "git stash clear"
20114
20099 -#: builtin/stash.c:28 builtin/stash.c:77
20115 +#: builtin/stash.c:28
20116 msgid ""
20117 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20118 " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
20119 +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
20120 " [--] [<pathspec>...]]"
20121 msgstr ""
20122 "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20106 -" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
20123 +" [-u|--include-untracked] [-a|--all] [-m|--message <訊息>]\n"
20124 +" [--pathspec-from-file=<檔案> [--pathspec-file-nul]]\n"
20125 " [--] [<路徑規格>...]]"
20126
20109 -#: builtin/stash.c:31 builtin/stash.c:84
20127 +#: builtin/stash.c:32 builtin/stash.c:85
20128 msgid ""
20129 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20130 " [-u|--include-untracked] [-a|--all] [<message>]"
@@ -20114,186 +20132,196 @@ msgstr ""
20132 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20133 " [-u|--include-untracked] [-a|--all] [<消息>]"
20134
20117 -#: builtin/stash.c:52
20135 +#: builtin/stash.c:53
20136 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
20137 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
20138
20121 -#: builtin/stash.c:57
20139 +#: builtin/stash.c:58
20140 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
20141 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
20142
20125 -#: builtin/stash.c:72
20143 +#: builtin/stash.c:73
20144 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
20145 msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
20146
20129 -#: builtin/stash.c:127
20147 +#: builtin/stash.c:78
20148 +msgid ""
20149 +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20150 +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
20151 +" [--] [<pathspec>...]]"
20152 +msgstr ""
20153 +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
20154 +" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
20155 +" [--] [<路徑規格>...]]"
20156 +
20157 +#: builtin/stash.c:128
20158 #, c-format
20159 msgid "'%s' is not a stash-like commit"
20160 msgstr "'%s' 不像是一個儲藏提交"
20161
20134 -#: builtin/stash.c:147
20162 +#: builtin/stash.c:148
20163 #, c-format
20164 msgid "Too many revisions specified:%s"
20165 msgstr "指定了太多的版本：%s"
20166
20139 -#: builtin/stash.c:161 git-legacy-stash.sh:549
20167 +#: builtin/stash.c:162 git-legacy-stash.sh:549
20168 msgid "No stash entries found."
20169 msgstr "未發現儲藏條目。"
20170
20143 -#: builtin/stash.c:175
20171 +#: builtin/stash.c:176
20172 #, c-format
20173 msgid "%s is not a valid reference"
20174 msgstr "%s 不是一個有效的引用名"
20175
20148 -#: builtin/stash.c:224 git-legacy-stash.sh:75
20176 +#: builtin/stash.c:225 git-legacy-stash.sh:75
20177 msgid "git stash clear with parameters is unimplemented"
20178 msgstr "git stash clear 不支援參數"
20179
20152 -#: builtin/stash.c:403
20180 +#: builtin/stash.c:404
20181 msgid "cannot apply a stash in the middle of a merge"
20182 msgstr "無法在合併過程套用儲藏"
20183
20156 -#: builtin/stash.c:414
20184 +#: builtin/stash.c:415
20185 #, c-format
20186 msgid "could not generate diff %s^!."
20187 msgstr "無法生成差異 %s^!."
20188
20161 -#: builtin/stash.c:421
20189 +#: builtin/stash.c:422
20190 msgid "conflicts in index.Try without --index."
20191 msgstr "索引中有衝突。嘗試不用 --index。"
20192
20165 -#: builtin/stash.c:427
20193 +#: builtin/stash.c:428
20194 msgid "could not save index tree"
20195 msgstr "不能儲存索引樹"
20196
20169 -#: builtin/stash.c:436
20197 +#: builtin/stash.c:437
20198 msgid "could not restore untracked files from stash"
20199 msgstr "無法從儲藏條目中復原未追蹤檔案"
20200
20173 -#: builtin/stash.c:450
20201 +#: builtin/stash.c:451
20202 #, c-format
20203 msgid "Merging %s with %s"
20204 msgstr "正在合併 %s 和 %s"
20205
20178 -#: builtin/stash.c:460 git-legacy-stash.sh:681
20206 +#: builtin/stash.c:461 git-legacy-stash.sh:681
20207 msgid "Index was not unstashed."
20208 msgstr "索引未從儲藏中復原。"
20209
20182 -#: builtin/stash.c:521 builtin/stash.c:620
20210 +#: builtin/stash.c:522 builtin/stash.c:621
20211 msgid "attempt to recreate the index"
20212 msgstr "嘗試重建索引"
20213
20186 -#: builtin/stash.c:554
20214 +#: builtin/stash.c:555
20215 #, c-format
20216 msgid "Dropped %s (%s)"
20217 msgstr "捨棄了 %s（%s）"
20218
20191 -#: builtin/stash.c:557
20219 +#: builtin/stash.c:558
20220 #, c-format
20221 msgid "%s: Could not drop stash entry"
20222 msgstr "%s：無法捨棄儲藏條目"
20223
20196 -#: builtin/stash.c:582
20224 +#: builtin/stash.c:583
20225 #, c-format
20226 msgid "'%s' is not a stash reference"
20227 msgstr "'%s' 不是一個儲藏引用"
20228
20201 -#: builtin/stash.c:632 git-legacy-stash.sh:695
20229 +#: builtin/stash.c:633 git-legacy-stash.sh:695
20230 msgid "The stash entry is kept in case you need it again."
20231 msgstr "儲藏條目被保留以備您再次需要。"
20232
20205 -#: builtin/stash.c:655 git-legacy-stash.sh:713
20233 +#: builtin/stash.c:656 git-legacy-stash.sh:713
20234 msgid "No branch name specified"
20235 msgstr "未指定分支名"
20236
20209 -#: builtin/stash.c:795 builtin/stash.c:832
20237 +#: builtin/stash.c:796 builtin/stash.c:833
20238 #, c-format
20239 msgid "Cannot update %s with %s"
20240 msgstr "無法用 %2$s 更新 %1$s"
20241
20214 -#: builtin/stash.c:813 builtin/stash.c:1473 builtin/stash.c:1509
20242 +#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
20243 msgid "stash message"
20244 msgstr "儲藏說明"
20245
20218 -#: builtin/stash.c:823
20246 +#: builtin/stash.c:824
20247 msgid "\"git stash store\" requires one <commit> argument"
20248 msgstr "\"git stash store\" 需要一個 <提交> 參數"
20249
20222 -#: builtin/stash.c:1048 git-legacy-stash.sh:218
20250 +#: builtin/stash.c:1049 git-legacy-stash.sh:218
20251 msgid "No changes selected"
20252 msgstr "沒有選擇變更"
20253
20226 -#: builtin/stash.c:1148 git-legacy-stash.sh:150
20254 +#: builtin/stash.c:1149 git-legacy-stash.sh:150
20255 msgid "You do not have the initial commit yet"
20256 msgstr "您尚未建立初始提交"
20257
20230 -#: builtin/stash.c:1175 git-legacy-stash.sh:165
20258 +#: builtin/stash.c:1176 git-legacy-stash.sh:165
20259 msgid "Cannot save the current index state"
20260 msgstr "無法儲存目前索引狀態"
20261
20234 -#: builtin/stash.c:1184 git-legacy-stash.sh:180
20262 +#: builtin/stash.c:1185 git-legacy-stash.sh:180
20263 msgid "Cannot save the untracked files"
20264 msgstr "無法儲存未追蹤檔案"
20265
20238 -#: builtin/stash.c:1195 builtin/stash.c:1204 git-legacy-stash.sh:201
20266 +#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
20267 #: git-legacy-stash.sh:214
20268 msgid "Cannot save the current worktree state"
20269 msgstr "無法儲存目前工作區狀態"
20270
20243 -#: builtin/stash.c:1232 git-legacy-stash.sh:234
20271 +#: builtin/stash.c:1233 git-legacy-stash.sh:234
20272 msgid "Cannot record working tree state"
20273 msgstr "不能記錄工作區狀態"
20274
20247 -#: builtin/stash.c:1281 git-legacy-stash.sh:338
20275 +#: builtin/stash.c:1282 git-legacy-stash.sh:338
20276 msgid "Can't use --patch and --include-untracked or --all at the same time"
20277 msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all"
20278
20251 -#: builtin/stash.c:1297
20279 +#: builtin/stash.c:1298
20280 msgid "Did you forget to 'git add'?"
20281 msgstr "您是否忘了執行 'git add'？"
20282
20255 -#: builtin/stash.c:1312 git-legacy-stash.sh:346
20283 +#: builtin/stash.c:1313 git-legacy-stash.sh:346
20284 msgid "No local changes to save"
20285 msgstr "沒有要儲存的本機修改"
20286
20259 -#: builtin/stash.c:1319 git-legacy-stash.sh:351
20287 +#: builtin/stash.c:1320 git-legacy-stash.sh:351
20288 msgid "Cannot initialize stash"
20289 msgstr "無法初始化儲藏"
20290
20263 -#: builtin/stash.c:1334 git-legacy-stash.sh:355
20291 +#: builtin/stash.c:1335 git-legacy-stash.sh:355
20292 msgid "Cannot save the current status"
20293 msgstr "無法儲存目前狀態"
20294
20267 -#: builtin/stash.c:1339
20295 +#: builtin/stash.c:1340
20296 #, c-format
20297 msgid "Saved working directory and index state %s"
20298 msgstr "儲存工作目錄和索引狀態 %s"
20299
20272 -#: builtin/stash.c:1429 git-legacy-stash.sh:385
20300 +#: builtin/stash.c:1430 git-legacy-stash.sh:385
20301 msgid "Cannot remove worktree changes"
20302 msgstr "無法刪除工作區變更"
20303
20276 -#: builtin/stash.c:1464 builtin/stash.c:1500
20304 +#: builtin/stash.c:1469 builtin/stash.c:1534
20305 msgid "keep index"
20306 msgstr "保持索引"
20307
20280 -#: builtin/stash.c:1466 builtin/stash.c:1502
20308 +#: builtin/stash.c:1471 builtin/stash.c:1536
20309 msgid "stash in patch mode"
20310 msgstr "以修補檔模式儲藏"
20311
20284 -#: builtin/stash.c:1467 builtin/stash.c:1503
20312 +#: builtin/stash.c:1472 builtin/stash.c:1537
20313 msgid "quiet mode"
20314 msgstr "靜默模式"
20315
20288 -#: builtin/stash.c:1469 builtin/stash.c:1505
20316 +#: builtin/stash.c:1474 builtin/stash.c:1539
20317 msgid "include untracked files in stash"
20318 msgstr "儲藏中包含未追蹤檔案"
20319
20292 -#: builtin/stash.c:1471 builtin/stash.c:1507
20320 +#: builtin/stash.c:1476 builtin/stash.c:1541
20321 msgid "include ignore files"
20322 msgstr "包含忽略的檔案"
20323
20296 -#: builtin/stash.c:1567
20324 +#: builtin/stash.c:1600
20325 #, c-format
20326 msgid "could not exec %s"
20327 msgstr "不能執行 %s"
@@ -20539,6 +20567,10 @@ msgid ""
20567 "submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
20568 "'--reference-if-able' instead of '--reference'."
20569 msgstr ""
20570 +"從上級專案的備用版本庫計算得出的備用版本庫無效。\n"
20571 +"這種情況下，請設定 submodule.alternateErrorStrategy 為 'info'\n"
20572 +"以允許 Git 不用備用版本庫複製，亦可使用等效的 '--reference-if-able'\n"
20573 +"而非 '--reference' 複製。"
20574
20575 #: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
20576 #, c-format
@@ -20689,7 +20721,7 @@ msgstr "update 參數取值錯誤"
20721 msgid ""
20722 "Submodule (%s) branch configured to inherit branch from superproject, but "
20723 "the superproject is not on any branch"
20692 -msgstr "子模組（%s）的分支設定為繼承上級項目的分支，但是上級項目不在任何分支上"
20724 +msgstr "子模組（%s）的分支設定為繼承上級專案的分支，但是上級專案不在任何分支上"
20725
20726 #: builtin/submodule--helper.c:2117
20727 #, c-format
@@ -21920,41 +21952,41 @@ msgstr "不能壓縮請求，zlib 結束錯誤 %d"
21952 msgid "dumb http transport does not support shallow capabilities"
21953 msgstr "啞 http 傳輸不支援 shalllow 能力"
21954
21923 -#: remote-curl.c:1037
21955 +#: remote-curl.c:1038
21956 msgid "fetch failed."
21957 msgstr "取得失敗。"
21958
21927 -#: remote-curl.c:1085
21959 +#: remote-curl.c:1086
21960 msgid "cannot fetch by sha1 over smart http"
21961 msgstr "無法透過智慧 HTTP 取得 sha1"
21962
21931 -#: remote-curl.c:1129 remote-curl.c:1135
21963 +#: remote-curl.c:1130 remote-curl.c:1136
21964 #, c-format
21965 msgid "protocol error: expected sha/ref, got '%s'"
21966 msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'"
21967
21936 -#: remote-curl.c:1147 remote-curl.c:1262
21968 +#: remote-curl.c:1148 remote-curl.c:1263
21969 #, c-format
21970 msgid "http transport does not support %s"
21971 msgstr "http 傳輸協定不支援 %s"
21972
21941 -#: remote-curl.c:1183
21973 +#: remote-curl.c:1184
21974 msgid "git-http-push failed"
21975 msgstr "git-http-push 失敗"
21976
21945 -#: remote-curl.c:1368
21977 +#: remote-curl.c:1369
21978 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
21979 msgstr "remote-curl：用法：git remote-curl <遠端> [<url>]"
21980
21949 -#: remote-curl.c:1400
21981 +#: remote-curl.c:1401
21982 msgid "remote-curl: error reading command stream from git"
21983 msgstr "remote-curl：錯誤讀取來自 git 的指令流"
21984
21953 -#: remote-curl.c:1407
21985 +#: remote-curl.c:1408
21986 msgid "remote-curl: fetch attempted without a local repo"
21987 msgstr "remote-curl：嘗試沒有本機版本庫下取得"
21988
21957 -#: remote-curl.c:1447
21989 +#: remote-curl.c:1448
21990 #, c-format
21991 msgid "remote-curl: unknown command '%s' from git"
21992 msgstr "remote-curl：未知的來自 git 的指令 '%s'"
@@ -24086,134 +24118,3 @@ msgstr "略過 %s 含備份後綴 '%s'。\n"
24118 #, perl-format
24119 msgid "Do you really want to send %s? [y|N]: "
24120 msgstr "您真的要傳送 %s？[y|N]："
24089 -
24090 -#, c-format
24091 -#~| msgid "Stage mode change [y,n,q,a,d%s,?]? "
24092 -#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "
24093 -#~ msgstr "暫存模式變更 [y,n,a,q,d%s,?]？"
24094 -
24095 -#, c-format
24096 -#~| msgid "Stage deletion [y,n,q,a,d%s,?]? "
24097 -#~ msgid "Stage deletion [y,n,a,q,d%s,?]? "
24098 -#~ msgstr "暫存刪除動作 [y,n,a,q,d%s,?]？"
24099 -
24100 -#, c-format
24101 -#~| msgid "Stage this hunk [y,n,q,a,d%s,?]? "
24102 -#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? "
24103 -#~ msgstr "暫存此區塊 [y,n,a,q,d%s,?]？"
24104 -
24105 -#~| msgid ""
24106 -#~| "If the patch applies cleanly, the edited hunk will immediately be\n"
24107 -#~| "marked for staging."
24108 -#~ msgid ""
24109 -#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
24110 -#~ "marked for staging.\n"
24111 -#~ msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為暫存。\n"
24112 -
24113 -#~| msgid ""
24114 -#~| "y - stage this hunk\n"
24115 -#~| "n - do not stage this hunk\n"
24116 -#~| "q - quit; do not stage this hunk or any of the remaining ones\n"
24117 -#~| "a - stage this hunk and all later hunks in the file\n"
24118 -#~| "d - do not stage this hunk or any of the later hunks in the file"
24119 -#~ msgid ""
24120 -#~ "y - stage this hunk\n"
24121 -#~ "n - do not stage this hunk\n"
24122 -#~ "q - quit; do not stage this hunk or any of the remaining ones\n"
24123 -#~ "a - stage this and all the remaining hunks\n"
24124 -#~ "d - do not stage this hunk nor any of the remaining hunks\n"
24125 -#~ msgstr ""
24126 -#~ "y - 暫存此區塊\n"
24127 -#~ "n - 不要暫存此區塊\n"
24128 -#~ "q - 離開。不暫存此區塊及後面的全部區塊\n"
24129 -#~ "a - 暫存這個區塊及所有剩餘區塊\n"
24130 -#~ "d - 不暫存這個區塊及任何剩餘區塊\n"
24131 -
24132 -#, c-format
24133 -#~ msgid "could not copy '%s' to '%s'."
24134 -#~ msgstr "不能複製 '%s' 至 '%s'。"
24135 -
24136 -#~| msgid "malformed input line: '%s'."
24137 -#~ msgid "malformed ident line"
24138 -#~ msgstr "識別行的格式錯誤"
24139 -
24140 -#, c-format
24141 -#~ msgid "could not parse '%.*s'"
24142 -#~ msgstr "無法解析 '%.*s'"
24143 -
24144 -#, c-format
24145 -#~ msgid "could not checkout %s"
24146 -#~ msgstr "不能簽出 %s"
24147 -
24148 -#, c-format
24149 -#~ msgid "filename in tree entry contains backslash: '%s'"
24150 -#~ msgstr "樹狀物件中的檔案名稱有反斜線：'%s'"
24151 -
24152 -#, c-format
24153 -#~ msgid "Use -f if you really want to add them.\n"
24154 -#~ msgstr "使用 -f 參數如果您確實要新增它們。\n"
24155 -
24156 -#, c-format
24157 -#~ msgid "Maybe you wanted to say 'git add .'?\n"
24158 -#~ msgstr "也許您想要執行 'git add .'？\n"
24159 -
24160 -#, c-format
24161 -#~ msgid "packfile is invalid: %s"
24162 -#~ msgstr "無效的 packfile：%s"
24163 -
24164 -#, c-format
24165 -#~ msgid "unable to open packfile for reuse: %s"
24166 -#~ msgstr "無法為重用開啟 packfile：%s"
24167 -
24168 -#~ msgid "unable to seek in reused packfile"
24169 -#~ msgstr "無法在重用的 packfile 中尋找"
24170 -
24171 -#~ msgid "unable to read from reused packfile"
24172 -#~ msgstr "無法從復用的 packfile 中讀取"
24173 -
24174 -#~ msgid "no HEAD?"
24175 -#~ msgstr "沒有 HEAD？"
24176 -
24177 -#~| msgid "Group by committer rather than author"
24178 -#~ msgid "make committer date match author date"
24179 -#~ msgstr "使提交日期符合撰寫日期"
24180 -
24181 -#~ msgid "ignore author date and use current date"
24182 -#~ msgstr "忽略撰寫日期，使用目前日期"
24183 -
24184 -#~| msgid "synonym for --files-with-matches"
24185 -#~ msgid "synonym of --reset-author-date"
24186 -#~ msgstr "和 --reset-author-date 同義"
24187 -
24188 -#~| msgid "ignore changes in whitespace at EOL"
24189 -#~ msgid "ignore changes in whitespace"
24190 -#~ msgstr "忽略空白字元變更"
24191 -
24192 -#~ msgid "preserve empty commits during rebase"
24193 -#~ msgstr "重定基底時保留空提交"
24194 -
24195 -#~ msgid "cannot combine --use-bitmap-index with object filtering"
24196 -#~ msgstr "不能將 --use-bitmap-index 和物件過濾組合使用"
24197 -
24198 -#, sh-format
24199 -#~ msgid ""
24200 -#~ "The following path is ignored by one of your .gitignore files:\n"
24201 -#~ "$sm_path\n"
24202 -#~ "Use -f if you really want to add it."
24203 -#~ msgstr ""
24204 -#~ "以下路徑被您的一個 .gitignore 檔案所忽略：\n"
24205 -#~ "$sm_path\n"
24206 -#~ "如果您確實想新增它，使用 -f 參數。"
24207 -
24208 -#, c-format
24209 -#~ msgid "unable to get tree for %s"
24210 -#~ msgstr "無法得到 %s 的樹狀物件"
24211 -
24212 -#~ msgid "Use an experimental heuristic to improve diffs"
24213 -#~ msgstr "使用一個實驗性的啟發式演算法改進差異顯示"
24214 -
24215 -#~ msgid "git commit-graph [--object-dir <objdir>]"
24216 -#~ msgstr "git commit-graph [--object-dir <物件目錄>]"
24217 -
24218 -#~ msgid "git commit-graph read [--object-dir <objdir>]"
24219 -#~ msgstr "git commit-graph read [--object-dir <物件目錄>]"