048a41db4d · matheusbsbs/matheus-bagliano

@@ -17,12 +17,13 @@

17 # - Yichao Yu <yyc1992 AT gmail.com>

18 # - Zhuang Ya <zhuangya AT me.com>

19 #

20 +# Yi-Jyun Pan <pan93412@gmail.com>, 2021.

21 msgid ""

22 msgstr ""

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

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

24 -"POT-Creation-Date: 2021-08-14 07:56+0800\n"

25 -"PO-Revision-Date: 2021-08-14 13:55+0800\n"

25 +"POT-Creation-Date: 2021-11-04 08:34+0800\n"

26 +"PO-Revision-Date: 2021-11-05 12:41+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"

@@ -35,210 +36,210 @@ msgstr ""

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

37 "zhconvert.org\n"

38

38 -#: add-interactive.c:376

39 +#: add-interactive.c:380

40 #, c-format

41 msgid "Huh (%s)?"

42 msgstr "嗯（%s）？"

43

43 -#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493

44 -#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528

45 -#: builtin/rebase.c:1953

44 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512

45 +#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233

46 +#: builtin/rebase.c:1642

47 msgid "could not read index"

48 msgstr "無法讀取索引"

49

49 -#: add-interactive.c:584 git-add--interactive.perl:269

50 +#: add-interactive.c:588 git-add--interactive.perl:269

51 #: git-add--interactive.perl:294

52 msgid "binary"

53 msgstr "二進位"

54

54 -#: add-interactive.c:642 git-add--interactive.perl:278

55 +#: add-interactive.c:646 git-add--interactive.perl:278

56 #: git-add--interactive.perl:332

57 msgid "nothing"

58 msgstr "無"

59

59 -#: add-interactive.c:643 git-add--interactive.perl:314

60 +#: add-interactive.c:647 git-add--interactive.perl:314

61 #: git-add--interactive.perl:329

62 msgid "unchanged"

63 msgstr "未變更"

64

64 -#: add-interactive.c:680 git-add--interactive.perl:641

65 +#: add-interactive.c:684 git-add--interactive.perl:641

66 msgid "Update"

67 msgstr "更新"

68

68 -#: add-interactive.c:697 add-interactive.c:885

69 +#: add-interactive.c:701 add-interactive.c:889

70 #, c-format

71 msgid "could not stage '%s'"

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

73

73 -#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707

74 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718

75 msgid "could not write index"

76 msgstr "無法寫入索引"

77

77 -#: add-interactive.c:706 git-add--interactive.perl:626

78 +#: add-interactive.c:710 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

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

84 +#: add-interactive.c:728 git-add--interactive.perl:676

85 #, c-format, perl-format

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

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

88

88 -#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298

89 -#: builtin/reset.c:145

89 +#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298

90 +#: builtin/reset.c:151

91 #, c-format

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

93 msgstr "「%s」路徑執行 make_cache_entry 失敗"

94

94 -#: add-interactive.c:759 git-add--interactive.perl:653

95 +#: add-interactive.c:763 git-add--interactive.perl:653

96 msgid "Revert"

97 msgstr "還原"

98

98 -#: add-interactive.c:775

99 +#: add-interactive.c:779

100 msgid "Could not parse HEAD^{tree}"

101 msgstr "不能解析 HEAD^{樹}"

102

102 -#: add-interactive.c:813 git-add--interactive.perl:629

103 +#: add-interactive.c:817 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

108 -#: add-interactive.c:864 git-add--interactive.perl:693

109 +#: add-interactive.c:868 git-add--interactive.perl:693

110 #, c-format

111 msgid "No untracked files.\n"

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

113

113 -#: add-interactive.c:868 git-add--interactive.perl:687

114 +#: add-interactive.c:872 git-add--interactive.perl:687

115 msgid "Add untracked"

116 msgstr "新增未追蹤的"

117

117 -#: add-interactive.c:895 git-add--interactive.perl:623

118 +#: add-interactive.c:899 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

123 -#: add-interactive.c:925

124 +#: add-interactive.c:929

125 #, c-format

126 msgid "ignoring unmerged: %s"

127 msgstr "忽略未合併：%s"

128

128 -#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369

129 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369

130 #, c-format

131 msgid "Only binary files changed.\n"

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

133

133 -#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371

134 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371

135 #, c-format

136 msgid "No changes.\n"

137 msgstr "沒有修改。\n"

138

138 -#: add-interactive.c:943 git-add--interactive.perl:1379

139 +#: add-interactive.c:947 git-add--interactive.perl:1379

140 msgid "Patch update"

141 msgstr "修補檔更新"

142

142 -#: add-interactive.c:982 git-add--interactive.perl:1792

143 +#: add-interactive.c:986 git-add--interactive.perl:1792

144 msgid "Review diff"

145 msgstr "檢視 diff"

146

146 -#: add-interactive.c:1010

147 +#: add-interactive.c:1014

148 msgid "show paths with changes"

149 msgstr "顯示有變更的路徑"

150

150 -#: add-interactive.c:1012

151 +#: add-interactive.c:1016

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

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

154

154 -#: add-interactive.c:1014

155 +#: add-interactive.c:1018

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

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

158

158 -#: add-interactive.c:1016

159 +#: add-interactive.c:1020

160 msgid "pick hunks and update selectively"

161 msgstr "挑選區塊並選擇性更新"

162

162 -#: add-interactive.c:1018

163 +#: add-interactive.c:1022

164 msgid "view diff between HEAD and index"

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

166

166 -#: add-interactive.c:1020

167 +#: add-interactive.c:1024

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

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

170

170 -#: add-interactive.c:1028 add-interactive.c:1077

171 +#: add-interactive.c:1032 add-interactive.c:1081

172 msgid "Prompt help:"

173 msgstr "提示說明："

174

174 -#: add-interactive.c:1030

175 +#: add-interactive.c:1034

176 msgid "select a single item"

177 msgstr "選擇單一項目"

178

178 -#: add-interactive.c:1032

179 +#: add-interactive.c:1036

180 msgid "select a range of items"

181 msgstr "選擇項目範圍"

182

182 -#: add-interactive.c:1034

183 +#: add-interactive.c:1038

184 msgid "select multiple ranges"

185 msgstr "選擇多個範圍"

186

186 -#: add-interactive.c:1036 add-interactive.c:1081

187 +#: add-interactive.c:1040 add-interactive.c:1085

188 msgid "select item based on unique prefix"

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

190

190 -#: add-interactive.c:1038

191 +#: add-interactive.c:1042

192 msgid "unselect specified items"

193 msgstr "取消選擇指定項目"

194

194 -#: add-interactive.c:1040

195 +#: add-interactive.c:1044

196 msgid "choose all items"

197 msgstr "選擇所有項目"

198

198 -#: add-interactive.c:1042

199 +#: add-interactive.c:1046

200 msgid "(empty) finish selecting"

201 msgstr "（空）完成選取"

202

202 -#: add-interactive.c:1079

203 +#: add-interactive.c:1083

204 msgid "select a numbered item"

205 msgstr "選擇編號過的項目"

206

206 -#: add-interactive.c:1083

207 +#: add-interactive.c:1087

208 msgid "(empty) select nothing"

209 msgstr "（空）全不選取"

210

210 -#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896

211 +#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896

212 msgid "*** Commands ***"

213 msgstr "*** 指令 ***"

214

214 -#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893

215 +#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893

216 msgid "What now"

217 msgstr "請選擇"

218

218 -#: add-interactive.c:1144 git-add--interactive.perl:213

219 +#: add-interactive.c:1148 git-add--interactive.perl:213

220 msgid "staged"

221 msgstr "快取"

222

222 -#: add-interactive.c:1144 git-add--interactive.perl:213

223 +#: add-interactive.c:1148 git-add--interactive.perl:213

224 msgid "unstaged"

225 msgstr "未快取"

226

226 -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309

227 -#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128

228 -#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190

229 -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886

230 -#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343

231 -#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589

232 -#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893

227 +#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311

228 +#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128

229 +#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190

230 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857

231 +#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503

232 +#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573

233 +#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811

234 #: git-add--interactive.perl:213

235 msgid "path"

236 msgstr "路徑"

237

237 -#: add-interactive.c:1151

238 +#: add-interactive.c:1155

239 msgid "could not refresh index"

240 msgstr "無法重新整理索引"

241

241 -#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803

242 +#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803

243 #, c-format

244 msgid "Bye.\n"

245 msgstr "再見。\n"

@@ -645,7 +646,7 @@ msgstr "選取的區塊不會套用進索引！"

646

647 #: add-patch.c:1291 git-add--interactive.perl:1346

648 msgid "Apply them to the worktree anyway? "

648 -msgstr "無論如何都要套用到工作區嗎？"

649 +msgstr "無論如何都要套用到工作區嗎？ "

650

651 #: add-patch.c:1298 git-add--interactive.perl:1349

652 msgid "Nothing was applied.\n"

@@ -668,7 +669,7 @@ msgstr ""

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

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

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

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

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

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

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

675 "? - 顯示說明\n"

@@ -691,7 +692,7 @@ msgstr "要跳轉到哪個區塊（<Enter> 檢視更多）？ "

692

693 #: add-patch.c:1550 git-add--interactive.perl:1608

694 msgid "go to which hunk? "

694 -msgstr "跳轉到哪個區塊？"

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

696

697 #: add-patch.c:1561

698 #, c-format

@@ -710,12 +711,12 @@ msgstr "沒有其它可供尋找的區塊"

711

712 #: add-patch.c:1581 git-add--interactive.perl:1661

713 msgid "search for regex? "

713 -msgstr "使用正規表示式搜尋？"

714 +msgstr "使用常規表示式搜尋？ "

715

716 #: add-patch.c:1596

717 #, c-format

718 msgid "Malformed search regexp %s: %s"

718 -msgstr "錯誤的正規表示式 %s：%s"

719 +msgstr "錯誤的常規表示式 %s：%s"

720

721 #: add-patch.c:1613

722 msgid "No hunk matches the given pattern"

@@ -738,7 +739,7 @@ msgstr "對不起，不能編輯這個區塊"

739 msgid "'git apply' failed"

740 msgstr "'git apply' 失敗"

741

741 -#: advice.c:145

742 +#: advice.c:78

743 #, c-format

744 msgid ""

745 "\n"

@@ -747,37 +748,37 @@ msgstr ""

748 "\n"

749 "請使用「git config advice.%s false」來停用此訊息"

750

750 -#: advice.c:161

751 +#: advice.c:94

752 #, c-format

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

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

755

755 -#: advice.c:252

756 +#: advice.c:178

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

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

759

759 -#: advice.c:254

760 +#: advice.c:180

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

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

763

763 -#: advice.c:256

764 +#: advice.c:182

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

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

767

767 -#: advice.c:258

768 +#: advice.c:184

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

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

771

771 -#: advice.c:260

772 +#: advice.c:186

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

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

775

775 -#: advice.c:262

776 +#: advice.c:188

777 #, c-format

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

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

780

780 -#: advice.c:270

781 +#: advice.c:196

782 msgid ""

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

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

@@ -785,38 +786,48 @@ msgstr ""

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

787 "解決方案並提交。"

788

788 -#: advice.c:278

789 +#: advice.c:204

790 msgid "Exiting because of an unresolved conflict."

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

792

792 -#: advice.c:283 builtin/merge.c:1375

793 +#: advice.c:209 builtin/merge.c:1379

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

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

796

796 -#: advice.c:285

797 +#: advice.c:211

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

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

800

800 -#: advice.c:286

801 +#: advice.c:212

802 msgid "Exiting because of unfinished merge."

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

804

804 -#: advice.c:296

805 +#: advice.c:217

806 +msgid "Not possible to fast-forward, aborting."

807 +msgstr "無法快轉，終止。"

808 +

809 +#: advice.c:227

810 #, c-format

811 msgid ""

807 -"The following pathspecs didn't match any eligible path, but they do match "

808 -"index\n"

809 -"entries outside the current sparse checkout:\n"

812 +"The following paths and/or pathspecs matched paths that exist\n"

813 +"outside of your sparse-checkout definition, so will not be\n"

814 +"updated in the index:\n"

815 msgstr ""

811 -"下列路徑規格不符合任何適合路徑，\n"

812 -"但符合目前稀疏簽出外的索引項目：\n"

816 +"下列路徑和（或）路徑規格\n"

817 +"符合稀疏簽出定義外且存在的路徑，\n"

818 +"所以不會在索引中更新：\n"

819

814 -#: advice.c:303

820 +#: advice.c:234

821 msgid ""

816 -"Disable or modify the sparsity rules if you intend to update such entries."

817 -msgstr "若有意更新這些項目，請停用或修改稀疏規則。"

822 +"If you intend to update such entries, try one of the following:\n"

823 +"* Use the --sparse option.\n"

824 +"* Disable or modify the sparsity rules."

825 +msgstr ""

826 +"如果您執意要更新這些項目，請試試以下任一方式：\n"

827 +"* 使用 --sparse 選項。\n"

828 +"* 停用或修改稀疏規則。"

829

819 -#: advice.c:310

830 +#: advice.c:242

831 #, c-format

832 msgid ""

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

@@ -840,20 +851,20 @@ msgid ""

851 msgstr ""

852 "注意：正在切換到 '%s'。\n"

853 "\n"

843 -"您正處於分離開頭指標狀態。您可以檢視、做實驗性的修改及提交，並且您可以在切"

844 -"換\n"

845 -"回一個分支時，捨棄在此狀態下所做的提交而不對分支造成影響。\n"

854 +"您正處於分離開頭指標狀態。您可以檢視、進行實驗性修改並提交，\n"

855 +"而且您可以在切換回一個分支時，\n"

856 +"捨棄在此狀態下所做的提交而不對分支造成影響。\n"

857 "\n"

847 -"如果您想要透過建立分支來保留在此狀態下所做的提交，您可以透過在 switch 指令\n"

848 -"中新增參數 -c 來實現（現在或稍後）。例如：\n"

858 +"如果您想要透過建立分支來保留在此狀態下所做的提交，\n"

859 +"您可以現在或稍後在 switch 指令使用 -c 選項。例如：\n"

860 "\n"

850 -" git switch -c <新分支名>\n"

861 +" git switch -c <新分支名稱>\n"

862 "\n"

852 -"或者復原此動作：\n"

863 +"或者是復原此動作：\n"

864 "\n"

865 " git switch -\n"

866 "\n"

856 -"透過將設定變數 advice.detachedHead 設定為 false 來關閉此建議\n"

867 +"將組態變數 advice.detachedHead 設定為 false，即可關閉本建議\n"

868 "\n"

869

870 #: alias.c:50

@@ -893,7 +904,7 @@ msgstr "--cached 在版本庫之外"

904 #: apply.c:800

905 #, c-format

906 msgid "Cannot prepare timestamp regexp %s"

896 -msgstr "無法準備時間戳正規表示式 %s"

907 +msgstr "無法準備時間戳常規表示式 %s"

908

909 #: apply.c:809

910 #, c-format

@@ -988,48 +999,48 @@ msgstr "刪除的檔案 %s 仍有內容"

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

1000 msgstr "** 警告：檔案 %s 成為空檔案但並未刪除"

1001

991 -#: apply.c:1977

1002 +#: apply.c:1978

1003 #, c-format

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

1005 msgstr "二進位修補檔在第 %d 行損壞：%.*s"

1006

996 -#: apply.c:2014

1007 +#: apply.c:2015

1008 #, c-format

1009 msgid "unrecognized binary patch at line %d"

1010 msgstr "無法識別的二進位修補檔位於第 %d 行"

1011

1001 -#: apply.c:2176

1012 +#: apply.c:2177

1013 #, c-format

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

1015 msgstr "修補檔案的第 %d 行只有垃圾資料"

1016

1006 -#: apply.c:2262

1017 +#: apply.c:2263

1018 #, c-format

1019 msgid "unable to read symlink %s"

1020 msgstr "無法讀取符號連結 %s"

1021

1011 -#: apply.c:2266

1022 +#: apply.c:2267

1023 #, c-format

1024 msgid "unable to open or read %s"

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

1026

1016 -#: apply.c:2935

1027 +#: apply.c:2936

1028 #, c-format

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

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

1031

1021 -#: apply.c:3056

1032 +#: apply.c:3057

1033 #, c-format

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

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

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

1037

1027 -#: apply.c:3068

1038 +#: apply.c:3069

1039 #, c-format

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

1041 msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔區塊"

1042

1032 -#: apply.c:3074

1043 +#: apply.c:3075

1044 #, c-format

1045 msgid ""

1046 "while searching for:\n"

@@ -1038,434 +1049,435 @@ msgstr ""

1049 "當查詢：\n"

1050 "%.*s"

1051

1041 -#: apply.c:3096

1052 +#: apply.c:3097

1053 #, c-format

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

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

1056

1046 -#: apply.c:3104

1057 +#: apply.c:3105

1058 #, c-format

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

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

1061

1051 -#: apply.c:3151

1062 +#: apply.c:3152

1063 #, c-format

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

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

1066

1056 -#: apply.c:3162

1067 +#: apply.c:3163

1068 #, c-format

1069 msgid ""

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

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

1072

1062 -#: apply.c:3170

1073 +#: apply.c:3171

1074 #, c-format

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

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

1077

1067 -#: apply.c:3188

1078 +#: apply.c:3189

1079 #, c-format

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

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

1082

1072 -#: apply.c:3201

1083 +#: apply.c:3202

1084 #, c-format

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

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

1087

1077 -#: apply.c:3208

1088 +#: apply.c:3209

1089 #, c-format

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

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

1092

1082 -#: apply.c:3229

1093 +#: apply.c:3230

1094 #, c-format

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

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

1097

1087 -#: apply.c:3352

1098 +#: apply.c:3353

1099 #, c-format

1100 msgid "cannot checkout %s"

1101 msgstr "不能簽出 %s"

1102

1092 -#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214

1103 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214

1104 #: setup.c:308

1105 #, c-format

1106 msgid "failed to read %s"

1107 msgstr "無法讀取 %s"

1108

1098 -#: apply.c:3412

1109 +#: apply.c:3413

1110 #, c-format

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

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

1113

1103 -#: apply.c:3441 apply.c:3687

1114 +#: apply.c:3442 apply.c:3709

1115 #, c-format

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

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

1118

