@matheusbsbs / matheus-bagliano / commits / c9f01d5f5f

l10n: zh_TW: v2.36.0 round 2

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

Yi-Jyun Pan committed Apr 7, 2022 at 14:30 UTC c9f01d5f5f4f752598d7e79c7ae3ef5c5b807ac1
1 file changed +4761 -3985
po/zh_TW.po
+4761 -3985
@@ -22,8 +22,8 @@ msgid ""
22 msgstr ""
23 "Project-Id-Version: Git\n"
24 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
25 -"POT-Creation-Date: 2022-01-17 08:31+0800\n"
26 -"PO-Revision-Date: 2022-01-22 07:05+0800\n"
25 +"POT-Creation-Date: 2022-04-13 14:52+0800\n"
26 +"PO-Revision-Date: 2022-04-14 08:04+0800\n"
27 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
28 "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
29 "po/git-cli/zh_Hant/>\n"
@@ -36,210 +36,209 @@ msgstr ""
36 "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
37 "zhconvert.org\n"
38
39 -#: add-interactive.c:380
39 +#: add-interactive.c:382
40 #, c-format
41 msgid "Huh (%s)?"
42 msgstr "嗯（%s）？"
43
44 -#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509
45 -#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233
46 -#: builtin/rebase.c:1642
44 +#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505
45 +#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261
46 +#: builtin/rebase.c:1671
47 msgid "could not read index"
48 msgstr "無法讀取索引"
49
50 -#: add-interactive.c:588 git-add--interactive.perl:269
50 +#: add-interactive.c:590 git-add--interactive.perl:269
51 #: git-add--interactive.perl:294
52 msgid "binary"
53 msgstr "二進位"
54
55 -#: add-interactive.c:646 git-add--interactive.perl:278
55 +#: add-interactive.c:648 git-add--interactive.perl:278
56 #: git-add--interactive.perl:332
57 msgid "nothing"
58 msgstr "無"
59
60 -#: add-interactive.c:647 git-add--interactive.perl:314
60 +#: add-interactive.c:649 git-add--interactive.perl:314
61 #: git-add--interactive.perl:329
62 msgid "unchanged"
63 msgstr "未變更"
64
65 -#: add-interactive.c:684 git-add--interactive.perl:641
65 +#: add-interactive.c:686 git-add--interactive.perl:641
66 msgid "Update"
67 msgstr "更新"
68
69 -#: add-interactive.c:701 add-interactive.c:889
69 +#: add-interactive.c:703 add-interactive.c:891
70 #, c-format
71 msgid "could not stage '%s'"
72 msgstr "無法暫存「%s」"
73
74 -#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713
74 +#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709
75 msgid "could not write index"
76 msgstr "無法寫入索引"
77
78 -#: add-interactive.c:710 git-add--interactive.perl:626
78 +#: add-interactive.c:712 git-add--interactive.perl:626
79 #, c-format, perl-format
80 msgid "updated %d path\n"
81 msgid_plural "updated %d paths\n"
82 msgstr[0] "已更新 %d 個路徑\n"
83
84 -#: add-interactive.c:728 git-add--interactive.perl:676
84 +#: add-interactive.c:730 git-add--interactive.perl:676
85 #, c-format, perl-format
86 msgid "note: %s is untracked now.\n"
87 msgstr "注意：%s 現已不再追蹤。\n"
88
89 -#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306
89 +#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311
90 #: builtin/reset.c:167
91 #, c-format
92 msgid "make_cache_entry failed for path '%s'"
93 msgstr "「%s」路徑執行 make_cache_entry 失敗"
94
95 -#: add-interactive.c:763 git-add--interactive.perl:653
95 +#: add-interactive.c:765 git-add--interactive.perl:653
96 msgid "Revert"
97 msgstr "還原"
98
99 -#: add-interactive.c:779
99 +#: add-interactive.c:781
100 msgid "Could not parse HEAD^{tree}"
101 msgstr "不能解析 HEAD^{樹}"
102
103 -#: add-interactive.c:817 git-add--interactive.perl:629
103 +#: add-interactive.c:819 git-add--interactive.perl:629
104 #, c-format, perl-format
105 msgid "reverted %d path\n"
106 msgid_plural "reverted %d paths\n"
107 msgstr[0] "還原了 %d 個路徑\n"
108
109 -#: add-interactive.c:868 git-add--interactive.perl:693
109 +#: add-interactive.c:870 git-add--interactive.perl:693
110 #, c-format
111 msgid "No untracked files.\n"
112 msgstr "沒有未追蹤的檔案。\n"
113
114 -#: add-interactive.c:872 git-add--interactive.perl:687
114 +#: add-interactive.c:874 git-add--interactive.perl:687
115 msgid "Add untracked"
116 msgstr "新增未追蹤的"
117
118 -#: add-interactive.c:899 git-add--interactive.perl:623
118 +#: add-interactive.c:901 git-add--interactive.perl:623
119 #, c-format, perl-format
120 msgid "added %d path\n"
121 msgid_plural "added %d paths\n"
122 msgstr[0] "增加了 %d 個路徑\n"
123
124 -#: add-interactive.c:929
124 +#: add-interactive.c:931
125 #, c-format
126 msgid "ignoring unmerged: %s"
127 msgstr "忽略未合併：%s"
128
129 -#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1371
129 +#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371
130 #, c-format
131 msgid "Only binary files changed.\n"
132 msgstr "只有二進位檔案被修改。\n"
133
134 -#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373
134 +#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373
135 #, c-format
136 msgid "No changes.\n"
137 msgstr "沒有修改。\n"
138
139 -#: add-interactive.c:947 git-add--interactive.perl:1381
139 +#: add-interactive.c:949 git-add--interactive.perl:1381
140 msgid "Patch update"
141 msgstr "修補檔更新"
142
143 -#: add-interactive.c:986 git-add--interactive.perl:1794
143 +#: add-interactive.c:988 git-add--interactive.perl:1794
144 msgid "Review diff"
145 msgstr "檢視 diff"
146
147 -#: add-interactive.c:1014
147 +#: add-interactive.c:1016
148 msgid "show paths with changes"
149 msgstr "顯示有變更的路徑"
150
151 -#: add-interactive.c:1016
151 +#: add-interactive.c:1018
152 msgid "add working tree state to the staged set of changes"
153 msgstr "加入工作區狀態至暫存列表"
154
155 -#: add-interactive.c:1018
155 +#: add-interactive.c:1020
156 msgid "revert staged set of changes back to the HEAD version"
157 msgstr "還原修改的暫存集至 HEAD 版本"
158
159 -#: add-interactive.c:1020
159 +#: add-interactive.c:1022
160 msgid "pick hunks and update selectively"
161 msgstr "挑選區塊並選擇性更新"
162
163 -#: add-interactive.c:1022
163 +#: add-interactive.c:1024
164 msgid "view diff between HEAD and index"
165 msgstr "檢視 HEAD 及索引之間的差異"
166
167 -#: add-interactive.c:1024
167 +#: add-interactive.c:1026
168 msgid "add contents of untracked files to the staged set of changes"
169 msgstr "加入未追蹤檔案的內容至暫存列表"
170
171 -#: add-interactive.c:1032 add-interactive.c:1081
171 +#: add-interactive.c:1034 add-interactive.c:1083
172 msgid "Prompt help:"
173 msgstr "提示說明："
174
175 -#: add-interactive.c:1034
175 +#: add-interactive.c:1036
176 msgid "select a single item"
177 msgstr "選擇單一項目"
178
179 -#: add-interactive.c:1036
179 +#: add-interactive.c:1038
180 msgid "select a range of items"
181 msgstr "選擇項目範圍"
182
183 -#: add-interactive.c:1038
183 +#: add-interactive.c:1040
184 msgid "select multiple ranges"
185 msgstr "選擇多個範圍"
186
187 -#: add-interactive.c:1040 add-interactive.c:1085
187 +#: add-interactive.c:1042 add-interactive.c:1087
188 msgid "select item based on unique prefix"
189 msgstr "基於唯一前綴選擇項目"
190
191 -#: add-interactive.c:1042
191 +#: add-interactive.c:1044
192 msgid "unselect specified items"
193 msgstr "取消選擇指定項目"
194
195 -#: add-interactive.c:1044
195 +#: add-interactive.c:1046
196 msgid "choose all items"
197 msgstr "選擇所有項目"
198
199 -#: add-interactive.c:1046
199 +#: add-interactive.c:1048
200 msgid "(empty) finish selecting"
201 msgstr "（空）完成選取"
202
203 -#: add-interactive.c:1083
203 +#: add-interactive.c:1085
204 msgid "select a numbered item"
205 msgstr "選擇編號過的項目"
206
207 -#: add-interactive.c:1087
207 +#: add-interactive.c:1089
208 msgid "(empty) select nothing"
209 msgstr "（空）全不選取"
210
211 -#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898
211 +#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898
212 msgid "*** Commands ***"
213 msgstr "*** 指令 ***"
214
215 -#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895
215 +#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895
216 msgid "What now"
217 msgstr "請選擇"
218
219 -#: add-interactive.c:1148 git-add--interactive.perl:213
219 +#: add-interactive.c:1150 git-add--interactive.perl:213
220 msgid "staged"
221 msgstr "快取"
222
223 -#: add-interactive.c:1148 git-add--interactive.perl:213
223 +#: add-interactive.c:1150 git-add--interactive.perl:213
224 msgid "unstaged"
225 msgstr "未快取"
226
227 -#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367
228 -#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128
229 -#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194
230 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858
231 -#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504
232 -#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574
233 -#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812
227 +#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370
228 +#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132
229 +#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194
230 +#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872
231 +#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709
232 +#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891
233 #: git-add--interactive.perl:213
234 msgid "path"
235 msgstr "路徑"
236
238 -#: add-interactive.c:1155
237 +#: add-interactive.c:1157
238 msgid "could not refresh index"
239 msgstr "無法重新整理索引"
240
242 -#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805
241 +#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805
242 #, c-format
243 msgid "Bye.\n"
244 msgstr "再見。\n"
@@ -540,24 +539,24 @@ msgstr "無法解析區塊標頭 '%.*s'"
539 msgid "could not parse colored hunk header '%.*s'"
540 msgstr "無法解析上色過的區塊標頭 '%.*s'"
541
543 -#: add-patch.c:420
542 +#: add-patch.c:431
543 msgid "could not parse diff"
544 msgstr "無法解析差異 (diff)"
545
547 -#: add-patch.c:439
546 +#: add-patch.c:450
547 msgid "could not parse colored diff"
548 msgstr "無法解析上色過的差異 (diff)"
549
551 -#: add-patch.c:453
550 +#: add-patch.c:464
551 #, c-format
552 msgid "failed to run '%s'"
553 msgstr "無法執行 '%s'"
554
556 -#: add-patch.c:612
555 +#: add-patch.c:618
556 msgid "mismatched output from interactive.diffFilter"
557 msgstr "interactive.diffFilter 的輸出不符"
558
560 -#: add-patch.c:613
559 +#: add-patch.c:619
560 msgid ""
561 "Your filter must maintain a one-to-one correspondence\n"
562 "between its input and output lines."
@@ -565,7 +564,7 @@ msgstr ""
564 "您的過濾器必須在其輸入及輸出行\n"
565 "維持一對一的對應關係。"
566
568 -#: add-patch.c:791
567 +#: add-patch.c:797
568 #, c-format
569 msgid ""
570 "expected context line #%d in\n"
@@ -574,7 +573,7 @@ msgstr ""
573 "應有上下文行 #%d 於\n"
574 "%.*s"
575
577 -#: add-patch.c:806
576 +#: add-patch.c:812
577 #, c-format
578 msgid ""
579 "hunks do not overlap:\n"
@@ -587,11 +586,11 @@ msgstr ""
586 "\t不以下述結尾：\n"
587 "%.*s"
588
590 -#: add-patch.c:1082 git-add--interactive.perl:1115
589 +#: add-patch.c:1088 git-add--interactive.perl:1115
590 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
591 msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n"
592
594 -#: add-patch.c:1086
593 +#: add-patch.c:1092
594 #, c-format
595 msgid ""
596 "---\n"
@@ -605,7 +604,7 @@ msgstr ""
604 "以 %c 開始的行將被刪除。\n"
605
606 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
608 -#: add-patch.c:1100 git-add--interactive.perl:1129
607 +#: add-patch.c:1106 git-add--interactive.perl:1129
608 msgid ""
609 "If it does not apply cleanly, you will be given an opportunity to\n"
610 "edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -615,11 +614,11 @@ msgstr ""
614 "若刪掉此區塊的全部內容，則會中止\n"
615 "本次編輯，區塊則不會被修改。\n"
616
618 -#: add-patch.c:1133
617 +#: add-patch.c:1139
618 msgid "could not parse hunk header"
619 msgstr "無法解析區塊標頭"
620
622 -#: add-patch.c:1178
621 +#: add-patch.c:1184
622 msgid "'git apply --cached' failed"
623 msgstr "「git apply --cached」失敗"
624
@@ -635,24 +634,24 @@ msgstr "「git apply --cached」失敗"
634 #. Consider translating (saying "no" discards!) as
635 #. (saying "n" for "no" discards!) if the translation
636 #. of the word "no" does not start with n.
638 -#: add-patch.c:1247 git-add--interactive.perl:1244
637 +#: add-patch.c:1253 git-add--interactive.perl:1244
638 msgid ""
639 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
640 msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? "
641
643 -#: add-patch.c:1290
642 +#: add-patch.c:1296
643 msgid "The selected hunks do not apply to the index!"
644 msgstr "選取的區塊不會套用進索引！"
645
647 -#: add-patch.c:1291 git-add--interactive.perl:1348
646 +#: add-patch.c:1297 git-add--interactive.perl:1348
647 msgid "Apply them to the worktree anyway? "
648 msgstr "無論如何都要套用到工作區嗎？ "
649
651 -#: add-patch.c:1298 git-add--interactive.perl:1351
650 +#: add-patch.c:1304 git-add--interactive.perl:1351
651 msgid "Nothing was applied.\n"
652 msgstr "未套用。\n"
653
655 -#: add-patch.c:1355
654 +#: add-patch.c:1361
655 msgid ""
656 "j - leave this hunk undecided, see next undecided hunk\n"
657 "J - leave this hunk undecided, see next hunk\n"
@@ -674,72 +673,72 @@ msgstr ""
673 "e - 手動編輯目前區塊\n"
674 "? - 顯示說明\n"
675
677 -#: add-patch.c:1517 add-patch.c:1527
676 +#: add-patch.c:1523 add-patch.c:1533
677 msgid "No previous hunk"
678 msgstr "沒有上一個區塊"
679
681 -#: add-patch.c:1522 add-patch.c:1532
680 +#: add-patch.c:1528 add-patch.c:1538
681 msgid "No next hunk"
682 msgstr "沒有下一個區塊"
683
685 -#: add-patch.c:1538
684 +#: add-patch.c:1544
685 msgid "No other hunks to goto"
686 msgstr "沒有其它可供跳轉的區塊"
687
689 -#: add-patch.c:1549 git-add--interactive.perl:1608
688 +#: add-patch.c:1555 git-add--interactive.perl:1608
689 msgid "go to which hunk (<ret> to see more)? "
690 msgstr "要跳轉到哪個區塊（<Enter> 檢視更多）？ "
691
693 -#: add-patch.c:1550 git-add--interactive.perl:1610
692 +#: add-patch.c:1556 git-add--interactive.perl:1610
693 msgid "go to which hunk? "
694 msgstr "跳轉到哪個區塊？ "
695
697 -#: add-patch.c:1561
696 +#: add-patch.c:1567
697 #, c-format
698 msgid "Invalid number: '%s'"
699 msgstr "無效數字：'%s'"
700
702 -#: add-patch.c:1566
701 +#: add-patch.c:1572
702 #, c-format
703 msgid "Sorry, only %d hunk available."
704 msgid_plural "Sorry, only %d hunks available."
705 msgstr[0] "對不起，只有 %d 個可用區塊。"
706
708 -#: add-patch.c:1575
707 +#: add-patch.c:1581
708 msgid "No other hunks to search"
709 msgstr "沒有其它可供尋找的區塊"
710
712 -#: add-patch.c:1581 git-add--interactive.perl:1663
711 +#: add-patch.c:1587 git-add--interactive.perl:1663
712 msgid "search for regex? "
713 msgstr "使用常規表示式搜尋？ "
714
716 -#: add-patch.c:1596
715 +#: add-patch.c:1602
716 #, c-format
717 msgid "Malformed search regexp %s: %s"
718 msgstr "錯誤的常規表示式 %s：%s"
719
721 -#: add-patch.c:1613
720 +#: add-patch.c:1619
721 msgid "No hunk matches the given pattern"
722 msgstr "沒有和提供模式相符合的區塊"
723
725 -#: add-patch.c:1620
724 +#: add-patch.c:1626
725 msgid "Sorry, cannot split this hunk"
726 msgstr "對不起，不能分割這個區塊"
727
729 -#: add-patch.c:1624
728 +#: add-patch.c:1630
729 #, c-format
730 msgid "Split into %d hunks."
731 msgstr "分割為 %d 個區塊。"
732
734 -#: add-patch.c:1628
733 +#: add-patch.c:1634
734 msgid "Sorry, cannot edit this hunk"
735 msgstr "對不起，不能編輯這個區塊"
736
738 -#: add-patch.c:1680
737 +#: add-patch.c:1686
738 msgid "'git apply' failed"
739 msgstr "'git apply' 失敗"
740
742 -#: advice.c:78
741 +#: advice.c:81
742 #, c-format
743 msgid ""
744 "\n"
@@ -748,37 +747,37 @@ msgstr ""
747 "\n"
748 "請使用「git config advice.%s false」來停用此訊息"
749
751 -#: advice.c:94
750 +#: advice.c:97
751 #, c-format
752 msgid "%shint: %.*s%s\n"
753 msgstr "%s提示：%.*s%s\n"
754
756 -#: advice.c:178
755 +#: advice.c:181
756 msgid "Cherry-picking is not possible because you have unmerged files."
757 msgstr "無法揀選，因為您有未合併的檔案。"
758
760 -#: advice.c:180
759 +#: advice.c:183
760 msgid "Committing is not possible because you have unmerged files."
761 msgstr "無法提交，因為您有未合併的檔案。"
762
764 -#: advice.c:182
763 +#: advice.c:185
764 msgid "Merging is not possible because you have unmerged files."
765 msgstr "無法合併，因為您有未合併的檔案。"
766
768 -#: advice.c:184
767 +#: advice.c:187
768 msgid "Pulling is not possible because you have unmerged files."
769 msgstr "無法拉取，因為您有未合併的檔案。"
770
772 -#: advice.c:186
771 +#: advice.c:189
772 msgid "Reverting is not possible because you have unmerged files."
773 msgstr "無法還原提交，因為您有未合併的檔案。"
774
776 -#: advice.c:188
775 +#: advice.c:191
776 #, c-format
777 msgid "It is not possible to %s because you have unmerged files."
778 msgstr "無法 %s，因為您有未合併的檔案。"
779
781 -#: advice.c:196
780 +#: advice.c:199
781 msgid ""
782 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
783 "as appropriate to mark resolution and make a commit."
@@ -786,27 +785,27 @@ msgstr ""
785 "請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n"
786 "解決方案並提交。"
787
789 -#: advice.c:204
788 +#: advice.c:207
789 msgid "Exiting because of an unresolved conflict."
790 msgstr "因為存在未解決的衝突而離開。"
791
793 -#: advice.c:209 builtin/merge.c:1382
792 +#: advice.c:212 builtin/merge.c:1388
793 msgid "You have not concluded your merge (MERGE_HEAD exists)."
794 msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。"
795
797 -#: advice.c:211
796 +#: advice.c:214
797 msgid "Please, commit your changes before merging."
798 msgstr "請在合併前先提交您的修改。"
799
801 -#: advice.c:212
800 +#: advice.c:215
801 msgid "Exiting because of unfinished merge."
802 msgstr "因為存在未完成的合併而離開。"
803
805 -#: advice.c:217
804 +#: advice.c:220
805 msgid "Not possible to fast-forward, aborting."
806 msgstr "無法快轉，終止。"
807
809 -#: advice.c:227
808 +#: advice.c:230
809 #, c-format
810 msgid ""
811 "The following paths and/or pathspecs matched paths that exist\n"
@@ -817,7 +816,7 @@ msgstr ""
816 "符合稀疏簽出定義外且存在的路徑，\n"
817 "所以不會在索引中更新：\n"
818
820 -#: advice.c:234
819 +#: advice.c:237
820 msgid ""
821 "If you intend to update such entries, try one of the following:\n"
822 "* Use the --sparse option.\n"
@@ -827,7 +826,7 @@ msgstr ""
826 "* 使用 --sparse 選項。\n"
827 "* 停用或修改稀疏規則。"
828
830 -#: advice.c:242
829 +#: advice.c:245
830 #, c-format
831 msgid ""
832 "Note: switching to '%s'.\n"
@@ -885,80 +884,83 @@ msgstr "無法識別的空白字元選項 '%s'"
884 msgid "unrecognized whitespace ignore option '%s'"
885 msgstr "無法識別的空白字元忽略選項 '%s'"
886
888 -#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307
889 -#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870
890 -#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885
891 -#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541
892 -#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470
893 -#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757
894 -#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361
895 -#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155
896 -#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2038
897 -#: builtin/fetch.c:2043 builtin/index-pack.c:1852 builtin/init-db.c:560
898 -#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778
899 -#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073
900 -#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
901 -#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199
902 -#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426
903 -#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710
904 -#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316
905 -#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572
906 -#: builtin/worktree.c:702
887 +#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555
888 +#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332
889 +#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907
890 +#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509
891 +#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755
892 +#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663
893 +#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921
894 +#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200
895 +#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593
896 +#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245
897 +#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167
898 +#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560
899 +#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778
900 +#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409
901 +#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592
902 +#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641
903 +#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227
904 +#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433
905 +#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711
906 +#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328
907 +#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573
908 +#: builtin/worktree.c:779
909 #, c-format
910 msgid "options '%s' and '%s' cannot be used together"
911 msgstr "不能同時使用 '%s' 和 '%s' 選項"
912
911 -#: apply.c:139 apply.c:150 apply.c:153
913 +#: apply.c:141 apply.c:152 apply.c:155
914 #, c-format
915 msgid "'%s' outside a repository"
916 msgstr "'%s' 在版本庫之外"
917
916 -#: apply.c:800
918 +#: apply.c:807
919 #, c-format
920 msgid "Cannot prepare timestamp regexp %s"
921 msgstr "無法準備時間戳常規表示式 %s"
922
921 -#: apply.c:809
923 +#: apply.c:816
924 #, c-format
925 msgid "regexec returned %d for input: %s"
926 msgstr "regexec 返回 %d，輸入為：%s"
927
926 -#: apply.c:883
928 +#: apply.c:890
929 #, c-format
930 msgid "unable to find filename in patch at line %d"
931 msgstr "不能在修補檔的第 %d 行找到檔案名"
932
931 -#: apply.c:921
933 +#: apply.c:928
934 #, c-format
935 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
936 msgstr "git apply：錯誤的 git-diff - 應為 /dev/null，但在第 %2$d 行得到 %1$s"
937
936 -#: apply.c:927
938 +#: apply.c:934
939 #, c-format
940 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
941 msgstr "git apply：錯誤的 git-diff - 第 %d 行上新檔案名不一致"
942
941 -#: apply.c:928
943 +#: apply.c:935
944 #, c-format
945 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
946 msgstr "git apply：錯誤的 git-diff - 第 %d 行上舊檔案名不一致"
947
946 -#: apply.c:933
948 +#: apply.c:940
949 #, c-format
950 msgid "git apply: bad git-diff - expected /dev/null on line %d"
951 msgstr "git apply：錯誤的 git-diff - 第 %d 行處應為 /dev/null"
952
951 -#: apply.c:962
953 +#: apply.c:969
954 #, c-format
955 msgid "invalid mode on line %d: %s"
956 msgstr "第 %d 行包含無效檔案模式：%s"
957
956 -#: apply.c:1281
958 +#: apply.c:1288
959 #, c-format
960 msgid "inconsistent header lines %d and %d"
961 msgstr "不一致的檔案頭，%d 行和 %d 行"
962
961 -#: apply.c:1371
963 +#: apply.c:1378
964 #, c-format
965 msgid ""
966 "git diff header lacks filename information when removing %d leading pathname "
@@ -968,91 +970,91 @@ msgid_plural ""
970 "components (line %d)"
971 msgstr[0] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）"
972
971 -#: apply.c:1384
973 +#: apply.c:1391
974 #, c-format
975 msgid "git diff header lacks filename information (line %d)"
976 msgstr "git diff 的標頭訊息中缺乏檔案名訊息（第 %d 行）"
977
976 -#: apply.c:1480
978 +#: apply.c:1487
979 #, c-format
980 msgid "recount: unexpected line: %.*s"
981 msgstr "recount：意外的行：%.*s"
982
981 -#: apply.c:1549
983 +#: apply.c:1556
984 #, c-format
985 msgid "patch fragment without header at line %d: %.*s"
986 msgstr "第 %d 行的修補檔區塊沒有標頭訊息：%.*s"
987
986 -#: apply.c:1752
988 +#: apply.c:1759
989 msgid "new file depends on old contents"
990 msgstr "新檔案依賴舊內容"
991
990 -#: apply.c:1754
992 +#: apply.c:1761
993 msgid "deleted file still has contents"
994 msgstr "刪除的檔案仍有內容"
995
994 -#: apply.c:1788
996 +#: apply.c:1795
997 #, c-format
998 msgid "corrupt patch at line %d"
999 msgstr "修補檔在第 %d 行發現損壞"
1000
999 -#: apply.c:1825
1001 +#: apply.c:1832
1002 #, c-format
1003 msgid "new file %s depends on old contents"
1004 msgstr "新檔案 %s 依賴舊內容"
1005
1004 -#: apply.c:1827
1006 +#: apply.c:1834
1007 #, c-format
1008 msgid "deleted file %s still has contents"
1009 msgstr "刪除的檔案 %s 仍有內容"
1010
1009 -#: apply.c:1830
1011 +#: apply.c:1837
1012 #, c-format
1013 msgid "** warning: file %s becomes empty but is not deleted"
1014 msgstr "** 警告：檔案 %s 成為空檔案但並未刪除"
1015
1014 -#: apply.c:1978
1016 +#: apply.c:1985
1017 #, c-format
1018 msgid "corrupt binary patch at line %d: %.*s"
1019 msgstr "二進位修補檔在第 %d 行損壞：%.*s"
1020
1019 -#: apply.c:2015
1021 +#: apply.c:2022
1022 #, c-format
1023 msgid "unrecognized binary patch at line %d"
1024 msgstr "無法識別的二進位修補檔位於第 %d 行"
1025
1024 -#: apply.c:2177
1026 +#: apply.c:2184
1027 #, c-format
1028 msgid "patch with only garbage at line %d"
1029 msgstr "修補檔案的第 %d 行只有垃圾資料"
1030
1029 -#: apply.c:2263
1031 +#: apply.c:2270
1032 #, c-format
1033 msgid "unable to read symlink %s"
1034 msgstr "無法讀取符號連結 %s"
1035
1034 -#: apply.c:2267
1036 +#: apply.c:2274
1037 #, c-format
1038 msgid "unable to open or read %s"
1039 msgstr "不能開啟或讀取 %s"
1040
1039 -#: apply.c:2936
1041 +#: apply.c:2943
1042 #, c-format
1043 msgid "invalid start of line: '%c'"
1044 msgstr "無效的行首字元：'%c'"
1045
1044 -#: apply.c:3057
1046 +#: apply.c:3064
1047 #, c-format
1048 msgid "Hunk #%d succeeded at %d (offset %d line)."
1049 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1050 msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）。"
1051
1050 -#: apply.c:3069
1052 +#: apply.c:3076
1053 #, c-format
1054 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1055 msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔區塊"
1056
1055 -#: apply.c:3075
1057 +#: apply.c:3082
1058 #, c-format
1059 msgid ""
1060 "while searching for:\n"
@@ -1061,442 +1063,442 @@ msgstr ""
1063 "當查詢：\n"
1064 "%.*s"
1065
1064 -#: apply.c:3097
1066 +#: apply.c:3104
1067 #, c-format
1068 msgid "missing binary patch data for '%s'"
1069 msgstr "缺少 '%s' 的二進位修補檔資料"
1070
1069 -#: apply.c:3105
1071 +#: apply.c:3112
1072 #, c-format
1073 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
1074 msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位修補檔"
1075
1074 -#: apply.c:3152
1076 +#: apply.c:3159
1077 #, c-format
1078 msgid "cannot apply binary patch to '%s' without full index line"
1079 msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔"
1080
1079 -#: apply.c:3163
1081 +#: apply.c:3170
1082 #, c-format
1083 msgid ""
1084 "the patch applies to '%s' (%s), which does not match the current contents."
1085 msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。"
1086
1085 -#: apply.c:3171
1087 +#: apply.c:3178
1088 #, c-format
1089 msgid "the patch applies to an empty '%s' but it is not empty"
1090 msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案"
1091
1090 -#: apply.c:3189
1092 +#: apply.c:3196
1093 #, c-format
1094 msgid "the necessary postimage %s for '%s' cannot be read"
1095 msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s"
1096
1095 -#: apply.c:3202
1097 +#: apply.c:3209
1098 #, c-format
1099 msgid "binary patch does not apply to '%s'"
1100 msgstr "二進位修補檔未套用到 '%s'"
1101
1100 -#: apply.c:3209
1102 +#: apply.c:3216
1103 #, c-format
1104 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1105 msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）"
1106
1105 -#: apply.c:3230
1107 +#: apply.c:3237
1108 #, c-format
1109 msgid "patch failed: %s:%ld"
1110 msgstr "打修補檔失敗：%s:%ld"
1111
1110 -#: apply.c:3353
1112 +#: apply.c:3360
1113 #, c-format
1114 msgid "cannot checkout %s"
1115 msgstr "不能簽出 %s"
1116
1115 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214
1116 -#: setup.c:309
1117 +#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214
1118 +#: setup.c:310
1119 #, c-format
1120 msgid "failed to read %s"
1121 msgstr "無法讀取 %s"
1122
1121 -#: apply.c:3413
1123 +#: apply.c:3420
1124 #, c-format
1125 msgid "reading from '%s' beyond a symbolic link"
1126 msgstr "讀取位於符號連結中的 '%s'"
1127
1126 -#: apply.c:3442 apply.c:3711
1128 +#: apply.c:3449 apply.c:3721
1129 #, c-format
1130 msgid "path %s has been renamed/deleted"
1131 msgstr "路徑 %s 已經被重新命名/刪除"
1132
1131 -#: apply.c:3549 apply.c:3726
1133 +#: apply.c:3559 apply.c:3736
1134 #, c-format
1135 msgid "%s: does not exist in index"
1136 msgstr "%s：不存在於索引中"
1137
1136 -#: apply.c:3558 apply.c:3734 apply.c:3978
1138 +#: apply.c:3568 apply.c:3744 apply.c:3960
1139 #, c-format
1140 msgid "%s: does not match index"
1141 msgstr "%s：和索引不符合"
1142
1141 -#: apply.c:3595
1143 +#: apply.c:3605
1144 msgid "repository lacks the necessary blob to perform 3-way merge."
1145 msgstr "版本庫缺少用來進行三方合併所需要的資料物件。"
1146
1145 -#: apply.c:3598
1147 +#: apply.c:3608
1148 #, c-format
1149 msgid "Performing three-way merge...\n"
1150 msgstr "正在進行三方合併⋯⋯\n"
1151
1150 -#: apply.c:3614 apply.c:3618
1152 +#: apply.c:3624 apply.c:3628
1153 #, c-format
1154 msgid "cannot read the current contents of '%s'"
1155 msgstr "無法讀取 '%s' 的目前內容"
1156
1155 -#: apply.c:3630
1157 +#: apply.c:3640
1158 #, c-format
1159 msgid "Failed to perform three-way merge...\n"
1160 msgstr "無法進行三方合併⋯⋯\n"
1161
1160 -#: apply.c:3644
1162 +#: apply.c:3654
1163 #, c-format
1164 msgid "Applied patch to '%s' with conflicts.\n"
1165 msgstr "套用修補檔到 '%s' 存在衝突。\n"
1166
1165 -#: apply.c:3649
1167 +#: apply.c:3659
1168 #, c-format
1169 msgid "Applied patch to '%s' cleanly.\n"
1170 msgstr "成功套用修補檔到 '%s'。\n"
1171
1170 -#: apply.c:3666
1172 +#: apply.c:3676
1173 #, c-format
1174 msgid "Falling back to direct application...\n"
1175 msgstr "回復至直接套用模式⋯⋯\n"
1176
1175 -#: apply.c:3678
1177 +#: apply.c:3688
1178 msgid "removal patch leaves file contents"
1179 msgstr "移除修補檔仍留下了檔案內容"
1180
1179 -#: apply.c:3751
1181 +#: apply.c:3761
1182 #, c-format
1183 msgid "%s: wrong type"
1184 msgstr "%s：錯誤類型"
1185
1184 -#: apply.c:3753
1186 +#: apply.c:3763
1187 #, c-format
1188 msgid "%s has type %o, expected %o"
1189 msgstr "%s 的類型是 %o，應為 %o"
1190
1189 -#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918
1190 -#: read-cache.c:1381
1191 +#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932
1192 +#: read-cache.c:1399
1193 #, c-format
1194 msgid "invalid path '%s'"
1195 msgstr "無效路徑 '%s'"
1196
1195 -#: apply.c:3976
1197 +#: apply.c:3958
1198 #, c-format
1199 msgid "%s: already exists in index"
1200 msgstr "%s：已經存在於索引中"
1201
1200 -#: apply.c:3980
1202 +#: apply.c:3962
1203 #, c-format
1204 msgid "%s: already exists in working directory"
1205 msgstr "%s：已經存在於工作區中"
1206
1205 -#: apply.c:4000
1207 +#: apply.c:3982
1208 #, c-format
1209 msgid "new mode (%o) of %s does not match old mode (%o)"
1210 msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合"
1211
1210 -#: apply.c:4005
1212 +#: apply.c:3987
1213 #, c-format
1214 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1215 msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符合"
1216
1215 -#: apply.c:4025
1217 +#: apply.c:4007
1218 #, c-format
1219 msgid "affected file '%s' is beyond a symbolic link"
1220 msgstr "受影響的檔案 '%s' 位於符號連結中"
1221
1220 -#: apply.c:4029
1222 +#: apply.c:4011
1223 #, c-format
1224 msgid "%s: patch does not apply"
1225 msgstr "%s：修補檔未套用"
1226
1225 -#: apply.c:4044
1227 +#: apply.c:4026
1228 #, c-format
1229 msgid "Checking patch %s..."
1230 msgstr "正在檢查修補檔 %s..."
1231
1230 -#: apply.c:4136
1232 +#: apply.c:4118
1233 #, c-format
1234 msgid "sha1 information is lacking or useless for submodule %s"
1235 msgstr "子模組 %s 的 sha1 訊息缺少或無效"
1236
1235 -#: apply.c:4143
1237 +#: apply.c:4125
1238 #, c-format
1239 msgid "mode change for %s, which is not in current HEAD"
1240 msgstr "%s 的模式變更，但它不在目前 HEAD 中"
1241
1240 -#: apply.c:4146
1242 +#: apply.c:4128
1243 #, c-format
1244 msgid "sha1 information is lacking or useless (%s)."
1245 msgstr "sha1 訊息缺少或無效（%s）。"
1246
1245 -#: apply.c:4155
1247 +#: apply.c:4137
1248 #, c-format
1249 msgid "could not add %s to temporary index"
1250 msgstr "不能在暫時索引中新增 %s"
1251
1250 -#: apply.c:4165
1252 +#: apply.c:4147
1253 #, c-format
1254 msgid "could not write temporary index to %s"
1255 msgstr "不能把暫時索引寫入到 %s"
1256
1255 -#: apply.c:4303
1257 +#: apply.c:4285
1258 #, c-format
1259 msgid "unable to remove %s from index"
1260 msgstr "不能從索引中移除 %s"
1261
1260 -#: apply.c:4337
1262 +#: apply.c:4319
1263 #, c-format
1264 msgid "corrupt patch for submodule %s"
1265 msgstr "子模組 %s 損壞的修補檔"
1266
1265 -#: apply.c:4343
1267 +#: apply.c:4325
1268 #, c-format
1269 msgid "unable to stat newly created file '%s'"
1270 msgstr "不能對建立檔案 '%s' 呼叫 stat"
1271
1270 -#: apply.c:4351
1272 +#: apply.c:4333
1273 #, c-format
1274 msgid "unable to create backing store for newly created file %s"
1275 msgstr "不能為建立檔案 %s 建立後端儲存"
1276
1275 -#: apply.c:4357 apply.c:4502
1277 +#: apply.c:4339 apply.c:4484
1278 #, c-format
1279 msgid "unable to add cache entry for %s"
1280 msgstr "無法為 %s 新增快取條目"
1281
1280 -#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258
1282 +#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258
1283 #: builtin/gc.c:2293
1284 #, c-format
1285 msgid "failed to write to '%s'"
1286 msgstr "寫入 '%s' 失敗"
1287
1286 -#: apply.c:4404
1288 +#: apply.c:4386
1289 #, c-format
1290 msgid "closing file '%s'"
1291 msgstr "關閉檔案 '%s'"
1292
1291 -#: apply.c:4474
1293 +#: apply.c:4456
1294 #, c-format
1295 msgid "unable to write file '%s' mode %o"
1296 msgstr "不能寫入檔案 '%s' 權限 %o"
1297
1296 -#: apply.c:4572
1298 +#: apply.c:4554
1299 #, c-format
1300 msgid "Applied patch %s cleanly."
1301 msgstr "成功套用修補檔 %s。"
1302
1301 -#: apply.c:4580
1303 +#: apply.c:4562
1304 msgid "internal error"
1305 msgstr "內部錯誤"
1306
1305 -#: apply.c:4583
1307 +#: apply.c:4565
1308 #, c-format
1309 msgid "Applying patch %%s with %d reject..."
1310 msgid_plural "Applying patch %%s with %d rejects..."
1311 msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..."
1312
1311 -#: apply.c:4594
1313 +#: apply.c:4576
1314 #, c-format
1315 msgid "truncating .rej filename to %.*s.rej"
1316 msgstr "截短 .rej 檔案名為 %.*s.rej"
1317
1316 -#: apply.c:4602
1318 +#: apply.c:4584
1319 #, c-format
1320 msgid "cannot open %s"
1321 msgstr "不能開啟 %s"
1322
1321 -#: apply.c:4616
1323 +#: apply.c:4598
1324 #, c-format
1325 msgid "Hunk #%d applied cleanly."
1326 msgstr "成功套用第 #%d 個區塊。"
1327
1326 -#: apply.c:4620
1328 +#: apply.c:4602
1329 #, c-format
1330 msgid "Rejected hunk #%d."
1331 msgstr "拒絕第 #%d 個區塊。"
1332
1331 -#: apply.c:4749
1333 +#: apply.c:4731
1334 #, c-format
1335 msgid "Skipped patch '%s'."
1336 msgstr "略過修補檔 '%s'。"
1337
1336 -#: apply.c:4758
1338 +#: apply.c:4740
1339 msgid "No valid patches in input (allow with \"--allow-empty\")"
1340 msgstr "輸入中沒有有效的修補檔內容（傳入「--allow-empty」允許）"
1341
1340 -#: apply.c:4779
1342 +#: apply.c:4761
1343 msgid "unable to read index file"
1344 msgstr "無法讀取索引檔案"
1345
1344 -#: apply.c:4936
1346 +#: apply.c:4918
1347 #, c-format
1348 msgid "can't open patch '%s': %s"
1349 msgstr "不能開啟修補檔 '%s'：%s"
1350
1349 -#: apply.c:4963
1351 +#: apply.c:4945
1352 #, c-format
1353 msgid "squelched %d whitespace error"
1354 msgid_plural "squelched %d whitespace errors"
1355 msgstr[0] "抑制下仍有 %d 個空白字元誤用"
1356
1355 -#: apply.c:4969 apply.c:4984
1357 +#: apply.c:4951 apply.c:4966
1358 #, c-format
1359 msgid "%d line adds whitespace errors."
1360 msgid_plural "%d lines add whitespace errors."
1361 msgstr[0] "%d 行新增了空白字元誤用。"
1362
1361 -#: apply.c:4977
1363 +#: apply.c:4959
1364 #, c-format
1365 msgid "%d line applied after fixing whitespace errors."
1366 msgid_plural "%d lines applied after fixing whitespace errors."
1367 msgstr[0] "修復空白錯誤後，套用了 %d 行。"
1368
1367 -#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430
1369 +#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430
1370 msgid "Unable to write new index file"
1371 msgstr "無法寫入新索引檔案"
1372
1371 -#: apply.c:5021
1373 +#: apply.c:5003
1374 msgid "don't apply changes matching the given path"
1375 msgstr "不要套用符合提供路徑的變更"
1376
1375 -#: apply.c:5024
1377 +#: apply.c:5006
1378 msgid "apply changes matching the given path"
1379 msgstr "套用符合提供路徑的變更"
1380
1379 -#: apply.c:5026 builtin/am.c:2376
1381 +#: apply.c:5008 builtin/am.c:2379
1382 msgid "num"
1383 msgstr "數字"
1384
1383 -#: apply.c:5027
1385 +#: apply.c:5009
1386 msgid "remove <num> leading slashes from traditional diff paths"
1387 msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線"
1388
1387 -#: apply.c:5030
1389 +#: apply.c:5012
1390 msgid "ignore additions made by the patch"
1391 msgstr "忽略修補檔中的新增的檔案"
1392
1391 -#: apply.c:5032
1393 +#: apply.c:5014
1394 msgid "instead of applying the patch, output diffstat for the input"
1395 msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）"
1396
1395 -#: apply.c:5036
1397 +#: apply.c:5018
1398 msgid "show number of added and deleted lines in decimal notation"
1399 msgstr "以十進位數顯示新增和刪除的行數"
1400
1399 -#: apply.c:5038
1401 +#: apply.c:5020
1402 msgid "instead of applying the patch, output a summary for the input"
1403 msgstr "不套用修補檔，而是顯示輸入的概要"
1404
1403 -#: apply.c:5040
1405 +#: apply.c:5022
1406 msgid "instead of applying the patch, see if the patch is applicable"
1407 msgstr "不套用修補檔，而是檢視修補檔是否可套用"
1408
1407 -#: apply.c:5042
1409 +#: apply.c:5024
1410 msgid "make sure the patch is applicable to the current index"
1411 msgstr "確認修補檔可以套用到目前索引"
1412
1411 -#: apply.c:5044
1413 +#: apply.c:5026
1414 msgid "mark new files with `git add --intent-to-add`"
1415 msgstr "使用指令 `git add --intent-to-add` 標記新增檔案"
1416
1415 -#: apply.c:5046
1417 +#: apply.c:5028
1418 msgid "apply a patch without touching the working tree"
1419 msgstr "套用修補檔而不修改工作區"
1420
1419 -#: apply.c:5048
1421 +#: apply.c:5030
1422 msgid "accept a patch that touches outside the working area"
1423 msgstr "接受修改工作區之外檔案的修補檔"
1424
1423 -#: apply.c:5051
1425 +#: apply.c:5033
1426 msgid "also apply the patch (use with --stat/--summary/--check)"
1427 msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）"
1428
1427 -#: apply.c:5053
1429 +#: apply.c:5035
1430 msgid "attempt three-way merge, fall back on normal patch if that fails"
1431 msgstr "嘗試三方合併。如果失敗，則回到正常修補檔 (patch) 模式"
1432
1431 -#: apply.c:5055
1433 +#: apply.c:5037
1434 msgid "build a temporary index based on embedded index information"
1435 msgstr "建立一個暫時索引基於嵌入的索引訊息"
1436
1435 -#: apply.c:5058 builtin/checkout-index.c:196
1437 +#: apply.c:5040 builtin/checkout-index.c:230
1438 msgid "paths are separated with NUL character"
1439 msgstr "路徑以 NUL 字元分隔"
1440
1439 -#: apply.c:5060
1441 +#: apply.c:5042
1442 msgid "ensure at least <n> lines of context match"
1443 msgstr "確保至少符合 <n> 行上下文"
1444
1443 -#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355
1445 +#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358
1446 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100
1445 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960
1446 -#: builtin/rebase.c:1051
1447 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983
1448 +#: builtin/rebase.c:1079
1449 msgid "action"
1450 msgstr "動作"
1451
1450 -#: apply.c:5062
1452 +#: apply.c:5044
1453 msgid "detect new or modified lines that have whitespace errors"
1454 msgstr "檢查新增和修改的行中間的空白字元濫用"
1455
1454 -#: apply.c:5065 apply.c:5068
1456 +#: apply.c:5047 apply.c:5050
1457 msgid "ignore changes in whitespace when finding context"
1458 msgstr "尋找上下文時忽略空白字元的變更"
1459
1458 -#: apply.c:5071
1460 +#: apply.c:5053
1461 msgid "apply the patch in reverse"
1462 msgstr "反向套用修補檔"
1463
1462 -#: apply.c:5073
1464 +#: apply.c:5055
1465 msgid "don't expect at least one line of context"
1466 msgstr "無需至少一行上下文"
1467
1466 -#: apply.c:5075
1468 +#: apply.c:5057
1469 msgid "leave the rejected hunks in corresponding *.rej files"
1470 msgstr "將拒絕的修補檔區塊儲存在對應的 *.rej 檔案中"
1471
1470 -#: apply.c:5077
1472 +#: apply.c:5059
1473 msgid "allow overlapping hunks"
1474 msgstr "允許重疊的修補檔區塊"
1475
1474 -#: apply.c:5080
1476 +#: apply.c:5062
1477 msgid "tolerate incorrectly detected missing new-line at the end of file"
1478 msgstr "允許不正確的檔案末尾換行符號"
1479
1478 -#: apply.c:5083
1480 +#: apply.c:5065
1481 msgid "do not trust the line counts in the hunk headers"
1482 msgstr "不信任修補檔區塊的標頭訊息中的行號"
1483
1482 -#: apply.c:5085 builtin/am.c:2364
1484 +#: apply.c:5067 builtin/am.c:2367
1485 msgid "root"
1486 msgstr "根目錄"
1487
1486 -#: apply.c:5086
1488 +#: apply.c:5068
1489 msgid "prepend <root> to all filenames"
1490 msgstr "為所有檔案名前新增 <根目錄>"
1491
1490 -#: apply.c:5089
1492 +#: apply.c:5071
1493 msgid "don't return error for empty patches"
1494 msgstr "遇到空白修補檔時不回傳錯誤"
1495
1494 -#: archive-tar.c:125 archive-zip.c:345
1496 +#: archive-tar.c:125 archive-zip.c:346
1497 #, c-format
1498 msgid "cannot stream blob %s"
1499 msgstr "不能開啟資料物件 %s"
1500
1499 -#: archive-tar.c:265 archive-zip.c:358
1501 +#: archive-tar.c:265 archive-zip.c:359
1502 #, c-format
1503 msgid "unsupported file mode: 0%o (SHA1: %s)"
1504 msgstr "不支援的檔案模式：0%o (SHA1: %s)"
@@ -1515,22 +1517,22 @@ msgstr "無法重定向描述符"
1517 msgid "'%s' filter reported error"
1518 msgstr "'%s' 過濾器報告了錯誤"
1519
1518 -#: archive-zip.c:318
1520 +#: archive-zip.c:319
1521 #, c-format
1522 msgid "path is not valid UTF-8: %s"
1523 msgstr "路徑不是有效的 UTF-8：%s"
1524
1523 -#: archive-zip.c:322
1525 +#: archive-zip.c:323
1526 #, c-format
1527 msgid "path too long (%d chars, SHA1: %s): %s"
1528 msgstr "路徑太長（%d 字元，SHA1：%s）：%s"
1529
1528 -#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
1530 +#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366
1531 #, c-format
1532 msgid "deflate error (%d)"
1533 msgstr "壓縮錯誤 (%d)"
1534
1533 -#: archive-zip.c:603
1535 +#: archive-zip.c:604
1536 #, c-format
1537 msgid "timestamp too large for this system: %<PRIuMAX>"
1538 msgstr "對於本系統時間戳太大：%<PRIuMAX>"
@@ -1539,10 +1541,6 @@ msgstr "對於本系統時間戳太大：%<PRIuMAX>"
1541 msgid "git archive [<options>] <tree-ish> [<path>...]"
1542 msgstr "git archive [<選項>] <樹或提交> [<路徑>...]"
1543
1542 -#: archive.c:15
1543 -msgid "git archive --list"
1544 -msgstr "git archive --list"
1545 -
1544 #: archive.c:16
1545 msgid ""
1546 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
@@ -1554,12 +1552,12 @@ msgid "git archive --remote <repo> [--exec <cmd>] --list"
1552 msgstr "git archive --remote <版本庫> [--exec <命令>] --list"
1553
1554 #: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238
1557 -#: builtin/tag.c:578
1555 +#: builtin/tag.c:579
1556 #, c-format
1557 msgid "cannot read '%s'"
1558 msgstr "不能讀取 '%s'"
1559
1562 -#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334
1560 +#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334
1561 #, c-format
1562 msgid "pathspec '%s' did not match any files"
1563 msgstr "路徑規格 '%s' 未符合任何檔案"
@@ -1601,7 +1599,7 @@ msgstr "格式"
1599 msgid "archive format"
1600 msgstr "歸檔格式"
1601
1604 -#: archive.c:552 builtin/log.c:1790
1602 +#: archive.c:552 builtin/log.c:1809
1603 msgid "prefix"
1604 msgstr "前綴"
1605
@@ -1609,12 +1607,12 @@ msgstr "前綴"
1607 msgid "prepend prefix to each pathname in the archive"
1608 msgstr "為歸檔中每個路徑名加上前綴"
1609
1612 -#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884
1613 -#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135
1610 +#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885
1611 +#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135
1612 #: builtin/fast-export.c:1181 builtin/fast-export.c:1183
1615 -#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103
1613 +#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104
1614 #: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410
1617 -#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190
1615 +#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195
1616 msgid "file"
1617 msgstr "檔案"
1618
@@ -1642,8 +1640,8 @@ msgstr "設定壓縮級別"
1640 msgid "list supported archive formats"
1641 msgstr "列出支援的歸檔格式"
1642
1645 -#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121
1646 -#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513
1643 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125
1644 +#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718
1645 msgid "repo"
1646 msgstr "版本庫"
1647
@@ -1664,11 +1662,12 @@ msgstr "遠端 git-upload-archive 指令的路徑"
1662 msgid "Unexpected option --remote"
1663 msgstr "未知參數 --remote"
1664
1667 -#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544
1668 -#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370
1669 -#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115
1670 -#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281
1671 -#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144
1665 +#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530
1666 +#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099
1667 +#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230
1668 +#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442
1669 +#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708
1670 +#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144
1671 #: http-fetch.c:153
1672 #, c-format
1673 msgid "the option '%s' requires '%s'"
@@ -1688,17 +1687,17 @@ msgstr "未知歸檔格式 '%s'"
1687 msgid "Argument not supported for format '%s': -%d"
1688 msgstr "參數不支援此格式 '%s'：-%d"
1689
1691 -#: attr.c:203
1690 +#: attr.c:202
1691 #, c-format
1692 msgid "%.*s is not a valid attribute name"
1693 msgstr "%.*s 不是一個有效的屬性名"
1694
1696 -#: attr.c:364
1695 +#: attr.c:363
1696 #, c-format
1697 msgid "%s not allowed: %s:%d"
1698 msgstr "不允許 %s：%s:%d"
1699
1701 -#: attr.c:404
1700 +#: attr.c:403
1701 msgid ""
1702 "Negative patterns are ignored in git attributes\n"
1703 "Use '\\!' for literal leading exclamation."
@@ -1716,12 +1715,12 @@ msgstr "檔案 '%s' 包含錯誤的引用格式：%s"
1715 msgid "We cannot bisect more!\n"
1716 msgstr "我們無法進行更多的二分搜尋！\n"
1717
1719 -#: bisect.c:764
1718 +#: bisect.c:765
1719 #, c-format
1720 msgid "Not a valid commit name %s"
1721 msgstr "不是一個有效的提交名 %s"
1722
1724 -#: bisect.c:789
1723 +#: bisect.c:790
1724 #, c-format
1725 msgid ""
1726 "The merge base %s is bad.\n"
@@ -1730,7 +1729,7 @@ msgstr ""
1729 "合併基礎 %s 是壞的。\n"
1730 "這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n"
1731
1733 -#: bisect.c:794
1732 +#: bisect.c:795
1733 #, c-format
1734 msgid ""
1735 "The merge base %s is new.\n"
@@ -1739,7 +1738,7 @@ msgstr ""
1738 "合併基礎 %s 是新的。\n"
1739 "介於 %s 和 [%s] 之間的屬性已經被修改。\n"
1740
1742 -#: bisect.c:799
1741 +#: bisect.c:800
1742 #, c-format
1743 msgid ""
1744 "The merge base %s is %s.\n"
@@ -1748,7 +1747,7 @@ msgstr ""
1747 "合併基礎 %s 是 %s。\n"
1748 "這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n"
1749
1751 -#: bisect.c:807
1750 +#: bisect.c:808
1751 #, c-format
1752 msgid ""
1753 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1759,7 +1758,7 @@ msgstr ""
1758 "這種情況下 git 二分搜尋無法正常工作。\n"
1759 "您可能弄錯了 %s 和 %s 版本？\n"
1760
1762 -#: bisect.c:820
1761 +#: bisect.c:821
1762 #, c-format
1763 msgid ""
1764 "the merge base between %s and [%s] must be skipped.\n"
@@ -1770,36 +1769,36 @@ msgstr ""
1769 "所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n"
1770 "我們仍舊繼續。"
1771
1773 -#: bisect.c:859
1772 +#: bisect.c:860
1773 #, c-format
1774 msgid "Bisecting: a merge base must be tested\n"
1775 msgstr "二分搜尋中：合併基礎必須是經過測試的\n"
1776
1778 -#: bisect.c:909
1777 +#: bisect.c:910
1778 #, c-format
1779 msgid "a %s revision is needed"
1780 msgstr "需要一個 %s 版本"
1781
1783 -#: bisect.c:939
1782 +#: bisect.c:940
1783 #, c-format
1784 msgid "could not create file '%s'"
1785 msgstr "不能建立檔案 '%s'"
1786
1788 -#: bisect.c:985 builtin/merge.c:155
1787 +#: bisect.c:986 builtin/merge.c:155
1788 #, c-format
1789 msgid "could not read file '%s'"
1790 msgstr "不能讀取檔案 '%s'"
1791
1793 -#: bisect.c:1025
1792 +#: bisect.c:1026
1793 msgid "reading bisect refs failed"
1794 msgstr "讀取二分搜尋引用失敗"
1795
1797 -#: bisect.c:1055
1796 +#: bisect.c:1056
1797 #, c-format
1798 msgid "%s was both %s and %s\n"
1799 msgstr "%s 同時為 %s 和 %s\n"
1800
1802 -#: bisect.c:1064
1801 +#: bisect.c:1065
1802 #, c-format
1803 msgid ""
1804 "No testable commit found.\n"
@@ -1808,7 +1807,7 @@ msgstr ""
1807 "沒找到能夠測試的提交。\n"
1808 "可能是執行傳入的路徑引數是錯誤的？\n"
1809
1811 -#: bisect.c:1093
1810 +#: bisect.c:1094
1811 #, c-format
1812 msgid "(roughly %d step)"
1813 msgid_plural "(roughly %d steps)"
@@ -1817,79 +1816,79 @@ msgstr[0] "（大概 %d 步）"
1816 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
1817 #. steps)" translation.
1818 #.
1820 -#: bisect.c:1099
1819 +#: bisect.c:1100
1820 #, c-format
1821 msgid "Bisecting: %d revision left to test after this %s\n"
1822 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
1823 msgstr[0] "二分搜尋中：在此之後，還剩 %d 個版本待測試 %s\n"
1824
1826 -#: blame.c:2776
1825 +#: blame.c:2773
1826 msgid "--contents and --reverse do not blend well."
1827 msgstr "--contents 和 --reverse 不能混用。"
1828
1830 -#: blame.c:2790
1829 +#: blame.c:2787
1830 msgid "cannot use --contents with final commit object name"
1831 msgstr "不能將 --contents 和最終的提交物件名共用"
1832
1834 -#: blame.c:2811
1833 +#: blame.c:2808
1834 msgid "--reverse and --first-parent together require specified latest commit"
1835 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
1836
1838 -#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158
1839 -#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114
1840 -#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071
1841 -#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373
1842 -#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790
1837 +#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157
1838 +#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118
1839 +#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096
1840 +#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381
1841 +#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796
1842 #: builtin/shortlog.c:255
1843 msgid "revision walk setup failed"
1844 msgstr "版本遍歷設定失敗"
1845
1847 -#: blame.c:2838
1846 +#: blame.c:2835
1847 msgid ""
1848 "--reverse --first-parent together require range along first-parent chain"
1849 msgstr "--reverse 和 --first-parent 共用，需要第一祖先鏈上的提交範圍"
1850
1852 -#: blame.c:2849
1851 +#: blame.c:2846
1852 #, c-format
1853 msgid "no such path %s in %s"
1854 msgstr "在 %2$s 中無此路徑 %1$s"
1855
1857 -#: blame.c:2860
1856 +#: blame.c:2857
1857 #, c-format
1858 msgid "cannot read blob %s for path %s"
1859 msgstr "不能為路徑 %2$s 讀取資料物件 %1$s"
1860
1862 -#: branch.c:77
1861 +#: branch.c:93
1862 msgid ""
1863 "cannot inherit upstream tracking configuration of multiple refs when "
1864 "rebasing is requested"
1865 msgstr "請求重定基底時，無法繼承多個參照的上游追蹤設定"
1866
1868 -#: branch.c:88
1867 +#: branch.c:104
1868 #, c-format
1869 msgid "not setting branch '%s' as its own upstream"
1870 msgstr "未將「%s」分支設定為其自己的上游"
1871
1873 -#: branch.c:144
1872 +#: branch.c:160
1873 #, c-format
1874 msgid "branch '%s' set up to track '%s' by rebasing."
1875 msgstr "已將「%s」分支設定為透過重定基底追蹤「%s」。"
1876
1878 -#: branch.c:145
1877 +#: branch.c:161
1878 #, c-format
1879 msgid "branch '%s' set up to track '%s'."
1880 msgstr "已將「%s」分支設定為追蹤「%s」。"
1881
1883 -#: branch.c:148
1882 +#: branch.c:164
1883 #, c-format
1884 msgid "branch '%s' set up to track:"
1885 msgstr "「%s」分支已設定追蹤："
1886
1888 -#: branch.c:160
1887 +#: branch.c:176
1888 msgid "unable to write upstream branch configuration"
1889 msgstr "無法寫入上游分支設定"
1890
1892 -#: branch.c:162
1891 +#: branch.c:178
1892 msgid ""
1893 "\n"
1894 "After fixing the error cause you may try to fix up\n"
@@ -1899,47 +1898,84 @@ msgstr ""
1898 "修正錯誤後，您可以執行下述命令\n"
1899 "命令修正遠端追蹤資訊："
1900
1902 -#: branch.c:203
1901 +#: branch.c:219
1902 #, c-format
1903 msgid "asked to inherit tracking from '%s', but no remote is set"
1904 msgstr "請求繼承「%s」的追蹤設定，但未設定遠端"
1905
1907 -#: branch.c:209
1906 +#: branch.c:225
1907 #, c-format
1908 msgid "asked to inherit tracking from '%s', but no merge configuration is set"
1909 msgstr "請求繼承「%s」的追蹤設定，但未設定合併設定"
1910
1912 -#: branch.c:252
1911 +#: branch.c:277
1912 +#, c-format
1913 +msgid "not tracking: ambiguous information for ref '%s'"
1914 +msgstr "未追蹤：「%s」引用有歧義"
1915 +
1916 +# 譯者：為保證在輸出中對齊，注意調整句中空格！
1917 +#. TRANSLATORS: This is a line listing a remote with duplicate
1918 +#. refspecs in the advice message below. For RTL languages you'll
1919 +#. probably want to swap the "%s" and leading " " space around.
1920 +#.
1921 +#. TRANSLATORS: This is line item of ambiguous object output
1922 +#. from describe_ambiguous_object() above. For RTL languages
1923 +#. you'll probably want to swap the "%s" and leading " " space
1924 +#. around.
1925 +#.
1926 +#: branch.c:289 object-name.c:464
1927 +#, c-format
1928 +msgid " %s\n"
1929 +msgstr " %s\n"
1930 +
1931 +#. TRANSLATORS: The second argument is a \n-delimited list of
1932 +#. duplicate refspecs, composed above.
1933 +#.
1934 +#: branch.c:295
1935 #, c-format
1914 -msgid "not tracking: ambiguous information for ref %s"
1915 -msgstr "未追蹤：%s 引用有歧義"
1936 +msgid ""
1937 +"There are multiple remotes whose fetch refspecs map to the remote\n"
1938 +"tracking ref '%s':\n"
1939 +"%s\n"
1940 +"This is typically a configuration error.\n"
1941 +"\n"
1942 +"To support setting up tracking branches, ensure that\n"
1943 +"different remotes' fetch refspecs map into different\n"
1944 +"tracking namespaces."
1945 +msgstr ""
1946 +"有多個遠端的抓取引用規格映射到遠端追蹤引用「%s」的規格：\n"
1947 +"%s\n"
1948 +"這通常是設定錯誤。\n"
1949 +"\n"
1950 +"若要支援設定追蹤分支，請確定不同遠端的抓取引用規格\n"
1951 +"映射到不同的追蹤命名空間。"
1952
1917 -#: branch.c:287
1953 +#: branch.c:344
1954 #, c-format
1955 msgid "'%s' is not a valid branch name"
1956 msgstr "「%s」不是一個有效的分支名稱"
1957
1922 -#: branch.c:307
1958 +#: branch.c:364
1959 #, c-format
1960 msgid "a branch named '%s' already exists"
1961 msgstr "已有同名「%s」分支"
1962
1927 -#: branch.c:313
1963 +#: branch.c:370
1964 #, c-format
1965 msgid "cannot force update the branch '%s' checked out at '%s'"
1966 msgstr "無法強制更新在「%2$s」簽出的「%1$s」分支"
1967
1932 -#: branch.c:336
1968 +#: branch.c:393
1969 #, c-format
1970 msgid "cannot set up tracking information; starting point '%s' is not a branch"
1971 msgstr "無法設定追蹤資訊：起始點「%s」不是分支"
1972
1937 -#: branch.c:338
1973 +#: branch.c:395
1974 #, c-format
1975 msgid "the requested upstream branch '%s' does not exist"
1976 msgstr "請求的上游分支 '%s' 不存在"
1977
1942 -#: branch.c:340
1978 +#: branch.c:397
1979 msgid ""
1980 "\n"
1981 "If you are planning on basing your work on an upstream\n"
@@ -1958,124 +1994,143 @@ msgstr ""
1994 "且建立兩個分支間的追蹤關係，\n"
1995 "您可能需要使用「git push -u」推送分支並設定和上游的關聯。"
1996
1961 -#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377
1997 +#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377
1998 #: builtin/replace.c:423 builtin/replace.c:453
1999 #, c-format
2000 msgid "not a valid object name: '%s'"
2001 msgstr "不是一個有效的物件名：'%s'"
2002
1967 -#: branch.c:404
2003 +#: branch.c:465
2004 #, c-format
2005 msgid "ambiguous object name: '%s'"
2006 msgstr "物件名稱有歧義：「%s」"
2007
1972 -#: branch.c:409
2008 +#: branch.c:470
2009 #, c-format
2010 msgid "not a valid branch point: '%s'"
2011 msgstr "無效的分支點：「%s」"
2012
1977 -#: branch.c:469
2013 +#: branch.c:658
2014 +#, c-format
2015 +msgid "submodule '%s': unable to find submodule"
2016 +msgstr "「%s」子模組：找不到子模組"
2017 +
2018 +#: branch.c:661
2019 +#, c-format
2020 +msgid ""
2021 +"You may try updating the submodules using 'git checkout %s && git submodule "
2022 +"update --init'"
2023 +msgstr ""
2024 +"您可以嘗試使用「git checkout %s && git submodule update --init」命令更新子模"
2025 +"組"
2026 +
2027 +#: branch.c:672 branch.c:698
2028 +#, c-format
2029 +msgid "submodule '%s': cannot create branch '%s'"
2030 +msgstr "「%s」子模組：無法建立「%s」分支"
2031 +
2032 +#: branch.c:730
2033 #, c-format
2034 msgid "'%s' is already checked out at '%s'"
2035 msgstr "'%s' 已經簽出到 '%s'"
2036
1982 -#: branch.c:494
2037 +#: branch.c:755
2038 #, c-format
2039 msgid "HEAD of working tree %s is not updated"
2040 msgstr "工作區 %s 的 HEAD 指向沒有被更新"
2041
1987 -#: bundle.c:44
2042 +#: bundle.c:45
2043 #, c-format
2044 msgid "unrecognized bundle hash algorithm: %s"
1990 -msgstr "無法識別的包雜湊演算法：%s"
2045 +msgstr "無法識別的套件雜湊演算法：%s"
2046
1992 -#: bundle.c:48
2047 +#: bundle.c:53
2048 #, c-format
2049 msgid "unknown capability '%s'"
2050 msgstr "未知功能 '%s'"
2051
1997 -#: bundle.c:74
2052 +#: bundle.c:79
2053 #, c-format
2054 msgid "'%s' does not look like a v2 or v3 bundle file"
2000 -msgstr "'%s' 不像是一個 v2 或 v3 版本的包檔案"
2055 +msgstr "'%s' 不像是一個 v2 或 v3 版本的套件檔案"
2056
2002 -#: bundle.c:113
2057 +#: bundle.c:118
2058 #, c-format
2059 msgid "unrecognized header: %s%s (%d)"
2060 msgstr "無法識別的包頭：%s%s (%d)"
2061
2007 -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406
2008 -#: builtin/commit.c:862
2062 +#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402
2063 +#: builtin/commit.c:865
2064 #, c-format
2065 msgid "could not open '%s'"
2066 msgstr "不能開啟 '%s'"
2067
2013 -#: bundle.c:198
2068 +#: bundle.c:203
2069 msgid "Repository lacks these prerequisite commits:"
2070 msgstr "版本庫中缺少這些必備的提交："
2071
2017 -#: bundle.c:201
2072 +#: bundle.c:206
2073 msgid "need a repository to verify a bundle"
2019 -msgstr "需要版本庫驗證一個包"
2074 +msgstr "需要版本庫驗證套件"
2075
2021 -#: bundle.c:257
2076 +#: bundle.c:264
2077 #, c-format
2078 msgid "The bundle contains this ref:"
2024 -msgid_plural "The bundle contains these %d refs:"
2025 -msgstr[0] "這個包中含有這 %d 個引用："
2079 +msgid_plural "The bundle contains these %<PRIuMAX> refs:"
2080 +msgstr[0] "這個套件含有這 %<PRIuMAX> 個引用："
2081
2027 -#: bundle.c:264
2082 +#: bundle.c:272
2083 msgid "The bundle records a complete history."
2029 -msgstr "這個包記錄一個完整歷史。"
2084 +msgstr "這個套件記錄完整歷史紀錄。"
2085
2031 -#: bundle.c:266
2086 +#: bundle.c:274
2087 #, c-format
2088 msgid "The bundle requires this ref:"
2034 -msgid_plural "The bundle requires these %d refs:"
2035 -msgstr[0] "這個包需要這 %d 個引用："
2089 +msgid_plural "The bundle requires these %<PRIuMAX> refs:"
2090 +msgstr[0] "這個套件需要這 %<PRIuMAX> 個引用："
2091
2037 -#: bundle.c:333
2092 +#: bundle.c:350
2093 msgid "unable to dup bundle descriptor"
2039 -msgstr "無法複製 bundle 描述符"
2094 +msgstr "無法複製套件描述符"
2095
2041 -#: bundle.c:340
2096 +#: bundle.c:357
2097 msgid "Could not spawn pack-objects"
2098 msgstr "不能生成 pack-objects 進程"
2099
2045 -#: bundle.c:351
2100 +#: bundle.c:368
2101 msgid "pack-objects died"
2102 msgstr "pack-objects 終止"
2103
2049 -#: bundle.c:400
2104 +#: bundle.c:417
2105 #, c-format
2106 msgid "ref '%s' is excluded by the rev-list options"
2107 msgstr "引用 '%s' 被 rev-list 選項排除"
2108
2054 -#: bundle.c:504
2109 +#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400
2110 #, c-format
2056 -msgid "unsupported bundle version %d"
2057 -msgstr "不支援的包版本 %d"
2111 +msgid "unrecognized argument: %s"
2112 +msgstr "無法識別的參數：%s"
2113
2059 -#: bundle.c:506
2114 +#: bundle.c:548
2115 #, c-format
2061 -msgid "cannot write bundle version %d with algorithm %s"
2062 -msgstr "無法寫入 %2$s 演算法的包版本 %1$d"
2116 +msgid "unsupported bundle version %d"
2117 +msgstr "不支援的套件版本 %d"
2118
2064 -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399
2119 +#: bundle.c:550
2120 #, c-format
2066 -msgid "unrecognized argument: %s"
2067 -msgstr "無法識別的參數：%s"
2121 +msgid "cannot write bundle version %d with algorithm %s"
2122 +msgstr "無法寫入 %2$s 演算法的套件版本 %1$d"
2123
2069 -#: bundle.c:553
2124 +#: bundle.c:600
2125 msgid "Refusing to create empty bundle."
2071 -msgstr "不能建立空包。"
2126 +msgstr "不能建立空套件。"
2127
2073 -#: bundle.c:563
2128 +#: bundle.c:610
2129 #, c-format
2130 msgid "cannot create '%s'"
2131 msgstr "不能建立 '%s'"
2132
2078 -#: bundle.c:588
2133 +#: bundle.c:639
2134 msgid "index-pack died"
2135 msgstr "index-pack 終止"
2136
@@ -2103,7 +2158,7 @@ msgstr "最終區塊有非零 ID %<PRIx32>"
2158 msgid "invalid color value: %.*s"
2159 msgstr "無效的顏色值：%.*s"
2160
2106 -#: commit-graph.c:204 midx.c:51
2161 +#: commit-graph.c:204 midx.c:52
2162 msgid "invalid hash version"
2163 msgstr "無效的雜湊版本"
2164
@@ -2131,232 +2186,233 @@ msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合"
2186 msgid "commit-graph file is too small to hold %u chunks"
2187 msgstr "commit-graph 檔案不夠放置 %u 個區塊"
2188
2134 -#: commit-graph.c:482
2189 +#: commit-graph.c:485
2190 msgid "commit-graph has no base graphs chunk"
2191 msgstr "提交圖形沒有基礎圖形區塊"
2192
2138 -#: commit-graph.c:492
2193 +#: commit-graph.c:495
2194 msgid "commit-graph chain does not match"
2195 msgstr "提交圖形鏈不符合"
2196
2142 -#: commit-graph.c:540
2197 +#: commit-graph.c:543
2198 #, c-format
2199 msgid "invalid commit-graph chain: line '%s' not a hash"
2200 msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"
2201
2147 -#: commit-graph.c:564
2202 +#: commit-graph.c:567
2203 msgid "unable to find all commit-graph files"
2204 msgstr "無法找到所有提交圖形檔案"
2205
2151 -#: commit-graph.c:749 commit-graph.c:786
2206 +#: commit-graph.c:752 commit-graph.c:789
2207 msgid "invalid commit position. commit-graph is likely corrupt"
2208 msgstr "無效的提交位置。提交圖形可能已損壞"
2209
2155 -#: commit-graph.c:770
2210 +#: commit-graph.c:773
2211 #, c-format
2212 msgid "could not find commit %s"
2213 msgstr "無法找到提交 %s"
2214
2160 -#: commit-graph.c:803
2215 +#: commit-graph.c:806
2216 msgid "commit-graph requires overflow generation data but has none"
2217 msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料"
2218
2164 -#: commit-graph.c:1108 builtin/am.c:1369
2219 +#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775
2220 +#: builtin/clone.c:705
2221 #, c-format
2222 msgid "unable to parse commit %s"
2223 msgstr "不能解析提交 %s"
2224
2169 -#: commit-graph.c:1370 builtin/pack-objects.c:3070
2225 +#: commit-graph.c:1373 builtin/pack-objects.c:3078
2226 #, c-format
2227 msgid "unable to get type of object %s"
2228 msgstr "無法獲得物件 %s 類型"
2229
2174 -#: commit-graph.c:1401
2230 +#: commit-graph.c:1404
2231 msgid "Loading known commits in commit graph"
2232 msgstr "正在載入提交圖中的已知提交"
2233
2178 -#: commit-graph.c:1418
2234 +#: commit-graph.c:1421
2235 msgid "Expanding reachable commits in commit graph"
2236 msgstr "正在展開提交圖中的可以取得的提交"
2237
2182 -#: commit-graph.c:1438
2238 +#: commit-graph.c:1441
2239 msgid "Clearing commit marks in commit graph"
2240 msgstr "正在清除提交圖中的提交標記"
2241
2186 -#: commit-graph.c:1457
2242 +#: commit-graph.c:1460
2243 msgid "Computing commit graph topological levels"
2244 msgstr "正在計算提交圖拓樸級別"
2245
2190 -#: commit-graph.c:1510
2246 +#: commit-graph.c:1513
2247 msgid "Computing commit graph generation numbers"
2248 msgstr "正在計算提交圖世代數字"
2249
2194 -#: commit-graph.c:1591
2250 +#: commit-graph.c:1598
2251 msgid "Computing commit changed paths Bloom filters"
2252 msgstr "正在計算提交變更路徑的布隆過濾器"
2253
2198 -#: commit-graph.c:1668
2254 +#: commit-graph.c:1675
2255 msgid "Collecting referenced commits"
2256 msgstr "正在收集引用提交"
2257
2202 -#: commit-graph.c:1693
2258 +#: commit-graph.c:1701
2259 #, c-format
2204 -msgid "Finding commits for commit graph in %d pack"
2205 -msgid_plural "Finding commits for commit graph in %d packs"
2206 -msgstr[0] "正在 %d 個包中尋找提交圖的提交"
2260 +msgid "Finding commits for commit graph in %<PRIuMAX> pack"
2261 +msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs"
2262 +msgstr[0] "正在從 %<PRIuMAX> 個包中尋找提交圖的提交"
2263
2208 -#: commit-graph.c:1706
2264 +#: commit-graph.c:1714
2265 #, c-format
2266 msgid "error adding pack %s"
2267 msgstr "新增包 %s 發生錯誤"
2268
2213 -#: commit-graph.c:1710
2269 +#: commit-graph.c:1718
2270 #, c-format
2271 msgid "error opening index for %s"
2272 msgstr "為 %s 開啟索引發生錯誤"
2273
2218 -#: commit-graph.c:1747
2274 +#: commit-graph.c:1756
2275 msgid "Finding commits for commit graph among packed objects"
2276 msgstr "正在打包物件中尋找提交圖的提交"
2277
2222 -#: commit-graph.c:1765
2278 +#: commit-graph.c:1774
2279 msgid "Finding extra edges in commit graph"
2280 msgstr "正在尋找提交圖中額外的邊"
2281
2226 -#: commit-graph.c:1814
2282 +#: commit-graph.c:1823
2283 msgid "failed to write correct number of base graph ids"
2284 msgstr "無法寫入正確數量的基礎圖形 ID"
2285
2230 -#: commit-graph.c:1845 midx.c:1149
2286 +#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475
2287 #, c-format
2288 msgid "unable to create leading directories of %s"
2289 msgstr "不能為 %s 建立先導目錄"
2290
2235 -#: commit-graph.c:1858
2291 +#: commit-graph.c:1868
2292 msgid "unable to create temporary graph layer"
2293 msgstr "無法建立暫時的圖形層"
2294
2239 -#: commit-graph.c:1863
2295 +#: commit-graph.c:1873
2296 #, c-format
2297 msgid "unable to adjust shared permissions for '%s'"
2298 msgstr "無法調整「%s」的共用權限"
2299
2244 -#: commit-graph.c:1920
2300 +#: commit-graph.c:1930
2301 #, c-format
2302 msgid "Writing out commit graph in %d pass"
2303 msgid_plural "Writing out commit graph in %d passes"
2304 msgstr[0] "正在用 %d 步寫出提交圖"
2305
2250 -#: commit-graph.c:1956
2306 +#: commit-graph.c:1967
2307 msgid "unable to open commit-graph chain file"
2308 msgstr "無法開啟提交圖形鏈檔案"
2309
2254 -#: commit-graph.c:1972
2310 +#: commit-graph.c:1983
2311 msgid "failed to rename base commit-graph file"
2312 msgstr "無法重新命名基礎提交圖形檔案"
2313
2258 -#: commit-graph.c:1992
2314 +#: commit-graph.c:2004
2315 msgid "failed to rename temporary commit-graph file"
2316 msgstr "無法重新命名暫時提交圖形檔案"
2317
2262 -#: commit-graph.c:2125
2318 +#: commit-graph.c:2137
2319 msgid "Scanning merged commits"
2320 msgstr "正在掃描合併提交"
2321
2266 -#: commit-graph.c:2169
2322 +#: commit-graph.c:2181
2323 msgid "Merging commit-graph"
2324 msgstr "正在合併提交圖形"
2325
2270 -#: commit-graph.c:2277
2326 +#: commit-graph.c:2289
2327 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
2328 msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用"
2329
2274 -#: commit-graph.c:2384
2330 +#: commit-graph.c:2396
2331 msgid "too many commits to write graph"
2332 msgstr "提交太多不能畫圖"
2333
2278 -#: commit-graph.c:2482
2334 +#: commit-graph.c:2494
2335 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2336 msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"
2337
2282 -#: commit-graph.c:2492
2338 +#: commit-graph.c:2504
2339 #, c-format
2340 msgid "commit-graph has incorrect OID order: %s then %s"
2341 msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"
2342
2287 -#: commit-graph.c:2502 commit-graph.c:2517
2343 +#: commit-graph.c:2514 commit-graph.c:2529
2344 #, c-format
2345 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2346 msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"
2347
2292 -#: commit-graph.c:2509
2348 +#: commit-graph.c:2521
2349 #, c-format
2350 msgid "failed to parse commit %s from commit-graph"
2351 msgstr "無法從提交圖形中解析提交 %s"
2352
2297 -#: commit-graph.c:2527
2353 +#: commit-graph.c:2539
2354 msgid "Verifying commits in commit graph"
2355 msgstr "正在驗證提交圖中的提交"
2356
2301 -#: commit-graph.c:2542
2357 +#: commit-graph.c:2554
2358 #, c-format
2359 msgid "failed to parse commit %s from object database for commit-graph"
2360 msgstr "無法從提交圖形的物件庫中解析提交 %s"
2361
2306 -#: commit-graph.c:2549
2362 +#: commit-graph.c:2561
2363 #, c-format
2364 msgid "root tree OID for commit %s in commit-graph is %s != %s"
2365 msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"
2366
2311 -#: commit-graph.c:2559
2367 +#: commit-graph.c:2571
2368 #, c-format
2369 msgid "commit-graph parent list for commit %s is too long"
2370 msgstr "提交 %s 的提交圖形父提交列表太長了"
2371
2316 -#: commit-graph.c:2568
2372 +#: commit-graph.c:2580
2373 #, c-format
2374 msgid "commit-graph parent for %s is %s != %s"
2375 msgstr "%s 的提交圖形父提交是 %s != %s"
2376
2321 -#: commit-graph.c:2582
2377 +#: commit-graph.c:2594
2378 #, c-format
2379 msgid "commit-graph parent list for commit %s terminates early"
2380 msgstr "提交 %s 的提交圖形父提交列表過早終止"
2381
2326 -#: commit-graph.c:2587
2382 +#: commit-graph.c:2599
2383 #, c-format
2384 msgid ""
2385 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
2386 msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"
2387
2332 -#: commit-graph.c:2591
2388 +#: commit-graph.c:2603
2389 #, c-format
2390 msgid ""
2391 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
2392 msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"
2393
2338 -#: commit-graph.c:2608
2394 +#: commit-graph.c:2620
2395 #, c-format
2396 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
2397 msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"
2398
2343 -#: commit-graph.c:2614
2399 +#: commit-graph.c:2626
2400 #, c-format
2401 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2402 msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
2403
2348 -#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444
2349 -#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456
2404 +#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445
2405 +#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456
2406 #, c-format
2407 msgid "could not parse %s"
2408 msgstr "不能解析 %s"
2409
2354 -#: commit.c:55
2410 +#: commit.c:56
2411 #, c-format
2412 msgid "%s %s is not a commit!"
2413 msgstr "%s %s 不是一個提交！"
2414
2359 -#: commit.c:196
2415 +#: commit.c:197
2416 msgid ""
2417 "Support for <GIT_DIR>/info/grafts is deprecated\n"
2418 "and will be removed in a future Git version.\n"
@@ -2376,27 +2432,27 @@ msgstr ""
2432 "設定 \"git config advice.graftFileDeprecated false\"\n"
2433 "可關閉本消息"
2434
2379 -#: commit.c:1241
2435 +#: commit.c:1252
2436 #, c-format
2437 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2438 msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"
2439
2384 -#: commit.c:1245
2440 +#: commit.c:1256
2441 #, c-format
2442 msgid "Commit %s has a bad GPG signature allegedly by %s."
2443 msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"
2444
2389 -#: commit.c:1248
2445 +#: commit.c:1259
2446 #, c-format
2447 msgid "Commit %s does not have a GPG signature."
2448 msgstr "提交 %s 沒有 GPG 簽名。"
2449
2394 -#: commit.c:1251
2450 +#: commit.c:1262
2451 #, c-format
2452 msgid "Commit %s has a good GPG signature by %s\n"
2453 msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"
2454
2399 -#: commit.c:1505
2455 +#: commit.c:1516
2456 msgid ""
2457 "Warning: commit message did not conform to UTF-8.\n"
2458 "You may want to amend it after fixing the message, or set the config\n"
@@ -2410,7 +2466,15 @@ msgstr ""
2466 msgid "memory exhausted"
2467 msgstr "記憶體耗盡"
2468
2413 -#: config.c:125
2469 +#: compat/terminal.c:167
2470 +msgid "cannot resume in the background, please use 'fg' to resume"
2471 +msgstr "無法在背景繼續；請使用 “fg” 繼續"
2472 +
2473 +#: compat/terminal.c:168
2474 +msgid "cannot restore terminal settings"
2475 +msgstr "無法復原終端機設定"
2476 +
2477 +#: config.c:143
2478 #, c-format
2479 msgid ""
2480 "exceeded maximum include depth (%d) while including\n"
@@ -2425,333 +2489,360 @@ msgstr ""
2489 "\t%2$s\n"
2490 "這可能是因為循環包含。"
2491
2428 -#: config.c:141
2492 +#: config.c:159
2493 #, c-format
2494 msgid "could not expand include path '%s'"
2495 msgstr "無法展開包含路徑 '%s'"
2496
2433 -#: config.c:152
2497 +#: config.c:170
2498 msgid "relative config includes must come from files"
2499 msgstr "相對路徑的設定檔案引用必須來自於檔案"
2500
2437 -#: config.c:201
2501 +#: config.c:219
2502 msgid "relative config include conditionals must come from files"
2503 msgstr "相對路徑的設定檔案條件引用必須來自於檔案"
2504
2441 -#: config.c:398
2505 +#: config.c:364
2506 +msgid ""
2507 +"remote URLs cannot be configured in file directly or indirectly included by "
2508 +"includeIf.hasconfig:remote.*.url"
2509 +msgstr ""
2510 +"無法在檔案設定遠端 URL，無論是直接或間接透過 includeIf.hasconfig:remote.*."
2511 +"url 引入"
2512 +
2513 +#: config.c:508
2514 #, c-format
2515 msgid "invalid config format: %s"
2516 msgstr "無效的設定檔格式：%s"
2517
2446 -#: config.c:402
2518 +#: config.c:512
2519 #, c-format
2520 msgid "missing environment variable name for configuration '%.*s'"
2521 msgstr "缺少「%.*s」組態設定的環境變數名稱"
2522
2451 -#: config.c:407
2523 +#: config.c:517
2524 #, c-format
2525 msgid "missing environment variable '%s' for configuration '%.*s'"
2526 msgstr "缺少環境變數「%s」（於「%.*s」組態設定）"
2527
2456 -#: config.c:443
2528 +#: config.c:553
2529 #, c-format
2530 msgid "key does not contain a section: %s"
2531 msgstr "鍵名沒有包含一個小節名稱：%s"
2532
2461 -#: config.c:448
2533 +#: config.c:558
2534 #, c-format
2535 msgid "key does not contain variable name: %s"
2536 msgstr "鍵名沒有包含變數名：%s"
2537
2466 -#: config.c:470 sequencer.c:2806
2538 +#: config.c:580 sequencer.c:2802
2539 #, c-format
2540 msgid "invalid key: %s"
2541 msgstr "無效鍵名：%s"
2542
2471 -#: config.c:475
2543 +#: config.c:585
2544 #, c-format
2545 msgid "invalid key (newline): %s"
2546 msgstr "無效鍵名（有換行符號）：%s"
2547
2476 -#: config.c:495
2548 +#: config.c:605
2549 msgid "empty config key"
2550 msgstr "空白設定鍵"
2551
2480 -#: config.c:513 config.c:525
2552 +#: config.c:623 config.c:635
2553 #, c-format
2554 msgid "bogus config parameter: %s"
2555 msgstr "偽設定參數：%s"
2556
2485 -#: config.c:539 config.c:556 config.c:563 config.c:572
2557 +#: config.c:649 config.c:666 config.c:673 config.c:682
2558 #, c-format
2559 msgid "bogus format in %s"
2560 msgstr "%s 中格式錯誤"
2561
2490 -#: config.c:606
2562 +#: config.c:716
2563 #, c-format
2564 msgid "bogus count in %s"
2565 msgstr "%s 中有偽計數"
2566
2495 -#: config.c:610
2567 +#: config.c:720
2568 #, c-format
2569 msgid "too many entries in %s"
2570 msgstr "%s 中的項目過多"
2571
2500 -#: config.c:620
2572 +#: config.c:730
2573 #, c-format
2574 msgid "missing config key %s"
2575 msgstr "缺少 %s 設定鍵"
2576
2505 -#: config.c:628
2577 +#: config.c:738
2578 #, c-format
2579 msgid "missing config value %s"
2580 msgstr "缺少 %s 設定值"
2581
2510 -#: config.c:979
2582 +#: config.c:1089
2583 #, c-format
2584 msgid "bad config line %d in blob %s"
2585 msgstr "資料物件 %2$s 中錯誤的設定行 %1$d"
2586
2515 -#: config.c:983
2587 +#: config.c:1093
2588 #, c-format
2589 msgid "bad config line %d in file %s"
2590 msgstr "檔案 %2$s 中錯誤的設定行 %1$d"
2591
2520 -#: config.c:987
2592 +#: config.c:1097
2593 #, c-format
2594 msgid "bad config line %d in standard input"
2595 msgstr "標準輸入中錯誤的設定行 %d"
2596
2525 -#: config.c:991
2597 +#: config.c:1101
2598 #, c-format
2599 msgid "bad config line %d in submodule-blob %s"
2600 msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d"
2601
2530 -#: config.c:995
2602 +#: config.c:1105
2603 #, c-format
2604 msgid "bad config line %d in command line %s"
2605 msgstr "指令列 %2$s 中錯誤的設定行 %1$d"
2606
2535 -#: config.c:999
2607 +#: config.c:1109
2608 #, c-format
2609 msgid "bad config line %d in %s"
2610 msgstr "在 %2$s 中錯誤的設定行 %1$d"
2611
2540 -#: config.c:1136
2612 +#: config.c:1246
2613 msgid "out of range"
2614 msgstr "超出範圍"
2615
2544 -#: config.c:1136
2616 +#: config.c:1246
2617 msgid "invalid unit"
2618 msgstr "無效的單位"
2619
2548 -#: config.c:1137
2620 +#: config.c:1247
2621 #, c-format
2622 msgid "bad numeric config value '%s' for '%s': %s"
2623 msgstr "設定變數 '%2$s' 的數字取值 '%1$s' 設定錯誤：%3$s"
2624
2553 -#: config.c:1147
2625 +#: config.c:1257
2626 #, c-format
2627 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
2628 msgstr "資料物件 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
2629
2558 -#: config.c:1150
2630 +#: config.c:1260
2631 #, c-format
2632 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
2633 msgstr "檔案 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
2634
2563 -#: config.c:1153
2635 +#: config.c:1263
2636 #, c-format
2637 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
2638 msgstr "標準輸入中設定變數 '%2$s' 錯誤的取值 '%1$s'：%3$s"
2639
2568 -#: config.c:1156
2640 +#: config.c:1266
2641 #, c-format
2642 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
2643 msgstr "子模組資料 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
2644
2573 -#: config.c:1159
2645 +#: config.c:1269
2646 #, c-format
2647 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
2648 msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
2649
2578 -#: config.c:1162
2650 +#: config.c:1272
2651 #, c-format
2652 msgid "bad numeric config value '%s' for '%s' in %s: %s"
2653 msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"
2654
2583 -#: config.c:1241
2655 +#: config.c:1368
2656 +#, c-format
2657 +msgid "invalid value for variable %s"
2658 +msgstr "%s 變數的值無效"
2659 +
2660 +#: config.c:1389
2661 +#, c-format
2662 +msgid "ignoring unknown core.fsync component '%s'"
2663 +msgstr "忽略未知的 core.fsync 組件「%s」"
2664 +
2665 +#: config.c:1425
2666 #, c-format
2667 msgid "bad boolean config value '%s' for '%s'"
2668 msgstr "「%2$s」的「%1$s」布林設定值無效"
2669
2588 -#: config.c:1259
2670 +#: config.c:1443
2671 #, c-format
2672 msgid "failed to expand user dir in: '%s'"
2673 msgstr "無法展開使用者目錄於：’%s’"
2674
2593 -#: config.c:1268
2675 +#: config.c:1452
2676 #, c-format
2677 msgid "'%s' for '%s' is not a valid timestamp"
2678 msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳"
2679
2598 -#: config.c:1361
2680 +#: config.c:1545
2681 #, c-format
2682 msgid "abbrev length out of range: %d"
2683 msgstr "縮寫長度超出範圍：%d"
2684
2603 -#: config.c:1375 config.c:1386
2685 +#: config.c:1559 config.c:1570
2686 #, c-format
2687 msgid "bad zlib compression level %d"
2688 msgstr "錯誤的 zlib 壓縮級別 %d"
2689
2608 -#: config.c:1476
2690 +#: config.c:1660
2691 msgid "core.commentChar should only be one character"
2692 msgstr "core.commentChar 應該是一個字元"
2693
2612 -#: config.c:1509
2694 +#: config.c:1692
2695 +#, c-format
2696 +msgid "ignoring unknown core.fsyncMethod value '%s'"
2697 +msgstr "忽略未知的 core.fsyncMethod 值「%s」"
2698 +
2699 +#: config.c:1698
2700 +msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
2701 +msgstr "core.fsyncObjectFiles 已被取代。請改用 core.fsync"
2702 +
2703 +#: config.c:1714
2704 #, c-format
2705 msgid "invalid mode for object creation: %s"
2706 msgstr "無效的物件建立模式：%s"
2707
2617 -#: config.c:1584
2708 +#: config.c:1800
2709 #, c-format
2710 msgid "malformed value for %s"
2711 msgstr "%s 的取值格式錯誤"
2712
2622 -#: config.c:1610
2713 +#: config.c:1826
2714 #, c-format
2715 msgid "malformed value for %s: %s"
2716 msgstr "%s 的取值格式錯誤：%s"
2717
2627 -#: config.c:1611
2718 +#: config.c:1827
2719 msgid "must be one of nothing, matching, simple, upstream or current"
2720 msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"
2721
2631 -#: config.c:1672 builtin/pack-objects.c:4053
2722 +#: config.c:1888 builtin/pack-objects.c:4078
2723 #, c-format
2724 msgid "bad pack compression level %d"
2725 msgstr "錯誤的打包壓縮級別 %d"
2726
2636 -#: config.c:1795
2727 +#: config.c:2014
2728 #, c-format
2729 msgid "unable to load config blob object '%s'"
2730 msgstr "無法從資料物件 '%s' 載入設定"
2731
2641 -#: config.c:1798
2732 +#: config.c:2017
2733 #, c-format
2734 msgid "reference '%s' does not point to a blob"
2735 msgstr "引用 '%s' 沒有指向一個資料物件"
2736
2646 -#: config.c:1816
2737 +#: config.c:2035
2738 #, c-format
2739 msgid "unable to resolve config blob '%s'"
2740 msgstr "不能解析設定物件 '%s'"
2741
2651 -#: config.c:1861
2742 +#: config.c:2080
2743 #, c-format
2744 msgid "failed to parse %s"
2745 msgstr "解析 %s 失敗"
2746
2656 -#: config.c:1917
2747 +#: config.c:2136
2748 msgid "unable to parse command-line config"
2749 msgstr "無法解析指令列中的設定"
2750
2660 -#: config.c:2285
2751 +#: config.c:2512
2752 msgid "unknown error occurred while reading the configuration files"
2753 msgstr "在讀取設定檔案時遇到未知錯誤"
2754
2664 -#: config.c:2459
2755 +#: config.c:2686
2756 #, c-format
2757 msgid "Invalid %s: '%s'"
2758 msgstr "無效 %s：'%s'"
2759
2669 -#: config.c:2504
2760 +#: config.c:2731
2761 #, c-format
2762 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2763 msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間"
2764
2674 -#: config.c:2550
2765 +#: config.c:2763
2766 #, c-format
2767 msgid "unable to parse '%s' from command-line config"
2768 msgstr "無法解析指令列設定中的 '%s'"
2769
2679 -#: config.c:2552
2770 +#: config.c:2765
2771 #, c-format
2772 msgid "bad config variable '%s' in file '%s' at line %d"
2773 msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'"
2774
2684 -#: config.c:2637
2775 +#: config.c:2850
2776 #, c-format
2777 msgid "invalid section name '%s'"
2778 msgstr "無效的小節名稱 '%s'"
2779
2689 -#: config.c:2669
2780 +#: config.c:2882
2781 #, c-format
2782 msgid "%s has multiple values"
2783 msgstr "%s 有多個取值"
2784
2694 -#: config.c:2698
2785 +#: config.c:2911
2786 #, c-format
2787 msgid "failed to write new configuration file %s"
2788 msgstr "寫入新的設定檔案 %s 失敗"
2789
2699 -#: config.c:2950 config.c:3277
2790 +#: config.c:3177 config.c:3518
2791 #, c-format
2792 msgid "could not lock config file %s"
2793 msgstr "不能鎖定設定檔案 %s"
2794
2704 -#: config.c:2961
2795 +#: config.c:3188
2796 #, c-format
2797 msgid "opening %s"
2798 msgstr "開啟 %s"
2799
2709 -#: config.c:2998 builtin/config.c:361
2800 +#: config.c:3225 builtin/config.c:361
2801 #, c-format
2802 msgid "invalid pattern: %s"
2803 msgstr "無效模式：%s"
2804
2714 -#: config.c:3023
2805 +#: config.c:3250
2806 #, c-format
2807 msgid "invalid config file %s"
2808 msgstr "無效的設定檔案 %s"
2809
2719 -#: config.c:3036 config.c:3290
2810 +#: config.c:3263 config.c:3531
2811 #, c-format
2812 msgid "fstat on %s failed"
2813 msgstr "對 %s 呼叫 fstat 失敗"
2814
2724 -#: config.c:3047
2815 +#: config.c:3274
2816 #, c-format
2817 msgid "unable to mmap '%s'%s"
2818 msgstr "無法 mmap '%s'%s"
2819
2729 -#: config.c:3057 config.c:3295
2820 +#: config.c:3284 config.c:3536
2821 #, c-format
2822 msgid "chmod on %s failed"
2823 msgstr "對 %s 呼叫 chmod 失敗"
2824
2734 -#: config.c:3142 config.c:3392
2825 +#: config.c:3369 config.c:3633
2826 #, c-format
2827 msgid "could not write config file %s"
2828 msgstr "不能寫入設定檔案 %s"
2829
2739 -#: config.c:3176
2830 +#: config.c:3403
2831 #, c-format
2832 msgid "could not set '%s' to '%s'"
2833 msgstr "不能設定 '%s' 為 '%s'"
2834
2744 -#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868
2835 +#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893
2836 #, c-format
2837 msgid "could not unset '%s'"
2838 msgstr "不能取消設定 '%s'"
2839
2749 -#: config.c:3268
2840 +#: config.c:3509
2841 #, c-format
2842 msgid "invalid section name: %s"
2843 msgstr "無效的小節名稱：%s"
2844
2754 -#: config.c:3435
2845 +#: config.c:3676
2846 #, c-format
2847 msgid "missing value for '%s'"
2848 msgstr "%s 的取值缺少"
@@ -3079,75 +3170,75 @@ msgstr "拒絕使用缺少主機欄位的憑證"
3170 msgid "refusing to work with credential missing protocol field"
3171 msgstr "拒絕使用缺少通訊協定欄位的憑證"
3172
3082 -#: credential.c:395
3173 +#: credential.c:396
3174 #, c-format
3175 msgid "url contains a newline in its %s component: %s"
3176 msgstr "URL 的 %s 部分有換行：%s"
3177
3087 -#: credential.c:439
3178 +#: credential.c:440
3179 #, c-format
3180 msgid "url has no scheme: %s"
3181 msgstr "URL 沒有 Scheme：%s"
3182
3092 -#: credential.c:512
3183 +#: credential.c:513
3184 #, c-format
3185 msgid "credential url cannot be parsed: %s"
3186 msgstr "無法解析憑證 URL：%s"
3187
3097 -#: date.c:138
3188 +#: date.c:139
3189 msgid "in the future"
3190 msgstr "在將來"
3191
3101 -#: date.c:144
3192 +#: date.c:145
3193 #, c-format
3194 msgid "%<PRIuMAX> second ago"
3195 msgid_plural "%<PRIuMAX> seconds ago"
3196 msgstr[0] "%<PRIuMAX> 秒鐘前"
3197
3107 -#: date.c:151
3198 +#: date.c:152
3199 #, c-format
3200 msgid "%<PRIuMAX> minute ago"
3201 msgid_plural "%<PRIuMAX> minutes ago"
3202 msgstr[0] "%<PRIuMAX> 分鐘前"
3203
3113 -#: date.c:158
3204 +#: date.c:159
3205 #, c-format
3206 msgid "%<PRIuMAX> hour ago"
3207 msgid_plural "%<PRIuMAX> hours ago"
3208 msgstr[0] "%<PRIuMAX> 小時前"
3209
3119 -#: date.c:165
3210 +#: date.c:166
3211 #, c-format
3212 msgid "%<PRIuMAX> day ago"
3213 msgid_plural "%<PRIuMAX> days ago"
3214 msgstr[0] "%<PRIuMAX> 天前"
3215
3125 -#: date.c:171
3216 +#: date.c:172
3217 #, c-format
3218 msgid "%<PRIuMAX> week ago"
3219 msgid_plural "%<PRIuMAX> weeks ago"
3220 msgstr[0] "%<PRIuMAX> 周前"
3221
3131 -#: date.c:178
3222 +#: date.c:179
3223 #, c-format
3224 msgid "%<PRIuMAX> month ago"
3225 msgid_plural "%<PRIuMAX> months ago"
3226 msgstr[0] "%<PRIuMAX> 個月前"
3227
3137 -#: date.c:189
3228 +#: date.c:190
3229 #, c-format
3230 msgid "%<PRIuMAX> year"
3231 msgid_plural "%<PRIuMAX> years"
3232 msgstr[0] "%<PRIuMAX> 年"
3233
3234 #. TRANSLATORS: "%s" is "<n> years"
3144 -#: date.c:192
3235 +#: date.c:193
3236 #, c-format
3237 msgid "%s, %<PRIuMAX> month ago"
3238 msgid_plural "%s, %<PRIuMAX> months ago"
3239 msgstr[0] "%s %<PRIuMAX> 個月前"
3240
3150 -#: date.c:197 date.c:202
3241 +#: date.c:198 date.c:203
3242 #, c-format
3243 msgid "%<PRIuMAX> year ago"
3244 msgid_plural "%<PRIuMAX> years ago"
@@ -3177,10 +3268,14 @@ msgstr "來自 config 的資料島常規表示式有太多的擷取群組（最
3268 msgid "Marked %d islands, done.\n"
3269 msgstr "已標記 %d 個資料島，結束。\n"
3270
3180 -#: diff-merges.c:70
3271 +#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37
3272 +#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203
3273 +#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742
3274 +#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45
3275 +#: builtin/pull.c:47 builtin/pull.c:321
3276 #, c-format
3182 -msgid "unknown value for --diff-merges: %s"
3183 -msgstr "--diff-merges 的值無效：%s"
3277 +msgid "invalid value for '%s': '%s'"
3278 +msgstr "「%s」的值無效：「%s」"
3279
3280 #: diff-lib.c:561
3281 msgid "--merge-base does not work with ranges"
@@ -3213,18 +3308,18 @@ msgid ""
3308 msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑"
3309
3310 # 譯者：請維持前導空格
3216 -#: diff.c:158
3311 +#: diff.c:159
3312 #, c-format
3313 msgid " Failed to parse dirstat cut-off percentage '%s'\n"
3314 msgstr " 無法解析 dirstat 截止（cut-off）百分比 '%s'\n"
3315
3316 # 譯者：請維持前導空格
3222 -#: diff.c:163
3317 +#: diff.c:164
3318 #, c-format
3319 msgid " Unknown dirstat parameter '%s'\n"
3320 msgstr " 未知的 dirstat 參數 '%s'\n"
3321
3227 -#: diff.c:299
3322 +#: diff.c:300
3323 msgid ""
3324 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
3325 "'dimmed-zebra', 'plain'"
@@ -3232,7 +3327,7 @@ msgstr ""
3327 "移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-"
3328 "zebra'、'plain'"
3329
3235 -#: diff.c:327
3330 +#: diff.c:328
3331 #, c-format
3332 msgid ""
3333 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3241,18 +3336,18 @@ msgstr ""
3336 "未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-"
3337 "space-at-eol'、'ignore-all-space'、'allow-indentation-change'"
3338
3244 -#: diff.c:335
3339 +#: diff.c:336
3340 msgid ""
3341 "color-moved-ws: allow-indentation-change cannot be combined with other "
3342 "whitespace modes"
3343 msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用"
3344
3250 -#: diff.c:412
3345 +#: diff.c:413
3346 #, c-format
3347 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
3348 msgstr "設定變數 'diff.submodule' 未知的取值：'%s'"
3349
3255 -#: diff.c:472
3350 +#: diff.c:473
3351 #, c-format
3352 msgid ""
3353 "Found errors in 'diff.dirstat' config variable:\n"
@@ -3261,48 +3356,48 @@ msgstr ""
3356 "發現設定變數 'diff.dirstat' 中的錯誤：\n"
3357 "%s"
3358
3264 -#: diff.c:4237
3359 +#: diff.c:4282
3360 #, c-format
3361 msgid "external diff died, stopping at %s"
3362 msgstr "外部 diff 離開，停止在 %s"
3363
3269 -#: diff.c:4589
3364 +#: diff.c:4677 parse-options.c:1114
3365 #, c-format
3366 msgid "options '%s', '%s', '%s', and '%s' cannot be used together"
3367 msgstr "「%s」、「%s」、「%s」和「%s」選項不得同時使用"
3368
3274 -#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506
3369 +#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578
3370 #, c-format
3371 msgid "options '%s', '%s', and '%s' cannot be used together"
3372 msgstr "「%s」、「%s」和「%s」選項不得同時使用"
3373
3279 -#: diff.c:4597
3374 +#: diff.c:4685
3375 #, c-format
3376 msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"
3377 msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」"
3378
3284 -#: diff.c:4601
3379 +#: diff.c:4689
3380 #, c-format
3381 msgid ""
3382 "options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"
3383 msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」、「%s」"
3384
3290 -#: diff.c:4681
3385 +#: diff.c:4769
3386 msgid "--follow requires exactly one pathspec"
3387 msgstr "--follow 明確要求只跟一個路徑規格"
3388
3294 -#: diff.c:4729
3389 +#: diff.c:4823
3390 #, c-format
3391 msgid "invalid --stat value: %s"
3392 msgstr "無效的 --stat 值：%s"
3393
3299 -#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277
3394 +#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319
3395 #: parse-options.c:217 parse-options.c:221
3396 #, c-format
3397 msgid "%s expects a numerical value"
3398 msgstr "%s 期望一個數字值"
3399
3305 -#: diff.c:4766
3400 +#: diff.c:4860
3401 #, c-format
3402 msgid ""
3403 "Failed to parse --dirstat/-X option parameter:\n"
@@ -3311,200 +3406,200 @@ msgstr ""
3406 "無法解析 --dirstat/-X 選項的參數：\n"
3407 "%s"
3408
3314 -#: diff.c:4851
3409 +#: diff.c:4893
3410 #, c-format
3411 msgid "unknown change class '%c' in --diff-filter=%s"
3412 msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"
3413
3319 -#: diff.c:4875
3414 +#: diff.c:4917
3415 #, c-format
3416 msgid "unknown value after ws-error-highlight=%.*s"
3417 msgstr "ws-error-highlight=%.*s 之後未知的值"
3418
3324 -#: diff.c:4889
3419 +#: diff.c:4931
3420 #, c-format
3421 msgid "unable to resolve '%s'"
3422 msgstr "不能解析 '%s'"
3423
3329 -#: diff.c:4939 diff.c:4945
3424 +#: diff.c:4981 diff.c:4987
3425 #, c-format
3426 msgid "%s expects <n>/<m> form"
3427 msgstr "%s 期望 <n>/<m> 格式"
3428
3334 -#: diff.c:4957
3429 +#: diff.c:4999
3430 #, c-format
3431 msgid "%s expects a character, got '%s'"
3432 msgstr "%s 期望一個字元，得到 '%s'"
3433
3339 -#: diff.c:4978
3434 +#: diff.c:5020
3435 #, c-format
3436 msgid "bad --color-moved argument: %s"
3437 msgstr "壞的 --color-moved 參數：%s"
3438
3344 -#: diff.c:4997
3439 +#: diff.c:5039
3440 #, c-format
3441 msgid "invalid mode '%s' in --color-moved-ws"
3442 msgstr "--color-moved-ws 中的無效模式 '%s'"
3443
3349 -#: diff.c:5037
3444 +#: diff.c:5079
3445 msgid ""
3446 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3447 "\"histogram\""
3448 msgstr ""
3449 "diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
3450
3356 -#: diff.c:5073 diff.c:5093
3451 +#: diff.c:5115 diff.c:5135
3452 #, c-format
3453 msgid "invalid argument to %s"
3454 msgstr "%s 的參數無效"
3455
3361 -#: diff.c:5197
3456 +#: diff.c:5239
3457 #, c-format
3458 msgid "invalid regex given to -I: '%s'"
3459 msgstr "傳入 -I 的常規表示式無效：「%s」"
3460
3366 -#: diff.c:5246
3461 +#: diff.c:5288
3462 #, c-format
3463 msgid "failed to parse --submodule option parameter: '%s'"
3464 msgstr "無法解析 --submodule 選項的參數：'%s'"
3465
3371 -#: diff.c:5302
3466 +#: diff.c:5344
3467 #, c-format
3468 msgid "bad --word-diff argument: %s"
3469 msgstr "壞的 --word-diff 參數：%s"
3470
3376 -#: diff.c:5338
3471 +#: diff.c:5380
3472 msgid "Diff output format options"
3473 msgstr "差異輸出格式化選項"
3474
3380 -#: diff.c:5340 diff.c:5346
3475 +#: diff.c:5382 diff.c:5388
3476 msgid "generate patch"
3477 msgstr "生成修補檔"
3478
3384 -#: diff.c:5343 builtin/log.c:179
3479 +#: diff.c:5385 builtin/log.c:180
3480 msgid "suppress diff output"
3481 msgstr "不顯示差異輸出"
3482
3388 -#: diff.c:5348 diff.c:5462 diff.c:5469
3483 +#: diff.c:5390 diff.c:5504 diff.c:5511
3484 msgid "<n>"
3485 msgstr "<n>"
3486
3392 -#: diff.c:5349 diff.c:5352
3487 +#: diff.c:5391 diff.c:5394
3488 msgid "generate diffs with <n> lines context"
3489 msgstr "生成含 <n> 行上下文的差異"
3490
3396 -#: diff.c:5354
3491 +#: diff.c:5396
3492 msgid "generate the diff in raw format"
3493 msgstr "生成原始格式的差異"
3494
3400 -#: diff.c:5357
3495 +#: diff.c:5399
3496 msgid "synonym for '-p --raw'"
3497 msgstr "和 '-p --raw' 同義"
3498
3404 -#: diff.c:5361
3499 +#: diff.c:5403
3500 msgid "synonym for '-p --stat'"
3501 msgstr "和 '-p --stat' 同義"
3502
3408 -#: diff.c:5365
3503 +#: diff.c:5407
3504 msgid "machine friendly --stat"
3505 msgstr "機器友好的 --stat"
3506
3412 -#: diff.c:5368
3507 +#: diff.c:5410
3508 msgid "output only the last line of --stat"
3509 msgstr "只輸出 --stat 的最後一行"
3510
3416 -#: diff.c:5370 diff.c:5378
3511 +#: diff.c:5412 diff.c:5420
3512 msgid "<param1,param2>..."
3513 msgstr "<參數1,參數2>..."
3514
3420 -#: diff.c:5371
3515 +#: diff.c:5413
3516 msgid ""
3517 "output the distribution of relative amount of changes for each sub-directory"
3518 msgstr "輸出每個子目錄相對變更的分布"
3519
3425 -#: diff.c:5375
3520 +#: diff.c:5417
3521 msgid "synonym for --dirstat=cumulative"
3522 msgstr "和 --dirstat=cumulative 同義"
3523
3429 -#: diff.c:5379
3524 +#: diff.c:5421
3525 msgid "synonym for --dirstat=files,param1,param2..."
3526 msgstr "是 --dirstat=files,param1,param2... 的同義詞"
3527
3433 -#: diff.c:5383
3528 +#: diff.c:5425
3529 msgid "warn if changes introduce conflict markers or whitespace errors"
3530 msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告"
3531
3437 -#: diff.c:5386
3532 +#: diff.c:5428
3533 msgid "condensed summary such as creations, renames and mode changes"
3534 msgstr "精簡摘要，例如建立、重新命名和模式變更"
3535
3441 -#: diff.c:5389
3536 +#: diff.c:5431
3537 msgid "show only names of changed files"
3538 msgstr "只顯示變更檔案的檔案名"
3539
3445 -#: diff.c:5392
3540 +#: diff.c:5434
3541 msgid "show only names and status of changed files"
3542 msgstr "只顯示變更檔案的檔案名和狀態"
3543
3449 -#: diff.c:5394
3544 +#: diff.c:5436
3545 msgid "<width>[,<name-width>[,<count>]]"
3546 msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"
3547
3453 -#: diff.c:5395
3548 +#: diff.c:5437
3549 msgid "generate diffstat"
3550 msgstr "生成差異統計（diffstat）"
3551
3457 -#: diff.c:5397 diff.c:5400 diff.c:5403
3552 +#: diff.c:5439 diff.c:5442 diff.c:5445
3553 msgid "<width>"
3554 msgstr "<寬度>"
3555
3461 -#: diff.c:5398
3556 +#: diff.c:5440
3557 msgid "generate diffstat with a given width"
3558 msgstr "使用提供的長度生成差異統計"
3559
3465 -#: diff.c:5401
3560 +#: diff.c:5443
3561 msgid "generate diffstat with a given name width"
3562 msgstr "使用提供的檔案名長度生成差異統計"
3563
3469 -#: diff.c:5404
3564 +#: diff.c:5446
3565 msgid "generate diffstat with a given graph width"
3566 msgstr "使用提供的圖形長度生成差異統計"
3567
3473 -#: diff.c:5406
3568 +#: diff.c:5448
3569 msgid "<count>"
3570 msgstr "<次數>"
3571
3477 -#: diff.c:5407
3572 +#: diff.c:5449
3573 msgid "generate diffstat with limited lines"
3574 msgstr "生成有限行數的差異統計"
3575
3481 -#: diff.c:5410
3576 +#: diff.c:5452
3577 msgid "generate compact summary in diffstat"
3578 msgstr "生成差異統計的簡潔摘要"
3579
3485 -#: diff.c:5413
3580 +#: diff.c:5455
3581 msgid "output a binary diff that can be applied"
3582 msgstr "輸出一個可以套用的二進位差異"
3583
3489 -#: diff.c:5416
3584 +#: diff.c:5458
3585 msgid "show full pre- and post-image object names on the \"index\" lines"
3586 msgstr "在 \"index\" 行顯示完整的前後物件名稱"
3587
3493 -#: diff.c:5418
3588 +#: diff.c:5460
3589 msgid "show colored diff"
3590 msgstr "顯示帶顏色的差異"
3591
3497 -#: diff.c:5419
3592 +#: diff.c:5461
3593 msgid "<kind>"
3594 msgstr "<類型>"
3595
3501 -#: diff.c:5420
3596 +#: diff.c:5462
3597 msgid ""
3598 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
3599 "diff"
3600 msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元"
3601
3507 -#: diff.c:5423
3602 +#: diff.c:5465
3603 msgid ""
3604 "do not munge pathnames and use NULs as output field terminators in --raw or "
3605 "--numstat"
@@ -3512,311 +3607,311 @@ msgstr ""
3607 "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"
3608 "符"
3609
3515 -#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541
3610 +#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583
3611 msgid "<prefix>"
3612 msgstr "<前綴>"
3613
3519 -#: diff.c:5427
3614 +#: diff.c:5469
3615 msgid "show the given source prefix instead of \"a/\""
3616 msgstr "顯示提供的來源前綴，而非 \"a/\""
3617
3523 -#: diff.c:5430
3618 +#: diff.c:5472
3619 msgid "show the given destination prefix instead of \"b/\""
3620 msgstr "顯示提供的目的地前綴取代 \"b/\""
3621
3527 -#: diff.c:5433
3622 +#: diff.c:5475
3623 msgid "prepend an additional prefix to every line of output"
3624 msgstr "輸出的每一行附加前綴"
3625
3531 -#: diff.c:5436
3626 +#: diff.c:5478
3627 msgid "do not show any source or destination prefix"
3628 msgstr "不顯示任何來源和目的地前綴"
3629
3535 -#: diff.c:5439
3630 +#: diff.c:5481
3631 msgid "show context between diff hunks up to the specified number of lines"
3632 msgstr "顯示指定行數的差異區塊間的上下文"
3633
3539 -#: diff.c:5443 diff.c:5448 diff.c:5453
3634 +#: diff.c:5485 diff.c:5490 diff.c:5495
3635 msgid "<char>"
3636 msgstr "<字元>"
3637
3543 -#: diff.c:5444
3638 +#: diff.c:5486
3639 msgid "specify the character to indicate a new line instead of '+'"
3640 msgstr "指定一個字元取代 '+' 來表示新的一行"
3641
3547 -#: diff.c:5449
3642 +#: diff.c:5491
3643 msgid "specify the character to indicate an old line instead of '-'"
3644 msgstr "指定一個字元取代 '-' 來表示舊的一行"
3645
3551 -#: diff.c:5454
3646 +#: diff.c:5496
3647 msgid "specify the character to indicate a context instead of ' '"
3648 msgstr "指定一個字元取代 ' ' 來表示一行上下文"
3649
3555 -#: diff.c:5457
3650 +#: diff.c:5499
3651 msgid "Diff rename options"
3652 msgstr "差異重新命名選項"
3653
3559 -#: diff.c:5458
3654 +#: diff.c:5500
3655 msgid "<n>[/<m>]"
3656 msgstr "<n>[/<m>]"
3657
3563 -#: diff.c:5459
3658 +#: diff.c:5501
3659 msgid "break complete rewrite changes into pairs of delete and create"
3660 msgstr "將完全重寫的變更打破為成對的刪除和建立"
3661
3567 -#: diff.c:5463
3662 +#: diff.c:5505
3663 msgid "detect renames"
3664 msgstr "檢測重新命名"
3665
3571 -#: diff.c:5467
3666 +#: diff.c:5509
3667 msgid "omit the preimage for deletes"
3668 msgstr "省略刪除變更的差異輸出"
3669
3575 -#: diff.c:5470
3670 +#: diff.c:5512
3671 msgid "detect copies"
3672 msgstr "檢測複製"
3673
3579 -#: diff.c:5474
3674 +#: diff.c:5516
3675 msgid "use unmodified files as source to find copies"
3676 msgstr "使用未修改的檔案做為發現拷貝的來源"
3677
3583 -#: diff.c:5476
3678 +#: diff.c:5518
3679 msgid "disable rename detection"
3680 msgstr "停用重新命名偵測"
3681
3587 -#: diff.c:5479
3682 +#: diff.c:5521
3683 msgid "use empty blobs as rename source"
3684 msgstr "使用空的資料物件做為重新命名的來源"
3685
3591 -#: diff.c:5481
3686 +#: diff.c:5523
3687 msgid "continue listing the history of a file beyond renames"
3688 msgstr "繼續列出檔案重新命名以外的歷史記錄"
3689
3595 -#: diff.c:5484
3690 +#: diff.c:5526
3691 msgid ""
3692 "prevent rename/copy detection if the number of rename/copy targets exceeds "
3693 "given limit"
3694 msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"
3695
3601 -#: diff.c:5486
3696 +#: diff.c:5528
3697 msgid "Diff algorithm options"
3698 msgstr "差異演算法選項"
3699
3605 -#: diff.c:5488
3700 +#: diff.c:5530
3701 msgid "produce the smallest possible diff"
3702 msgstr "生成儘可能小的差異"
3703
3609 -#: diff.c:5491
3704 +#: diff.c:5533
3705 msgid "ignore whitespace when comparing lines"
3706 msgstr "行比較時忽略空白字元"
3707
3613 -#: diff.c:5494
3708 +#: diff.c:5536
3709 msgid "ignore changes in amount of whitespace"
3710 msgstr "忽略空白字元的變更"
3711
3617 -#: diff.c:5497
3712 +#: diff.c:5539
3713 msgid "ignore changes in whitespace at EOL"
3714 msgstr "忽略行尾的空白字元變更"
3715
3621 -#: diff.c:5500
3716 +#: diff.c:5542
3717 msgid "ignore carrier-return at the end of line"
3718 msgstr "忽略行尾的Enter符（CR）"
3719
3625 -#: diff.c:5503
3720 +#: diff.c:5545
3721 msgid "ignore changes whose lines are all blank"
3722 msgstr "忽略整行都是空白的變更"
3723
3629 -#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575
3724 +#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617
3725 msgid "<regex>"
3726 msgstr "<正則>"
3727
3633 -#: diff.c:5506
3728 +#: diff.c:5548
3729 msgid "ignore changes whose all lines match <regex>"
3730 msgstr "忽略整行符合 <regex> 的變更"
3731
3637 -#: diff.c:5509
3732 +#: diff.c:5551
3733 msgid "heuristic to shift diff hunk boundaries for easy reading"
3734 msgstr "啟發式轉換差異邊界以便閱讀"
3735
3641 -#: diff.c:5512
3736 +#: diff.c:5554
3737 msgid "generate diff using the \"patience diff\" algorithm"
3738 msgstr "使用 \"patience diff\" 演算法生成差異"
3739
3645 -#: diff.c:5516
3740 +#: diff.c:5558
3741 msgid "generate diff using the \"histogram diff\" algorithm"
3742 msgstr "使用 \"histogram diff\" 演算法生成差異"
3743
3649 -#: diff.c:5518
3744 +#: diff.c:5560
3745 msgid "<algorithm>"
3746 msgstr "<演算法>"
3747
3653 -#: diff.c:5519
3748 +#: diff.c:5561
3749 msgid "choose a diff algorithm"
3750 msgstr "選擇一個差異演算法"
3751
3657 -#: diff.c:5521
3752 +#: diff.c:5563
3753 msgid "<text>"
3754 msgstr "<文字>"
3755
3661 -#: diff.c:5522
3756 +#: diff.c:5564
3757 msgid "generate diff using the \"anchored diff\" algorithm"
3758 msgstr "使用 \"anchored diff\" 演算法生成差異"
3759
3665 -#: diff.c:5524 diff.c:5533 diff.c:5536
3760 +#: diff.c:5566 diff.c:5575 diff.c:5578
3761 msgid "<mode>"
3762 msgstr "<模式>"
3763
3669 -#: diff.c:5525
3764 +#: diff.c:5567
3765 msgid "show word diff, using <mode> to delimit changed words"
3766 msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞"
3767
3673 -#: diff.c:5528
3768 +#: diff.c:5570
3769 msgid "use <regex> to decide what a word is"
3770 msgstr "使用 <常規表示式> 確定何為一個詞"
3771
3677 -#: diff.c:5531
3772 +#: diff.c:5573
3773 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
3774 msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"
3775
3681 -#: diff.c:5534
3776 +#: diff.c:5576
3777 msgid "moved lines of code are colored differently"
3778 msgstr "移動的程式碼行用不同方式著色"
3779
3685 -#: diff.c:5537
3780 +#: diff.c:5579
3781 msgid "how white spaces are ignored in --color-moved"
3782 msgstr "在 --color-moved 下如何忽略空白字元"
3783
3689 -#: diff.c:5540
3784 +#: diff.c:5582
3785 msgid "Other diff options"
3786 msgstr "其它差異選項"
3787
3693 -#: diff.c:5542
3788 +#: diff.c:5584
3789 msgid "when run from subdir, exclude changes outside and show relative paths"
3790 msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑"
3791
3697 -#: diff.c:5546
3792 +#: diff.c:5588
3793 msgid "treat all files as text"
3794 msgstr "把所有檔案當做文字處理"
3795
3701 -#: diff.c:5548
3796 +#: diff.c:5590
3797 msgid "swap two inputs, reverse the diff"
3798 msgstr "交換兩個輸入，反轉差異"
3799
3705 -#: diff.c:5550
3800 +#: diff.c:5592
3801 msgid "exit with 1 if there were differences, 0 otherwise"
3802 msgstr "有差異時離開碼為 1，否則為 0"
3803
3709 -#: diff.c:5552
3804 +#: diff.c:5594
3805 msgid "disable all output of the program"
3806 msgstr "停用本程式的所有輸出"
3807
3713 -#: diff.c:5554
3808 +#: diff.c:5596
3809 msgid "allow an external diff helper to be executed"
3810 msgstr "允許執行一個外部的差異協助工具"
3811
3717 -#: diff.c:5556
3812 +#: diff.c:5598
3813 msgid "run external text conversion filters when comparing binary files"
3814 msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器"
3815
3721 -#: diff.c:5558
3816 +#: diff.c:5600
3817 msgid "<when>"
3818 msgstr "<何時>"
3819
3725 -#: diff.c:5559
3820 +#: diff.c:5601
3821 msgid "ignore changes to submodules in the diff generation"
3822 msgstr "在生成差異時，忽略子模組的更改"
3823
3729 -#: diff.c:5562
3824 +#: diff.c:5604
3825 msgid "<format>"
3826 msgstr "<格式>"
3827
3733 -#: diff.c:5563
3828 +#: diff.c:5605
3829 msgid "specify how differences in submodules are shown"
3830 msgstr "指定子模組的差異如何顯示"
3831
3737 -#: diff.c:5567
3832 +#: diff.c:5609
3833 msgid "hide 'git add -N' entries from the index"
3834 msgstr "隱藏索引中 'git add -N' 條目"
3835
3741 -#: diff.c:5570
3836 +#: diff.c:5612
3837 msgid "treat 'git add -N' entries as real in the index"
3838 msgstr "將索引中 'git add -N' 條目當做真實的"
3839
3745 -#: diff.c:5572
3840 +#: diff.c:5614
3841 msgid "<string>"
3842 msgstr "<字串>"
3843
3749 -#: diff.c:5573
3844 +#: diff.c:5615
3845 msgid ""
3846 "look for differences that change the number of occurrences of the specified "
3847 "string"
3848 msgstr "尋找改變了指定字串出現次數的差異"
3849
3755 -#: diff.c:5576
3850 +#: diff.c:5618
3851 msgid ""
3852 "look for differences that change the number of occurrences of the specified "
3853 "regex"
3854 msgstr "尋找改變指定正則符合出現次數的差異"
3855
3761 -#: diff.c:5579
3856 +#: diff.c:5621
3857 msgid "show all changes in the changeset with -S or -G"
3858 msgstr "顯示使用 -S 或 -G 的變更集的所有變更"
3859
3765 -#: diff.c:5582
3860 +#: diff.c:5624
3861 msgid "treat <string> in -S as extended POSIX regular expression"
3862 msgstr "將 -S 的 <string> 當做延伸 POSIX 常規表示式"
3863
3769 -#: diff.c:5585
3864 +#: diff.c:5627
3865 msgid "control the order in which files appear in the output"
3866 msgstr "控制輸出中的檔案顯示順序"
3867
3773 -#: diff.c:5586 diff.c:5589
3868 +#: diff.c:5628 diff.c:5631
3869 msgid "<path>"
3870 msgstr "<路徑>"
3871
3777 -#: diff.c:5587
3872 +#: diff.c:5629
3873 msgid "show the change in the specified path first"
3874 msgstr "先顯示指定路徑的變更"
3875
3781 -#: diff.c:5590
3876 +#: diff.c:5632
3877 msgid "skip the output to the specified path"
3878 msgstr "略過輸出至指定路徑"
3879
3785 -#: diff.c:5592
3880 +#: diff.c:5634
3881 msgid "<object-id>"
3882 msgstr "<物件 ID>"
3883
3789 -#: diff.c:5593
3884 +#: diff.c:5635
3885 msgid ""
3886 "look for differences that change the number of occurrences of the specified "
3887 "object"
3888 msgstr "尋找改變指定物件出現次數的差異"
3889
3795 -#: diff.c:5595
3890 +#: diff.c:5637
3891 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
3892 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
3893
3799 -#: diff.c:5596
3894 +#: diff.c:5638
3895 msgid "select files by diff type"
3896 msgstr "透過差異類型選擇檔案"
3897
3803 -#: diff.c:5598
3898 +#: diff.c:5640
3899 msgid "<file>"
3900 msgstr "<檔案>"
3901
3807 -#: diff.c:5599
3808 -msgid "Output to a specific file"
3809 -msgstr "輸出到一個指定的檔案"
3902 +#: diff.c:5641
3903 +msgid "output to a specific file"
3904 +msgstr "輸出至指定檔案"
3905
3811 -#: diff.c:6257
3906 +#: diff.c:6321
3907 msgid "exhaustive rename detection was skipped due to too many files."
3908 msgstr "因為檔案太多，已略過詳細重新命名偵測。"
3909
3815 -#: diff.c:6260
3910 +#: diff.c:6324
3911 msgid "only found copies from modified paths due to too many files."
3912 msgstr "因為檔案太多，只在修改的路徑中尋找複製。"
3913
3819 -#: diff.c:6263
3914 +#: diff.c:6327
3915 #, c-format
3916 msgid ""
3917 "you may want to set your %s variable to at least %d and retry the command."
@@ -3865,20 +3960,20 @@ msgstr "停用 cone 樣式符合模式"
3960 msgid "cannot use %s as an exclude file"
3961 msgstr "不能將 %s 用作排除檔案"
3962
3868 -#: dir.c:2418
3963 +#: dir.c:2419
3964 #, c-format
3965 msgid "could not open directory '%s'"
3966 msgstr "不能開啟目錄 '%s'"
3967
3873 -#: dir.c:2720
3968 +#: dir.c:2721
3969 msgid "failed to get kernel name and information"
3970 msgstr "無法獲得核心名稱和訊息"
3971
3877 -#: dir.c:2844
3972 +#: dir.c:2846
3973 msgid "untracked cache is disabled on this system or location"
3974 msgstr "快取未追蹤檔案在本系統或位置中被停用"
3975
3881 -#: dir.c:3112
3976 +#: dir.c:3119
3977 msgid ""
3978 "No directory name could be guessed.\n"
3979 "Please specify a directory on the command line"
@@ -3886,17 +3981,17 @@ msgstr ""
3981 "無法猜到目錄名。\n"
3982 "請在指令列指定一個目錄"
3983
3889 -#: dir.c:3800
3984 +#: dir.c:3807
3985 #, c-format
3986 msgid "index file corrupt in repo %s"
3987 msgstr "版本庫 %s 中的索引檔案損壞"
3988
3894 -#: dir.c:3847 dir.c:3852
3989 +#: dir.c:3854 dir.c:3859
3990 #, c-format
3991 msgid "could not create directories for %s"
3992 msgstr "不能為 %s 建立目錄"
3993
3899 -#: dir.c:3881
3994 +#: dir.c:3888
3995 #, c-format
3996 msgid "could not migrate git directory from '%s' to '%s'"
3997 msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"
@@ -3915,7 +4010,7 @@ msgstr "過濾內容"
4010 msgid "could not stat file '%s'"
4011 msgstr "不能對檔案 '%s' 呼叫 stat"
4012
3918 -#: environment.c:145
4013 +#: environment.c:147
4014 #, c-format
4015 msgid "bad git namespace path \"%s\""
4016 msgstr "錯誤的 git 名字空間路徑 \"%s\""
@@ -3946,253 +4041,280 @@ msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'"
4041 msgid "unable to write to remote"
4042 msgstr "無法寫到遠端"
4043
3949 -#: fetch-pack.c:395 fetch-pack.c:1439
4044 +#: fetch-pack.c:397 fetch-pack.c:1460
4045 #, c-format
4046 msgid "invalid shallow line: %s"
4047 msgstr "無效的 shallow 訊息：%s"
4048
3954 -#: fetch-pack.c:401 fetch-pack.c:1445
4049 +#: fetch-pack.c:403 fetch-pack.c:1466
4050 #, c-format
4051 msgid "invalid unshallow line: %s"
4052 msgstr "無效的 unshallow 訊息：%s"
4053
3959 -#: fetch-pack.c:403 fetch-pack.c:1447
4054 +#: fetch-pack.c:405 fetch-pack.c:1468
4055 #, c-format
4056 msgid "object not found: %s"
4057 msgstr "物件未找到：%s"
4058
3964 -#: fetch-pack.c:406 fetch-pack.c:1450
4059 +#: fetch-pack.c:408 fetch-pack.c:1471
4060 #, c-format
4061 msgid "error in object: %s"
4062 msgstr "物件中發生錯誤：%s"
4063
3969 -#: fetch-pack.c:408 fetch-pack.c:1452
4064 +#: fetch-pack.c:410 fetch-pack.c:1473
4065 #, c-format
4066 msgid "no shallow found: %s"
4067 msgstr "未發現 shallow：%s"
4068
3974 -#: fetch-pack.c:411 fetch-pack.c:1456
4069 +#: fetch-pack.c:413 fetch-pack.c:1477
4070 #, c-format
4071 msgid "expected shallow/unshallow, got %s"
4072 msgstr "應為 shallow/unshallow，卻得到 %s"
4073
3979 -#: fetch-pack.c:451
4074 +#: fetch-pack.c:453
4075 #, c-format
4076 msgid "got %s %d %s"
4077 msgstr "得到 %s %d %s"
4078
3984 -#: fetch-pack.c:468
4079 +#: fetch-pack.c:470
4080 #, c-format
4081 msgid "invalid commit %s"
4082 msgstr "無效提交 %s"
4083
3989 -#: fetch-pack.c:499
4084 +#: fetch-pack.c:501
4085 msgid "giving up"
4086 msgstr "放棄"
4087
3993 -#: fetch-pack.c:512 progress.c:339
4088 +#: fetch-pack.c:514 progress.h:25
4089 msgid "done"
4090 msgstr "完成"
4091
3997 -#: fetch-pack.c:524
4092 +#: fetch-pack.c:526
4093 #, c-format
4094 msgid "got %s (%d) %s"
4095 msgstr "得到 %s (%d) %s"
4096
4002 -#: fetch-pack.c:560
4097 +#: fetch-pack.c:562
4098 #, c-format
4099 msgid "Marking %s as complete"
4100 msgstr "標記 %s 為完成"
4101
4007 -#: fetch-pack.c:775
4102 +#: fetch-pack.c:784
4103 #, c-format
4104 msgid "already have %s (%s)"
4105 msgstr "已經有 %s（%s）"
4106
4012 -#: fetch-pack.c:861
4107 +#: fetch-pack.c:870
4108 msgid "fetch-pack: unable to fork off sideband demultiplexer"
4109 msgstr "fetch-pack：無法衍生 sideband 多路輸出"
4110
4016 -#: fetch-pack.c:869
4111 +#: fetch-pack.c:878
4112 msgid "protocol error: bad pack header"
4113 msgstr "協定錯誤：壞的包頭"
4114
4020 -#: fetch-pack.c:965
4115 +#: fetch-pack.c:974
4116 #, c-format
4117 msgid "fetch-pack: unable to fork off %s"
4118 msgstr "fetch-pack：無法 fork %s 處理程序"
4119
4025 -#: fetch-pack.c:971
4120 +#: fetch-pack.c:980
4121 msgid "fetch-pack: invalid index-pack output"
4122 msgstr "fetch-pack：無效的 index-pack 輸出"
4123
4029 -#: fetch-pack.c:988
4124 +#: fetch-pack.c:997
4125 #, c-format
4126 msgid "%s failed"
4127 msgstr "%s 失敗"
4128
4034 -#: fetch-pack.c:990
4129 +#: fetch-pack.c:999
4130 msgid "error in sideband demultiplexer"
4131 msgstr "sideband 多路輸出發生錯誤"
4132
4038 -#: fetch-pack.c:1035
4133 +#: fetch-pack.c:1048
4134 #, c-format
4135 msgid "Server version is %.*s"
4136 msgstr "伺服器版本 %.*s"
4137
4043 -#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058
4044 -#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074
4045 -#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090
4046 -#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112
4138 +#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071
4139 +#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087
4140 +#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103
4141 +#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125
4142 #, c-format
4143 msgid "Server supports %s"
4144 msgstr "伺服器支援 %s"
4145
4051 -#: fetch-pack.c:1045
4146 +#: fetch-pack.c:1058
4147 msgid "Server does not support shallow clients"
4148 msgstr "伺服器不支援 shallow 用戶端"
4149
4055 -#: fetch-pack.c:1105
4150 +#: fetch-pack.c:1118
4151 msgid "Server does not support --shallow-since"
4152 msgstr "伺服器不支援 --shallow-since"
4153
4059 -#: fetch-pack.c:1110
4154 +#: fetch-pack.c:1123
4155 msgid "Server does not support --shallow-exclude"
4156 msgstr "伺服器不支援 --shallow-exclude"
4157
4063 -#: fetch-pack.c:1114
4158 +#: fetch-pack.c:1127
4159 msgid "Server does not support --deepen"
4160 msgstr "伺服器不支援 --deepen"
4161
4067 -#: fetch-pack.c:1116
4162 +#: fetch-pack.c:1129
4163 msgid "Server does not support this repository's object format"
4164 msgstr "伺服器不支援此版本庫的物件格式"
4165
4071 -#: fetch-pack.c:1129
4166 +#: fetch-pack.c:1142
4167 msgid "no common commits"
4168 msgstr "沒有共同的提交"
4169
4075 -#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130
4170 +#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166
4171 msgid "source repository is shallow, reject to clone."
4172 msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。"
4173
4079 -#: fetch-pack.c:1144 fetch-pack.c:1681
4174 +#: fetch-pack.c:1157 fetch-pack.c:1705
4175 msgid "git fetch-pack: fetch failed."
4176 msgstr "git fetch-pack：取得失敗。"
4177
4083 -#: fetch-pack.c:1258
4178 +#: fetch-pack.c:1271
4179 #, c-format
4180 msgid "mismatched algorithms: client %s; server %s"
4181 msgstr "算法不一致：用戶端 %s；伺服器 %s"
4182
4088 -#: fetch-pack.c:1262
4183 +#: fetch-pack.c:1275
4184 #, c-format
4185 msgid "the server does not support algorithm '%s'"
4186 msgstr "伺服器不支援「%s」算法"
4187
4093 -#: fetch-pack.c:1295
4188 +#: fetch-pack.c:1308
4189 msgid "Server does not support shallow requests"
4190 msgstr "伺服器不支援 shallow 請求"
4191
4097 -#: fetch-pack.c:1302
4192 +#: fetch-pack.c:1315
4193 msgid "Server supports filter"
4194 msgstr "伺服器支援 filter"
4195
4101 -#: fetch-pack.c:1345 fetch-pack.c:2063
4196 +#: fetch-pack.c:1358 fetch-pack.c:2087
4197 msgid "unable to write request to remote"
4198 msgstr "無法將請求寫到遠端"
4199
4105 -#: fetch-pack.c:1363
4200 +#: fetch-pack.c:1376
4201 #, c-format
4202 msgid "error reading section header '%s'"
4203 msgstr "讀取節標題 '%s' 發生錯誤"
4204
4110 -#: fetch-pack.c:1369
4205 +#: fetch-pack.c:1382
4206 #, c-format
4207 msgid "expected '%s', received '%s'"
4208 msgstr "預期 '%s'，得到 '%s'"
4209
4115 -#: fetch-pack.c:1403
4210 +#: fetch-pack.c:1416
4211 #, c-format
4212 msgid "unexpected acknowledgment line: '%s'"
4213 msgstr "意外的確認行：'%s'"
4214
4120 -#: fetch-pack.c:1408
4215 +#: fetch-pack.c:1421
4216 #, c-format
4217 msgid "error processing acks: %d"
4218 msgstr "處理 ack 發生錯誤：%d"
4219
4125 -#: fetch-pack.c:1418
4126 -msgid "expected packfile to be sent after 'ready'"
4127 -msgstr "預期在 'ready' 之後傳送 packfile"
4220 +#. TRANSLATORS: The parameter will be 'ready', a protocol
4221 +#. keyword.
4222 +#.
4223 +#: fetch-pack.c:1435
4224 +#, c-format
4225 +msgid "expected packfile to be sent after '%s'"
4226 +msgstr "預期在 「%s」後傳送 packfile"
4227
4129 -#: fetch-pack.c:1420
4130 -msgid "expected no other sections to be sent after no 'ready'"
4131 -msgstr "在沒有 'ready' 不應該傳送其它小節"
4228 +#. TRANSLATORS: The parameter will be 'ready', a protocol
4229 +#. keyword.
4230 +#.
4231 +#: fetch-pack.c:1441
4232 +#, c-format
4233 +msgid "expected no other sections to be sent after no '%s'"
4234 +msgstr "預期在沒有「%s」後不傳送其他區段"
4235
4133 -#: fetch-pack.c:1461
4236 +#: fetch-pack.c:1482
4237 #, c-format
4238 msgid "error processing shallow info: %d"
4239 msgstr "處理淺複製訊息發生錯誤：%d"
4240
4138 -#: fetch-pack.c:1510
4241 +#: fetch-pack.c:1531
4242 #, c-format
4243 msgid "expected wanted-ref, got '%s'"
4244 msgstr "預期 wanted-ref，得到 '%s'"
4245
4143 -#: fetch-pack.c:1515
4246 +#: fetch-pack.c:1536
4247 #, c-format
4248 msgid "unexpected wanted-ref: '%s'"
4249 msgstr "意外的 wanted-ref：'%s'"
4250
4148 -#: fetch-pack.c:1520
4251 +#: fetch-pack.c:1541
4252 #, c-format
4253 msgid "error processing wanted refs: %d"
4254 msgstr "處理要取得的引用發生錯誤：%d"
4255
4153 -#: fetch-pack.c:1550
4256 +#: fetch-pack.c:1571
4257 msgid "git fetch-pack: expected response end packet"
4258 msgstr "git fetch-pack: 預期要有回應結束封包"
4259
4157 -#: fetch-pack.c:1959
4260 +#: fetch-pack.c:1983
4261 msgid "no matching remote head"
4262 msgstr "沒有符合的遠端分支"
4263
4161 -#: fetch-pack.c:1982 builtin/clone.c:581
4264 +#: fetch-pack.c:2006 builtin/clone.c:587
4265 msgid "remote did not send all necessary objects"
4266 msgstr "遠端沒有傳送所有必需的物件"
4267
4165 -#: fetch-pack.c:2085
4268 +#: fetch-pack.c:2109
4269 msgid "unexpected 'ready' from remote"
4270 msgstr "從遠端收到非預期的 ‘ready’"
4271
4169 -#: fetch-pack.c:2108
4272 +#: fetch-pack.c:2132
4273 #, c-format
4274 msgid "no such remote ref %s"
4275 msgstr "沒有這樣的遠端引用 %s"
4276
4174 -#: fetch-pack.c:2111
4277 +#: fetch-pack.c:2135
4278 #, c-format
4279 msgid "Server does not allow request for unadvertised object %s"
4280 msgstr "伺服器不允許請求未公開的物件 %s"
4281
4179 -#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974
4180 -#: gpg-interface.c:990
4282 +#: fsmonitor-ipc.c:119
4283 +#, c-format
4284 +msgid "fsmonitor_ipc__send_query: invalid path '%s'"
4285 +msgstr "fsmonitor_ipc__send_query：路徑「%s」無效"
4286 +
4287 +#: fsmonitor-ipc.c:125
4288 +#, c-format
4289 +msgid "fsmonitor_ipc__send_query: unspecified error on '%s'"
4290 +msgstr "fsmonitor_ipc__send_query：「%s」上有未指定的錯誤"
4291 +
4292 +#: fsmonitor-ipc.c:155
4293 +msgid "fsmonitor--daemon is not running"
4294 +msgstr "fsmonitor--daemon 未在運作"
4295 +
4296 +#: fsmonitor-ipc.c:164
4297 +#, c-format
4298 +msgid "could not send '%s' command to fsmonitor--daemon"
4299 +msgstr "無法將「%s」命令傳送到 fsmonitor--daemon"
4300 +
4301 +#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995
4302 +#: gpg-interface.c:1011
4303 msgid "could not create temporary file"
4304 msgstr "不能建立暫存檔"
4305
4184 -#: gpg-interface.c:332 gpg-interface.c:460
4306 +#: gpg-interface.c:332 gpg-interface.c:459
4307 #, c-format
4308 msgid "failed writing detached signature to '%s'"
4309 msgstr "無法將分離式簽名寫入 '%s'"
4310
4189 -#: gpg-interface.c:451
4311 +#: gpg-interface.c:450
4312 msgid ""
4313 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "
4314 "signature verification"
4315 msgstr "SSH 簽名驗證需要設定 gpg.ssh.allowedSignersFile，簽名檔案也要存在"
4316
4195 -#: gpg-interface.c:480
4317 +#: gpg-interface.c:479
4318 msgid ""
4319 "ssh-keygen -Y find-principals/verify is needed for ssh signature "
4320 "verification (available in openssh version 8.2p1+)"
@@ -4200,61 +4322,61 @@ msgstr ""
4322 "SSH 簽名驗證需要 ssh-keygen -Y find-principals/verify（可以在 openssh 8.2p1+ "
4323 "版本使用）"
4324
4203 -#: gpg-interface.c:536
4325 +#: gpg-interface.c:550
4326 #, c-format
4327 msgid "ssh signing revocation file configured but not found: %s"
4328 msgstr "有設定 SSH 簽名廢止檔案，但找不到檔案本體：%s"
4329
4208 -#: gpg-interface.c:624
4330 +#: gpg-interface.c:638
4331 #, c-format
4332 msgid "bad/incompatible signature '%s'"
4333 msgstr "簽名「%s」損壞或者不相容"
4334
4213 -#: gpg-interface.c:801 gpg-interface.c:806
4335 +#: gpg-interface.c:815 gpg-interface.c:820
4336 #, c-format
4337 msgid "failed to get the ssh fingerprint for key '%s'"
4338 msgstr "無法取得「%s」金鑰的 SSH 指紋"
4339
4218 -#: gpg-interface.c:829
4340 +#: gpg-interface.c:843
4341 msgid ""
4342 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
4343 msgstr "需要設定 user.signingkey 或 gpg.ssh.defaultKeyCommand 任一"
4344
4223 -#: gpg-interface.c:851
4345 +#: gpg-interface.c:865
4346 #, c-format
4347 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
4348 msgstr "gpg.ssh.defaultKeyCommand 執行成功，但沒回傳按鍵：%s %s"
4349
4228 -#: gpg-interface.c:857
4350 +#: gpg-interface.c:871
4351 #, c-format
4352 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
4353 msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s"
4354
4233 -#: gpg-interface.c:945
4355 +#: gpg-interface.c:966
4356 msgid "gpg failed to sign the data"
4357 msgstr "gpg 無法為資料簽名"
4358
4237 -#: gpg-interface.c:967
4359 +#: gpg-interface.c:988
4360 msgid "user.signingkey needs to be set for ssh signing"
4361 msgstr "需要設定 user.signingkey 才能進行 SSH 簽名"
4362
4241 -#: gpg-interface.c:978
4363 +#: gpg-interface.c:999
4364 #, c-format
4365 msgid "failed writing ssh signing key to '%s'"
4366 msgstr "無法將 SSH 簽名金鑰寫入「%s」"
4367
4246 -#: gpg-interface.c:996
4368 +#: gpg-interface.c:1017
4369 #, c-format
4370 msgid "failed writing ssh signing key buffer to '%s'"
4371 msgstr "無法將 SSH 簽名金鑰緩衝區寫入「%s」"
4372
4251 -#: gpg-interface.c:1014
4373 +#: gpg-interface.c:1035
4374 msgid ""
4375 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "
4376 "8.2p1+)"
4377 msgstr "SSH 簽名需要 ssh-keygen -Y sign（可以在 openssh 8.2p1+ 版本使用）"
4378
4257 -#: gpg-interface.c:1026
4379 +#: gpg-interface.c:1047
4380 #, c-format
4381 msgid "failed reading ssh signing data buffer from '%s'"
4382 msgstr "無法從「%s」讀取 SSH 簽名資料緩衝區"
@@ -4264,7 +4386,7 @@ msgstr "無法從「%s」讀取 SSH 簽名資料緩衝區"
4386 msgid "ignored invalid color '%.*s' in log.graphColors"
4387 msgstr "已忽略 log.graphColors 中無效的 “%.*s” 色彩"
4388
4267 -#: grep.c:531
4389 +#: grep.c:446
4390 msgid ""
4391 "given pattern contains NULL byte (via -f <file>). This is only supported "
4392 "with -P under PCRE v2"
@@ -4272,109 +4394,109 @@ msgstr ""
4394 "提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此"
4395 "功能"
4396
4275 -#: grep.c:1942
4397 +#: grep.c:1859
4398 #, c-format
4399 msgid "'%s': unable to read %s"
4400 msgstr "'%s'：無法讀取 %s"
4401
4280 -#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90
4402 +#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90
4403 #: builtin/rm.c:136
4404 #, c-format
4405 msgid "failed to stat '%s'"
4406 msgstr "對 '%s' 呼叫 stat 失敗"
4407
4286 -#: grep.c:1970
4408 +#: grep.c:1887
4409 #, c-format
4410 msgid "'%s': short read"
4411 msgstr "'%s'：讀取不完整"
4412
4291 -#: help.c:24
4413 +#: help.c:25
4414 msgid "start a working area (see also: git help tutorial)"
4415 msgstr "開始一個工作區（參見：git help tutorial）"
4416
4295 -#: help.c:25
4417 +#: help.c:26
4418 msgid "work on the current change (see also: git help everyday)"
4419 msgstr "在目前變更上工作（參見：git help everyday）"
4420
4299 -#: help.c:26
4421 +#: help.c:27
4422 msgid "examine the history and state (see also: git help revisions)"
4423 msgstr "檢查歷史和狀態（參見：git help revisions）"
4424
4303 -#: help.c:27
4425 +#: help.c:28
4426 msgid "grow, mark and tweak your common history"
4427 msgstr "擴展、標記和調校您的歷史記錄"
4428
4307 -#: help.c:28
4429 +#: help.c:29
4430 msgid "collaborate (see also: git help workflows)"
4431 msgstr "協同（參見：git help workflows）"
4432
4311 -#: help.c:32
4433 +#: help.c:33
4434 msgid "Main Porcelain Commands"
4435 msgstr "主要的上層指令"
4436
4315 -#: help.c:33
4437 +#: help.c:34
4438 msgid "Ancillary Commands / Manipulators"
4439 msgstr "輔助指令/動作者"
4440
4319 -#: help.c:34
4441 +#: help.c:35
4442 msgid "Ancillary Commands / Interrogators"
4443 msgstr "輔助指令/詢問者"
4444
4323 -#: help.c:35
4445 +#: help.c:36
4446 msgid "Interacting with Others"
4447 msgstr "與其它系統互動"
4448
4327 -#: help.c:36
4449 +#: help.c:37
4450 msgid "Low-level Commands / Manipulators"
4451 msgstr "低級指令/動作者"
4452
4331 -#: help.c:37
4453 +#: help.c:38
4454 msgid "Low-level Commands / Interrogators"
4455 msgstr "低級指令/詢問者"
4456
4335 -#: help.c:38
4457 +#: help.c:39
4458 msgid "Low-level Commands / Syncing Repositories"
4459 msgstr "低級指令 / 同步版本庫"
4460
4339 -#: help.c:39
4461 +#: help.c:40
4462 msgid "Low-level Commands / Internal Helpers"
4463 msgstr "低級指令/內部協助工具"
4464
4343 -#: help.c:313
4465 +#: help.c:316
4466 #, c-format
4467 msgid "available git commands in '%s'"
4468 msgstr "在 '%s' 下可用的 git 指令"
4469
4348 -#: help.c:320
4470 +#: help.c:323
4471 msgid "git commands available from elsewhere on your $PATH"
4472 msgstr "在 $PATH 路徑中的其他地方可用的 git 指令"
4473
4352 -#: help.c:329
4474 +#: help.c:332
4475 msgid "These are common Git commands used in various situations:"
4476 msgstr "這些是各種場合常見的 Git 指令："
4477
4356 -#: help.c:378 git.c:100
4478 +#: help.c:382 git.c:100
4479 #, c-format
4480 msgid "unsupported command listing type '%s'"
4481 msgstr "不支援的指令列表類型 '%s'"
4482
4361 -#: help.c:418
4483 +#: help.c:422
4484 msgid "The Git concept guides are:"
4485 msgstr "Git 概念嚮導有："
4486
4365 -#: help.c:442
4366 -msgid "See 'git help <command>' to read about a specific subcommand"
4367 -msgstr "執行　'git help <command>' 來檢視特定子指令"
4368 -
4369 -#: help.c:447
4487 +#: help.c:446
4488 msgid "External commands"
4489 msgstr "外部指令"
4490
4373 -#: help.c:462
4491 +#: help.c:468
4492 msgid "Command aliases"
4493 msgstr "指令別名"
4494
4377 -#: help.c:543
4495 +#: help.c:486
4496 +msgid "See 'git help <command>' to read about a specific subcommand"
4497 +msgstr "執行　'git help <command>' 來檢視特定子指令"
4498 +
4499 +#: help.c:563
4500 #, c-format
4501 msgid ""
4502 "'%s' appears to be a git command, but we were not\n"
@@ -4383,36 +4505,36 @@ msgstr ""
4505 "'%s' 像是一個 git 指令，但卻無法執行。\n"
4506 "可能是 git-%s 受損？"
4507
4386 -#: help.c:565 help.c:662
4508 +#: help.c:585 help.c:682
4509 #, c-format
4510 msgid "git: '%s' is not a git command. See 'git --help'."
4511 msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。"
4512
4391 -#: help.c:613
4513 +#: help.c:633
4514 msgid "Uh oh. Your system reports no Git commands at all."
4515 msgstr "唉呀，您的系統中未發現 Git 指令。"
4516
4395 -#: help.c:635
4517 +#: help.c:655
4518 #, c-format
4519 msgid "WARNING: You called a Git command named '%s', which does not exist."
4520 msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。"
4521
4400 -#: help.c:640
4522 +#: help.c:660
4523 #, c-format
4524 msgid "Continuing under the assumption that you meant '%s'."
4525 msgstr "假定你想要的是 '%s' 並繼續。"
4526
4405 -#: help.c:646
4527 +#: help.c:666
4528 #, c-format
4529 msgid "Run '%s' instead [y/N]? "
4530 msgstr "改執行「%s」[y/N]？ "
4531
4410 -#: help.c:654
4532 +#: help.c:674
4533 #, c-format
4534 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
4535 msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。"
4536
4415 -#: help.c:666
4537 +#: help.c:686
4538 msgid ""
4539 "\n"
4540 "The most similar command is"
@@ -4423,16 +4545,16 @@ msgstr[0] ""
4545 "\n"
4546 "最類似的指令有"
4547
4426 -#: help.c:706
4548 +#: help.c:729
4549 msgid "git version [<options>]"
4550 msgstr "git version [<選項>]"
4551
4430 -#: help.c:761
4552 +#: help.c:784
4553 #, c-format
4554 msgid "%s: %s - %s"
4555 msgstr "%s：%s - %s"
4556
4435 -#: help.c:765
4557 +#: help.c:788
4558 msgid ""
4559 "\n"
4560 "Did you mean this?"
@@ -4443,7 +4565,7 @@ msgstr[0] ""
4565 "\n"
4566 "您指的是這個嗎？"
4567
4446 -#: hook.c:27
4568 +#: hook.c:28
4569 #, c-format
4570 msgid ""
4571 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -4452,15 +4574,20 @@ msgstr ""
4574 "因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n"
4575 "設定 `git config advice.ignoredHook false` 來關閉這條警告。"
4576
4455 -#: ident.c:353
4577 +#: hook.c:87
4578 +#, c-format
4579 +msgid "Couldn't start hook '%s'\n"
4580 +msgstr "無法啟動「%s」掛鉤\n"
4581 +
4582 +#: ident.c:354
4583 msgid "Author identity unknown\n"
4584 msgstr "作者身分未知\n"
4585
4459 -#: ident.c:356
4586 +#: ident.c:357
4587 msgid "Committer identity unknown\n"
4588 msgstr "提交者身分未知\n"
4589
4463 -#: ident.c:362
4590 +#: ident.c:363
4591 msgid ""
4592 "\n"
4593 "*** Please tell me who you are.\n"
@@ -4486,71 +4613,71 @@ msgstr ""
4613 "若只要在這個版本庫設定身份標記，請省略 --global 參數。\n"
4614 "\n"
4615
4489 -#: ident.c:397
4616 +#: ident.c:398
4617 msgid "no email was given and auto-detection is disabled"
4618 msgstr "未提供信件位址且自動偵測被停用"
4619
4493 -#: ident.c:402
4620 +#: ident.c:403
4621 #, c-format
4622 msgid "unable to auto-detect email address (got '%s')"
4623 msgstr "無法自動偵測信件位址（得到 '%s'）"
4624
4498 -#: ident.c:419
4625 +#: ident.c:420
4626 msgid "no name was given and auto-detection is disabled"
4627 msgstr "未提供姓名且自動偵測被停用"
4628
4502 -#: ident.c:425
4629 +#: ident.c:426
4630 #, c-format
4631 msgid "unable to auto-detect name (got '%s')"
4632 msgstr "無法自動偵測姓名（得到 '%s'）"
4633
4507 -#: ident.c:433
4634 +#: ident.c:434
4635 #, c-format
4636 msgid "empty ident name (for <%s>) not allowed"
4637 msgstr "不允許空的姓名（對於 <%s>）"
4638
4512 -#: ident.c:439
4639 +#: ident.c:440
4640 #, c-format
4641 msgid "name consists only of disallowed characters: %s"
4642 msgstr "姓名中僅包含停用字元：%s"
4643
4517 -#: ident.c:454 builtin/commit.c:648
4644 +#: ident.c:455 builtin/commit.c:649
4645 #, c-format
4646 msgid "invalid date format: %s"
4647 msgstr "無效的日期格式：%s"
4648
4522 -#: list-objects-filter-options.c:83
4649 +#: list-objects-filter-options.c:68
4650 msgid "expected 'tree:<depth>'"
4651 msgstr "期望 'tree:<深度>'"
4652
4526 -#: list-objects-filter-options.c:98
4653 +#: list-objects-filter-options.c:83
4654 msgid "sparse:path filters support has been dropped"
4655 msgstr "sparse:path 過濾器支援已被刪除"
4656
4530 -#: list-objects-filter-options.c:105
4657 +#: list-objects-filter-options.c:90
4658 #, c-format
4659 msgid "'%s' for 'object:type=<type>' is not a valid object type"
4660 msgstr "“object:type=<type>” 的 “%s” 不是有效的物件格式"
4661
4535 -#: list-objects-filter-options.c:124
4662 +#: list-objects-filter-options.c:109
4663 #, c-format
4664 msgid "invalid filter-spec '%s'"
4665 msgstr "無效的過濾器規格 '%s'"
4666
4540 -#: list-objects-filter-options.c:140
4667 +#: list-objects-filter-options.c:125
4668 #, c-format
4669 msgid "must escape char in sub-filter-spec: '%c'"
4670 msgstr "必須對 sub-filter-spec 中的字元進行轉義：'%c'"
4671
4545 -#: list-objects-filter-options.c:182
4672 +#: list-objects-filter-options.c:167
4673 msgid "expected something after combine:"
4674 msgstr "期望在組合後有一些東西："
4675
4549 -#: list-objects-filter-options.c:264
4676 +#: list-objects-filter-options.c:249
4677 msgid "multiple filter-specs cannot be combined"
4678 msgstr "不能混用多種過濾規格"
4679
4553 -#: list-objects-filter-options.c:376
4680 +#: list-objects-filter-options.c:365
4681 msgid "unable to upgrade repository format to support partial clone"
4682 msgstr "無法升級版本庫格式，以致不支援部分複製"
4683
@@ -4564,17 +4691,17 @@ msgstr "不能存取 '%s' 中的稀疏資料物件"
4691 msgid "unable to parse sparse filter data in %s"
4692 msgstr "無法解析 %s 中的稀疏過濾器資料"
4693
4567 -#: list-objects.c:127
4694 +#: list-objects.c:144
4695 #, c-format
4696 msgid "entry '%s' in tree %s has tree mode, but is not a tree"
4697 msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性，但不是一個樹狀物件"
4698
4572 -#: list-objects.c:140
4699 +#: list-objects.c:157
4700 #, c-format
4701 msgid "entry '%s' in tree %s has blob mode, but is not a blob"
4702 msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性，但不是一個資料物件"
4703
4577 -#: list-objects.c:398
4704 +#: list-objects.c:415
4705 #, c-format
4706 msgid "unable to load root tree for commit %s"
4707 msgstr "無法為提交 %s 載入根樹"
@@ -4603,17 +4730,12 @@ msgstr ""
4730 msgid "Unable to create '%s.lock': %s"
4731 msgstr "不能建立 '%s.lock'：%s"
4732
4606 -#: ls-refs.c:37
4607 -#, c-format
4608 -msgid "invalid value '%s' for lsrefs.unborn"
4609 -msgstr "lsrefs.unborn 的值「%s」無效"
4610 -
4611 -#: ls-refs.c:174
4733 +#: ls-refs.c:175
4734 #, c-format
4735 msgid "unexpected line: '%s'"
4736 msgstr "遇到非預期橫列：「%s」"
4737
4616 -#: ls-refs.c:178
4738 +#: ls-refs.c:179
4739 msgid "expected flush after ls-refs arguments"
4740 msgstr "在 ls-refs 引數之後應該有一個 flush 包"
4741
@@ -4621,37 +4743,37 @@ msgstr "在 ls-refs 引數之後應該有一個 flush 包"
4743 msgid "quoted CRLF detected"
4744 msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF"
4745
4624 -#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46
4746 +#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46
4747 #, c-format
4748 msgid "bad action '%s' for '%s'"
4749 msgstr "「%s」動作對「%s」無效"
4750
4629 -#: merge-ort.c:1584 merge-recursive.c:1211
4751 +#: merge-ort.c:1630 merge-recursive.c:1214
4752 #, c-format
4753 msgid "Failed to merge submodule %s (not checked out)"
4754 msgstr "無法合併子模組 %s （沒有簽出）"
4755
4634 -#: merge-ort.c:1593 merge-recursive.c:1218
4756 +#: merge-ort.c:1639 merge-recursive.c:1221
4757 #, c-format
4758 msgid "Failed to merge submodule %s (commits not present)"
4759 msgstr "無法合併子模組 %s（提交不存在）"
4760
4639 -#: merge-ort.c:1602 merge-recursive.c:1225
4761 +#: merge-ort.c:1648 merge-recursive.c:1228
4762 #, c-format
4763 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4764 msgstr "無法合併子模組 %s （提交未跟隨合併基礎）"
4765
4644 -#: merge-ort.c:1612 merge-ort.c:1620
4766 +#: merge-ort.c:1658 merge-ort.c:1666
4767 #, c-format
4768 msgid "Note: Fast-forwarding submodule %s to %s"
4769 msgstr "注意：正在將 %s 子模組快轉到 %s"
4770
4649 -#: merge-ort.c:1642
4771 +#: merge-ort.c:1688
4772 #, c-format
4773 msgid "Failed to merge submodule %s"
4774 msgstr "無法合併 %s 子模組"
4775
4654 -#: merge-ort.c:1649
4776 +#: merge-ort.c:1695
4777 #, c-format
4778 msgid ""
4779 "Failed to merge submodule %s, but a possible merge resolution exists:\n"
@@ -4660,7 +4782,7 @@ msgstr ""
4782 "無法合併 %s 子模組，但有找到一個可行的合併方案：\n"
4783 "%s\n"
4784
4663 -#: merge-ort.c:1653 merge-recursive.c:1281
4785 +#: merge-ort.c:1699 merge-recursive.c:1284
4786 #, c-format
4787 msgid ""
4788 "If this is correct simply add it to the index for example\n"
@@ -4676,7 +4798,7 @@ msgstr ""
4798 "\n"
4799 "接受本建議。\n"
4800
4679 -#: merge-ort.c:1666
4801 +#: merge-ort.c:1712
4802 #, c-format
4803 msgid ""
4804 "Failed to merge submodule %s, but multiple possible merges exist:\n"
@@ -4685,21 +4807,21 @@ msgstr ""
4807 "無法合併 %s 子模組，但有找到幾個可行的合併方案：\n"
4808 "%s"
4809
4688 -#: merge-ort.c:1887 merge-recursive.c:1372
4810 +#: merge-ort.c:1937 merge-recursive.c:1375
4811 msgid "Failed to execute internal merge"
4812 msgstr "無法執行內部合併"
4813
4692 -#: merge-ort.c:1892 merge-recursive.c:1377
4814 +#: merge-ort.c:1942 merge-recursive.c:1380
4815 #, c-format
4816 msgid "Unable to add %s to database"
4817 msgstr "不能新增 %s 至物件庫"
4818
4697 -#: merge-ort.c:1899 merge-recursive.c:1410
4819 +#: merge-ort.c:1949 merge-recursive.c:1413
4820 #, c-format
4821 msgid "Auto-merging %s"
4822 msgstr "自動合併 %s"
4823
4702 -#: merge-ort.c:2038 merge-recursive.c:2132
4824 +#: merge-ort.c:2088 merge-recursive.c:2135
4825 #, c-format
4826 msgid ""
4827 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4708,7 +4830,7 @@ msgstr ""
4830 "衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑"
4831 "放在：%s。"
4832
4711 -#: merge-ort.c:2048 merge-recursive.c:2142
4833 +#: merge-ort.c:2098 merge-recursive.c:2145
4834 #, c-format
4835 msgid ""
4836 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4717,7 +4839,7 @@ msgstr ""
4839 "衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這"
4840 "些路徑放置於此：%s"
4841
4720 -#: merge-ort.c:2106
4842 +#: merge-ort.c:2156
4843 #, c-format
4844 msgid ""
4845 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4727,14 +4849,14 @@ msgstr ""
4849 "衝突（分割的目錄重新命名）：未知 %s 重新命名的位置。它被重新命名為多個其他目"
4850 "錄，但沒有目的地取得過半檔案。"
4851
4730 -#: merge-ort.c:2260 merge-recursive.c:2478
4852 +#: merge-ort.c:2310 merge-recursive.c:2481
4853 #, c-format
4854 msgid ""
4855 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
4856 "renamed."
4857 msgstr "警告：避免套用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。"
4858
4737 -#: merge-ort.c:2400 merge-recursive.c:3261
4859 +#: merge-ort.c:2450 merge-recursive.c:3264
4860 #, c-format
4861 msgid ""
4862 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4742,7 +4864,7 @@ msgid ""
4864 msgstr ""
4865 "路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"
4866
4745 -#: merge-ort.c:2407 merge-recursive.c:3268
4867 +#: merge-ort.c:2457 merge-recursive.c:3271
4868 #, c-format
4869 msgid ""
4870 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4751,7 +4873,7 @@ msgstr ""
4873 "路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將"
4874 "其移動到 %5$s。"
4875
4754 -#: merge-ort.c:2420 merge-recursive.c:3264
4876 +#: merge-ort.c:2470 merge-recursive.c:3267
4877 #, c-format
4878 msgid ""
4879 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4760,7 +4882,7 @@ msgstr ""
4882 "衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移"
4883 "動到 %s。"
4884
4763 -#: merge-ort.c:2428 merge-recursive.c:3271
4885 +#: merge-ort.c:2478 merge-recursive.c:3274
4886 #, c-format
4887 msgid ""
4888 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4769,14 +4891,14 @@ msgstr ""
4891 "衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s "
4892 "中，建議將其移動到 %5$s。"
4893
4772 -#: merge-ort.c:2584
4894 +#: merge-ort.c:2634
4895 #, c-format
4896 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
4897 msgstr ""
4898 "衝突（重新命名/重新命名）：%1$s 已重新命名為 %3$s 中的 %2$s 和 %5$s 中的 "
4899 "%4$s。"
4900
4779 -#: merge-ort.c:2679
4901 +#: merge-ort.c:2729
4902 #, c-format
4903 msgid ""
4904 "CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -4786,30 +4908,30 @@ msgstr ""
4908 "衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可"
4909 "能會因此出現巢狀衝突標記。"
4910
4789 -#: merge-ort.c:2698 merge-ort.c:2722
4911 +#: merge-ort.c:2748 merge-ort.c:2772
4912 #, c-format
4913 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
4914 msgstr ""
4915 "衝突（重新命名/刪除）：%1$s 已重新命名為 %3$s 中的 %2$s 卻在 %4$s 中被刪除。"
4916
4795 -#: merge-ort.c:3212 merge-recursive.c:3022
4917 +#: merge-ort.c:3261 merge-recursive.c:3025
4918 #, c-format
4919 msgid "cannot read object %s"
4920 msgstr "不能讀取物件 %s"
4921
4800 -#: merge-ort.c:3215 merge-recursive.c:3025
4922 +#: merge-ort.c:3264 merge-recursive.c:3028
4923 #, c-format
4924 msgid "object %s is not a blob"
4925 msgstr "物件 %s 不是一個資料物件"
4926
4805 -#: merge-ort.c:3644
4927 +#: merge-ort.c:3693
4928 #, c-format
4929 msgid ""
4930 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
4931 "%s instead."
4932 msgstr "衝突（檔案/目錄）：目錄佔住 %2$s 中 %1$s 的位置。改移動到 %3$s。"
4933
4812 -#: merge-ort.c:3721
4934 +#: merge-ort.c:3770
4935 #, c-format
4936 msgid ""
4937 "CONFLICT (distinct types): %s had different types on each side; renamed both "
@@ -4818,7 +4940,7 @@ msgstr ""
4940 "衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名這兩個來源，這樣就可以分"
4941 "別記錄這兩方檔案。"
4942
4821 -#: merge-ort.c:3728
4943 +#: merge-ort.c:3777
4944 #, c-format
4945 msgid ""
4946 "CONFLICT (distinct types): %s had different types on each side; renamed one "
@@ -4827,24 +4949,24 @@ msgstr ""
4949 "衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名其中一個來源，這樣就可以"
4950 "分別記錄這兩方檔案。"
4951
4830 -#: merge-ort.c:3819 merge-recursive.c:3101
4952 +#: merge-ort.c:3866 merge-recursive.c:3104
4953 msgid "content"
4954 msgstr "內容"
4955
4834 -#: merge-ort.c:3821 merge-recursive.c:3105
4956 +#: merge-ort.c:3868 merge-recursive.c:3108
4957 msgid "add/add"
4958 msgstr "新增/新增"
4959
4838 -#: merge-ort.c:3823 merge-recursive.c:3150
4960 +#: merge-ort.c:3870 merge-recursive.c:3153
4961 msgid "submodule"
4962 msgstr "子模組"
4963
4842 -#: merge-ort.c:3825 merge-recursive.c:3151
4964 +#: merge-ort.c:3872 merge-recursive.c:3154
4965 #, c-format
4966 msgid "CONFLICT (%s): Merge conflict in %s"
4967 msgstr "衝突（%s）：合併衝突於 %s"
4968
4847 -#: merge-ort.c:3869
4969 +#: merge-ort.c:3916
4970 #, c-format
4971 msgid ""
4972 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -4853,7 +4975,7 @@ msgstr ""
4975 "衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹"
4976 "上。"
4977
4856 -#: merge-ort.c:4165
4978 +#: merge-ort.c:4212
4979 #, c-format
4980 msgid ""
4981 "Note: %s not up to date and in way of checking out conflicted version; old "
@@ -4863,12 +4985,12 @@ msgstr "註：%s 不是最新且干擾到簽出衝突版本。已將舊拷貝重
4985 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
4986 #. base, and 2-3) the trees for the two trees we're merging.
4987 #.
4866 -#: merge-ort.c:4534
4988 +#: merge-ort.c:4586
4989 #, c-format
4990 msgid "collecting merge info failed for trees %s, %s, %s"
4991 msgstr "%s, %s, %s 樹的合併資訊收集失敗"
4992
4871 -#: merge-ort-wrappers.c:13 merge-recursive.c:3716
4993 +#: merge-ort-wrappers.c:13 merge-recursive.c:3723
4994 #, c-format
4995 msgid ""
4996 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4877,7 +4999,7 @@ msgstr ""
4999 "您對下列檔案的本機修改將被合併動作覆蓋：\n"
5000 " %s"
5001
4880 -#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405
5002 +#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405
5003 msgid "Already up to date."
5004 msgstr "已經是最新的。"
5005
@@ -4914,7 +5036,7 @@ msgstr "：可能是一個目錄/檔案衝突？"
5036 msgid "refusing to lose untracked file at '%s'"
5037 msgstr "拒絕捨棄 '%s' 中的未追蹤檔案"
5038
4917 -#: merge-recursive.c:956 builtin/cat-file.c:41
5039 +#: merge-recursive.c:956 builtin/cat-file.c:47
5040 #, c-format
5041 msgid "cannot read object %s '%s'"
5042 msgstr "不能讀取物件 %s '%s'"
@@ -4939,41 +5061,41 @@ msgstr "建立符號連結 '%s' 失敗：%s"
5061 msgid "do not know what to do with %06o %s '%s'"
5062 msgstr "不知道如何處理 %06o %s '%s'"
5063
4942 -#: merge-recursive.c:1233 merge-recursive.c:1246
5064 +#: merge-recursive.c:1236 merge-recursive.c:1249
5065 #, c-format
5066 msgid "Fast-forwarding submodule %s to the following commit:"
5067 msgstr "子模組 %s 快轉到如下提交："
5068
4947 -#: merge-recursive.c:1236 merge-recursive.c:1249
5069 +#: merge-recursive.c:1239 merge-recursive.c:1252
5070 #, c-format
5071 msgid "Fast-forwarding submodule %s"
5072 msgstr "快轉子模組 %s"
5073
4952 -#: merge-recursive.c:1273
5074 +#: merge-recursive.c:1276
5075 #, c-format
5076 msgid "Failed to merge submodule %s (merge following commits not found)"
5077 msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）"
5078
4957 -#: merge-recursive.c:1277
5079 +#: merge-recursive.c:1280
5080 #, c-format
5081 msgid "Failed to merge submodule %s (not fast-forward)"
5082 msgstr "無法合併子模組 %s（非快轉）"
5083
4962 -#: merge-recursive.c:1278
5084 +#: merge-recursive.c:1281
5085 msgid "Found a possible merge resolution for the submodule:\n"
5086 msgstr "找到子模組的一個可能的合併方案：\n"
5087
4966 -#: merge-recursive.c:1290
5088 +#: merge-recursive.c:1293
5089 #, c-format
5090 msgid "Failed to merge submodule %s (multiple merges found)"
5091 msgstr "無法合併子模組 %s （發現多個合併）"
5092
4971 -#: merge-recursive.c:1434
5093 +#: merge-recursive.c:1437
5094 #, c-format
5095 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
5096 msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。"
5097
4976 -#: merge-recursive.c:1506
5098 +#: merge-recursive.c:1509
5099 #, c-format
5100 msgid ""
5101 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4982,7 +5104,7 @@ msgstr ""
5104 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
5105 "本被保留。"
5106
4985 -#: merge-recursive.c:1511
5107 +#: merge-recursive.c:1514
5108 #, c-format
5109 msgid ""
5110 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4991,7 +5113,7 @@ msgstr ""
5113 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
5114 "%7$s 版本被保留。"
5115
4994 -#: merge-recursive.c:1518
5116 +#: merge-recursive.c:1521
5117 #, c-format
5118 msgid ""
5119 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5000,7 +5122,7 @@ msgstr ""
5122 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
5123 "本保留在 %8$s 中。"
5124
5003 -#: merge-recursive.c:1523
5125 +#: merge-recursive.c:1526
5126 #, c-format
5127 msgid ""
5128 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5009,41 +5131,41 @@ msgstr ""
5131 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
5132 "%7$s 版本保留在 %9$s 中。"
5133
5012 -#: merge-recursive.c:1558
5134 +#: merge-recursive.c:1561
5135 msgid "rename"
5136 msgstr "重新命名"
5137
5016 -#: merge-recursive.c:1558
5138 +#: merge-recursive.c:1561
5139 msgid "renamed"
5140 msgstr "重新命名"
5141
5020 -#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178
5142 +#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181
5143 #, c-format
5144 msgid "Refusing to lose dirty file at %s"
5145 msgstr "拒絕遺失髒檔案 '%s'"
5146
5025 -#: merge-recursive.c:1619
5147 +#: merge-recursive.c:1622
5148 #, c-format
5149 msgid "Refusing to lose untracked file at %s, even though it's in the way."
5150 msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。"
5151
5030 -#: merge-recursive.c:1677
5152 +#: merge-recursive.c:1680
5153 #, c-format
5154 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
5155 msgstr ""
5156 "衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"
5157
5036 -#: merge-recursive.c:1708
5158 +#: merge-recursive.c:1711
5159 #, c-format
5160 msgid "%s is a directory in %s adding as %s instead"
5161 msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增"
5162
5041 -#: merge-recursive.c:1713
5163 +#: merge-recursive.c:1716
5164 #, c-format
5165 msgid "Refusing to lose untracked file at %s; adding as %s instead"
5166 msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s"
5167
5046 -#: merge-recursive.c:1740
5168 +#: merge-recursive.c:1743
5169 #, c-format
5170 msgid ""
5171 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5052,18 +5174,18 @@ msgstr ""
5174 "衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在"
5175 "分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s"
5176
5055 -#: merge-recursive.c:1745
5177 +#: merge-recursive.c:1748
5178 msgid " (left unresolved)"
5179 msgstr " （留下未解決）"
5180
5059 -#: merge-recursive.c:1837
5181 +#: merge-recursive.c:1840
5182 #, c-format
5183 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
5184 msgstr ""
5185 "衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 "
5186 "%4$s->%5$s"
5187
5066 -#: merge-recursive.c:2100
5188 +#: merge-recursive.c:2103
5189 #, c-format
5190 msgid ""
5191 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5073,7 +5195,7 @@ msgstr ""
5195 "衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到"
5196 "多個其它目錄，沒有目錄包含大部分檔案。"
5197
5076 -#: merge-recursive.c:2234
5198 +#: merge-recursive.c:2237
5199 #, c-format
5200 msgid ""
5201 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5082,77 +5204,77 @@ msgstr ""
5204 "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新"
5205 "命名目錄 %4$s->%5$s"
5206
5085 -#: merge-recursive.c:3089
5207 +#: merge-recursive.c:3092
5208 msgid "modify"
5209 msgstr "修改"
5210
5089 -#: merge-recursive.c:3089
5211 +#: merge-recursive.c:3092
5212 msgid "modified"
5213 msgstr "修改"
5214
5093 -#: merge-recursive.c:3128
5215 +#: merge-recursive.c:3131
5216 #, c-format
5217 msgid "Skipped %s (merged same as existing)"
5218 msgstr "略過 %s（已經做過相同合併）"
5219
5098 -#: merge-recursive.c:3181
5220 +#: merge-recursive.c:3184
5221 #, c-format
5222 msgid "Adding as %s instead"
5223 msgstr "而是以 %s 為名新增"
5224
5103 -#: merge-recursive.c:3385
5225 +#: merge-recursive.c:3388
5226 #, c-format
5227 msgid "Removing %s"
5228 msgstr "刪除 %s"
5229
5108 -#: merge-recursive.c:3408
5230 +#: merge-recursive.c:3411
5231 msgid "file/directory"
5232 msgstr "檔案/目錄"
5233
5112 -#: merge-recursive.c:3413
5234 +#: merge-recursive.c:3416
5235 msgid "directory/file"
5236 msgstr "目錄/檔案"
5237
5116 -#: merge-recursive.c:3420
5238 +#: merge-recursive.c:3423
5239 #, c-format
5240 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
5241 msgstr "衝突（%1$s）：在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s"
5242
5121 -#: merge-recursive.c:3429
5243 +#: merge-recursive.c:3432
5244 #, c-format
5245 msgid "Adding %s"
5246 msgstr "新增 %s"
5247
5126 -#: merge-recursive.c:3438
5248 +#: merge-recursive.c:3441
5249 #, c-format
5250 msgid "CONFLICT (add/add): Merge conflict in %s"
5251 msgstr "衝突（add/add）：合併衝突於 %s"
5252
5131 -#: merge-recursive.c:3491
5253 +#: merge-recursive.c:3494
5254 #, c-format
5255 msgid "merging of trees %s and %s failed"
5256 msgstr "無法合併樹 %s 和 %s"
5257
5136 -#: merge-recursive.c:3585
5258 +#: merge-recursive.c:3588
5259 msgid "Merging:"
5260 msgstr "合併："
5261
5140 -#: merge-recursive.c:3598
5262 +#: merge-recursive.c:3601
5263 #, c-format
5264 msgid "found %u common ancestor:"
5265 msgid_plural "found %u common ancestors:"
5266 msgstr[0] "發現 %u 個共同祖先："
5267
5146 -#: merge-recursive.c:3648
5268 +#: merge-recursive.c:3651
5269 msgid "merge returned no commit"
5270 msgstr "合併未返回提交"
5271
5150 -#: merge-recursive.c:3816
5272 +#: merge-recursive.c:3823
5273 #, c-format
5274 msgid "Could not parse object '%s'"
5275 msgstr "不能解析物件 '%s'"
5276
5155 -#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906
5277 +#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912
5278 #: builtin/stash.c:489
5279 msgid "Unable to write index."
5280 msgstr "不能寫入索引。"
@@ -5161,221 +5283,225 @@ msgstr "不能寫入索引。"
5283 msgid "failed to read the cache"
5284 msgstr "讀取快取失敗"
5285
5164 -#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022
5165 -#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706
5286 +#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023
5287 +#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714
5288 #: builtin/stash.c:269
5289 msgid "unable to write new index file"
5290 msgstr "無法寫新的索引檔案"
5291
5170 -#: midx.c:78
5292 +#: midx.c:79
5293 msgid "multi-pack-index OID fanout is of the wrong size"
5294 msgstr "多包索引的物件 ID fanout 大小錯誤"
5295
5174 -#: midx.c:111
5296 +#: midx.c:112
5297 #, c-format
5298 msgid "multi-pack-index file %s is too small"
5299 msgstr "多包索引檔案 %s 太小"
5300
5179 -#: midx.c:127
5301 +#: midx.c:128
5302 #, c-format
5303 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
5304 msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合"
5305
5184 -#: midx.c:132
5306 +#: midx.c:133
5307 #, c-format
5308 msgid "multi-pack-index version %d not recognized"
5309 msgstr "multi-pack-index 版本 %d 不能被識別"
5310
5189 -#: midx.c:137

This file is too large to show in full.