1108 -#: apply.c:3527 apply.c:3702

1119 +#: apply.c:3549 apply.c:3724

1120 #, c-format

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

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

1123

1113 -#: apply.c:3536 apply.c:3710 apply.c:3954

1124 +#: apply.c:3558 apply.c:3732 apply.c:3976

1125 #, c-format

1126 msgid "%s: does not match index"

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

1128

1118 -#: apply.c:3571

1129 +#: apply.c:3593

1130 msgid "repository lacks the necessary blob to perform 3-way merge."

1131 msgstr "版本庫缺少用來進行三方合併所需要的資料物件。"

1132

1122 -#: apply.c:3574

1133 +#: apply.c:3596

1134 #, c-format

1135 msgid "Performing three-way merge...\n"

1136 msgstr "正在進行三方合併⋯⋯\n"

1137

1127 -#: apply.c:3590 apply.c:3594

1138 +#: apply.c:3612 apply.c:3616

1139 #, c-format

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

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

1142

1132 -#: apply.c:3606

1143 +#: apply.c:3628

1144 #, c-format

1145 msgid "Failed to perform three-way merge...\n"

1146 msgstr "無法進行三方合併⋯⋯\n"

1147

1137 -#: apply.c:3620

1148 +#: apply.c:3642

1149 #, c-format

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

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

1152

1142 -#: apply.c:3625

1153 +#: apply.c:3647

1154 #, c-format

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

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

1157

1147 -#: apply.c:3642

1158 +#: apply.c:3664

1159 #, c-format

1160 msgid "Falling back to direct application...\n"

1161 msgstr "回復至直接套用模式⋯⋯\n"

1162

1152 -#: apply.c:3654

1163 +#: apply.c:3676

1164 msgid "removal patch leaves file contents"

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

1166

1156 -#: apply.c:3727

1167 +#: apply.c:3749

1168 #, c-format

1169 msgid "%s: wrong type"

1170 msgstr "%s：錯誤類型"

1171

1161 -#: apply.c:3729

1172 +#: apply.c:3751

1173 #, c-format

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

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

1176

1166 -#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892

1167 -#: read-cache.c:1353

1177 +#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905

1178 +#: read-cache.c:1368

1179 #, c-format

1180 msgid "invalid path '%s'"

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

1182

1172 -#: apply.c:3952

1183 +#: apply.c:3974

1184 #, c-format

1185 msgid "%s: already exists in index"

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

1187

1177 -#: apply.c:3956

1188 +#: apply.c:3978

1189 #, c-format

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

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

1192

1182 -#: apply.c:3976

1193 +#: apply.c:3998

1194 #, c-format

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

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

1197

1187 -#: apply.c:3981

1198 +#: apply.c:4003

1199 #, c-format

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

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

1202

1192 -#: apply.c:4001

1203 +#: apply.c:4023

1204 #, c-format

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

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

1207

1197 -#: apply.c:4005

1208 +#: apply.c:4027

1209 #, c-format

1210 msgid "%s: patch does not apply"

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

1212

1202 -#: apply.c:4020

1213 +#: apply.c:4042

1214 #, c-format

1215 msgid "Checking patch %s..."

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

1217

1207 -#: apply.c:4112

1218 +#: apply.c:4134

1219 #, c-format

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

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

1222

1212 -#: apply.c:4119

1223 +#: apply.c:4141

1224 #, c-format

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

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

1227

1217 -#: apply.c:4122

1228 +#: apply.c:4144

1229 #, c-format

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

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

1232

1222 -#: apply.c:4131

1233 +#: apply.c:4153

1234 #, c-format

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

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

1237

1227 -#: apply.c:4141

1238 +#: apply.c:4163

1239 #, c-format

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

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

1242

1232 -#: apply.c:4279

1243 +#: apply.c:4301

1244 #, c-format

1245 msgid "unable to remove %s from index"

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

1247

1237 -#: apply.c:4313

1248 +#: apply.c:4335

1249 #, c-format

1250 msgid "corrupt patch for submodule %s"

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

1252

1242 -#: apply.c:4319

1253 +#: apply.c:4341

1254 #, c-format

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

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

1257

1247 -#: apply.c:4327

1258 +#: apply.c:4349

1259 #, c-format

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

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

1262

1252 -#: apply.c:4333 apply.c:4478

1263 +#: apply.c:4355 apply.c:4500

1264 #, c-format

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

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

1267

1257 -#: apply.c:4376 builtin/bisect--helper.c:525

1268 +#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241

1269 +#: builtin/gc.c:2276

1270 #, c-format

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

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

1273

1262 -#: apply.c:4380

1274 +#: apply.c:4402

1275 #, c-format

1276 msgid "closing file '%s'"

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

1278

1267 -#: apply.c:4450

1279 +#: apply.c:4472

1280 #, c-format

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

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

1283

1272 -#: apply.c:4548

1284 +#: apply.c:4570

1285 #, c-format

1286 msgid "Applied patch %s cleanly."

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

1288

1277 -#: apply.c:4556

1289 +#: apply.c:4578

1290 msgid "internal error"

1291 msgstr "內部錯誤"

1292

1281 -#: apply.c:4559

1293 +#: apply.c:4581

1294 #, c-format

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

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

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

1298

1287 -#: apply.c:4570

1299 +#: apply.c:4592

1300 #, c-format

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

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

1303

1292 -#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394

1304 +#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408

1305 #, c-format

1306 msgid "cannot open %s"

1307 msgstr "不能開啟 %s"

1308

1297 -#: apply.c:4592

1309 +#: apply.c:4614

1310 #, c-format

1311 msgid "Hunk #%d applied cleanly."

1312 msgstr "成功套用第 #%d 個區塊。"

1313

1302 -#: apply.c:4596

1314 +#: apply.c:4618

1315 #, c-format

1316 msgid "Rejected hunk #%d."

1317 msgstr "拒絕第 #%d 個區塊。"

1318

1307 -#: apply.c:4725

1319 +#: apply.c:4747

1320 #, c-format

1321 msgid "Skipped patch '%s'."

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

1323

1312 -#: apply.c:4733

1324 +#: apply.c:4755

1325 msgid "unrecognized input"

1326 msgstr "無法識別的輸入"

1327

1316 -#: apply.c:4753

1328 +#: apply.c:4775

1329 msgid "unable to read index file"

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

1331

1320 -#: apply.c:4910

1332 +#: apply.c:4932

1333 #, c-format

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

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

1336

1325 -#: apply.c:4937

1337 +#: apply.c:4959

1338 #, c-format

1339 msgid "squelched %d whitespace error"

1340 msgid_plural "squelched %d whitespace errors"

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

1342

1331 -#: apply.c:4943 apply.c:4958

1343 +#: apply.c:4965 apply.c:4980

1344 #, c-format

1345 msgid "%d line adds whitespace errors."

1346 msgid_plural "%d lines add whitespace errors."

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

1348

1337 -#: apply.c:4951

1349 +#: apply.c:4973

1350 #, c-format

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

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

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

1354

1343 -#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423

1355 +#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429

1356 msgid "Unable to write new index file"

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

1358

1347 -#: apply.c:4995

1359 +#: apply.c:5017

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

1361 msgstr "不要套用符合提供路徑的變更"

1362

1351 -#: apply.c:4998

1363 +#: apply.c:5020

1364 msgid "apply changes matching the given path"

1365 msgstr "套用符合提供路徑的變更"

1366

1355 -#: apply.c:5000 builtin/am.c:2318

1367 +#: apply.c:5022 builtin/am.c:2320

1368 msgid "num"

1369 msgstr "數字"

1370

1359 -#: apply.c:5001

1371 +#: apply.c:5023

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

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

1374

1363 -#: apply.c:5004

1375 +#: apply.c:5026

1376 msgid "ignore additions made by the patch"

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

1378

1367 -#: apply.c:5006

1379 +#: apply.c:5028

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

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

1382

1371 -#: apply.c:5010

1383 +#: apply.c:5032

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

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

1386

1375 -#: apply.c:5012

1387 +#: apply.c:5034

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

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

1390

1379 -#: apply.c:5014

1391 +#: apply.c:5036

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

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

1394

1383 -#: apply.c:5016

1395 +#: apply.c:5038

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

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

1398

1387 -#: apply.c:5018

1399 +#: apply.c:5040

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

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

1402

1391 -#: apply.c:5020

1403 +#: apply.c:5042

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

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

1406

1395 -#: apply.c:5022

1407 +#: apply.c:5044

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

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

1410

1399 -#: apply.c:5025

1411 +#: apply.c:5047

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

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

1414

1403 -#: apply.c:5027

1415 +#: apply.c:5049

1416 msgid "attempt three-way merge, fall back on normal patch if that fails"

1417 msgstr "嘗試三方合併。如果失敗，則回到正常修補檔 (patch) 模式"

1418

1407 -#: apply.c:5029

1419 +#: apply.c:5051

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

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

1422

1411 -#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617

1423 +#: apply.c:5054 builtin/checkout-index.c:196

1424 msgid "paths are separated with NUL character"

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

1426

1415 -#: apply.c:5034

1427 +#: apply.c:5056

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

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

1430

1419 -#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297

1431 +#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299

1432 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100

1421 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991

1422 -#: builtin/rebase.c:1347

1433 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960

1434 +#: builtin/rebase.c:1051

1435 msgid "action"

1436 msgstr "動作"

1437

1426 -#: apply.c:5036

1438 +#: apply.c:5058

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

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

1441

1430 -#: apply.c:5039 apply.c:5042

1442 +#: apply.c:5061 apply.c:5064

1443 msgid "ignore changes in whitespace when finding context"

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

1445

1434 -#: apply.c:5045

1446 +#: apply.c:5067

1447 msgid "apply the patch in reverse"

1448 msgstr "反向套用修補檔"

1449

1438 -#: apply.c:5047

1450 +#: apply.c:5069

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

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

1453

1442 -#: apply.c:5049

1454 +#: apply.c:5071

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

1456 msgstr "將拒絕的修補檔區塊儲存在對應的 *.rej 檔案中"

1457

1446 -#: apply.c:5051

1458 +#: apply.c:5073

1459 msgid "allow overlapping hunks"

1460 msgstr "允許重疊的修補檔區塊"

1461

1450 -#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22

1451 -#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756

1452 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128

1462 +#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22

1463 +#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788

1464 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120

1465 msgid "be verbose"

1466 msgstr "詳細輸出"

1467

1456 -#: apply.c:5054

1468 +#: apply.c:5076

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

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

1471

1460 -#: apply.c:5057

1472 +#: apply.c:5079

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

1474 msgstr "不信任修補檔區塊的標頭訊息中的行號"

1475

1464 -#: apply.c:5059 builtin/am.c:2306

1476 +#: apply.c:5081 builtin/am.c:2308

1477 msgid "root"

1478 msgstr "根目錄"

1479

1468 -#: apply.c:5060

1480 +#: apply.c:5082

1481 msgid "prepend <root> to all filenames"

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

1483

@@ -1536,152 +1548,151 @@ msgstr "git archive --remote <版本庫> [--exec <命令>] --list"

1548 msgid "cannot read %s"

1549 msgstr "不能讀取 %s"

1550

1539 -#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095

1540 -#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833

1541 -#: builtin/merge.c:1144

1551 +#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114

1552 +#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834

1553 +#: builtin/merge.c:1145

1554 #, c-format

1555 msgid "could not read '%s'"

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

1557

1546 -#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328

1558 +#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334

1559 #, c-format

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

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

1562

1551 -#: archive.c:451

1563 +#: archive.c:450

1564 #, c-format

1565 msgid "no such ref: %.*s"

1566 msgstr "無此引用：%.*s"

1567

1556 -#: archive.c:457

1568 +#: archive.c:456

1569 #, c-format

1570 msgid "not a valid object name: %s"

1571 msgstr "不是一個有效的物件名：%s"

1572

1561 -#: archive.c:470

1573 +#: archive.c:469

1574 #, c-format

1575 msgid "not a tree object: %s"

1576 msgstr "不是一個樹狀物件：%s"

1577

1566 -#: archive.c:482

1578 +#: archive.c:481

1579 msgid "current working directory is untracked"

1580 msgstr "目前工作目錄未被追蹤"

1581

1570 -#: archive.c:523

1582 +#: archive.c:522

1583 #, c-format

1584 msgid "File not found: %s"

1585 msgstr "找不到檔案：%s"

1586

1575 -#: archive.c:525

1587 +#: archive.c:524

1588 #, c-format

1589 msgid "Not a regular file: %s"

1590 msgstr "不是一般檔案：%s"

1591

1580 -#: archive.c:552

1592 +#: archive.c:551

1593 msgid "fmt"

1594 msgstr "格式"

1595

1584 -#: archive.c:552

1596 +#: archive.c:551

1597 msgid "archive format"

1598 msgstr "歸檔格式"

1599

1588 -#: archive.c:553 builtin/log.c:1775

1600 +#: archive.c:552 builtin/log.c:1775

1601 msgid "prefix"

1602 msgstr "前綴"

1603

1592 -#: archive.c:554

1604 +#: archive.c:553

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

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

1607

1596 -#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888

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

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

1599 -#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105

1600 -#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412

1601 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191

1608 +#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884

1609 +#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135

1610 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1611 +#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103

1612 +#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410

1613 +#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190

1614 msgid "file"

1615 msgstr "檔案"

1616

1605 -#: archive.c:556

1617 +#: archive.c:555

1618 msgid "add untracked file to archive"

1619 msgstr "將未追蹤檔案加入歸檔"

1620

1609 -#: archive.c:559 builtin/archive.c:90

1621 +#: archive.c:558 builtin/archive.c:88

1622 msgid "write the archive to this file"

1623 msgstr "歸檔寫入此檔案"

1624

1613 -#: archive.c:561

1625 +#: archive.c:560

1626 msgid "read .gitattributes in working directory"

1627 msgstr "讀取工作區中的 .gitattributes"

1628

1617 -#: archive.c:562

1629 +#: archive.c:561

1630 msgid "report archived files on stderr"

1631 msgstr "在標準錯誤上報告歸檔檔案"

1632

1621 -#: archive.c:564

1633 +#: archive.c:563

1634 msgid "set compression level"

1635 msgstr "設定壓縮級別"

1636

1625 -#: archive.c:567

1637 +#: archive.c:566

1638 msgid "list supported archive formats"

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

1640

1629 -#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121

1630 -#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352

1631 -#: builtin/submodule--helper.c:2902

1641 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121

1642 +#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512

1643 msgid "repo"

1644 msgstr "版本庫"

1645

1635 -#: archive.c:570 builtin/archive.c:92

1646 +#: archive.c:569 builtin/archive.c:90

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

1648 msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案"

1649

1639 -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717

1640 -#: builtin/notes.c:498

1650 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714

1651 +#: builtin/notes.c:496

1652 msgid "command"

1653 msgstr "指令"

1654

1644 -#: archive.c:572 builtin/archive.c:94

1655 +#: archive.c:571 builtin/archive.c:92

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

1657 msgstr "遠端 git-upload-archive 指令的路徑"

1658

1648 -#: archive.c:579

1659 +#: archive.c:578

1660 msgid "Unexpected option --remote"

1661 msgstr "未知參數 --remote"

1662

1652 -#: archive.c:581

1663 +#: archive.c:580

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

1665 msgstr "選項 --exec 只能和 --remote 同時使用"

1666

1656 -#: archive.c:583

1667 +#: archive.c:582

1668 msgid "Unexpected option --output"

1669 msgstr "未知參數 --output"

1670

1660 -#: archive.c:585

1671 +#: archive.c:584

1672 msgid "Options --add-file and --remote cannot be used together"

1673 msgstr "--add-file 和 --remote 選項不能同時使用"

1674

1664 -#: archive.c:607

1675 +#: archive.c:606

1676 #, c-format

1677 msgid "Unknown archive format '%s'"

1678 msgstr "未知歸檔格式 '%s'"

1679

1669 -#: archive.c:616

1680 +#: archive.c:615

1681 #, c-format

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

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

1684

1674 -#: attr.c:202

1685 +#: attr.c:203

1686 #, c-format

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

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

1689

1679 -#: attr.c:363

1690 +#: attr.c:364

1691 #, c-format

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

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

1694

1684 -#: attr.c:403

1695 +#: attr.c:404

1696 msgid ""

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

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

@@ -1689,22 +1700,22 @@ msgstr ""

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

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

1702

1692 -#: bisect.c:489

1703 +#: bisect.c:488

1704 #, c-format

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

1706 msgstr "檔案 '%s' 包含錯誤的引用格式：%s"

1707

1697 -#: bisect.c:699

1708 +#: bisect.c:698

1709 #, c-format

1710 msgid "We cannot bisect more!\n"

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

1712

1702 -#: bisect.c:766

1713 +#: bisect.c:764

1714 #, c-format

1715 msgid "Not a valid commit name %s"

1716 msgstr "不是一個有效的提交名 %s"

1717

1707 -#: bisect.c:791

1718 +#: bisect.c:789

1719 #, c-format

1720 msgid ""

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

@@ -1713,7 +1724,7 @@ msgstr ""

1724 "合併基礎 %s 是壞的。\n"

1725 "這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n"

1726

1716 -#: bisect.c:796

1727 +#: bisect.c:794

1728 #, c-format

1729 msgid ""

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

@@ -1722,7 +1733,7 @@ msgstr ""

1733 "合併基礎 %s 是新的。\n"

1734 "介於 %s 和 [%s] 之間的屬性已經被修改。\n"

1735

1725 -#: bisect.c:801

1736 +#: bisect.c:799

1737 #, c-format

1738 msgid ""

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

@@ -1731,7 +1742,7 @@ msgstr ""

1742 "合併基礎 %s 是 %s。\n"

1743 "這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n"

1744

1734 -#: bisect.c:809

1745 +#: bisect.c:807

1746 #, c-format

1747 msgid ""

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

@@ -1742,7 +1753,7 @@ msgstr ""

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

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

1755

1745 -#: bisect.c:822

1756 +#: bisect.c:820

1757 #, c-format

1758 msgid ""

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

@@ -1753,36 +1764,36 @@ msgstr ""

1764 "所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n"

1765 "我們仍舊繼續。"

1766

1756 -#: bisect.c:861

1767 +#: bisect.c:859

1768 #, c-format

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

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

1771

1761 -#: bisect.c:911

1772 +#: bisect.c:909

1773 #, c-format

1774 msgid "a %s revision is needed"

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

1776

1766 -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298

1777 +#: bisect.c:939

1778 #, c-format

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

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

1781

1771 -#: bisect.c:987 builtin/merge.c:153

1782 +#: bisect.c:985 builtin/merge.c:154

1783 #, c-format

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

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

1786

1776 -#: bisect.c:1027

1787 +#: bisect.c:1025

1788 msgid "reading bisect refs failed"

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

1790

1780 -#: bisect.c:1057

1791 +#: bisect.c:1055

1792 #, c-format

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

1794 msgstr "%s 同時為 %s 和 %s\n"

1795

1785 -#: bisect.c:1066

1796 +#: bisect.c:1064

1797 #, c-format

1798 msgid ""

1799 "No testable commit found.\n"

@@ -1791,7 +1802,7 @@ msgstr ""

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

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

1804

1794 -#: bisect.c:1095

1805 +#: bisect.c:1093

1806 #, c-format

1807 msgid "(roughly %d step)"

1808 msgid_plural "(roughly %d steps)"

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

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

1812 #. steps)" translation.

1813 #.

1803 -#: bisect.c:1101

1814 +#: bisect.c:1099

1815 #, c-format

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

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

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

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

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

1831

1821 -#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333

1822 -#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414

1823 -#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346

1824 -#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806

1825 -#: builtin/pack-objects.c:3821 builtin/shortlog.c:255

1832 +#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041

1833 +#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114

1834 +#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056

1835 +#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373

1836 +#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790

1837 +#: builtin/shortlog.c:255

1838 msgid "revision walk setup failed"

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

1840

@@ -1850,8 +1862,9 @@ msgid ""

1862 "\"git branch --set-upstream-to=%s%s%s\"."

1863 msgstr ""

1864 "\n"

1853 -"在修復錯誤後，您可以嘗試修改遠端追蹤分支，透過執行指令\n"

1854 -"\"git branch --set-upstream-to=%s%s%s\" 。"

1865 +"修正錯誤後，您可以執行\n"

1866 +"\"git branch --set-upstream-to=%s%s%s\"\n"

1867 +"命令修正遠端追蹤資訊。"

1868

1869 #: branch.c:67

1870 #, c-format

@@ -1943,11 +1956,12 @@ msgid ""

1956 "\"git push -u\" to set the upstream config as you push."

1957 msgstr ""

1958 "\n"

1946 -"如果您正計劃基於遠端一個現存的上游分支開始你的工作，\n"

1947 -"您可能需要執行 \"git fetch\" 來取得分支。\n"

1959 +"如果您打算以遠端現存的上游分支為基礎進行修改，\n"

1960 +"您或許需要執行「git fetch」取得分支。\n"

1961 "\n"

1949 -"如果您正計劃推送一個能與對應遠端分支建立追蹤的新的本機分支，\n"

1950 -"您可能需要使用 \"git push -u\" 推送分支並設定和上游的關聯。"

1962 +"如果您打算將新建立的本機分支推送至對應的遠端分支，\n"

1963 +"且建立兩個分支間的追蹤關係，\n"

1964 +"您可能需要使用「git push -u」推送分支並設定和上游的關聯。"

1965

1966 #: branch.c:281

1967 #, c-format

@@ -1994,8 +2008,8 @@ msgstr "'%s' 不像是一個 v2 或 v3 版本的包檔案"

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

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

2010

1997 -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

1998 -#: builtin/commit.c:861

2011 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404

2012 +#: builtin/commit.c:862

2013 #, c-format

2014 msgid "could not open '%s'"

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

@@ -2051,7 +2065,7 @@ msgstr "不支援的包版本 %d"

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

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

2067

2054 -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396

2068 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399

2069 #, c-format

2070 msgid "unrecognized argument: %s"

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

@@ -2093,7 +2107,7 @@ msgstr "最終區塊有非零 ID %<PRIx32>"

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

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

2109

2096 -#: commit-graph.c:204 midx.c:47

2110 +#: commit-graph.c:204 midx.c:51

2111 msgid "invalid hash version"

2112 msgstr "無效的雜湊版本"

2113

@@ -2138,215 +2152,215 @@ msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"

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

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

2154

2141 -#: commit-graph.c:745 commit-graph.c:782

2155 +#: commit-graph.c:746 commit-graph.c:783

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

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

2158

2145 -#: commit-graph.c:766

2159 +#: commit-graph.c:767

2160 #, c-format

2161 msgid "could not find commit %s"

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

2163

2150 -#: commit-graph.c:799

2164 +#: commit-graph.c:800

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

2166 msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料"

2167

2154 -#: commit-graph.c:1075 builtin/am.c:1341

2168 +#: commit-graph.c:1105 builtin/am.c:1342

2169 #, c-format

2170 msgid "unable to parse commit %s"

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

2172

2159 -#: commit-graph.c:1337 builtin/pack-objects.c:3057

2173 +#: commit-graph.c:1367 builtin/pack-objects.c:3070

2174 #, c-format

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

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

2177

2164 -#: commit-graph.c:1368

2178 +#: commit-graph.c:1398

2179 msgid "Loading known commits in commit graph"

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

2181

2168 -#: commit-graph.c:1385

2182 +#: commit-graph.c:1415

2183 msgid "Expanding reachable commits in commit graph"

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

2184 +msgstr "正在展開提交圖中的可以取得的提交"

2185

2172 -#: commit-graph.c:1405

2186 +#: commit-graph.c:1435

2187 msgid "Clearing commit marks in commit graph"

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

2189

2176 -#: commit-graph.c:1424

2190 +#: commit-graph.c:1454

2191 msgid "Computing commit graph topological levels"

2192 msgstr "正在計算提交圖拓樸級別"

2193

2180 -#: commit-graph.c:1477

2194 +#: commit-graph.c:1507

2195 msgid "Computing commit graph generation numbers"

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

2197

2184 -#: commit-graph.c:1558

2198 +#: commit-graph.c:1588

2199 msgid "Computing commit changed paths Bloom filters"

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

2201

2188 -#: commit-graph.c:1635

2202 +#: commit-graph.c:1665

2203 msgid "Collecting referenced commits"

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

2205

2192 -#: commit-graph.c:1660

2206 +#: commit-graph.c:1690

2207 #, c-format

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

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

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

2211

2198 -#: commit-graph.c:1673

2212 +#: commit-graph.c:1703

2213 #, c-format

2214 msgid "error adding pack %s"

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

2216

2203 -#: commit-graph.c:1677

2217 +#: commit-graph.c:1707

2218 #, c-format

2219 msgid "error opening index for %s"

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

2221

2208 -#: commit-graph.c:1714

2222 +#: commit-graph.c:1744

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

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

2225

2212 -#: commit-graph.c:1732

2226 +#: commit-graph.c:1762

2227 msgid "Finding extra edges in commit graph"

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

2229

2216 -#: commit-graph.c:1781

2230 +#: commit-graph.c:1811

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

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

2233

2220 -#: commit-graph.c:1812 midx.c:911

2234 +#: commit-graph.c:1842 midx.c:1146

2235 #, c-format

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

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

2238

2225 -#: commit-graph.c:1825

2239 +#: commit-graph.c:1855

2240 msgid "unable to create temporary graph layer"

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

2242

2229 -#: commit-graph.c:1830

2243 +#: commit-graph.c:1860

2244 #, c-format

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

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

2247

2234 -#: commit-graph.c:1887

2248 +#: commit-graph.c:1917

2249 #, c-format

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

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

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

2253

2240 -#: commit-graph.c:1923

2254 +#: commit-graph.c:1953

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

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

2257

2244 -#: commit-graph.c:1939

2258 +#: commit-graph.c:1969

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

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

2261

2248 -#: commit-graph.c:1959

2262 +#: commit-graph.c:1989

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

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

2265

2252 -#: commit-graph.c:2092

2266 +#: commit-graph.c:2122

2267 msgid "Scanning merged commits"

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

2269

2256 -#: commit-graph.c:2136

2270 +#: commit-graph.c:2166

2271 msgid "Merging commit-graph"

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

2273

2260 -#: commit-graph.c:2244

2274 +#: commit-graph.c:2274

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

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

2277

2264 -#: commit-graph.c:2351

2278 +#: commit-graph.c:2381

2279 msgid "too many commits to write graph"

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

2281

2268 -#: commit-graph.c:2449

2282 +#: commit-graph.c:2479

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

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

2285

2272 -#: commit-graph.c:2459

2286 +#: commit-graph.c:2489

2287 #, c-format

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

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

2290

2277 -#: commit-graph.c:2469 commit-graph.c:2484

2291 +#: commit-graph.c:2499 commit-graph.c:2514

2292 #, c-format

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

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

2295

2282 -#: commit-graph.c:2476

2296 +#: commit-graph.c:2506

2297 #, c-format

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

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

2300

2287 -#: commit-graph.c:2494

2301 +#: commit-graph.c:2524

2302 msgid "Verifying commits in commit graph"

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

2304

2291 -#: commit-graph.c:2509

2305 +#: commit-graph.c:2539

2306 #, c-format

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

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

2309

2296 -#: commit-graph.c:2516

2310 +#: commit-graph.c:2546

2311 #, c-format

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

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

2314

2301 -#: commit-graph.c:2526

2315 +#: commit-graph.c:2556

2316 #, c-format

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

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

2319

2306 -#: commit-graph.c:2535

2320 +#: commit-graph.c:2565

2321 #, c-format

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

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

2324

2311 -#: commit-graph.c:2549

2325 +#: commit-graph.c:2579

2326 #, c-format

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

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

2329

2316 -#: commit-graph.c:2554

2330 +#: commit-graph.c:2584

2331 #, c-format

2332 msgid ""

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

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

2335

2322 -#: commit-graph.c:2558

2336 +#: commit-graph.c:2588

2337 #, c-format

2338 msgid ""

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

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

2341

2328 -#: commit-graph.c:2575

2342 +#: commit-graph.c:2605

2343 #, c-format

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

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

2346

2333 -#: commit-graph.c:2581

2347 +#: commit-graph.c:2611

2348 #, c-format

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

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

2351

2338 -#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417

2339 -#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457

2352 +#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418

2353 +#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457

2354 #, c-format

2355 msgid "could not parse %s"

2356 msgstr "不能解析 %s"

2357

2344 -#: commit.c:54

2358 +#: commit.c:55

2359 #, c-format

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

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

2362

2349 -#: commit.c:194

2363 +#: commit.c:196

2364 msgid ""

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

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

@@ -2366,27 +2380,27 @@ msgstr ""

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

2381 "可關閉本消息"

2382

2369 -#: commit.c:1237

2383 +#: commit.c:1239

2384 #, c-format

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

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

2387

2374 -#: commit.c:1241

2388 +#: commit.c:1243

2389 #, c-format

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

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

2392

2379 -#: commit.c:1244

2393 +#: commit.c:1246

2394 #, c-format

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

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

2397

2384 -#: commit.c:1247

2398 +#: commit.c:1249

2399 #, c-format

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

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

2402

2389 -#: commit.c:1501

2403 +#: commit.c:1503

2404 msgid ""

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

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

@@ -2400,7 +2414,7 @@ msgstr ""

2414 msgid "memory exhausted"

2415 msgstr "記憶體耗盡"

2416

2403 -#: config.c:126

2417 +#: config.c:125

2418 #, c-format

2419 msgid ""

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

@@ -2415,35 +2429,35 @@ msgstr ""

2429 "\t%2$s\n"

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

2431

2418 -#: config.c:142

2432 +#: config.c:141

2433 #, c-format

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

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

2435 +msgstr "無法展開包含路徑 '%s'"

2436

2423 -#: config.c:153

2437 +#: config.c:152

2438 msgid "relative config includes must come from files"

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

2440

2427 -#: config.c:199

2441 +#: config.c:201

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

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

2444

2431 -#: config.c:396

2445 +#: config.c:398

2446 #, c-format

2447 msgid "invalid config format: %s"

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

2449

2436 -#: config.c:400

2450 +#: config.c:402

2451 #, c-format

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

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

2454

2441 -#: config.c:405

2455 +#: config.c:407

2456 #, c-format

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

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

2459

2446 -#: config.c:442

2460 +#: config.c:443

2461 #, c-format

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

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

@@ -2453,295 +2467,295 @@ msgstr "鍵名沒有包含一個小節名稱：%s"

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

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

2469

2456 -#: config.c:472 sequencer.c:2785

2470 +#: config.c:470 sequencer.c:2804

2471 #, c-format

2472 msgid "invalid key: %s"

2473 msgstr "無效鍵名：%s"

2474

2461 -#: config.c:478

2475 +#: config.c:475

2476 #, c-format

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

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

2479

2466 -#: config.c:511

2480 +#: config.c:495

2481 msgid "empty config key"

2482 msgstr "空白設定鍵"

2483

2470 -#: config.c:529 config.c:541

2484 +#: config.c:513 config.c:525

2485 #, c-format

2486 msgid "bogus config parameter: %s"

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

2488

2475 -#: config.c:555 config.c:572 config.c:579 config.c:588

2489 +#: config.c:539 config.c:556 config.c:563 config.c:572

2490 #, c-format

2491 msgid "bogus format in %s"

2492 msgstr "%s 中格式錯誤"

2493

2480 -#: config.c:622

2494 +#: config.c:606

2495 #, c-format

2496 msgid "bogus count in %s"

2497 msgstr "%s 中有偽計數"

2498

2485 -#: config.c:626

2499 +#: config.c:610

2500 #, c-format

2501 msgid "too many entries in %s"

2502 msgstr "%s 中的項目過多"

2503

2490 -#: config.c:636

2504 +#: config.c:620

2505 #, c-format

2506 msgid "missing config key %s"

2507 msgstr "缺少 %s 設定鍵"

2508

2495 -#: config.c:644

2509 +#: config.c:628

2510 #, c-format

2511 msgid "missing config value %s"

2512 msgstr "缺少 %s 設定值"

2513

2500 -#: config.c:995

2514 +#: config.c:979

2515 #, c-format

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

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

2518

2505 -#: config.c:999

2519 +#: config.c:983

2520 #, c-format

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

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

2523

2510 -#: config.c:1003

2524 +#: config.c:987

2525 #, c-format

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

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

2528

2515 -#: config.c:1007

2529 +#: config.c:991

2530 #, c-format

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

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

2533

2520 -#: config.c:1011

2534 +#: config.c:995

2535 #, c-format

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

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

2538

2525 -#: config.c:1015

2539 +#: config.c:999

2540 #, c-format

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

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

2543

2530 -#: config.c:1152

2544 +#: config.c:1136

2545 msgid "out of range"

2546 msgstr "超出範圍"

2547

2534 -#: config.c:1152

2548 +#: config.c:1136

2549 msgid "invalid unit"

2550 msgstr "無效的單位"

2551

2538 -#: config.c:1153

2552 +#: config.c:1137

2553 #, c-format

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

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

2556

2543 -#: config.c:1163

2557 +#: config.c:1147

2558 #, c-format

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

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

2561

2548 -#: config.c:1166

2562 +#: config.c:1150

2563 #, c-format

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

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

2566

2553 -#: config.c:1169

2567 +#: config.c:1153

2568 #, c-format

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

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

2571

2558 -#: config.c:1172

2572 +#: config.c:1156

2573 #, c-format

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

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

2576

2563 -#: config.c:1175

2577 +#: config.c:1159

2578 #, c-format

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

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

2581

2568 -#: config.c:1178

2582 +#: config.c:1162

2583 #, c-format

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

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

2586

2573 -#: config.c:1257

2587 +#: config.c:1241

2588 #, c-format

2589 msgid "bad boolean config value '%s' for '%s'"

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

2591

2578 -#: config.c:1275

2592 +#: config.c:1259

2593 #, c-format

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

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

2595 +msgstr "無法展開使用者目錄於：’%s’"

2596

2583 -#: config.c:1284

2597 +#: config.c:1268

2598 #, c-format

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

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

2601

2588 -#: config.c:1377

2602 +#: config.c:1361

2603 #, c-format

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

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

2606

2593 -#: config.c:1391 config.c:1402

2607 +#: config.c:1375 config.c:1386

2608 #, c-format

2609 msgid "bad zlib compression level %d"

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

2611

2598 -#: config.c:1494

2612 +#: config.c:1476

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

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

2615

2602 -#: config.c:1527

2616 +#: config.c:1509

2617 #, c-format

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

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

2620

2607 -#: config.c:1599

2621 +#: config.c:1581

2622 #, c-format

2623 msgid "malformed value for %s"

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

2625

2612 -#: config.c:1625

2626 +#: config.c:1607

2627 #, c-format

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

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

2630

2617 -#: config.c:1626

2631 +#: config.c:1608

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

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

2634

2621 -#: config.c:1687 builtin/pack-objects.c:4084

2635 +#: config.c:1669 builtin/pack-objects.c:4053

2636 #, c-format

2637 msgid "bad pack compression level %d"

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

2639

2626 -#: config.c:1809

2640 +#: config.c:1792

2641 #, c-format

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

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

2644

2631 -#: config.c:1812

2645 +#: config.c:1795

2646 #, c-format

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

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

2649

2636 -#: config.c:1829

2650 +#: config.c:1813

2651 #, c-format

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

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

2654

2641 -#: config.c:1874

2655 +#: config.c:1858

2656 #, c-format

2657 msgid "failed to parse %s"

2658 msgstr "解析 %s 失敗"

2659

2646 -#: config.c:1930

2660 +#: config.c:1914

2661 msgid "unable to parse command-line config"

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

2663

2650 -#: config.c:2294

2664 +#: config.c:2282

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

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

2667

2654 -#: config.c:2468

2668 +#: config.c:2456

2669 #, c-format

2670 msgid "Invalid %s: '%s'"

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

2672

2659 -#: config.c:2513

2673 +#: config.c:2501

2674 #, c-format

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

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

2677

2664 -#: config.c:2559

2678 +#: config.c:2547

2679 #, c-format

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

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

2682

2669 -#: config.c:2561

2683 +#: config.c:2549

2684 #, c-format

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

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

2687

2674 -#: config.c:2645

2688 +#: config.c:2633

2689 #, c-format

2690 msgid "invalid section name '%s'"

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

2692

2679 -#: config.c:2677

2693 +#: config.c:2665

2694 #, c-format

2695 msgid "%s has multiple values"

2696 msgstr "%s 有多個取值"

2697

2684 -#: config.c:2706

2698 +#: config.c:2694

2699 #, c-format

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

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

2702

2689 -#: config.c:2958 config.c:3285

2703 +#: config.c:2946 config.c:3273

2704 #, c-format

2705 msgid "could not lock config file %s"

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

2707

2694 -#: config.c:2969

2708 +#: config.c:2957

2709 #, c-format

2710 msgid "opening %s"

2711 msgstr "開啟 %s"

2712

2699 -#: config.c:3006 builtin/config.c:361

2713 +#: config.c:2994 builtin/config.c:361

2714 #, c-format

2715 msgid "invalid pattern: %s"

2716 msgstr "無效模式：%s"

2717

2704 -#: config.c:3031

2718 +#: config.c:3019

2719 #, c-format

2720 msgid "invalid config file %s"

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

2722

2709 -#: config.c:3044 config.c:3298

2723 +#: config.c:3032 config.c:3286

2724 #, c-format

2725 msgid "fstat on %s failed"

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

2727

2714 -#: config.c:3055

2728 +#: config.c:3043

2729 #, c-format

2730 msgid "unable to mmap '%s'%s"

2731 msgstr "無法 mmap '%s'%s"

2732

2719 -#: config.c:3065 config.c:3303

2733 +#: config.c:3053 config.c:3291

2734 #, c-format

2735 msgid "chmod on %s failed"

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

2737

2724 -#: config.c:3150 config.c:3400

2738 +#: config.c:3138 config.c:3388

2739 #, c-format

2740 msgid "could not write config file %s"

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

2742

2729 -#: config.c:3184

2743 +#: config.c:3172

2744 #, c-format

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

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

2747

2734 -#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2748 +#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868

2749 #, c-format

2750 msgid "could not unset '%s'"

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

2752

2739 -#: config.c:3276

2753 +#: config.c:3264

2754 #, c-format

2755 msgid "invalid section name: %s"

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

2757

2744 -#: config.c:3443

2758 +#: config.c:3431

2759 #, c-format

2760 msgid "missing value for '%s'"

2761 msgstr "%s 的取值缺少"

@@ -2775,72 +2789,72 @@ msgstr "伺服器不支援特性 '%s'"

2789 msgid "expected flush after capabilities"

2790 msgstr "在能力之後應為一個 flush 包"

2791

2778 -#: connect.c:263

2792 +#: connect.c:265

2793 #, c-format

2794 msgid "ignoring capabilities after first line '%s'"

2795 msgstr "忽略第一行 '%s' 之後的能力欄位"

2796

2783 -#: connect.c:284

2797 +#: connect.c:286

2798 msgid "protocol error: unexpected capabilities^{}"

2799 msgstr "協定錯誤：意外的 capabilities^{}"

2800

2787 -#: connect.c:306

2801 +#: connect.c:308

2802 #, c-format

2803 msgid "protocol error: expected shallow sha-1, got '%s'"

2804 msgstr "協定錯誤：預期淺複製 sha-1，卻得到 '%s'"

2805

2792 -#: connect.c:308

2806 +#: connect.c:310

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

2808 msgstr "另一端的版本庫不能是淺複製版本庫"

2809

2796 -#: connect.c:347

2810 +#: connect.c:349

2811 msgid "invalid packet"

2812 msgstr "無效封包"

2813

2800 -#: connect.c:367

2814 +#: connect.c:369

2815 #, c-format

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

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

2818

2805 -#: connect.c:497

2819 +#: connect.c:499

2820 #, c-format

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

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

2823

2810 -#: connect.c:526

2824 +#: connect.c:528

2825 #, c-format

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

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

2828

2815 -#: connect.c:530

2829 +#: connect.c:532

2830 msgid "expected flush after ref listing"

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

2832

2819 -#: connect.c:533

2833 +#: connect.c:535

2834 msgid "expected response end packet after ref listing"

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

2836

2823 -#: connect.c:666

2837 +#: connect.c:670

2838 #, c-format

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

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

2841

2828 -#: connect.c:717

2842 +#: connect.c:721

2843 msgid "unable to set SO_KEEPALIVE on socket"

2844 msgstr "無法為 socket 設定 SO_KEEPALIVE"

2845

2832 -#: connect.c:757 connect.c:820

2846 +#: connect.c:761 connect.c:824

2847 #, c-format

2848 msgid "Looking up %s ... "

2849 msgstr "尋找 %s ... "

2850

2837 -#: connect.c:761

2851 +#: connect.c:765

2852 #, c-format

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

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

2855

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

2843 -#: connect.c:765 connect.c:836

2857 +#: connect.c:769 connect.c:840

2858 #, c-format

2859 msgid ""

2860 "done.\n"

@@ -2849,7 +2863,7 @@ msgstr ""

2863 "完成。\n"

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

2865

2852 -#: connect.c:787 connect.c:864

2866 +#: connect.c:791 connect.c:868

2867 #, c-format

2868 msgid ""

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

@@ -2859,77 +2873,77 @@ msgstr ""

2873 "%s"

2874

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

2862 -#: connect.c:793 connect.c:870

2876 +#: connect.c:797 connect.c:874

2877 msgid "done."

2878 msgstr "完成。"

2879

2866 -#: connect.c:824

2880 +#: connect.c:828

2881 #, c-format

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

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

2884

2871 -#: connect.c:830

2885 +#: connect.c:834

2886 #, c-format

2887 msgid "unknown port %s"

2888 msgstr "未知埠 %s"

2889

2876 -#: connect.c:967 connect.c:1299

2890 +#: connect.c:971 connect.c:1303

2891 #, c-format

2892 msgid "strange hostname '%s' blocked"

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

2894

2881 -#: connect.c:969

2895 +#: connect.c:973

2896 #, c-format

2897 msgid "strange port '%s' blocked"

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

2899

2886 -#: connect.c:979

2900 +#: connect.c:983

2901 #, c-format

2902 msgid "cannot start proxy %s"

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

2904

2891 -#: connect.c:1050

2905 +#: connect.c:1054

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

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

2908

2895 -#: connect.c:1190

2909 +#: connect.c:1194

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

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

2912

2899 -#: connect.c:1247

2913 +#: connect.c:1251

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

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

2916

2903 -#: connect.c:1259

2917 +#: connect.c:1263

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

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

2920

2907 -#: connect.c:1276

2921 +#: connect.c:1280

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

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

2924

2911 -#: connect.c:1388

2925 +#: connect.c:1392

2926 #, c-format

2927 msgid "strange pathname '%s' blocked"

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

2929

2916 -#: connect.c:1436

2930 +#: connect.c:1440

2931 msgid "unable to fork"

2932 msgstr "無法 fork"

2933

2920 -#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45

2934 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45

2935 msgid "Checking connectivity"

2936 msgstr "正在檢查連通性"

2937

2924 -#: connected.c:120

2938 +#: connected.c:122

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

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

2941

2928 -#: connected.c:144

2942 +#: connected.c:146

2943 msgid "failed write to rev-list"

2944 msgstr "寫入 rev-list 失敗"

2945

2932 -#: connected.c:149

2946 +#: connected.c:151

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

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

2949

@@ -3069,17 +3083,17 @@ msgstr "拒絕使用缺少主機欄位的憑證"

3083 msgid "refusing to work with credential missing protocol field"

3084 msgstr "拒絕使用缺少通訊協定欄位的憑證"

3085

3072 -#: credential.c:394

3086 +#: credential.c:395

3087 #, c-format

3088 msgid "url contains a newline in its %s component: %s"

3089 msgstr "URL 的 %s 部分有換行：%s"

3090

3077 -#: credential.c:438

3091 +#: credential.c:439

3092 #, c-format

3093 msgid "url has no scheme: %s"

3094 msgstr "URL 沒有 Scheme：%s"

3095

3082 -#: credential.c:511

3096 +#: credential.c:512

3097 #, c-format

3098 msgid "credential url cannot be parsed: %s"

3099 msgstr "無法解析憑證 URL：%s"

@@ -3155,12 +3169,12 @@ msgstr "壞的樹狀物件 %s"

3169 #: delta-islands.c:334

3170 #, c-format

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

3158 -msgstr "未能載入 '%s' 的資料島正規表示式：%s"

3172 +msgstr "未能載入 '%s' 的資料島常規表示式：%s"

3173

3174 #: delta-islands.c:390

3175 #, c-format

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

3163 -msgstr "來自 config 的資料島正規表示式有太多的捕獲組（最多 %d 個）"

3177 +msgstr "來自 config 的資料島常規表示式有太多的擷取群組（最多 %d 個）"

3178

3179 #: delta-islands.c:467

3180 #, c-format

@@ -3172,23 +3186,23 @@ msgstr "已標記 %d 個資料島，結束。\n"

3186 msgid "unknown value for --diff-merges: %s"

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

3188

3175 -#: diff-lib.c:557

3189 +#: diff-lib.c:561

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

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

3192

3179 -#: diff-lib.c:559

3193 +#: diff-lib.c:563

3194 msgid "--merge-base only works with commits"

3195 msgstr "--merge-base 只能跟提交搭配才能運作"

3196

3183 -#: diff-lib.c:576

3197 +#: diff-lib.c:580

3198 msgid "unable to get HEAD"

3199 msgstr "不能取得 HEAD"

3200

3187 -#: diff-lib.c:583

3201 +#: diff-lib.c:587

3202 msgid "no merge base found"

3203 msgstr "找不到合併基底"

3204

3191 -#: diff-lib.c:585

3205 +#: diff-lib.c:589

3206 msgid "multiple merge bases found"

3207 msgstr "找到多個合併基底"

3208

@@ -3203,18 +3217,18 @@ msgid ""

3217 msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑"

3218

3219 # 譯者：請維持前導空格

3206 -#: diff.c:156

3220 +#: diff.c:157

3221 #, c-format

3222 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

3223 msgstr " 無法解析 dirstat 截止（cut-off）百分比 '%s'\n"

3224

3225 # 譯者：請維持前導空格

3212 -#: diff.c:161

3226 +#: diff.c:162

3227 #, c-format

3228 msgid " Unknown dirstat parameter '%s'\n"

3229 msgstr " 未知的 dirstat 參數 '%s'\n"

3230

3217 -#: diff.c:297

3231 +#: diff.c:298

3232 msgid ""

3233 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

3234 "'dimmed-zebra', 'plain'"

@@ -3222,7 +3236,7 @@ msgstr ""

3236 "移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-"

3237 "zebra'、'plain'"

3238

3225 -#: diff.c:325

3239 +#: diff.c:326

3240 #, c-format

3241 msgid ""

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

@@ -3231,18 +3245,18 @@ msgstr ""

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

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

3247

3234 -#: diff.c:333

3248 +#: diff.c:334

3249 msgid ""

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

3251 "whitespace modes"

3252 msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用"

3253

3240 -#: diff.c:410

3254 +#: diff.c:411

3255 #, c-format

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

3257 msgstr "設定變數 'diff.submodule' 未知的取值：'%s'"

3258

3245 -#: diff.c:470

3259 +#: diff.c:471

3260 #, c-format

3261 msgid ""

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

@@ -3251,47 +3265,47 @@ msgstr ""

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

3266 "%s"

3267

3254 -#: diff.c:4282

3268 +#: diff.c:4290

3269 #, c-format

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

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

3272

3259 -#: diff.c:4634

3273 +#: diff.c:4642

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

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

3276

3263 -#: diff.c:4637

3277 +#: diff.c:4645

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

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

3280

3267 -#: diff.c:4640

3281 +#: diff.c:4648

3282 msgid ""

3283 "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"

3284 msgstr "-G 和 --pickaxe-regex 互斥。請使用 --pickaxe-regex 搭配 -S"

3285

3272 -#: diff.c:4643

3286 +#: diff.c:4651

3287 msgid ""

3288 "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "

3289 "with -G and -S"

3290 msgstr ""

3291 "--pickaxe-all 和 --find-object 互斥。請使用 --pickaxe-all 搭配 -G 和 -S"

3292

3279 -#: diff.c:4722

3293 +#: diff.c:4730

3294 msgid "--follow requires exactly one pathspec"

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

3296

3283 -#: diff.c:4770

3297 +#: diff.c:4778

3298 #, c-format

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

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

3301

3288 -#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318

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

3302 +#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326

3303 +#: parse-options.c:217 parse-options.c:221

3304 #, c-format

3305 msgid "%s expects a numerical value"

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

3307

3294 -#: diff.c:4807

3308 +#: diff.c:4815

3309 #, c-format

3310 msgid ""

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

@@ -3300,200 +3314,200 @@ msgstr ""

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

3315 "%s"

3316

3303 -#: diff.c:4892

3317 +#: diff.c:4900

3318 #, c-format

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

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

3321

3308 -#: diff.c:4916

3322 +#: diff.c:4924

3323 #, c-format

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

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

3326

3313 -#: diff.c:4930

3327 +#: diff.c:4938

3328 #, c-format

3329 msgid "unable to resolve '%s'"

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

3331

3318 -#: diff.c:4980 diff.c:4986

3332 +#: diff.c:4988 diff.c:4994

3333 #, c-format

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

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

3336

3323 -#: diff.c:4998

3337 +#: diff.c:5006

3338 #, c-format

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

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

3341

3328 -#: diff.c:5019

3342 +#: diff.c:5027

3343 #, c-format

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

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

3346

3333 -#: diff.c:5038

3347 +#: diff.c:5046

3348 #, c-format

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

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

3351

3338 -#: diff.c:5078

3352 +#: diff.c:5086

3353 msgid ""

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

3355 "\"histogram\""

3356 msgstr ""

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

3358

3345 -#: diff.c:5114 diff.c:5134

3359 +#: diff.c:5122 diff.c:5142

3360 #, c-format

3361 msgid "invalid argument to %s"

3362 msgstr "%s 的參數無效"

3363

3350 -#: diff.c:5238

3364 +#: diff.c:5246

3365 #, c-format

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

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

3367 +msgstr "傳入 -I 的常規表示式無效：「%s」"

3368

3355 -#: diff.c:5287

3369 +#: diff.c:5295

3370 #, c-format

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

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

3373

3360 -#: diff.c:5343

3374 +#: diff.c:5351

3375 #, c-format

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

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

3378

3365 -#: diff.c:5379

3379 +#: diff.c:5387

3380 msgid "Diff output format options"

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

3382

3369 -#: diff.c:5381 diff.c:5387

3383 +#: diff.c:5389 diff.c:5395

3384 msgid "generate patch"

3385 msgstr "生成修補檔"

3386

3373 -#: diff.c:5384 builtin/log.c:179

3387 +#: diff.c:5392 builtin/log.c:179

3388 msgid "suppress diff output"

3389 msgstr "不顯示差異輸出"

3390

3377 -#: diff.c:5389 diff.c:5503 diff.c:5510

3391 +#: diff.c:5397 diff.c:5511 diff.c:5518

3392 msgid "<n>"

3393 msgstr "<n>"

3394

3381 -#: diff.c:5390 diff.c:5393

3395 +#: diff.c:5398 diff.c:5401

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

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

3398

3385 -#: diff.c:5395

3399 +#: diff.c:5403

3400 msgid "generate the diff in raw format"

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

3402

3389 -#: diff.c:5398

3403 +#: diff.c:5406

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

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

3406

3393 -#: diff.c:5402

3407 +#: diff.c:5410

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

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

3410

3397 -#: diff.c:5406

3411 +#: diff.c:5414

3412 msgid "machine friendly --stat"

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

3414

3401 -#: diff.c:5409

3415 +#: diff.c:5417

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

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

3418

3405 -#: diff.c:5411 diff.c:5419

3419 +#: diff.c:5419 diff.c:5427

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

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

3422

3409 -#: diff.c:5412

3423 +#: diff.c:5420

3424 msgid ""

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

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

3427

3414 -#: diff.c:5416

3428 +#: diff.c:5424

3429 msgid "synonym for --dirstat=cumulative"

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

3431

3418 -#: diff.c:5420

3432 +#: diff.c:5428

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

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

3435

3422 -#: diff.c:5424

3436 +#: diff.c:5432

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

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

3439

3426 -#: diff.c:5427

3440 +#: diff.c:5435

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

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

3443

3430 -#: diff.c:5430

3444 +#: diff.c:5438

3445 msgid "show only names of changed files"

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

3447

3434 -#: diff.c:5433

3448 +#: diff.c:5441

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

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

3451

3438 -#: diff.c:5435

3452 +#: diff.c:5443

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

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

3455

3442 -#: diff.c:5436

3456 +#: diff.c:5444

3457 msgid "generate diffstat"

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

3459

3446 -#: diff.c:5438 diff.c:5441 diff.c:5444

3460 +#: diff.c:5446 diff.c:5449 diff.c:5452

3461 msgid "<width>"

3462 msgstr "<寬度>"

3463

3450 -#: diff.c:5439

3464 +#: diff.c:5447

3465 msgid "generate diffstat with a given width"

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

3467

3454 -#: diff.c:5442

3468 +#: diff.c:5450

3469 msgid "generate diffstat with a given name width"

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

3471

3458 -#: diff.c:5445

3472 +#: diff.c:5453

3473 msgid "generate diffstat with a given graph width"

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

3475

3462 -#: diff.c:5447

3476 +#: diff.c:5455

3477 msgid "<count>"

3478 msgstr "<次數>"

3479

3466 -#: diff.c:5448

3480 +#: diff.c:5456

3481 msgid "generate diffstat with limited lines"

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

3483

3470 -#: diff.c:5451

3484 +#: diff.c:5459

3485 msgid "generate compact summary in diffstat"

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

3487

3474 -#: diff.c:5454

3488 +#: diff.c:5462

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

3490 msgstr "輸出一個可以套用的二進位差異"

3491

3478 -#: diff.c:5457

3492 +#: diff.c:5465

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

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

3495

3482 -#: diff.c:5459

3496 +#: diff.c:5467

3497 msgid "show colored diff"

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

3499

3486 -#: diff.c:5460

3500 +#: diff.c:5468

3501 msgid "<kind>"

3502 msgstr "<類型>"

3503

3490 -#: diff.c:5461

3504 +#: diff.c:5469

3505 msgid ""

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

3507 "diff"

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

3509

3496 -#: diff.c:5464

3510 +#: diff.c:5472

3511 msgid ""

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

3513 "--numstat"

@@ -3501,311 +3515,311 @@ msgstr ""

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

3516 "符"

3517

3504 -#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582

3518 +#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590

3519 msgid "<prefix>"

3520 msgstr "<前綴>"

3521

3508 -#: diff.c:5468

3522 +#: diff.c:5476

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

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

3524 +msgstr "顯示提供的來源前綴，而非 \"a/\""

3525

3512 -#: diff.c:5471

3526 +#: diff.c:5479

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

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

3528 +msgstr "顯示提供的目的地前綴取代 \"b/\""

3529

3516 -#: diff.c:5474

3530 +#: diff.c:5482

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

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

3533

3520 -#: diff.c:5477

3534 +#: diff.c:5485

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

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

3536 +msgstr "不顯示任何來源和目的地前綴"

3537

3524 -#: diff.c:5480

3538 +#: diff.c:5488

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

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

3541

3528 -#: diff.c:5484 diff.c:5489 diff.c:5494

3542 +#: diff.c:5492 diff.c:5497 diff.c:5502

3543 msgid "<char>"

3544 msgstr "<字元>"

3545

3532 -#: diff.c:5485

3546 +#: diff.c:5493

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

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

3549

3536 -#: diff.c:5490

3550 +#: diff.c:5498

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

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

3553

3540 -#: diff.c:5495

3554 +#: diff.c:5503

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

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

3557

3544 -#: diff.c:5498

3558 +#: diff.c:5506

3559 msgid "Diff rename options"

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

3561

3548 -#: diff.c:5499

3562 +#: diff.c:5507

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

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

3565

3552 -#: diff.c:5500

3566 +#: diff.c:5508

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

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

3569

3556 -#: diff.c:5504

3570 +#: diff.c:5512

3571 msgid "detect renames"

3572 msgstr "檢測重新命名"

3573

3560 -#: diff.c:5508

3574 +#: diff.c:5516

3575 msgid "omit the preimage for deletes"

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

3577

3564 -#: diff.c:5511

3578 +#: diff.c:5519

3579 msgid "detect copies"

3580 msgstr "檢測複製"

3581

3568 -#: diff.c:5515

3582 +#: diff.c:5523

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

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

3584 +msgstr "使用未修改的檔案做為發現拷貝的來源"

3585

3572 -#: diff.c:5517

3586 +#: diff.c:5525

3587 msgid "disable rename detection"

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

3589

3576 -#: diff.c:5520

3590 +#: diff.c:5528

3591 msgid "use empty blobs as rename source"

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

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

3593

3580 -#: diff.c:5522

3594 +#: diff.c:5530

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

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

3597

3584 -#: diff.c:5525

3598 +#: diff.c:5533

3599 msgid ""

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

3601 "given limit"

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

3603

3590 -#: diff.c:5527

3604 +#: diff.c:5535

3605 msgid "Diff algorithm options"

3606 msgstr "差異演算法選項"

3607

3594 -#: diff.c:5529

3608 +#: diff.c:5537

3609 msgid "produce the smallest possible diff"

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

3611

3598 -#: diff.c:5532

3612 +#: diff.c:5540

3613 msgid "ignore whitespace when comparing lines"

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

3615

3602 -#: diff.c:5535

3616 +#: diff.c:5543

3617 msgid "ignore changes in amount of whitespace"

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

3619

3606 -#: diff.c:5538

3620 +#: diff.c:5546

3621 msgid "ignore changes in whitespace at EOL"

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

3623

3610 -#: diff.c:5541

3624 +#: diff.c:5549

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

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

3627

3614 -#: diff.c:5544

3628 +#: diff.c:5552

3629 msgid "ignore changes whose lines are all blank"

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

3631

3618 -#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616

3632 +#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624

3633 msgid "<regex>"

3634 msgstr "<正則>"

3635

3622 -#: diff.c:5547

3636 +#: diff.c:5555

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

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

3639

3626 -#: diff.c:5550

3640 +#: diff.c:5558

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

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

3643

3630 -#: diff.c:5553

3644 +#: diff.c:5561

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

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

3647

3634 -#: diff.c:5557

3648 +#: diff.c:5565

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

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

3651

3638 -#: diff.c:5559

3652 +#: diff.c:5567

3653 msgid "<algorithm>"

3654 msgstr "<演算法>"

3655

3642 -#: diff.c:5560

3656 +#: diff.c:5568

3657 msgid "choose a diff algorithm"

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

3659

3646 -#: diff.c:5562

3660 +#: diff.c:5570

3661 msgid "<text>"

3662 msgstr "<文字>"

3663

3650 -#: diff.c:5563

3664 +#: diff.c:5571

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

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

3667

3654 -#: diff.c:5565 diff.c:5574 diff.c:5577

3668 +#: diff.c:5573 diff.c:5582 diff.c:5585

3669 msgid "<mode>"

3670 msgstr "<模式>"

3671

3658 -#: diff.c:5566

3672 +#: diff.c:5574

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

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

3675

3662 -#: diff.c:5569

3676 +#: diff.c:5577

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

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

3678 +msgstr "使用 <常規表示式> 確定何為一個詞"

3679

3666 -#: diff.c:5572

3680 +#: diff.c:5580

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

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

3683

3670 -#: diff.c:5575

3684 +#: diff.c:5583

3685 msgid "moved lines of code are colored differently"

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

3687

3674 -#: diff.c:5578

3688 +#: diff.c:5586

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

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

3691

3678 -#: diff.c:5581

3692 +#: diff.c:5589

3693 msgid "Other diff options"

3694 msgstr "其它差異選項"

3695

3682 -#: diff.c:5583

3696 +#: diff.c:5591

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

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

3699

3686 -#: diff.c:5587

3700 +#: diff.c:5595

3701 msgid "treat all files as text"

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

3703

3690 -#: diff.c:5589

3704 +#: diff.c:5597

3705 msgid "swap two inputs, reverse the diff"

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

3707

3694 -#: diff.c:5591

3708 +#: diff.c:5599

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

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

3711

3698 -#: diff.c:5593

3712 +#: diff.c:5601

3713 msgid "disable all output of the program"

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

3715

3702 -#: diff.c:5595

3716 +#: diff.c:5603

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

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

3719

3706 -#: diff.c:5597

3720 +#: diff.c:5605

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

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

3723

3710 -#: diff.c:5599

3724 +#: diff.c:5607

3725 msgid "<when>"

3726 msgstr "<何時>"

3727

3714 -#: diff.c:5600

3728 +#: diff.c:5608

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

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

3731

3718 -#: diff.c:5603

3732 +#: diff.c:5611

3733 msgid "<format>"

3734 msgstr "<格式>"

3735

3722 -#: diff.c:5604

3736 +#: diff.c:5612

3737 msgid "specify how differences in submodules are shown"

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

3739

3726 -#: diff.c:5608

3740 +#: diff.c:5616

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

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

3743

3730 -#: diff.c:5611

3744 +#: diff.c:5619

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

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

3747

3734 -#: diff.c:5613

3748 +#: diff.c:5621

3749 msgid "<string>"

3750 msgstr "<字串>"

3751

3738 -#: diff.c:5614

3752 +#: diff.c:5622

3753 msgid ""

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

3755 "string"

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

3757

3744 -#: diff.c:5617

3758 +#: diff.c:5625

3759 msgid ""

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

3761 "regex"

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

3763

3750 -#: diff.c:5620

3764 +#: diff.c:5628

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

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

3767

3754 -#: diff.c:5623

3768 +#: diff.c:5631

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

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

3770 +msgstr "將 -S 的 <string> 當做延伸 POSIX 常規表示式"

3771

3758 -#: diff.c:5626

3772 +#: diff.c:5634

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

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

3775

3762 -#: diff.c:5627 diff.c:5630

3776 +#: diff.c:5635 diff.c:5638

3777 msgid "<path>"

3778 msgstr "<路徑>"

3779

3766 -#: diff.c:5628

3780 +#: diff.c:5636

3781 msgid "show the change in the specified path first"

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

3783

3770 -#: diff.c:5631

3784 +#: diff.c:5639

3785 msgid "skip the output to the specified path"

3786 msgstr "略過輸出至指定路徑"

3787

3774 -#: diff.c:5633

3788 +#: diff.c:5641

3789 msgid "<object-id>"

3790 msgstr "<物件 ID>"

3791

3778 -#: diff.c:5634

3792 +#: diff.c:5642

3793 msgid ""

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

3795 "object"

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

3797

3784 -#: diff.c:5636

3798 +#: diff.c:5644

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

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

3801

3788 -#: diff.c:5637

3802 +#: diff.c:5645

3803 msgid "select files by diff type"

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

3805

3792 -#: diff.c:5639

3806 +#: diff.c:5647

3807 msgid "<file>"

3808 msgstr "<檔案>"

3809

3796 -#: diff.c:5640

3810 +#: diff.c:5648

3811 msgid "Output to a specific file"

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

3813

3800 -#: diff.c:6298

3814 +#: diff.c:6306

3815 msgid "exhaustive rename detection was skipped due to too many files."

3816 msgstr "因為檔案太多，已略過詳細重新命名偵測。"

3817

3804 -#: diff.c:6301

3818 +#: diff.c:6309

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

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

3821

3808 -#: diff.c:6304

3822 +#: diff.c:6312

3823 #, c-format

3824 msgid ""

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

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

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

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

3832

3819 -#: diffcore-rename.c:1514

3833 +#: diffcore-rename.c:1564

3834 msgid "Performing inexact rename detection"

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

3836

@@ -3854,337 +3868,410 @@ msgstr "停用 cone 樣式符合模式"

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

3869 msgstr "不能將 %s 用作排除檔案"

3870

3857 -#: dir.c:2351

3871 +#: dir.c:2464

3872 #, c-format

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

3874 msgstr "不能開啟目錄 '%s'"

3875

3862 -#: dir.c:2653

3876 +#: dir.c:2766

3877 msgid "failed to get kernel name and information"

3878 msgstr "無法獲得核心名稱和訊息"

3879

3866 -#: dir.c:2777

3880 +#: dir.c:2890

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

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

3883

3870 -#: dir.c:3610

3884 +#: dir.c:3158

3885 +msgid ""

3886 +"No directory name could be guessed.\n"

3887 +"Please specify a directory on the command line"

3888 +msgstr ""

3889 +"無法猜到目錄名。\n"

3890 +"請在指令列指定一個目錄"

3891 +

3892 +#: dir.c:3837

3893 #, c-format

3894 msgid "index file corrupt in repo %s"

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

3896

3875 -#: dir.c:3657 dir.c:3662

3897 +#: dir.c:3884 dir.c:3889

3898 #, c-format

3899 msgid "could not create directories for %s"

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

3901

3880 -#: dir.c:3691

3902 +#: dir.c:3918

3903 #, c-format

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

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

3906

3885 -#: editor.c:74

3907 +#: editor.c:77

3908 #, c-format

3909 msgid "hint: Waiting for your editor to close the file...%c"

3910 msgstr "提示：等待您的編輯器關閉檔案...%c"

3911

3890 -#: entry.c:176

3912 +#: entry.c:177

3913 msgid "Filtering content"

3914 msgstr "過濾內容"

3915

3894 -#: entry.c:497

3916 +#: entry.c:498

3917 #, c-format

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

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

3920

3899 -#: environment.c:152

3921 +#: environment.c:143

3922 #, c-format

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

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

3925

3904 -#: environment.c:334

3905 -#, c-format

3906 -msgid "could not set GIT_DIR to '%s'"

3907 -msgstr "不能設定 GIT_DIR 為 '%s'"

3908 -

3926 #: exec-cmd.c:363

3927 #, c-format

3928 msgid "too many args to run %s"

3929 msgstr "執行 %s 的參數太多"

3930

3914 -#: fetch-pack.c:182

3931 +#: fetch-pack.c:193

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

3933 msgstr "git fetch-pack：應為 shallow 列表"

3934

3918 -#: fetch-pack.c:185

3935 +#: fetch-pack.c:196

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

3937 msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"

3938

3922 -#: fetch-pack.c:196

3939 +#: fetch-pack.c:207

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

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

3942

3926 -#: fetch-pack.c:216

3943 +#: fetch-pack.c:227

3944 #, c-format

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

3946 msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'"

3947

3931 -#: fetch-pack.c:227

3948 +#: fetch-pack.c:238

3949 msgid "unable to write to remote"

3950 msgstr "無法寫到遠端"

3951

3935 -#: fetch-pack.c:288

3952 +#: fetch-pack.c:299

3953 msgid "--stateless-rpc requires multi_ack_detailed"

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

3955

3939 -#: fetch-pack.c:383 fetch-pack.c:1423

3956 +#: fetch-pack.c:394 fetch-pack.c:1434

3957 #, c-format

3958 msgid "invalid shallow line: %s"

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

3960

3944 -#: fetch-pack.c:389 fetch-pack.c:1429

3961 +#: fetch-pack.c:400 fetch-pack.c:1440

3962 #, c-format

3963 msgid "invalid unshallow line: %s"

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

3965

3949 -#: fetch-pack.c:391 fetch-pack.c:1431

3966 +#: fetch-pack.c:402 fetch-pack.c:1442

3967 #, c-format

3968 msgid "object not found: %s"

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

3970

3954 -#: fetch-pack.c:394 fetch-pack.c:1434

3971 +#: fetch-pack.c:405 fetch-pack.c:1445

3972 #, c-format

3973 msgid "error in object: %s"

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

3975

3959 -#: fetch-pack.c:396 fetch-pack.c:1436

3976 +#: fetch-pack.c:407 fetch-pack.c:1447

3977 #, c-format

3978 msgid "no shallow found: %s"

3979 msgstr "未發現 shallow：%s"

3980

3964 -#: fetch-pack.c:399 fetch-pack.c:1440

3981 +#: fetch-pack.c:410 fetch-pack.c:1451

3982 #, c-format

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

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

3985

3969 -#: fetch-pack.c:439

3986 +#: fetch-pack.c:450

3987 #, c-format

3988 msgid "got %s %d %s"

3989 msgstr "得到 %s %d %s"

3990

3974 -#: fetch-pack.c:456

3991 +#: fetch-pack.c:467

3992 #, c-format

3993 msgid "invalid commit %s"

3994 msgstr "無效提交 %s"

3995

3979 -#: fetch-pack.c:487

3996 +#: fetch-pack.c:498

3997 msgid "giving up"

3998 msgstr "放棄"

3999

3983 -#: fetch-pack.c:500 progress.c:339

4000 +#: fetch-pack.c:511 progress.c:339

4001 msgid "done"

4002 msgstr "完成"

4003

3987 -#: fetch-pack.c:512

4004 +#: fetch-pack.c:523

4005 #, c-format

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

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

4008

3992 -#: fetch-pack.c:548

4009 +#: fetch-pack.c:559

4010 #, c-format

4011 msgid "Marking %s as complete"

4012 msgstr "標記 %s 為完成"

4013

3997 -#: fetch-pack.c:763

4014 +#: fetch-pack.c:774

4015 #, c-format

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

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

4018

4002 -#: fetch-pack.c:849

4019 +#: fetch-pack.c:860

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

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

4022

4006 -#: fetch-pack.c:857

4023 +#: fetch-pack.c:868

4024 msgid "protocol error: bad pack header"

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

4026

4010 -#: fetch-pack.c:951

4027 +#: fetch-pack.c:962

4028 #, c-format

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

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

4031

4015 -#: fetch-pack.c:957

4032 +#: fetch-pack.c:968

4033 msgid "fetch-pack: invalid index-pack output"

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

4035

4019 -#: fetch-pack.c:974

4036 +#: fetch-pack.c:985

4037 #, c-format

4038 msgid "%s failed"

4039 msgstr "%s 失敗"

4040

4024 -#: fetch-pack.c:976

4041 +#: fetch-pack.c:987

4042 msgid "error in sideband demultiplexer"

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

4044

4028 -#: fetch-pack.c:1019

4045 +#: fetch-pack.c:1030

4046 #, c-format

4047 msgid "Server version is %.*s"

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

4049

4033 -#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042

4034 -#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058

4035 -#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074

4036 -#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096

4050 +#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053

4051 +#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069

4052 +#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085

4053 +#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107

4054 #, c-format

4055 msgid "Server supports %s"

4056 msgstr "伺服器支援 %s"

4057

4041 -#: fetch-pack.c:1029

4058 +#: fetch-pack.c:1040

4059 msgid "Server does not support shallow clients"

4060 msgstr "伺服器不支援 shallow 用戶端"

4061

4045 -#: fetch-pack.c:1089

4062 +#: fetch-pack.c:1100

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

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

4065

4049 -#: fetch-pack.c:1094

4066 +#: fetch-pack.c:1105

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

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

4069

4053 -#: fetch-pack.c:1098

4070 +#: fetch-pack.c:1109

4071 msgid "Server does not support --deepen"

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

4073

4057 -#: fetch-pack.c:1100

4074 +#: fetch-pack.c:1111

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

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

4077

4061 -#: fetch-pack.c:1113

4078 +#: fetch-pack.c:1124

4079 msgid "no common commits"

4080 msgstr "沒有共同的提交"

4081

4065 -#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238

4082 +#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130

4083 msgid "source repository is shallow, reject to clone."

4084 msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。"

4085

4069 -#: fetch-pack.c:1128 fetch-pack.c:1660

4086 +#: fetch-pack.c:1139 fetch-pack.c:1671

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

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

4089

4073 -#: fetch-pack.c:1242

4090 +#: fetch-pack.c:1253

4091 #, c-format

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

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

4094

4078 -#: fetch-pack.c:1246

4095 +#: fetch-pack.c:1257

4096 #, c-format

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

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

4099

4083 -#: fetch-pack.c:1279

4100 +#: fetch-pack.c:1290

4101 msgid "Server does not support shallow requests"

4102 msgstr "伺服器不支援 shallow 請求"

4103

4087 -#: fetch-pack.c:1286

4104 +#: fetch-pack.c:1297

4105 msgid "Server supports filter"

4106 msgstr "伺服器支援 filter"

4107

4091 -#: fetch-pack.c:1329 fetch-pack.c:2043

4108 +#: fetch-pack.c:1340 fetch-pack.c:2053

4109 msgid "unable to write request to remote"

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

4111

4095 -#: fetch-pack.c:1347

4112 +#: fetch-pack.c:1358

4113 #, c-format

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

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

4116

4100 -#: fetch-pack.c:1353

4117 +#: fetch-pack.c:1364

4118 #, c-format

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

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

4121

4105 -#: fetch-pack.c:1387

4122 +#: fetch-pack.c:1398

4123 #, c-format

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

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

4126

4110 -#: fetch-pack.c:1392

4127 +#: fetch-pack.c:1403

4128 #, c-format

4129 msgid "error processing acks: %d"

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

4131

4115 -#: fetch-pack.c:1402

4132 +#: fetch-pack.c:1413

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

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

4135

4119 -#: fetch-pack.c:1404

4136 +#: fetch-pack.c:1415

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

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

4139

4123 -#: fetch-pack.c:1445

4140 +#: fetch-pack.c:1456

4141 #, c-format

4142 msgid "error processing shallow info: %d"

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

4144

4128 -#: fetch-pack.c:1494

4145 +#: fetch-pack.c:1505

4146 #, c-format

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

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

4149

4133 -#: fetch-pack.c:1499

4150 +#: fetch-pack.c:1510

4151 #, c-format

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

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

4154

4138 -#: fetch-pack.c:1504

4155 +#: fetch-pack.c:1515

4156 #, c-format

4157 msgid "error processing wanted refs: %d"

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

4159

4143 -#: fetch-pack.c:1534

4160 +#: fetch-pack.c:1545

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

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

4163

4147 -#: fetch-pack.c:1939

4164 +#: fetch-pack.c:1949

4165 msgid "no matching remote head"

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

4167

4151 -#: fetch-pack.c:1962 builtin/clone.c:697

4168 +#: fetch-pack.c:1972 builtin/clone.c:581

4169 msgid "remote did not send all necessary objects"

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

4171

4155 -#: fetch-pack.c:2065

4172 +#: fetch-pack.c:2075

4173 msgid "unexpected 'ready' from remote"

4174 msgstr "從遠端收到非預期的 ‘ready’"

4175

4159 -#: fetch-pack.c:2088

4176 +#: fetch-pack.c:2098

4177 #, c-format

4178 msgid "no such remote ref %s"

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

4180

4164 -#: fetch-pack.c:2091

4181 +#: fetch-pack.c:2101

4182 #, c-format

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

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

4185

4169 -#: gpg-interface.c:273

4186 +#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902

4187 +#: gpg-interface.c:918

4188 msgid "could not create temporary file"

4189 msgstr "不能建立暫存檔"

4190

4173 -#: gpg-interface.c:276

4191 +#: gpg-interface.c:332 gpg-interface.c:454

4192 #, c-format

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

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

4195

4178 -#: gpg-interface.c:470

4196 +#: gpg-interface.c:445

4197 +msgid ""

4198 +"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "

4199 +"signature verification"

4200 +msgstr "SSH 簽名驗證需要設定 gpg.ssh.allowedSignersFile，簽名檔案也要存在"

4201 +

4202 +#: gpg-interface.c:469

4203 +msgid ""

4204 +"ssh-keygen -Y find-principals/verify is needed for ssh signature "

4205 +"verification (available in openssh version 8.2p1+)"

4206 +msgstr ""

4207 +"SSH 簽名驗證需要 ssh-keygen -Y find-principals/verify（可以在 openssh 8.2p1+ "

4208 +"版本使用）"

4209 +

4210 +#: gpg-interface.c:523

4211 +#, c-format

4212 +msgid "ssh signing revocation file configured but not found: %s"

4213 +msgstr "有設定 SSH 簽名廢止檔案，但找不到檔案本體：%s"

4214 +

4215 +#: gpg-interface.c:576

4216 +#, c-format

4217 +msgid "bad/incompatible signature '%s'"

4218 +msgstr "簽名「%s」損壞或者不相容"

4219 +

4220 +#: gpg-interface.c:735 gpg-interface.c:740

4221 +#, c-format

4222 +msgid "failed to get the ssh fingerprint for key '%s'"

4223 +msgstr "無法取得「%s」金鑰的 SSH 指紋"

4224 +

4225 +#: gpg-interface.c:762

4226 +msgid ""

4227 +"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"

4228 +msgstr "需要設定 user.signingkey 或 gpg.ssh.defaultKeyCommand 任一"

4229 +

4230 +#: gpg-interface.c:780

4231 +#, c-format

4232 +msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"

4233 +msgstr "gpg.ssh.defaultKeyCommand 執行成功，但沒回傳按鍵：%s %s"

4234 +

4235 +#: gpg-interface.c:786

4236 +#, c-format

4237 +msgid "gpg.ssh.defaultKeyCommand failed: %s %s"

4238 +msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s"

4239 +

4240 +#: gpg-interface.c:874

4241 msgid "gpg failed to sign the data"

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

4243

4244 +#: gpg-interface.c:895

4245 +msgid "user.signingkey needs to be set for ssh signing"

4246 +msgstr "需要設定 user.signingkey 才能進行 SSH 簽名"

4247 +

4248 +#: gpg-interface.c:906

4249 +#, c-format

4250 +msgid "failed writing ssh signing key to '%s'"

4251 +msgstr "無法將 SSH 簽名金鑰寫入「%s」"

4252 +

4253 +#: gpg-interface.c:924

4254 +#, c-format

4255 +msgid "failed writing ssh signing key buffer to '%s'"

4256 +msgstr "無法將 SSH 簽名金鑰緩衝區寫入「%s」"

4257 +

4258 +#: gpg-interface.c:942

4259 +msgid ""

4260 +"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "

4261 +"8.2p1+)"

4262 +msgstr "SSH 簽名需要 ssh-keygen -Y sign（可以在 openssh 8.2p1+ 版本使用）"

4263 +

4264 +#: gpg-interface.c:954

4265 +#, c-format

4266 +msgid "failed reading ssh signing data buffer from '%s'"

4267 +msgstr "無法從「%s」讀取 SSH 簽名資料緩衝區"

4268 +

4269 #: graph.c:98

4270 #, c-format

4271 msgid "ignored invalid color '%.*s' in log.graphColors"

4272 msgstr "已忽略 log.graphColors 中無效的 “%.*s” 色彩"

4273

4187 -#: grep.c:531

4274 +#: grep.c:533

4275 msgid ""

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

4277 "with -P under PCRE v2"

@@ -4192,109 +4279,109 @@ msgstr ""

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

4280 "功能"

4281

4195 -#: grep.c:1895

4282 +#: grep.c:1928

4283 #, c-format

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

4285 msgstr "'%s'：無法讀取 %s"

4286

4200 -#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4287 +#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90

4288 #: builtin/rm.c:136

4289 #, c-format

4290 msgid "failed to stat '%s'"

4291 msgstr "對 '%s' 呼叫 stat 失敗"

4292

4206 -#: grep.c:1923

4293 +#: grep.c:1956

4294 #, c-format

4295 msgid "'%s': short read"

4296 msgstr "'%s'：讀取不完整"

4297

4211 -#: help.c:23

4298 +#: help.c:24

4299 msgid "start a working area (see also: git help tutorial)"

4300 msgstr "開始一個工作區（參見：git help tutorial）"

4301

4215 -#: help.c:24

4302 +#: help.c:25

4303 msgid "work on the current change (see also: git help everyday)"

4304 msgstr "在目前變更上工作（參見：git help everyday）"

4305

4219 -#: help.c:25

4306 +#: help.c:26

4307 msgid "examine the history and state (see also: git help revisions)"

4308 msgstr "檢查歷史和狀態（參見：git help revisions）"

4309

4223 -#: help.c:26

4310 +#: help.c:27

4311 msgid "grow, mark and tweak your common history"

4312 msgstr "擴展、標記和調校您的歷史記錄"

4313

4227 -#: help.c:27

4314 +#: help.c:28

4315 msgid "collaborate (see also: git help workflows)"

4316 msgstr "協同（參見：git help workflows）"

4317

4231 -#: help.c:31

4318 +#: help.c:32

4319 msgid "Main Porcelain Commands"

4320 msgstr "主要的上層指令"

4321

4235 -#: help.c:32

4322 +#: help.c:33

4323 msgid "Ancillary Commands / Manipulators"

4324 msgstr "輔助指令/動作者"

4325

4239 -#: help.c:33

4326 +#: help.c:34

4327 msgid "Ancillary Commands / Interrogators"

4328 msgstr "輔助指令/詢問者"

4329

4243 -#: help.c:34

4330 +#: help.c:35

4331 msgid "Interacting with Others"

4332 msgstr "與其它系統互動"

4333

4247 -#: help.c:35

4334 +#: help.c:36

4335 msgid "Low-level Commands / Manipulators"

4336 msgstr "低級指令/動作者"

4337

4251 -#: help.c:36

4338 +#: help.c:37

4339 msgid "Low-level Commands / Interrogators"

4340 msgstr "低級指令/詢問者"

4341

4255 -#: help.c:37

4342 +#: help.c:38

4343 msgid "Low-level Commands / Syncing Repositories"

4344 msgstr "低級指令 / 同步版本庫"

4345

4259 -#: help.c:38

4346 +#: help.c:39

4347 msgid "Low-level Commands / Internal Helpers"

4348 msgstr "低級指令/內部協助工具"

4349

4263 -#: help.c:300

4350 +#: help.c:313

4351 #, c-format

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

4353 msgstr "在 '%s' 下可用的 git 指令"

4354

4268 -#: help.c:307

4355 +#: help.c:320

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

4357 msgstr "在 $PATH 路徑中的其他地方可用的 git 指令"

4358

4272 -#: help.c:316

4359 +#: help.c:329

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

4361 msgstr "這些是各種場合常見的 Git 指令："

4362

4276 -#: help.c:365 git.c:100

4363 +#: help.c:378 git.c:100

4364 #, c-format

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

4366 msgstr "不支援的指令列表類型 '%s'"

4367

4281 -#: help.c:405

4368 +#: help.c:418

4369 msgid "The Git concept guides are:"

4370 msgstr "Git 概念嚮導有："

4371

4285 -#: help.c:429

4372 +#: help.c:442

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

4374 msgstr "執行　'git help <command>' 來檢視特定子指令"

4375

4289 -#: help.c:434

4376 +#: help.c:447

4377 msgid "External commands"

4378 msgstr "外部指令"

4379

4293 -#: help.c:449

4380 +#: help.c:462

4381 msgid "Command aliases"

4382 msgstr "指令別名"

4383

4297 -#: help.c:527

4384 +#: help.c:543

4385 #, c-format

4386 msgid ""

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

@@ -4303,31 +4390,36 @@ msgstr ""

4390 "'%s' 像是一個 git 指令，但卻無法執行。\n"

4391 "可能是 git-%s 受損？"

4392

4306 -#: help.c:543 help.c:631

4393 +#: help.c:565 help.c:662

4394 #, c-format

4395 msgid "git: '%s' is not a git command. See 'git --help'."

4396 msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。"

4397

4311 -#: help.c:591

4398 +#: help.c:613

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

4400 msgstr "唉呀，您的系統中未發現 Git 指令。"

4401

4315 -#: help.c:613

4402 +#: help.c:635

4403 #, c-format

4404 msgid "WARNING: You called a Git command named '%s', which does not exist."

4405 msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。"

4406

4320 -#: help.c:618

4407 +#: help.c:640

4408 #, c-format

4409 msgid "Continuing under the assumption that you meant '%s'."

4410 msgstr "假定你想要的是 '%s' 並繼續。"

4411

4325 -#: help.c:623

4412 +#: help.c:646

4413 +#, c-format

4414 +msgid "Run '%s' instead? (y/N)"

4415 +msgstr "改執行「%s」？(y/N)"

4416 +

4417 +#: help.c:654

4418 #, c-format

4419 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

4420 msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。"

4421

4330 -#: help.c:635

4422 +#: help.c:666

4423 msgid ""

4424 "\n"

4425 "The most similar command is"

@@ -4338,16 +4430,16 @@ msgstr[0] ""

4430 "\n"

4431 "最類似的指令有"

4432

4341 -#: help.c:675

4433 +#: help.c:706

4434 msgid "git version [<options>]"

4435 msgstr "git version [<選項>]"

4436

4345 -#: help.c:730

4437 +#: help.c:761

4438 #, c-format

4439 msgid "%s: %s - %s"

4440 msgstr "%s：%s - %s"

4441

4350 -#: help.c:734

4442 +#: help.c:765

4443 msgid ""

4444 "\n"

4445 "Did you mean this?"

@@ -4358,6 +4450,15 @@ msgstr[0] ""

4450 "\n"

4451 "您指的是這個嗎？"

4452

4453 +#: hook.c:27

4454 +#, c-format

4455 +msgid ""

4456 +"The '%s' hook was ignored because it's not set as executable.\n"

4457 +"You can disable this warning with `git config advice.ignoredHook false`."

4458 +msgstr ""

4459 +"因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n"

4460 +"設定 `git config advice.ignoredHook false` 來關閉這條警告。"

4461 +

4462 #: ident.c:353

4463 msgid "Author identity unknown\n"

4464 msgstr "作者身分未知\n"

@@ -4389,7 +4490,8 @@ msgstr ""

4490 " git config --global user.name \"Your Name\"\n"

4491 "\n"

4492 "來設定您帳號的預設身份標記。\n"

4392 -"如果僅在本版本庫設定身份標記，則省略 --global 參數。\n"

4493 +"若只要在這個版本庫設定身份標記，請省略 --global 參數。\n"

4494 +"\n"

4495

4496 #: ident.c:397

4497 msgid "no email was given and auto-detection is disabled"

@@ -4419,7 +4521,7 @@ msgstr "不允許空的姓名（對於 <%s>）"

4521 msgid "name consists only of disallowed characters: %s"

4522 msgstr "姓名中僅包含停用字元：%s"

4523

4422 -#: ident.c:454 builtin/commit.c:647

4524 +#: ident.c:454 builtin/commit.c:648

4525 #, c-format

4526 msgid "invalid date format: %s"

4527 msgstr "無效的日期格式：%s"

@@ -4440,7 +4542,7 @@ msgstr "“object:type=<type>” 的 “%s” 不是有效的物件格式"

4542 #: list-objects-filter-options.c:124

4543 #, c-format

4544 msgid "invalid filter-spec '%s'"

4443 -msgstr "無效的過濾器表達式 '%s'"

4545 +msgstr "無效的過濾器規格 '%s'"

4546

4547 #: list-objects-filter-options.c:140

4548 #, c-format

@@ -4497,10 +4599,11 @@ msgid ""

4599 msgstr ""

4600 "無法建立 '%s.lock'：%s。\n"

4601 "\n"

4500 -"似乎另外一個 git 進程在這個版本庫中執行，例如：'git commit' 指令打\n"

4501 -"開了一個編輯器。請確認所有進程都已經關閉然後重試。如果仍然報錯，\n"

4502 -"可能之前有一個 git 進程在這個版本庫中異常離開：\n"

4503 -"手動刪除這個檔案再繼續。"

4602 +"這個版本庫似乎有另一個 git 處理程序在執行，\n"

4603 +"例如「git commit」命令開啟的編輯器。\n"

4604 +"請確認所有處理程序都已經終止後再重試一次。如果錯誤沒有消失，\n"

4605 +"有可能是之前在這個版本庫執行的 git 處理程序當掉了。\n"

4606 +"如果是這樣，請自行刪除這個檔案再繼續。"

4607

4608 #: lockfile.c:160

4609 #, c-format

@@ -4512,7 +4615,12 @@ msgstr "不能建立 '%s.lock'：%s"

4615 msgid "invalid value '%s' for lsrefs.unborn"

4616 msgstr "lsrefs.unborn 的值「%s」無效"

4617

4515 -#: ls-refs.c:167

4618 +#: ls-refs.c:174

4619 +#, c-format

4620 +msgid "unexpected line: '%s'"

4621 +msgstr "遇到非預期橫列：「%s」"

4622 +

4623 +#: ls-refs.c:178

4624 msgid "expected flush after ls-refs arguments"

4625 msgstr "在 ls-refs 引數之後應該有一個 flush 包"

4626

@@ -4520,37 +4628,37 @@ msgstr "在 ls-refs 引數之後應該有一個 flush 包"

4628 msgid "quoted CRLF detected"

4629 msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF"

4630

4523 -#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46

4631 +#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46

4632 #, c-format

4633 msgid "bad action '%s' for '%s'"

4634 msgstr "「%s」動作對「%s」無效"

4635

4528 -#: merge-ort.c:1569 merge-recursive.c:1201

4636 +#: merge-ort.c:1584 merge-recursive.c:1211

4637 #, c-format

4638 msgid "Failed to merge submodule %s (not checked out)"

4639 msgstr "無法合併子模組 %s （沒有簽出）"

4640

4533 -#: merge-ort.c:1578 merge-recursive.c:1208

4641 +#: merge-ort.c:1593 merge-recursive.c:1218

4642 #, c-format

4643 msgid "Failed to merge submodule %s (commits not present)"

4644 msgstr "無法合併子模組 %s（提交不存在）"

4645

4538 -#: merge-ort.c:1587 merge-recursive.c:1215

4646 +#: merge-ort.c:1602 merge-recursive.c:1225

4647 #, c-format

4648 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4649 msgstr "無法合併子模組 %s （提交未跟隨合併基礎）"

4650

4543 -#: merge-ort.c:1597 merge-ort.c:1604

4651 +#: merge-ort.c:1612 merge-ort.c:1620

4652 #, c-format

4653 msgid "Note: Fast-forwarding submodule %s to %s"

4654 msgstr "注意：正在將 %s 子模組快轉到 %s"

4655

4548 -#: merge-ort.c:1625

4656 +#: merge-ort.c:1642

4657 #, c-format

4658 msgid "Failed to merge submodule %s"

4659 msgstr "無法合併 %s 子模組"

4660

4553 -#: merge-ort.c:1632

4661 +#: merge-ort.c:1649

4662 #, c-format

4663 msgid ""

4664 "Failed to merge submodule %s, but a possible merge resolution exists:\n"

@@ -4559,7 +4667,7 @@ msgstr ""

4667 "無法合併 %s 子模組，但有找到一個可行的合併方案：\n"

4668 "%s\n"

4669

4562 -#: merge-ort.c:1636 merge-recursive.c:1269

4670 +#: merge-ort.c:1653 merge-recursive.c:1281

4671 #, c-format

4672 msgid ""

4673 "If this is correct simply add it to the index for example\n"

@@ -4569,13 +4677,13 @@ msgid ""

4677 "\n"

4678 "which will accept this suggestion.\n"

4679 msgstr ""

4572 -"如果這個正確，將其新增到索引，例如使用指令：\n"

4680 +"正確的話，就能直接加進索引，例如執行下述命令：\n"

4681 "\n"

4682 " git update-index --cacheinfo 160000 %s \"%s\"\n"

4683 "\n"

4576 -"以接受此建議。\n"

4684 +"接受本建議。\n"

4685

4578 -#: merge-ort.c:1649

4686 +#: merge-ort.c:1666

4687 #, c-format

4688 msgid ""

4689 "Failed to merge submodule %s, but multiple possible merges exist:\n"

@@ -4584,21 +4692,21 @@ msgstr ""

4692 "無法合併 %s 子模組，但有找到幾個可行的合併方案：\n"

4693 "%s"

4694

4587 -#: merge-ort.c:1868 merge-recursive.c:1358

4695 +#: merge-ort.c:1887 merge-recursive.c:1372

4696 msgid "Failed to execute internal merge"

4697 msgstr "無法執行內部合併"

4698

4591 -#: merge-ort.c:1873 merge-recursive.c:1363

4699 +#: merge-ort.c:1892 merge-recursive.c:1377

4700 #, c-format

4701 msgid "Unable to add %s to database"

4702 msgstr "不能新增 %s 至物件庫"

4703

4596 -#: merge-ort.c:1880 merge-recursive.c:1396

4704 +#: merge-ort.c:1899 merge-recursive.c:1410

4705 #, c-format

4706 msgid "Auto-merging %s"

4707 msgstr "自動合併 %s"

4708

4601 -#: merge-ort.c:2019 merge-recursive.c:2118

4709 +#: merge-ort.c:2038 merge-recursive.c:2132

4710 #, c-format

4711 msgid ""

4712 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -4607,7 +4715,7 @@ msgstr ""

4715 "衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑"

4716 "放在：%s。"

4717

4610 -#: merge-ort.c:2029 merge-recursive.c:2128

4718 +#: merge-ort.c:2048 merge-recursive.c:2142

4719 #, c-format

4720 msgid ""

4721 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -4616,7 +4724,7 @@ msgstr ""

4724 "衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這"

4725 "些路徑放置於此：%s"

4726

4619 -#: merge-ort.c:2087

4727 +#: merge-ort.c:2106

4728 #, c-format

4729 msgid ""

4730 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "

@@ -4626,14 +4734,14 @@ msgstr ""

4734 "衝突（分割的目錄重新命名）：未知 %s 重新命名的位置。它被重新命名為多個其他目"

4735 "錄，但沒有目的地取得過半檔案。"

4736

4629 -#: merge-ort.c:2241 merge-recursive.c:2464

4737 +#: merge-ort.c:2260 merge-recursive.c:2478

4738 #, c-format

4739 msgid ""

4740 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

4741 "renamed."

4742 msgstr "警告：避免套用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。"

4743

4636 -#: merge-ort.c:2385 merge-recursive.c:3247

4744 +#: merge-ort.c:2400 merge-recursive.c:3261

4745 #, c-format

4746 msgid ""

4747 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -4641,7 +4749,7 @@ msgid ""

4749 msgstr ""

4750 "路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"

4751

4644 -#: merge-ort.c:2392 merge-recursive.c:3254

4752 +#: merge-ort.c:2407 merge-recursive.c:3268

4753 #, c-format

4754 msgid ""

4755 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4650,7 +4758,7 @@ msgstr ""

4758 "路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將"

4759 "其移動到 %5$s。"

4760

4653 -#: merge-ort.c:2405 merge-recursive.c:3250

4761 +#: merge-ort.c:2420 merge-recursive.c:3264

4762 #, c-format

4763 msgid ""

4764 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4659,7 +4767,7 @@ msgstr ""

4767 "衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移"

4768 "動到 %s。"

4769

4662 -#: merge-ort.c:2413 merge-recursive.c:3257

4770 +#: merge-ort.c:2428 merge-recursive.c:3271

4771 #, c-format

4772 msgid ""

4773 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4668,14 +4776,14 @@ msgstr ""

4776 "衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s "

4777 "中，建議將其移動到 %5$s。"

4778

4671 -#: merge-ort.c:2569

4779 +#: merge-ort.c:2584

4780 #, c-format

4781 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."

4782 msgstr ""

4783 "衝突（重新命名/重新命名）：%1$s 已重新命名為 %3$s 中的 %2$s 和 %5$s 中的 "

4784 "%4$s。"

4785

4678 -#: merge-ort.c:2664

4786 +#: merge-ort.c:2679

4787 #, c-format

4788 msgid ""

4789 "CONFLICT (rename involved in collision): rename of %s -> %s has content "

@@ -4685,30 +4793,30 @@ msgstr ""

4793 "衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可"

4794 "能會因此出現巢狀衝突標記。"

4795

4688 -#: merge-ort.c:2683 merge-ort.c:2707

4796 +#: merge-ort.c:2698 merge-ort.c:2722

4797 #, c-format

4798 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

4799 msgstr ""

4800 "衝突（重新命名/刪除）：%1$s 已重新命名為 %3$s 中的 %2$s 卻在 %4$s 中被刪除。"

4801

4694 -#: merge-ort.c:3182 merge-recursive.c:3008

4802 +#: merge-ort.c:3212 merge-recursive.c:3022

4803 #, c-format

4804 msgid "cannot read object %s"

4805 msgstr "不能讀取物件 %s"

4806

4699 -#: merge-ort.c:3185 merge-recursive.c:3011

4807 +#: merge-ort.c:3215 merge-recursive.c:3025

4808 #, c-format

4809 msgid "object %s is not a blob"

4810 msgstr "物件 %s 不是一個資料物件"

4811

4704 -#: merge-ort.c:3613

4812 +#: merge-ort.c:3644

4813 #, c-format

4814 msgid ""

4815 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "

4816 "%s instead."

4817 msgstr "衝突（檔案/目錄）：目錄佔住 %2$s 中 %1$s 的位置。改移動到 %3$s。"

4818

4711 -#: merge-ort.c:3689

4819 +#: merge-ort.c:3721

4820 #, c-format

4821 msgid ""

4822 "CONFLICT (distinct types): %s had different types on each side; renamed both "

@@ -4717,7 +4825,7 @@ msgstr ""

4825 "衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名這兩個來源，這樣就可以分"

4826 "別記錄這兩方檔案。"

4827

4720 -#: merge-ort.c:3696

4828 +#: merge-ort.c:3728

4829 #, c-format

4830 msgid ""

4831 "CONFLICT (distinct types): %s had different types on each side; renamed one "

@@ -4726,24 +4834,24 @@ msgstr ""

4834 "衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名其中一個來源，這樣就可以"

4835 "分別記錄這兩方檔案。"

4836

4729 -#: merge-ort.c:3796 merge-recursive.c:3087

4837 +#: merge-ort.c:3819 merge-recursive.c:3101

4838 msgid "content"

4839 msgstr "內容"

4840

4733 -#: merge-ort.c:3798 merge-recursive.c:3091

4841 +#: merge-ort.c:3821 merge-recursive.c:3105

4842 msgid "add/add"

4843 msgstr "新增/新增"

4844

4737 -#: merge-ort.c:3800 merge-recursive.c:3136

4845 +#: merge-ort.c:3823 merge-recursive.c:3150

4846 msgid "submodule"

4847 msgstr "子模組"

4848

4741 -#: merge-ort.c:3802 merge-recursive.c:3137

4849 +#: merge-ort.c:3825 merge-recursive.c:3151

4850 #, c-format

4851 msgid "CONFLICT (%s): Merge conflict in %s"

4852 msgstr "衝突（%s）：合併衝突於 %s"

4853

4746 -#: merge-ort.c:3833

4854 +#: merge-ort.c:3856

4855 #, c-format

4856 msgid ""

4857 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

@@ -4752,7 +4860,7 @@ msgstr ""

4860 "衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹"

4861 "上。"

4862

4755 -#: merge-ort.c:4120

4863 +#: merge-ort.c:4152

4864 #, c-format

4865 msgid ""

4866 "Note: %s not up to date and in way of checking out conflicted version; old "

@@ -4762,12 +4870,12 @@ msgstr "註：%s 不是最新且干擾到簽出衝突版本。已將舊拷貝重

4870 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

4871 #. base, and 2-3) the trees for the two trees we're merging.

4872 #.

4765 -#: merge-ort.c:4487

4873 +#: merge-ort.c:4521

4874 #, c-format

4875 msgid "collecting merge info failed for trees %s, %s, %s"

4876 msgstr "%s, %s, %s 樹的合併資訊收集失敗"

4877

4770 -#: merge-ort-wrappers.c:13 merge-recursive.c:3702

4878 +#: merge-ort-wrappers.c:13 merge-recursive.c:3716

4879 #, c-format

4880 msgid ""

4881 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4776,103 +4884,103 @@ msgstr ""

4884 "您對下列檔案的本機修改將被合併動作覆蓋：\n"

4885 " %s"

4886

4779 -#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402

4887 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403

4888 msgid "Already up to date."

4889 msgstr "已經是最新的。"

4890

4783 -#: merge-recursive.c:352

4891 +#: merge-recursive.c:353

4892 msgid "(bad commit)\n"

4893 msgstr "（壞提交）\n"

4894

4787 -#: merge-recursive.c:375

4895 +#: merge-recursive.c:381

4896 #, c-format

4897 msgid "add_cacheinfo failed for path '%s'; merge aborting."

4898 msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。"

4899

4792 -#: merge-recursive.c:384

4900 +#: merge-recursive.c:390

4901 #, c-format

4902 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

4903 msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。"

4904

4797 -#: merge-recursive.c:872

4905 +#: merge-recursive.c:881

4906 #, c-format

4907 msgid "failed to create path '%s'%s"

4908 msgstr "建立路徑 '%s'%s 失敗"

4909

4802 -#: merge-recursive.c:883

4910 +#: merge-recursive.c:892

4911 #, c-format

4912 msgid "Removing %s to make room for subdirectory\n"

4913 msgstr "刪除 %s 以便為子目錄留出空間\n"

4914

4807 -#: merge-recursive.c:897 merge-recursive.c:916

4915 +#: merge-recursive.c:906 merge-recursive.c:925

4916 msgid ": perhaps a D/F conflict?"

4917 msgstr "：可能是一個目錄/檔案衝突？"

4918

4811 -#: merge-recursive.c:906

4919 +#: merge-recursive.c:915

4920 #, c-format

4921 msgid "refusing to lose untracked file at '%s'"

4922 msgstr "拒絕捨棄 '%s' 中的未追蹤檔案"

4923

4816 -#: merge-recursive.c:947 builtin/cat-file.c:41

4924 +#: merge-recursive.c:956 builtin/cat-file.c:41

4925 #, c-format

4926 msgid "cannot read object %s '%s'"

4927 msgstr "不能讀取物件 %s '%s'"

4928

4821 -#: merge-recursive.c:952

4929 +#: merge-recursive.c:961

4930 #, c-format

4931 msgid "blob expected for %s '%s'"

4932 msgstr "%s '%s' 應為資料物件"

4933

4826 -#: merge-recursive.c:977

4934 +#: merge-recursive.c:986

4935 #, c-format

4936 msgid "failed to open '%s': %s"

4937 msgstr "開啟 '%s' 失敗：%s"

4938

4831 -#: merge-recursive.c:988

4939 +#: merge-recursive.c:997

4940 #, c-format

4941 msgid "failed to symlink '%s': %s"

4942 msgstr "建立符號連結 '%s' 失敗：%s"

4943

4836 -#: merge-recursive.c:993

4944 +#: merge-recursive.c:1002

4945 #, c-format

4946 msgid "do not know what to do with %06o %s '%s'"

4947 msgstr "不知道如何處理 %06o %s '%s'"

4948

4841 -#: merge-recursive.c:1223 merge-recursive.c:1235

4949 +#: merge-recursive.c:1233 merge-recursive.c:1246

4950 #, c-format

4951 msgid "Fast-forwarding submodule %s to the following commit:"

4952 msgstr "子模組 %s 快轉到如下提交："

4953

4846 -#: merge-recursive.c:1226 merge-recursive.c:1238

4954 +#: merge-recursive.c:1236 merge-recursive.c:1249

4955 #, c-format

4956 msgid "Fast-forwarding submodule %s"

4957 msgstr "快轉子模組 %s"

4958

4851 -#: merge-recursive.c:1261

4959 +#: merge-recursive.c:1273

4960 #, c-format

4961 msgid "Failed to merge submodule %s (merge following commits not found)"

4962 msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）"

4963

4856 -#: merge-recursive.c:1265

4964 +#: merge-recursive.c:1277

4965 #, c-format

4966 msgid "Failed to merge submodule %s (not fast-forward)"

4967 msgstr "無法合併子模組 %s（非快轉）"

4968

4861 -#: merge-recursive.c:1266

4969 +#: merge-recursive.c:1278

4970 msgid "Found a possible merge resolution for the submodule:\n"

4971 msgstr "找到子模組的一個可能的合併方案：\n"

4972

4865 -#: merge-recursive.c:1278

4973 +#: merge-recursive.c:1290

4974 #, c-format

4975 msgid "Failed to merge submodule %s (multiple merges found)"

4976 msgstr "無法合併子模組 %s （發現多個合併）"

4977

4870 -#: merge-recursive.c:1420

4978 +#: merge-recursive.c:1434

4979 #, c-format

4980 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

4981 msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。"

4982

4875 -#: merge-recursive.c:1492

4983 +#: merge-recursive.c:1506

4984 #, c-format

4985 msgid ""

4986 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -4881,7 +4989,7 @@ msgstr ""

4989 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

4990 "本被保留。"

4991

4884 -#: merge-recursive.c:1497

4992 +#: merge-recursive.c:1511

4993 #, c-format

4994 msgid ""

4995 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -4890,7 +4998,7 @@ msgstr ""

4998 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

4999 "%7$s 版本被保留。"

5000

4893 -#: merge-recursive.c:1504

5001 +#: merge-recursive.c:1518

5002 #, c-format

5003 msgid ""

5004 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -4899,7 +5007,7 @@ msgstr ""

5007 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

5008 "本保留在 %8$s 中。"

5009

4902 -#: merge-recursive.c:1509

5010 +#: merge-recursive.c:1523

5011 #, c-format

5012 msgid ""

5013 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -4908,41 +5016,41 @@ msgstr ""

5016 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

5017 "%7$s 版本保留在 %9$s 中。"

5018

4911 -#: merge-recursive.c:1544

5019 +#: merge-recursive.c:1558

5020 msgid "rename"

5021 msgstr "重新命名"

5022

4915 -#: merge-recursive.c:1544

5023 +#: merge-recursive.c:1558

5024 msgid "renamed"

5025 msgstr "重新命名"

5026

4919 -#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164

5027 +#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178

5028 #, c-format

5029 msgid "Refusing to lose dirty file at %s"

5030 msgstr "拒絕遺失髒檔案 '%s'"

5031

4924 -#: merge-recursive.c:1605

5032 +#: merge-recursive.c:1619

5033 #, c-format

5034 msgid "Refusing to lose untracked file at %s, even though it's in the way."

5035 msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。"

5036

4929 -#: merge-recursive.c:1663

5037 +#: merge-recursive.c:1677

5038 #, c-format

5039 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

5040 msgstr ""

5041 "衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"

5042

4935 -#: merge-recursive.c:1694

5043 +#: merge-recursive.c:1708

5044 #, c-format

5045 msgid "%s is a directory in %s adding as %s instead"

5046 msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增"

5047

4940 -#: merge-recursive.c:1699

5048 +#: merge-recursive.c:1713

5049 #, c-format

5050 msgid "Refusing to lose untracked file at %s; adding as %s instead"

5051 msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s"

5052

4945 -#: merge-recursive.c:1726

5053 +#: merge-recursive.c:1740

5054 #, c-format

5055 msgid ""

5056 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -4951,18 +5059,18 @@ msgstr ""

5059 "衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在"

5060 "分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s"

5061

4954 -#: merge-recursive.c:1731

5062 +#: merge-recursive.c:1745

5063 msgid " (left unresolved)"

5064 msgstr " （留下未解決）"

5065

4958 -#: merge-recursive.c:1823

5066 +#: merge-recursive.c:1837

5067 #, c-format

5068 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

5069 msgstr ""

5070 "衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 "

5071 "%4$s->%5$s"

5072

4965 -#: merge-recursive.c:2086

5073 +#: merge-recursive.c:2100

5074 #, c-format

5075 msgid ""

5076 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -4972,7 +5080,7 @@ msgstr ""

5080 "衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到"

5081 "多個其它目錄，沒有目錄包含大部分檔案。"

5082

4975 -#: merge-recursive.c:2220

5083 +#: merge-recursive.c:2234

5084 #, c-format

5085 msgid ""

5086 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -4981,78 +5089,78 @@ msgstr ""

5089 "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新"

5090 "命名目錄 %4$s->%5$s"

5091

4984 -#: merge-recursive.c:3075

5092 +#: merge-recursive.c:3089

5093 msgid "modify"

5094 msgstr "修改"

5095

4988 -#: merge-recursive.c:3075

5096 +#: merge-recursive.c:3089

5097 msgid "modified"

5098 msgstr "修改"

5099

4992 -#: merge-recursive.c:3114

5100 +#: merge-recursive.c:3128

5101 #, c-format

5102 msgid "Skipped %s (merged same as existing)"

5103 msgstr "略過 %s（已經做過相同合併）"

5104

4997 -#: merge-recursive.c:3167

5105 +#: merge-recursive.c:3181

5106 #, c-format

5107 msgid "Adding as %s instead"

5108 msgstr "而是以 %s 為名新增"

5109

5002 -#: merge-recursive.c:3371

5110 +#: merge-recursive.c:3385

5111 #, c-format

5112 msgid "Removing %s"

5113 msgstr "刪除 %s"

5114

5007 -#: merge-recursive.c:3394

5115 +#: merge-recursive.c:3408

5116 msgid "file/directory"

5117 msgstr "檔案/目錄"

5118

5011 -#: merge-recursive.c:3399

5119 +#: merge-recursive.c:3413

5120 msgid "directory/file"

5121 msgstr "目錄/檔案"

5122

5015 -#: merge-recursive.c:3406

5123 +#: merge-recursive.c:3420

5124 #, c-format

5125 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

5126 msgstr "衝突（%1$s）：在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s"

5127

5020 -#: merge-recursive.c:3415

5128 +#: merge-recursive.c:3429

5129 #, c-format

5130 msgid "Adding %s"

5131 msgstr "新增 %s"

5132

5025 -#: merge-recursive.c:3424

5133 +#: merge-recursive.c:3438

5134 #, c-format

5135 msgid "CONFLICT (add/add): Merge conflict in %s"

5136 msgstr "衝突（add/add）：合併衝突於 %s"

5137

5030 -#: merge-recursive.c:3477

5138 +#: merge-recursive.c:3491

5139 #, c-format

5140 msgid "merging of trees %s and %s failed"

5141 msgstr "無法合併樹 %s 和 %s"

5142

5035 -#: merge-recursive.c:3571

5143 +#: merge-recursive.c:3585

5144 msgid "Merging:"

5145 msgstr "合併："

5146

5039 -#: merge-recursive.c:3584

5147 +#: merge-recursive.c:3598

5148 #, c-format

5149 msgid "found %u common ancestor:"

5150 msgid_plural "found %u common ancestors:"

5151 msgstr[0] "發現 %u 個共同祖先："

5152

5045 -#: merge-recursive.c:3634

5153 +#: merge-recursive.c:3648

5154 msgid "merge returned no commit"

5155 msgstr "合併未返回提交"

5156

5049 -#: merge-recursive.c:3799

5157 +#: merge-recursive.c:3816

5158 #, c-format

5159 msgid "Could not parse object '%s'"

5160 msgstr "不能解析物件 '%s'"

5161

5054 -#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901

5055 -#: builtin/stash.c:473

5162 +#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904

5163 +#: builtin/stash.c:489

5164 msgid "Unable to write index."

5165 msgstr "不能寫入索引。"

5166

@@ -5060,189 +5168,221 @@ msgstr "不能寫入索引。"

5168 msgid "failed to read the cache"

5169 msgstr "讀取快取失敗"

5170

5063 -#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966

5064 -#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821

5065 -#: builtin/stash.c:267

5171 +#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967

5172 +#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706

5173 +#: builtin/stash.c:269

5174 msgid "unable to write new index file"

5175 msgstr "無法寫新的索引檔案"

5176

5069 -#: midx.c:74

5177 +#: midx.c:78

5178 msgid "multi-pack-index OID fanout is of the wrong size"

5179 msgstr "多包索引的物件 ID fanout 大小錯誤"

5180

5073 -#: midx.c:105

5181 +#: midx.c:109

5182 #, c-format

5183 msgid "multi-pack-index file %s is too small"

5184 msgstr "多包索引檔案 %s 太小"

5185

5078 -#: midx.c:121

5186 +#: midx.c:125

5187 #, c-format

5188 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

5189 msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合"

5190

5083 -#: midx.c:126

5191 +#: midx.c:130

5192 #, c-format

5193 msgid "multi-pack-index version %d not recognized"

5194 msgstr "multi-pack-index 版本 %d 不能被識別"

5195

5088 -#: midx.c:131

5196 +#: midx.c:135

5197 #, c-format

5198 msgid "multi-pack-index hash version %u does not match version %u"

5199 msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合"

5200

5093 -#: midx.c:148

5201 +#: midx.c:152

5202 msgid "multi-pack-index missing required pack-name chunk"

5203 msgstr "多包索引缺少必需的包名區塊"

5204

5097 -#: midx.c:150

5205 +#: midx.c:154

5206 msgid "multi-pack-index missing required OID fanout chunk"

5207 msgstr "多包索引缺少必需的物件 ID fanout 區塊"

5208

5101 -#: midx.c:152

5209 +#: midx.c:156

5210 msgid "multi-pack-index missing required OID lookup chunk"

5211 msgstr "多包索引缺少必需的物件 ID 查詢區塊"

5212

5105 -#: midx.c:154

5213 +#: midx.c:158

5214 msgid "multi-pack-index missing required object offsets chunk"

5215 msgstr "多包索引缺少必需的物件位移區塊"

5216

5109 -#: midx.c:170

5217 +#: midx.c:174

5218 #, c-format

5219 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

5220 msgstr "多包索引包名無序：'%s' 在 '%s' 之前"

5221

5114 -#: midx.c:214

5222 +#: midx.c:221

5223 #, c-format

5224 msgid "bad pack-int-id: %u (%u total packs)"

5225 msgstr "錯的 pack-int-id：%u（共有 %u 個包）"

5226

5119 -#: midx.c:264

5227 +#: midx.c:271

5228 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5229 msgstr "多包索引儲存一個64位位移，但是 off_t 太小"

5230

5123 -#: midx.c:490

5231 +#: midx.c:502

5232 #, c-format

5233 msgid "failed to add packfile '%s'"

5234 msgstr "新增 packfile '%s' 失敗"

5235

5128 -#: midx.c:496

5236 +#: midx.c:508

5237 #, c-format

5238 msgid "failed to open pack-index '%s'"

5239 msgstr "開啟包索引 '%s' 失敗"

5240

5133 -#: midx.c:564

5241 +#: midx.c:576

5242 #, c-format

5243 msgid "failed to locate object %d in packfile"

5244 msgstr "在 packfile 中定位物件 %d 失敗"

5245

5138 -#: midx.c:880 builtin/index-pack.c:1533

5246 +#: midx.c:892

5247 msgid "cannot store reverse index file"

5248 msgstr "無法儲存倒排索引檔案"

5249

5142 -#: midx.c:920

5250 +#: midx.c:990

5251 +#, c-format

5252 +msgid "could not parse line: %s"

5253 +msgstr "無法解析橫列：%s"

5254 +

5255 +#: midx.c:992

5256 +#, c-format

5257 +msgid "malformed line: %s"

5258 +msgstr "橫列格式錯誤：%s"

5259 +

5260 +#: midx.c:1159

5261 msgid "ignoring existing multi-pack-index; checksum mismatch"

5262 msgstr "忽略現有的多包索引：總和檢查碼不符"

5263

5146 -#: midx.c:943

5147 -msgid "Adding packfiles to multi-pack-index"

5148 -msgstr "正在新增 packfile 至多包索引"

5264 +#: midx.c:1184

5265 +msgid "could not load pack"

5266 +msgstr "無法載入包"

5267

5150 -#: midx.c:989

5268 +#: midx.c:1190

5269 #, c-format

5152 -msgid "did not see pack-file %s to drop"

5153 -msgstr "沒有看到要捨棄的包檔案 %s"

5270 +msgid "could not open index for %s"

5271 +msgstr "無法開啟 %s 的索引"

5272 +

5273 +#: midx.c:1201

5274 +msgid "Adding packfiles to multi-pack-index"

5275 +msgstr "正在新增 packfile 至多包索引"

5276

5155 -#: midx.c:1034

5277 +#: midx.c:1244

5278 #, c-format

5279 msgid "unknown preferred pack: '%s'"

5280 msgstr "未知偏好包：「%s」"

5281

5160 -#: midx.c:1039

5282 +#: midx.c:1289

5283 +#, c-format

5284 +msgid "cannot select preferred pack %s with no objects"

5285 +msgstr "無法選取偏好，沒有物件的 %s 包"

5286 +

5287 +#: midx.c:1321

5288 +#, c-format

5289 +msgid "did not see pack-file %s to drop"

5290 +msgstr "沒有看到要捨棄的包檔案 %s"

5291 +

5292 +#: midx.c:1367

5293 #, c-format

5294 msgid "preferred pack '%s' is expired"

5295 msgstr "偏好包「%s」已經過期"

5296

5165 -#: midx.c:1055

5297 +#: midx.c:1380

5298 msgid "no pack files to index."

5299 msgstr "沒有要索引的 pack 檔案。"

5300

5169 -#: midx.c:1135 builtin/clean.c:37

5301 +#: midx.c:1417

5302 +msgid "could not write multi-pack bitmap"

5303 +msgstr "無法寫入多包位圖"

5304 +

5305 +#: midx.c:1427

5306 +msgid "could not write multi-pack-index"

5307 +msgstr "無法寫入多包索引"

5308 +

5309 +#: midx.c:1486 builtin/clean.c:37

5310 #, c-format

5311 msgid "failed to remove %s"

5312 msgstr "刪除 %s 失敗"

5313

5174 -#: midx.c:1166

5314 +#: midx.c:1517

5315 #, c-format

5316 msgid "failed to clear multi-pack-index at %s"

5317 msgstr "清理位於 %s 的多包索引失敗"

5318

5179 -#: midx.c:1225

5319 +#: midx.c:1577

5320 msgid "multi-pack-index file exists, but failed to parse"

5321 msgstr "有 multi-pack-index 檔案，但無法解析"

5322

5183 -#: midx.c:1233

5323 +#: midx.c:1585

5324 msgid "incorrect checksum"

5325 msgstr "總和檢查碼不正確"

5326

5187 -#: midx.c:1236

5327 +#: midx.c:1588

5328 msgid "Looking for referenced packfiles"

5329 msgstr "正在尋找引用的 packfile"

5330

5191 -#: midx.c:1251

5331 +#: midx.c:1603

5332 #, c-format

5333 msgid ""

5334 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5335 msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5336

5197 -#: midx.c:1256

5337 +#: midx.c:1608

5338 msgid "the midx contains no oid"

5339 msgstr "midx 沒有 oid"

5340

5201 -#: midx.c:1265

5341 +#: midx.c:1617

5342 msgid "Verifying OID order in multi-pack-index"

5343 msgstr "正在驗證多包索引中的物件 ID 順序"

5344

5205 -#: midx.c:1274

5345 +#: midx.c:1626

5346 #, c-format

5347 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5348 msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]"

5349

5210 -#: midx.c:1294

5350 +#: midx.c:1646

5351 msgid "Sorting objects by packfile"

5352 msgstr "透過 packfile 為物件排序"

5353

5214 -#: midx.c:1301

5354 +#: midx.c:1653

5355 msgid "Verifying object offsets"

5356 msgstr "正在驗證物件位移"

5357

5218 -#: midx.c:1317

5358 +#: midx.c:1669

5359 #, c-format

5360 msgid "failed to load pack entry for oid[%d] = %s"

5361 msgstr "為 oid[%d] = %s 載入包條目失敗"

5362

5223 -#: midx.c:1323

5363 +#: midx.c:1675

5364 #, c-format

5365 msgid "failed to load pack-index for packfile %s"

5366 msgstr "為 packfile %s 載入包索引失敗"

5367

5228 -#: midx.c:1332

5368 +#: midx.c:1684

5369 #, c-format

5370 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5371 msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"

5372

5233 -#: midx.c:1357

5373 +#: midx.c:1709

5374 msgid "Counting referenced objects"

5375 msgstr "正在計算引用物件"

5376

5237 -#: midx.c:1367

5377 +#: midx.c:1719

5378 msgid "Finding and deleting unreferenced packfiles"

5239 -msgstr "正在尋找並刪除沒有參考的 packfile"

5379 +msgstr "正在尋找並刪除沒有引用的 packfile"

5380

5241 -#: midx.c:1558

5381 +#: midx.c:1911

5382 msgid "could not start pack-objects"

5383 msgstr "不能開始 pack-objects"

5384

5245 -#: midx.c:1578

5385 +#: midx.c:1931

5386 msgid "could not finish pack-objects"

5387 msgstr "不能結束 pack-objects"

5388

@@ -5300,257 +5440,257 @@ msgstr "拒絕向 %s（在 refs/notes/ 之外）寫入註解"

5440 msgid "Bad %s value: '%s'"

5441 msgstr "壞的 %s 值：'%s'"

5442

5303 -#: object-file.c:526

5443 +#: object-file.c:459

5444 #, c-format

5445 msgid "object directory %s does not exist; check .git/objects/info/alternates"

5446 msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates"

5447

5308 -#: object-file.c:584

5448 +#: object-file.c:517

5449 #, c-format

5450 msgid "unable to normalize alternate object path: %s"

5451 msgstr "無法規範化備用物件路徑：%s"

5452

5313 -#: object-file.c:658

5453 +#: object-file.c:591

5454 #, c-format

5455 msgid "%s: ignoring alternate object stores, nesting too deep"

5456 msgstr "%s：忽略備用物件庫，嵌套太深"

5457

5318 -#: object-file.c:665

5458 +#: object-file.c:598

5459 #, c-format

5460 msgid "unable to normalize object directory: %s"

5461 msgstr "無法規範化物件目錄: %s"

5462

5323 -#: object-file.c:708

5463 +#: object-file.c:641

5464 msgid "unable to fdopen alternates lockfile"

5465 msgstr "無法 fdopen 取代鎖檔案"

5466

5327 -#: object-file.c:726

5467 +#: object-file.c:659

5468 msgid "unable to read alternates file"

5469 msgstr "無法讀取替代檔案"

5470

5331 -#: object-file.c:733

5471 +#: object-file.c:666

5472 msgid "unable to move new alternates file into place"

5473 msgstr "無法將新的替代檔案移動到位"

5474

5335 -#: object-file.c:768

5475 +#: object-file.c:701

5476 #, c-format

5477 msgid "path '%s' does not exist"

5478 msgstr "路徑 '%s' 不存在"

5479

5340 -#: object-file.c:789

5480 +#: object-file.c:722

5481 #, c-format

5482 msgid "reference repository '%s' as a linked checkout is not supported yet."

5343 -msgstr "尚不支援將參考版本庫 '%s' 作為一個連結簽出。"

5483 +msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。"

5484

5345 -#: object-file.c:795

5485 +#: object-file.c:728

5486 #, c-format

5487 msgid "reference repository '%s' is not a local repository."

5348 -msgstr "參考版本庫 '%s' 不是一個本機版本庫。"

5488 +msgstr "引用版本庫 '%s' 不是一個本機版本庫。"

5489

5350 -#: object-file.c:801

5490 +#: object-file.c:734

5491 #, c-format

5492 msgid "reference repository '%s' is shallow"

5353 -msgstr "參考版本庫 '%s' 是一個淺複製"

5493 +msgstr "引用版本庫 '%s' 是一個淺複製"

5494

5355 -#: object-file.c:809

5495 +#: object-file.c:742

5496 #, c-format

5497 msgid "reference repository '%s' is grafted"

5358 -msgstr "參考版本庫 '%s' 已被移植"

5498 +msgstr "引用版本庫 '%s' 已被移植"

5499 +

5500 +#: object-file.c:773

5501 +#, c-format

5502 +msgid "could not find object directory matching %s"

5503 +msgstr "找不到符合 %s 的物件目錄"

5504

5360 -#: object-file.c:869

5505 +#: object-file.c:823

5506 #, c-format

5507 msgid "invalid line while parsing alternate refs: %s"

5508 msgstr "解析備用引用時無效的行：%s"

5509

5365 -#: object-file.c:1019

5510 +#: object-file.c:973

5511 #, c-format

5512 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5513 msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>"

5514

5370 -#: object-file.c:1054

5515 +#: object-file.c:1008

5516 #, c-format

5517 msgid "mmap failed%s"

5518 msgstr "mmap 失敗%s"

5519

5375 -#: object-file.c:1218

5520 +#: object-file.c:1174

5521 #, c-format

5522 msgid "object file %s is empty"

5523 msgstr "物件檔案 %s 為空"

5524

5380 -#: object-file.c:1353 object-file.c:2548

5525 +#: object-file.c:1293 object-file.c:2499

5526 #, c-format

5527 msgid "corrupt loose object '%s'"

5528 msgstr "損壞的鬆散物件 '%s'"

5529

5385 -#: object-file.c:1355 object-file.c:2552

5530 +#: object-file.c:1295 object-file.c:2503

5531 #, c-format

5532 msgid "garbage at end of loose object '%s'"

5533 msgstr "鬆散物件 '%s' 後面有垃圾資料"

5534

5390 -#: object-file.c:1397

5535 +#: object-file.c:1417

5536 +#, c-format

5537 +msgid "unable to parse %s header"

5538 +msgstr "無法解析 %s 頭部"

5539 +

5540 +#: object-file.c:1419

5541 msgid "invalid object type"

5542 msgstr "無效的物件類型"

5543

5394 -#: object-file.c:1481

5395 -#, c-format

5396 -msgid "unable to unpack %s header with --allow-unknown-type"

5397 -msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息"

5398 -

5399 -#: object-file.c:1484

5544 +#: object-file.c:1430

5545 #, c-format

5546 msgid "unable to unpack %s header"

5547 msgstr "無法解開 %s 頭部"

5548

5404 -#: object-file.c:1490

5405 -#, c-format

5406 -msgid "unable to parse %s header with --allow-unknown-type"

5407 -msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息"

5408 -

5409 -#: object-file.c:1493

5549 +#: object-file.c:1434

5550 #, c-format

5411 -msgid "unable to parse %s header"

5412 -msgstr "無法解析 %s 頭部"

5551 +msgid "header for %s too long, exceeds %d bytes"

5552 +msgstr "%s 的標頭過長，超出 %d 位元組"

5553

5414 -#: object-file.c:1717

5554 +#: object-file.c:1664

5555 #, c-format

5556 msgid "failed to read object %s"

5557 msgstr "讀取物件 %s 失敗"

5558

5419 -#: object-file.c:1721

5559 +#: object-file.c:1668

5560 #, c-format

5561 msgid "replacement %s not found for %s"

5562 msgstr "找不到 %2$s 的替代 %1$s"

5563

5424 -#: object-file.c:1725

5564 +#: object-file.c:1672

5565 #, c-format

5566 msgid "loose object %s (stored in %s) is corrupt"

5567 msgstr "鬆散物件 %s（儲存在 %s）已損壞"

5568

5429 -#: object-file.c:1729

5569 +#: object-file.c:1676

5570 #, c-format

5571 msgid "packed object %s (stored in %s) is corrupt"

5572 msgstr "打包物件 %s（儲存在 %s）已損壞"

5573

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