a6eff43bea · matheusbsbs/matheus-bagliano

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

292 msgstr ""

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

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

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

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

295 +"POT-Creation-Date: 2021-05-17 16:02+0800\n"

296 +"PO-Revision-Date: 2021-05-20 15:14+0800\n"

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

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

299 "Language: zh_TW\n"

@@ -301,7 +301,7 @@ msgstr ""

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

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

303 "Plural-Forms: nplurals=1; plural=0;\n"

304 -"X-Generator: Poedit 2.4.2\n"

304 +"X-Generator: Poedit 2.4.3\n"

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

306 "zhconvert.org\n"

307

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

310 msgid "Huh (%s)?"

311 msgstr "嗯（%s）？"

312

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

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

315 -#: builtin/rebase.c:1963

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

314 +#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528

315 +#: builtin/rebase.c:1953

316 msgid "could not read index"

317 msgstr "無法讀取索引"

318

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

340 msgid "could not stage '%s'"

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

342

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

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

344 msgid "could not write index"

345 msgstr "無法寫入索引"

346

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

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

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

357

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

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

359 #: builtin/reset.c:145

360 #, c-format

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

@@ -493,12 +493,12 @@ msgstr "快取"

493 msgid "unstaged"

494 msgstr "未快取"

495

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

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

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

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

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

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

496 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308

497 +#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128

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

499 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819

500 +#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327

501 +#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573

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

503 msgid "path"

504 msgstr "路徑"

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

1004 msgid "'git apply' failed"

1005 msgstr "'git apply' 失敗"

1006

1007 -#: advice.c:143

1007 +#: advice.c:145

1008 #, c-format

1009 msgid ""

1010 "\n"

@@ -1013,37 +1013,37 @@ msgstr ""

1013 "\n"

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

1015

1016 -#: advice.c:159

1016 +#: advice.c:161

1017 #, c-format

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

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

1020

1021 -#: advice.c:250

1021 +#: advice.c:252

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

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

1024

1025 -#: advice.c:252

1025 +#: advice.c:254

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

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

1028

1029 -#: advice.c:254

1029 +#: advice.c:256

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

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

1032

1033 -#: advice.c:256

1033 +#: advice.c:258

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

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

1036

1037 -#: advice.c:258

1037 +#: advice.c:260

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

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

1040

1041 -#: advice.c:260

1041 +#: advice.c:262

1042 #, c-format

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

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

1045

1046 -#: advice.c:268

1046 +#: advice.c:270

1047 msgid ""

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

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

@@ -1051,23 +1051,36 @@ msgstr ""

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

1052 "解決方案並提交。"

1053

1054 -#: advice.c:276

1054 +#: advice.c:278

1055 msgid "Exiting because of an unresolved conflict."

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

1057

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

1058 +#: advice.c:283 builtin/merge.c:1374

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

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

1061

1062 -#: advice.c:283

1062 +#: advice.c:285

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

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

1065

1066 -#: advice.c:284

1066 +#: advice.c:286

1067 msgid "Exiting because of unfinished merge."

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

1069

1070 -#: advice.c:290

1070 +#: advice.c:296

1071 +#, fuzzy, c-format

1072 +msgid ""

1073 +"The following pathspecs didn't match any eligible path, but they do match "

1074 +"index\n"

1075 +"entries outside the current sparse checkout:\n"

1076 +msgstr "沒有符合下列路徑規格的合規路徑，但有符合目前稀疏簽出之外的索引項目：\n"

1077 +

1078 +#: advice.c:303

1079 +msgid ""

1080 +"Disable or modify the sparsity rules if you intend to update such entries."

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

1082 +

1083 +#: advice.c:310

1084 #, c-format

1085 msgid ""

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

@@ -1115,82 +1128,78 @@ msgstr "指令列以 \\ 結尾"

1128 msgid "unclosed quote"

1129 msgstr "未閉合的引號"

1130

1118 -#: apply.c:69

1131 +#: apply.c:70

1132 #, c-format

1133 msgid "unrecognized whitespace option '%s'"

1134 msgstr "無法識別的空白字元選項 '%s'"

1135

1123 -#: apply.c:85

1136 +#: apply.c:86

1137 #, c-format

1138 msgid "unrecognized whitespace ignore option '%s'"

1139 msgstr "無法識別的空白字元忽略選項 '%s'"

1140

1128 -#: apply.c:135

1141 +#: apply.c:136

1142 msgid "--reject and --3way cannot be used together."

1143 msgstr "--reject 和 --3way 不能同時使用。"

1144

1132 -#: apply.c:137

1133 -msgid "--cached and --3way cannot be used together."

1134 -msgstr "--cached 和 --3way 不能同時使用。"

1135 -

1136 -#: apply.c:140

1145 +#: apply.c:139

1146 msgid "--3way outside a repository"

1147 msgstr "--3way 在版本庫之外"

1148

1140 -#: apply.c:151

1149 +#: apply.c:150

1150 msgid "--index outside a repository"

1151 msgstr "--index 在版本庫之外"

1152

1144 -#: apply.c:154

1153 +#: apply.c:153

1154 msgid "--cached outside a repository"

1155 msgstr "--cached 在版本庫之外"

1156

1148 -#: apply.c:801

1157 +#: apply.c:800

1158 #, c-format

1159 msgid "Cannot prepare timestamp regexp %s"

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

1161

1153 -#: apply.c:810

1162 +#: apply.c:809

1163 #, c-format

1164 msgid "regexec returned %d for input: %s"

1165 msgstr "regexec 返回 %d，輸入為：%s"

1166

1158 -#: apply.c:884

1167 +#: apply.c:883

1168 #, c-format

1169 msgid "unable to find filename in patch at line %d"

1170 msgstr "不能在修補檔的第 %d 行找到檔案名"

1171

1163 -#: apply.c:922

1172 +#: apply.c:921

1173 #, c-format

1174 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

1175 msgstr "git apply：錯誤的 git-diff - 應為 /dev/null，但在第 %2$d 行得到 %1$s"

1176

1168 -#: apply.c:928

1177 +#: apply.c:927

1178 #, c-format

1179 msgid "git apply: bad git-diff - inconsistent new filename on line %d"

1180 msgstr "git apply：錯誤的 git-diff - 第 %d 行上新檔案名不一致"

1181

1173 -#: apply.c:929

1182 +#: apply.c:928

1183 #, c-format

1184 msgid "git apply: bad git-diff - inconsistent old filename on line %d"

1185 msgstr "git apply：錯誤的 git-diff - 第 %d 行上舊檔案名不一致"

1186

1178 -#: apply.c:934

1187 +#: apply.c:933

1188 #, c-format

1189 msgid "git apply: bad git-diff - expected /dev/null on line %d"

1190 msgstr "git apply：錯誤的 git-diff - 第 %d 行處應為 /dev/null"

1191

1183 -#: apply.c:963

1192 +#: apply.c:962

1193 #, c-format

1194 msgid "invalid mode on line %d: %s"

1195 msgstr "第 %d 行包含無效檔案模式：%s"

1196

1188 -#: apply.c:1282

1197 +#: apply.c:1281

1198 #, c-format

1199 msgid "inconsistent header lines %d and %d"

1200 msgstr "不一致的檔案頭，%d 行和 %d 行"

1201

1193 -#: apply.c:1372

1202 +#: apply.c:1371

1203 #, c-format

1204 msgid ""

1205 "git diff header lacks filename information when removing %d leading pathname "

@@ -1200,91 +1209,91 @@ msgid_plural ""

1209 "components (line %d)"

1210 msgstr[0] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）"

1211

1203 -#: apply.c:1385

1212 +#: apply.c:1384

1213 #, c-format

1214 msgid "git diff header lacks filename information (line %d)"

1215 msgstr "git diff 的標頭訊息中缺乏檔案名訊息（第 %d 行）"

1216

1208 -#: apply.c:1481

1217 +#: apply.c:1480

1218 #, c-format

1219 msgid "recount: unexpected line: %.*s"

1220 msgstr "recount：意外的行：%.*s"

1221

1213 -#: apply.c:1550

1222 +#: apply.c:1549

1223 #, c-format

1224 msgid "patch fragment without header at line %d: %.*s"

1225 msgstr "第 %d 行的修補檔片段沒有標頭訊息：%.*s"

1226

1218 -#: apply.c:1753

1227 +#: apply.c:1752

1228 msgid "new file depends on old contents"

1229 msgstr "新檔案依賴舊內容"

1230

1222 -#: apply.c:1755

1231 +#: apply.c:1754

1232 msgid "deleted file still has contents"

1233 msgstr "刪除的檔案仍有內容"

1234

1226 -#: apply.c:1789

1235 +#: apply.c:1788

1236 #, c-format

1237 msgid "corrupt patch at line %d"

1238 msgstr "修補檔在第 %d 行發現損壞"

1239

1231 -#: apply.c:1826

1240 +#: apply.c:1825

1241 #, c-format

1242 msgid "new file %s depends on old contents"

1243 msgstr "新檔案 %s 依賴舊內容"

1244

1236 -#: apply.c:1828

1245 +#: apply.c:1827

1246 #, c-format

1247 msgid "deleted file %s still has contents"

1248 msgstr "刪除的檔案 %s 仍有內容"

1249

1241 -#: apply.c:1831

1250 +#: apply.c:1830

1251 #, c-format

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

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

1254

1246 -#: apply.c:1978

1255 +#: apply.c:1977

1256 #, c-format

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

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

1259

1251 -#: apply.c:2015

1260 +#: apply.c:2014

1261 #, c-format

1262 msgid "unrecognized binary patch at line %d"

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

1264

1256 -#: apply.c:2177

1265 +#: apply.c:2176

1266 #, c-format

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

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

1269

1261 -#: apply.c:2263

1270 +#: apply.c:2262

1271 #, c-format

1272 msgid "unable to read symlink %s"

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

1274

1266 -#: apply.c:2267

1275 +#: apply.c:2266

1276 #, c-format

1277 msgid "unable to open or read %s"

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

1279

1271 -#: apply.c:2936

1280 +#: apply.c:2935

1281 #, c-format

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

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

1284

1276 -#: apply.c:3057

1285 +#: apply.c:3056

1286 #, c-format

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

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

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

1290

1282 -#: apply.c:3069

1291 +#: apply.c:3068

1292 #, c-format

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

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

1295

1287 -#: apply.c:3075

1296 +#: apply.c:3074

1297 #, c-format

1298 msgid ""

1299 "while searching for:\n"

@@ -1293,428 +1302,434 @@ msgstr ""

1302 "當查詢：\n"

1303 "%.*s"

1304

1296 -#: apply.c:3097

1305 +#: apply.c:3096

1306 #, c-format

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

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

1309

1301 -#: apply.c:3105

1310 +#: apply.c:3104

1311 #, c-format

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

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

1314

1306 -#: apply.c:3152

1315 +#: apply.c:3151

1316 #, c-format

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

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

1319

1311 -#: apply.c:3163

1320 +#: apply.c:3162

1321 #, c-format

1322 msgid ""

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

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

1325

1317 -#: apply.c:3171

1326 +#: apply.c:3170

1327 #, c-format

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

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

1330

1322 -#: apply.c:3189

1331 +#: apply.c:3188

1332 #, c-format

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

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

1335

1327 -#: apply.c:3202

1336 +#: apply.c:3201

1337 #, c-format

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

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

1340

1332 -#: apply.c:3209

1341 +#: apply.c:3208

1342 #, c-format

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

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

1345

1337 -#: apply.c:3230

1346 +#: apply.c:3229

1347 #, c-format

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

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

1350

1342 -#: apply.c:3353

1351 +#: apply.c:3352

1352 #, c-format

1353 msgid "cannot checkout %s"

1354 msgstr "不能檢出 %s"

1355

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

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

1357 #: setup.c:308

1358 #, c-format

1359 msgid "failed to read %s"

1360 msgstr "無法讀取 %s"

1361

1353 -#: apply.c:3413

1362 +#: apply.c:3412

1363 #, c-format

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

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

1366

1358 -#: apply.c:3442 apply.c:3685

1367 +#: apply.c:3441 apply.c:3687

1368 #, c-format

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

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

1371

1363 -#: apply.c:3528 apply.c:3700

1372 +#: apply.c:3527 apply.c:3702

1373 #, c-format

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

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

1376

1368 -#: apply.c:3537 apply.c:3708 apply.c:3952

1377 +#: apply.c:3536 apply.c:3710 apply.c:3954

1378 #, c-format

1379 msgid "%s: does not match index"

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

1381

1373 -#: apply.c:3572

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

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

1382 +#: apply.c:3571

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

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

1385

1377 -#: apply.c:3575

1386 +#: apply.c:3574

1387 #, c-format

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

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

1388 +msgid "Performing three-way merge...\n"

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

1390

1382 -#: apply.c:3591 apply.c:3595

1391 +#: apply.c:3590 apply.c:3594

1392 #, c-format

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

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

1395

1387 -#: apply.c:3607

1396 +#: apply.c:3606

1397 #, c-format

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

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

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

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

1400

1392 -#: apply.c:3621

1401 +#: apply.c:3620

1402 #, c-format

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

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

1405

1397 -#: apply.c:3626

1406 +#: apply.c:3625

1407 #, c-format

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

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

1410

1402 -#: apply.c:3652

1411 +#: apply.c:3642

1412 +#, c-format

1413 +msgid "Falling back to direct application...\n"

1414 +msgstr ""

1415 +

1416 +#: apply.c:3654

1417 msgid "removal patch leaves file contents"

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

1419

1406 -#: apply.c:3725

1420 +#: apply.c:3727

1421 #, c-format

1422 msgid "%s: wrong type"

1423 msgstr "%s：錯誤類型"

1424

1411 -#: apply.c:3727

1425 +#: apply.c:3729

1426 #, c-format

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

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

1429

1416 -#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858

1417 -#: read-cache.c:1313

1430 +#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890

1431 +#: read-cache.c:1351

1432 #, c-format

1433 msgid "invalid path '%s'"

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

1435

1422 -#: apply.c:3950

1436 +#: apply.c:3952

1437 #, c-format

1438 msgid "%s: already exists in index"

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

1440

1427 -#: apply.c:3954

1441 +#: apply.c:3956

1442 #, c-format

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

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

1445

1432 -#: apply.c:3974

1446 +#: apply.c:3976

1447 #, c-format

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

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

1450

1437 -#: apply.c:3979

1451 +#: apply.c:3981

1452 #, c-format

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

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

1455

1442 -#: apply.c:3999

1456 +#: apply.c:4001

1457 #, c-format

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

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

1460

1447 -#: apply.c:4003

1461 +#: apply.c:4005

1462 #, c-format

1463 msgid "%s: patch does not apply"

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

1465

1452 -#: apply.c:4018

1466 +#: apply.c:4020

1467 #, c-format

1468 msgid "Checking patch %s..."

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

1470

1457 -#: apply.c:4110

1471 +#: apply.c:4112

1472 #, c-format

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

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

1475

1462 -#: apply.c:4117

1476 +#: apply.c:4119

1477 #, c-format

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

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

1480

1467 -#: apply.c:4120

1481 +#: apply.c:4122

1482 #, c-format

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

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

1485

1472 -#: apply.c:4129

1486 +#: apply.c:4131

1487 #, c-format

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

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

1490

1477 -#: apply.c:4139

1491 +#: apply.c:4141

1492 #, c-format

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

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

1495

1482 -#: apply.c:4277

1496 +#: apply.c:4279

1497 #, c-format

1498 msgid "unable to remove %s from index"

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

1500

1487 -#: apply.c:4311

1501 +#: apply.c:4313

1502 #, c-format

1503 msgid "corrupt patch for submodule %s"

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

1505

1492 -#: apply.c:4317

1506 +#: apply.c:4319

1507 #, c-format

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

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

1510

1497 -#: apply.c:4325

1511 +#: apply.c:4327

1512 #, c-format

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

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

1515

1502 -#: apply.c:4331 apply.c:4476

1516 +#: apply.c:4333 apply.c:4478

1517 #, c-format

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

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

1520

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

1521 +#: apply.c:4376 builtin/bisect--helper.c:523

1522 #, c-format

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

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

1525

1512 -#: apply.c:4378

1526 +#: apply.c:4380

1527 #, c-format

1528 msgid "closing file '%s'"

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

1530

1517 -#: apply.c:4448

1531 +#: apply.c:4450

1532 #, c-format

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

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

1535

1522 -#: apply.c:4546

1536 +#: apply.c:4548

1537 #, c-format

1538 msgid "Applied patch %s cleanly."

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

1540

1527 -#: apply.c:4554

1541 +#: apply.c:4556

1542 msgid "internal error"

1543 msgstr "內部錯誤"

1544

1531 -#: apply.c:4557

1545 +#: apply.c:4559

1546 #, c-format

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

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

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

1550

1537 -#: apply.c:4568

1551 +#: apply.c:4570

1552 #, c-format

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

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

1555

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

1556 +#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394

1557 #, c-format

1558 msgid "cannot open %s"

1559 msgstr "不能開啟 %s"

1560

1547 -#: apply.c:4590

1561 +#: apply.c:4592

1562 #, c-format

1563 msgid "Hunk #%d applied cleanly."

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

1565

1552 -#: apply.c:4594

1566 +#: apply.c:4596

1567 #, c-format

1568 msgid "Rejected hunk #%d."

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

1570

1557 -#: apply.c:4718

1571 +#: apply.c:4725

1572 #, c-format

1573 msgid "Skipped patch '%s'."

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

1575

1562 -#: apply.c:4726

1576 +#: apply.c:4733

1577 msgid "unrecognized input"

1578 msgstr "無法識別的輸入"

1579

1566 -#: apply.c:4746

1580 +#: apply.c:4753

1581 msgid "unable to read index file"

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

1583

1570 -#: apply.c:4903

1584 +#: apply.c:4910

1585 #, c-format

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

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

1588

1575 -#: apply.c:4930

1589 +#: apply.c:4937

1590 #, c-format

1591 msgid "squelched %d whitespace error"

1592 msgid_plural "squelched %d whitespace errors"

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

1594

1581 -#: apply.c:4936 apply.c:4951

1595 +#: apply.c:4943 apply.c:4958

1596 #, c-format

1597 msgid "%d line adds whitespace errors."

1598 msgid_plural "%d lines add whitespace errors."

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

1600

1587 -#: apply.c:4944

1601 +#: apply.c:4951

1602 #, c-format

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

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

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

1606

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

1607 +#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423

1608 msgid "Unable to write new index file"

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

1610

1597 -#: apply.c:4988

1611 +#: apply.c:4995

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

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

1614

1601 -#: apply.c:4991

1615 +#: apply.c:4998

1616 msgid "apply changes matching the given path"

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

1618

1605 -#: apply.c:4993 builtin/am.c:2266

1619 +#: apply.c:5000 builtin/am.c:2317

1620 msgid "num"

1621 msgstr "數字"

1622

1609 -#: apply.c:4994

1623 +#: apply.c:5001

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

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

1626

1613 -#: apply.c:4997

1627 +#: apply.c:5004

1628 msgid "ignore additions made by the patch"

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

1630

1617 -#: apply.c:4999

1631 +#: apply.c:5006

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

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

1634

1621 -#: apply.c:5003

1635 +#: apply.c:5010

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

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

1638

1625 -#: apply.c:5005

1639 +#: apply.c:5012

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

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

1642

1629 -#: apply.c:5007

1643 +#: apply.c:5014

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

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

1646

1633 -#: apply.c:5009

1647 +#: apply.c:5016

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

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

1650

1637 -#: apply.c:5011

1651 +#: apply.c:5018

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

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

1654

1641 -#: apply.c:5013

1655 +#: apply.c:5020

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

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

1658

1645 -#: apply.c:5015

1659 +#: apply.c:5022

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

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

1662

1649 -#: apply.c:5018

1663 +#: apply.c:5025

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

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

1666

1653 -#: apply.c:5020

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

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

1667 +#: apply.c:5027

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

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

1670

1657 -#: apply.c:5022

1671 +#: apply.c:5029

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

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

1674

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

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

1676 msgid "paths are separated with NUL character"

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

1678

1665 -#: apply.c:5027

1679 +#: apply.c:5034

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

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

1682

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

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

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

1683 +#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296

1684 +#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100

1685 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831

1686 +#: builtin/rebase.c:1347

1687 msgid "action"

1688 msgstr "動作"

1689

1675 -#: apply.c:5029

1690 +#: apply.c:5036

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

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

1693

1679 -#: apply.c:5032 apply.c:5035

1694 +#: apply.c:5039 apply.c:5042

1695 msgid "ignore changes in whitespace when finding context"

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

1697

1683 -#: apply.c:5038

1698 +#: apply.c:5045

1699 msgid "apply the patch in reverse"

1700 msgstr "反向套用修補檔"

1701

1687 -#: apply.c:5040

1702 +#: apply.c:5047

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

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

1705

1691 -#: apply.c:5042

1706 +#: apply.c:5049

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

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

1709

1695 -#: apply.c:5044

1710 +#: apply.c:5051

1711 msgid "allow overlapping hunks"

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

1713

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

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

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

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

1715 +#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755

1716 +#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128

1717 msgid "be verbose"

1718 msgstr "詳細輸出"

1719

1705 -#: apply.c:5047

1720 +#: apply.c:5054

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

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

1723

1709 -#: apply.c:5050

1724 +#: apply.c:5057

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

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

1727

1713 -#: apply.c:5052 builtin/am.c:2254

1728 +#: apply.c:5059 builtin/am.c:2305

1729 msgid "root"

1730 msgstr "根目錄"

1731

1717 -#: apply.c:5053

1732 +#: apply.c:5060

1733 msgid "prepend <root> to all filenames"

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

1735

@@ -1780,141 +1795,141 @@ msgstr ""

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

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

1797

1783 -#: archive.c:192

1798 +#: archive.c:188

1799 #, c-format

1800 msgid "cannot read %s"

1801 msgstr "不能讀取 %s"

1802

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

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

1790 -#: builtin/merge.c:1139

1803 +#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095

1804 +#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833

1805 +#: builtin/merge.c:1143

1806 #, c-format

1807 msgid "could not read '%s'"

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

1809

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

1810 +#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328

1811 #, c-format

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

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

1814

1800 -#: archive.c:454

1815 +#: archive.c:451

1816 #, c-format

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

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

1819

1805 -#: archive.c:460

1820 +#: archive.c:457

1821 #, c-format

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

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

1824

1810 -#: archive.c:473

1825 +#: archive.c:470

1826 #, c-format

1827 msgid "not a tree object: %s"

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

1829

1815 -#: archive.c:485

1830 +#: archive.c:482

1831 msgid "current working directory is untracked"

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

1833

1819 -#: archive.c:526

1834 +#: archive.c:523

1835 #, c-format

1836 msgid "File not found: %s"

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

1838

1824 -#: archive.c:528

1839 +#: archive.c:525

1840 #, c-format

1841 msgid "Not a regular file: %s"

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

1843

1829 -#: archive.c:555

1844 +#: archive.c:552

1845 msgid "fmt"

1846 msgstr "格式"

1847

1833 -#: archive.c:555

1848 +#: archive.c:552

1849 msgid "archive format"

1850 msgstr "歸檔格式"

1851

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

1852 +#: archive.c:553 builtin/log.c:1772

1853 msgid "prefix"

1854 msgstr "前綴"

1855

1841 -#: archive.c:557

1856 +#: archive.c:554

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

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

1859

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

1860 +#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888

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

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

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

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

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

1863 +#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105

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

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

1866 msgid "file"

1867 msgstr "檔案"

1868

1854 -#: archive.c:559

1869 +#: archive.c:556

1870 msgid "add untracked file to archive"

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

1872

1858 -#: archive.c:562 builtin/archive.c:90

1873 +#: archive.c:559 builtin/archive.c:90

1874 msgid "write the archive to this file"

1875 msgstr "歸檔寫入此檔案"

1876

1862 -#: archive.c:564

1877 +#: archive.c:561

1878 msgid "read .gitattributes in working directory"

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

1880

1866 -#: archive.c:565

1881 +#: archive.c:562

1882 msgid "report archived files on stderr"

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

1884

1870 -#: archive.c:567

1885 +#: archive.c:564

1886 msgid "set compression level"

1887 msgstr "設定壓縮級別"

1888

1874 -#: archive.c:570

1889 +#: archive.c:567

1890 msgid "list supported archive formats"

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

1892

1878 -#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117

1879 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335

1893 +#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121

1894 +#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336

1895 msgid "repo"

1896 msgstr "版本庫"

1897

1883 -#: archive.c:573 builtin/archive.c:92

1898 +#: archive.c:570 builtin/archive.c:92

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

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

1901

1887 -#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714

1902 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718

1903 #: builtin/notes.c:498

1904 msgid "command"

1905 msgstr "指令"

1906

1892 -#: archive.c:575 builtin/archive.c:94

1907 +#: archive.c:572 builtin/archive.c:94

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

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

1910

1896 -#: archive.c:582

1911 +#: archive.c:579

1912 msgid "Unexpected option --remote"

1913 msgstr "未知參數 --remote"

1914

1900 -#: archive.c:584

1915 +#: archive.c:581

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

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

1918

1904 -#: archive.c:586

1919 +#: archive.c:583

1920 msgid "Unexpected option --output"

1921 msgstr "未知參數 --output"

1922

1908 -#: archive.c:588

1923 +#: archive.c:585

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

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

1926

1912 -#: archive.c:610

1927 +#: archive.c:607

1928 #, c-format

1929 msgid "Unknown archive format '%s'"

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

1931

1917 -#: archive.c:619

1932 +#: archive.c:616

1933 #, c-format

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

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

@@ -1924,12 +1939,12 @@ msgstr "參數不支援此格式 '%s'：-%d"

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

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

1941

1927 -#: attr.c:359

1942 +#: attr.c:363

1943 #, c-format

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

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

1946

1932 -#: attr.c:399

1947 +#: attr.c:403

1948 msgid ""

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

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

@@ -2011,7 +2026,7 @@ msgstr "二分搜尋中：合併基礎必須是經過測試的\n"

2026 msgid "a %s revision is needed"

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

2028

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

2029 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298

2030 #, c-format

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

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

@@ -2054,37 +2069,37 @@ msgid "Bisecting: %d revision left to test after this %s\n"

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

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

2071

2057 -#: blame.c:2777

2072 +#: blame.c:2776

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

2074 msgstr "--contents 和 --reverse 不能混用。"

2075

2061 -#: blame.c:2791

2076 +#: blame.c:2790

2077 msgid "cannot use --contents with final commit object name"

2078 msgstr "不能將 --contents 和最終的提交物件名共用"

2079

2065 -#: blame.c:2812

2080 +#: blame.c:2811

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

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

2083

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

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

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

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

2073 -#: builtin/shortlog.c:255

2084 +#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333

2085 +#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411

2086 +#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344

2087 +#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646

2088 +#: builtin/pack-objects.c:3661 builtin/shortlog.c:255

2089 msgid "revision walk setup failed"

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

2091

2077 -#: blame.c:2839

2092 +#: blame.c:2838

2093 msgid ""

2094 "--reverse --first-parent together require range along first-parent chain"

2095 msgstr "--reverse 和 --first-parent 共用，需要第一祖先鏈上的提交範圍"

2096

2082 -#: blame.c:2850

2097 +#: blame.c:2849

2098 #, c-format

2099 msgid "no such path %s in %s"

2100 msgstr "在 %2$s 中無此路徑 %1$s"

2101

2087 -#: blame.c:2861

2102 +#: blame.c:2860

2103 #, c-format

2104 msgid "cannot read blob %s for path %s"

2105 msgstr "不能為路徑 %2$s 讀取資料物件 %1$s"

@@ -2212,12 +2227,12 @@ msgstr "歧義的物件名：'%s'。"

2227 msgid "Not a valid branch point: '%s'."

2228 msgstr "無效的分支點：'%s'。"

2229

2215 -#: branch.c:365

2230 +#: branch.c:366

2231 #, c-format

2232 msgid "'%s' is already checked out at '%s'"

2233 msgstr "'%s' 已經檢出到 '%s'"

2234

2220 -#: branch.c:388

2235 +#: branch.c:389

2236 #, c-format

2237 msgid "HEAD of working tree %s is not updated"

2238 msgstr "工作區 %s 的 HEAD 指向沒有被更新"

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

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

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

2259

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

2246 -#: builtin/commit.c:814

2260 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

2261 +#: builtin/commit.c:861

2262 #, c-format

2263 msgid "could not open '%s'"

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

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

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

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

2316

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

2317 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396

2318 #, c-format

2319 msgid "unrecognized argument: %s"

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

@@ -2341,252 +2356,250 @@ msgstr "最終區塊有非零 ID %<PRIx32>"

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

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

2358

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

2359 +#: commit-graph.c:204 midx.c:47

2360 msgid "invalid hash version"

2361 msgstr "無效的雜湊版本"

2362

2348 -#: commit-graph.c:255

2363 +#: commit-graph.c:262

2364 msgid "commit-graph file is too small"

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

2366

2352 -#: commit-graph.c:348

2367 +#: commit-graph.c:355

2368 #, c-format

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

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

2371

2357 -#: commit-graph.c:355

2372 +#: commit-graph.c:362

2373 #, c-format

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

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

2376

2362 -#: commit-graph.c:362

2377 +#: commit-graph.c:369

2378 #, c-format

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

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

2381

2367 -#: commit-graph.c:379

2382 +#: commit-graph.c:386

2383 #, c-format

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

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

2386

2372 -#: commit-graph.c:472

2387 +#: commit-graph.c:482

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

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

2390

2376 -#: commit-graph.c:482

2391 +#: commit-graph.c:492

2392 msgid "commit-graph chain does not match"

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

2394

2380 -#: commit-graph.c:530

2395 +#: commit-graph.c:540

2396 #, c-format

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

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

2399

2385 -#: commit-graph.c:554

2400 +#: commit-graph.c:564

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

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

2403

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

2404 +#: commit-graph.c:745 commit-graph.c:782

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

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

2407

2393 -#: commit-graph.c:756

2408 +#: commit-graph.c:766

2409 #, c-format

2410 msgid "could not find commit %s"

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

2412

2398 -#: commit-graph.c:789

2413 +#: commit-graph.c:799

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

2400 -msgstr ""

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

2416

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

2417 +#: commit-graph.c:1075 builtin/am.c:1340

2418 #, c-format

2419 msgid "unable to parse commit %s"

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

2421

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

2422 +#: commit-graph.c:1337 builtin/pack-objects.c:2897

2423 #, c-format

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

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

2426

2412 -#: commit-graph.c:1358

2427 +#: commit-graph.c:1368

2428 msgid "Loading known commits in commit graph"

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

2430

2416 -#: commit-graph.c:1375

2431 +#: commit-graph.c:1385

2432 msgid "Expanding reachable commits in commit graph"

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

2434

2420 -#: commit-graph.c:1395

2435 +#: commit-graph.c:1405

2436 msgid "Clearing commit marks in commit graph"

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

2438

2424 -#: commit-graph.c:1414

2425 -#, fuzzy

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

2439 +#: commit-graph.c:1424

2440 msgid "Computing commit graph topological levels"

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

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

2442

2430 -#: commit-graph.c:1467

2443 +#: commit-graph.c:1477

2444 msgid "Computing commit graph generation numbers"

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

2446

2434 -#: commit-graph.c:1548

2447 +#: commit-graph.c:1558

2448 msgid "Computing commit changed paths Bloom filters"

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

2450

2438 -#: commit-graph.c:1625

2451 +#: commit-graph.c:1635

2452 msgid "Collecting referenced commits"

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

2454

2442 -#: commit-graph.c:1650

2455 +#: commit-graph.c:1660

2456 #, c-format

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

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

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

2460

2448 -#: commit-graph.c:1663

2461 +#: commit-graph.c:1673

2462 #, c-format

2463 msgid "error adding pack %s"

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

2465

2453 -#: commit-graph.c:1667

2466 +#: commit-graph.c:1677

2467 #, c-format

2468 msgid "error opening index for %s"

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

2470

2458 -#: commit-graph.c:1704

2471 +#: commit-graph.c:1714

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

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

2474

2462 -#: commit-graph.c:1722

2475 +#: commit-graph.c:1732

2476 msgid "Finding extra edges in commit graph"

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

2478

2466 -#: commit-graph.c:1771

2479 +#: commit-graph.c:1781

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

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

2482

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

2483 +#: commit-graph.c:1812 midx.c:906

2484 #, c-format

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

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

2487

2475 -#: commit-graph.c:1815

2488 +#: commit-graph.c:1825

2489 msgid "unable to create temporary graph layer"

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

2491

2479 -#: commit-graph.c:1820

2492 +#: commit-graph.c:1830

2493 #, c-format

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

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

2496

2484 -#: commit-graph.c:1879

2497 +#: commit-graph.c:1887

2498 #, c-format

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

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

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

2502

2490 -#: commit-graph.c:1915

2503 +#: commit-graph.c:1923

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

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

2506

2494 -#: commit-graph.c:1931

2507 +#: commit-graph.c:1939

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

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

2510

2498 -#: commit-graph.c:1951

2511 +#: commit-graph.c:1959

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

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

2514

2502 -#: commit-graph.c:2084

2515 +#: commit-graph.c:2092

2516 msgid "Scanning merged commits"

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

2518

2506 -#: commit-graph.c:2128

2519 +#: commit-graph.c:2136

2520 msgid "Merging commit-graph"

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

2522

2510 -#: commit-graph.c:2235

2523 +#: commit-graph.c:2244

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

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

2526

2514 -#: commit-graph.c:2342

2527 +#: commit-graph.c:2351

2528 msgid "too many commits to write graph"

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

2530

2518 -#: commit-graph.c:2440

2531 +#: commit-graph.c:2450

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

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

2534

2522 -#: commit-graph.c:2450

2535 +#: commit-graph.c:2460

2536 #, c-format

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

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

2539

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

2540 +#: commit-graph.c:2470 commit-graph.c:2485

2541 #, c-format

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

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

2544

2532 -#: commit-graph.c:2467

2545 +#: commit-graph.c:2477

2546 #, c-format

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

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

2549

2537 -#: commit-graph.c:2485

2550 +#: commit-graph.c:2495

2551 msgid "Verifying commits in commit graph"

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

2553

2541 -#: commit-graph.c:2500

2554 +#: commit-graph.c:2510

2555 #, c-format

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

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

2558

2546 -#: commit-graph.c:2507

2559 +#: commit-graph.c:2517

2560 #, c-format

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

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

2563

2551 -#: commit-graph.c:2517

2564 +#: commit-graph.c:2527

2565 #, c-format

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

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

2568

2556 -#: commit-graph.c:2526

2569 +#: commit-graph.c:2536

2570 #, c-format

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

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

2573

2561 -#: commit-graph.c:2540

2574 +#: commit-graph.c:2550

2575 #, c-format

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

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

2578

2566 -#: commit-graph.c:2545

2579 +#: commit-graph.c:2555

2580 #, c-format

2581 msgid ""

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

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

2584

2572 -#: commit-graph.c:2549

2585 +#: commit-graph.c:2559

2586 #, c-format

2587 msgid ""

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

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

2590

2578 -#: commit-graph.c:2566

2591 +#: commit-graph.c:2576

2592 #, c-format

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

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

2595

2583 -#: commit-graph.c:2572

2596 +#: commit-graph.c:2582

2597 #, c-format

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

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

2600

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

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

2601 +#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416

2602 +#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457

2603 #, c-format

2604 msgid "could not parse %s"

2605 msgstr "不能解析 %s"

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

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

2630 "可關閉本消息"

2631

2619 -#: commit.c:1223

2632 +#: commit.c:1237

2633 #, c-format

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

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

2636

2624 -#: commit.c:1227

2637 +#: commit.c:1241

2638 #, c-format

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

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

2641

2629 -#: commit.c:1230

2642 +#: commit.c:1244

2643 #, c-format

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

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

2646

2634 -#: commit.c:1233

2647 +#: commit.c:1247

2648 #, c-format

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

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

2651

2639 -#: commit.c:1487

2652 +#: commit.c:1501

2653 msgid ""

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

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

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

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

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

2718

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

2719 +#: config.c:472 sequencer.c:2785

2720 #, c-format

2721 msgid "invalid key: %s"

2722 msgstr "無效鍵名：%s"

@@ -2820,70 +2833,70 @@ msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s"

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

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

2835

2823 -#: config.c:1194

2836 +#: config.c:1257

2837 #, c-format

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

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

2840

2828 -#: config.c:1289

2841 +#: config.c:1275

2842 #, c-format

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

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

2845

2833 -#: config.c:1298

2846 +#: config.c:1284

2847 #, c-format

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

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

2850

2838 -#: config.c:1391

2851 +#: config.c:1377

2852 #, c-format

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

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

2855

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

2856 +#: config.c:1391 config.c:1402

2857 #, c-format

2858 msgid "bad zlib compression level %d"

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

2860

2848 -#: config.c:1508

2861 +#: config.c:1494

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

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

2864

2852 -#: config.c:1541

2865 +#: config.c:1527

2866 #, c-format

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

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

2869

2857 -#: config.c:1613

2870 +#: config.c:1599

2871 #, c-format

2872 msgid "malformed value for %s"

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

2874

2862 -#: config.c:1639

2875 +#: config.c:1625

2876 #, c-format

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

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

2879

2867 -#: config.c:1640

2880 +#: config.c:1626

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

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

2883

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

2884 +#: config.c:1687 builtin/pack-objects.c:3924

2885 #, c-format

2886 msgid "bad pack compression level %d"

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

2888

2876 -#: config.c:1823

2889 +#: config.c:1809

2890 #, c-format

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

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

2893

2881 -#: config.c:1826

2894 +#: config.c:1812

2895 #, c-format

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

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

2898

2886 -#: config.c:1843

2899 +#: config.c:1829

2900 #, c-format

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

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

@@ -2893,105 +2906,105 @@ msgstr "不能解析設定物件 '%s'"

2906 msgid "failed to parse %s"

2907 msgstr "解析 %s 失敗"

2908

2896 -#: config.c:1927

2909 +#: config.c:1929

2910 msgid "unable to parse command-line config"

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

2912

2900 -#: config.c:2290

2913 +#: config.c:2293

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

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

2916

2904 -#: config.c:2464

2917 +#: config.c:2467

2918 #, c-format

2919 msgid "Invalid %s: '%s'"

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

2921

2909 -#: config.c:2509

2922 +#: config.c:2512

2923 #, c-format

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

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

2926

2914 -#: config.c:2555

2927 +#: config.c:2558

2928 #, c-format

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

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

2931

2919 -#: config.c:2557

2932 +#: config.c:2560

2933 #, c-format

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

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

2936

2924 -#: config.c:2641

2937 +#: config.c:2644

2938 #, c-format

2939 msgid "invalid section name '%s'"

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

2941

2929 -#: config.c:2673

2942 +#: config.c:2676

2943 #, c-format

2944 msgid "%s has multiple values"

2945 msgstr "%s 有多個取值"

2946

2934 -#: config.c:2702

2947 +#: config.c:2705

2948 #, c-format

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

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

2951

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

2952 +#: config.c:2957 config.c:3283

2953 #, c-format

2954 msgid "could not lock config file %s"

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

2956

2944 -#: config.c:2965

2957 +#: config.c:2968

2958 #, c-format

2959 msgid "opening %s"

2960 msgstr "開啟 %s"

2961

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

2962 +#: config.c:3005 builtin/config.c:361

2963 #, c-format

2964 msgid "invalid pattern: %s"

2965 msgstr "無效模式：%s"

2966

2954 -#: config.c:3027

2967 +#: config.c:3030

2968 #, c-format

2969 msgid "invalid config file %s"

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

2971

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

2972 +#: config.c:3043 config.c:3296

2973 #, c-format

2974 msgid "fstat on %s failed"

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

2976

2964 -#: config.c:3051

2977 +#: config.c:3054

2978 #, c-format

2979 msgid "unable to mmap '%s'"

2980 msgstr "不能 mmap '%s'"

2981

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

2982 +#: config.c:3063 config.c:3301

2983 #, c-format

2984 msgid "chmod on %s failed"

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

2986

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

2987 +#: config.c:3148 config.c:3398

2988 #, c-format

2989 msgid "could not write config file %s"

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

2991

2979 -#: config.c:3179

2992 +#: config.c:3182

2993 #, c-format

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

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

2996

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

2997 +#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2998 #, c-format

2999 msgid "could not unset '%s'"

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

3001

2989 -#: config.c:3271

3002 +#: config.c:3274

3003 #, c-format

3004 msgid "invalid section name: %s"

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

3006

2994 -#: config.c:3438

3007 +#: config.c:3441

3008 #, c-format

3009 msgid "missing value for '%s'"

3010 msgstr "%s 的取值缺少"

@@ -3167,7 +3180,7 @@ msgstr "已阻止奇怪的路徑名 '%s'"

3180 msgid "unable to fork"

3181 msgstr "無法 fork"

3182

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

3183 +#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45

3184 msgid "Checking connectivity"

3185 msgstr "正在檢查連通性"

3186

@@ -3183,17 +3196,17 @@ msgstr "寫入 rev-list 失敗"

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

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

3198

3186 -#: convert.c:194

3199 +#: convert.c:183

3200 #, c-format

3201 msgid "illegal crlf_action %d"

3202 msgstr "非法的 crlf 動作 %d"

3203

3191 -#: convert.c:207

3204 +#: convert.c:196

3205 #, c-format

3206 msgid "CRLF would be replaced by LF in %s"

3207 msgstr "%s 中的 CRLF 將被 LF 取代"

3208

3196 -#: convert.c:209

3209 +#: convert.c:198

3210 #, c-format

3211 msgid ""

3212 "CRLF will be replaced by LF in %s.\n"

@@ -3202,12 +3215,12 @@ msgstr ""

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

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

3217

3205 -#: convert.c:217

3218 +#: convert.c:206

3219 #, c-format

3220 msgid "LF would be replaced by CRLF in %s"

3221 msgstr "檔案 %s 中的 LF 將被 CRLF 取代"

3222

3210 -#: convert.c:219

3223 +#: convert.c:208

3224 #, c-format

3225 msgid ""

3226 "LF will be replaced by CRLF in %s.\n"

@@ -3216,24 +3229,24 @@ msgstr ""

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

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

3231

3219 -#: convert.c:284

3232 +#: convert.c:273

3233 #, c-format

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

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

3236

3224 -#: convert.c:291

3237 +#: convert.c:280

3238 #, c-format

3239 msgid ""

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

3241 "working-tree-encoding."

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

3243

3231 -#: convert.c:304

3244 +#: convert.c:293

3245 #, c-format

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

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

3248

3236 -#: convert.c:306

3249 +#: convert.c:295

3250 #, c-format

3251 msgid ""

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

@@ -3242,66 +3255,66 @@ msgstr ""

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

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

3257

3245 -#: convert.c:419 convert.c:490

3258 +#: convert.c:408 convert.c:479

3259 #, c-format

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

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

3262

3250 -#: convert.c:462

3263 +#: convert.c:451

3264 #, c-format

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

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

3267

3255 -#: convert.c:665

3268 +#: convert.c:654

3269 #, c-format

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

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

3272

3260 -#: convert.c:685

3273 +#: convert.c:674

3274 #, c-format

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

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

3277

3265 -#: convert.c:692

3278 +#: convert.c:681

3279 #, c-format

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

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

3282

3270 -#: convert.c:727 convert.c:730

3283 +#: convert.c:716 convert.c:719

3284 #, c-format

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

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

3287

3275 -#: convert.c:733 convert.c:788

3288 +#: convert.c:722 convert.c:777

3289 #, c-format

3290 msgid "external filter '%s' failed"

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

3292

3280 -#: convert.c:837

3293 +#: convert.c:826

3294 msgid "unexpected filter type"

3295 msgstr "意外的過濾類型"

3296

3284 -#: convert.c:848

3297 +#: convert.c:837

3298 msgid "path name too long for external filter"

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

3300

3288 -#: convert.c:940

3301 +#: convert.c:934

3302 #, c-format

3303 msgid ""

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

3305 "been filtered"

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

3307

3295 -#: convert.c:1240

3308 +#: convert.c:1234

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

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

3311

3299 -#: convert.c:1428 convert.c:1462

3312 +#: convert.c:1414 convert.c:1447

3313 #, c-format

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

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

3316

3304 -#: convert.c:1508

3317 +#: convert.c:1490

3318 #, c-format

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

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

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

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

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

3432

3420 -#: diff-merges.c:70

3433 +#: diff-merges.c:80

3434 #, c-format

3435 msgid "unknown value for --diff-merges: %s"

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

3437

3425 -#: diff-lib.c:534

3438 +#: diff-lib.c:538

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

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

3441

3429 -#: diff-lib.c:536

3442 +#: diff-lib.c:540

3443 msgid "--merge-base only works with commits"

3444 msgstr "--merge-base 只能跟提交搭配才能運作"

3445

3433 -#: diff-lib.c:553

3446 +#: diff-lib.c:557

3447 msgid "unable to get HEAD"

3448 msgstr "不能取得 HEAD"

3449

3437 -#: diff-lib.c:560

3450 +#: diff-lib.c:564

3451 msgid "no merge base found"

3452 msgstr "找不到合併基底"

3453

3441 -#: diff-lib.c:562

3454 +#: diff-lib.c:566

3455 msgid "multiple merge bases found"

3456 msgstr "找到多個合併基底"

3457

@@ -3501,35 +3514,35 @@ msgstr ""

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

3515 "%s"

3516

3504 -#: diff.c:4276

3517 +#: diff.c:4278

3518 #, c-format

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

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

3521

3509 -#: diff.c:4628

3522 +#: diff.c:4630

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

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

3525

3513 -#: diff.c:4631

3526 +#: diff.c:4633

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

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

3529

3517 -#: diff.c:4710

3530 +#: diff.c:4712

3531 msgid "--follow requires exactly one pathspec"

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

3533

3521 -#: diff.c:4758

3534 +#: diff.c:4760

3535 #, c-format

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

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

3538

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

3539 +#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308

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

3541 #, c-format

3542 msgid "%s expects a numerical value"

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

3544

3532 -#: diff.c:4795

3545 +#: diff.c:4797

3546 #, c-format

3547 msgid ""

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

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

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

3552 "%s"

3553

3541 -#: diff.c:4880

3554 +#: diff.c:4882

3555 #, c-format

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

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

3558

3546 -#: diff.c:4904

3559 +#: diff.c:4906

3560 #, c-format

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

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

3563

3551 -#: diff.c:4918

3564 +#: diff.c:4920

3565 #, c-format

3566 msgid "unable to resolve '%s'"

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

3568

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

3569 +#: diff.c:4970 diff.c:4976

3570 #, c-format

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

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

3573

3561 -#: diff.c:4986

3574 +#: diff.c:4988

3575 #, c-format

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

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

3578

3566 -#: diff.c:5007

3579 +#: diff.c:5009

3580 #, c-format

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

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

3583

3571 -#: diff.c:5026

3584 +#: diff.c:5028

3585 #, c-format

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

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

3588

3576 -#: diff.c:5066

3589 +#: diff.c:5068

3590 msgid ""

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

3592 "\"histogram\""

3593 msgstr ""

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

3595

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

3596 +#: diff.c:5104 diff.c:5124

3597 #, c-format

3598 msgid "invalid argument to %s"

3599 msgstr "%s 的參數無效"

3600

3588 -#: diff.c:5226

3601 +#: diff.c:5228

3602 #, c-format

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

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

3605

3593 -#: diff.c:5275

3606 +#: diff.c:5277

3607 #, c-format

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

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

3610

3598 -#: diff.c:5331

3611 +#: diff.c:5333

3612 #, c-format

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

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

3615

3603 -#: diff.c:5367

3616 +#: diff.c:5369

3617 msgid "Diff output format options"

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

3619

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

3620 +#: diff.c:5371 diff.c:5377

3621 msgid "generate patch"

3622 msgstr "生成修補檔"

3623

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

3624 +#: diff.c:5374 builtin/log.c:179

3625 msgid "suppress diff output"

3626 msgstr "不顯示差異輸出"

3627

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

3628 +#: diff.c:5379 diff.c:5493 diff.c:5500

3629 msgid "<n>"

3630 msgstr "<n>"

3631

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

3632 +#: diff.c:5380 diff.c:5383

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

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

3635

3623 -#: diff.c:5383

3636 +#: diff.c:5385

3637 msgid "generate the diff in raw format"

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

3639

3627 -#: diff.c:5386

3640 +#: diff.c:5388

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

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

3643

3631 -#: diff.c:5390

3644 +#: diff.c:5392

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

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

3647

3635 -#: diff.c:5394

3648 +#: diff.c:5396

3649 msgid "machine friendly --stat"

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

3651

3639 -#: diff.c:5397

3652 +#: diff.c:5399

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

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

3655

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

3656 +#: diff.c:5401 diff.c:5409

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

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

3659

3647 -#: diff.c:5400

3660 +#: diff.c:5402

3661 msgid ""

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

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

3664

3652 -#: diff.c:5404

3665 +#: diff.c:5406

3666 msgid "synonym for --dirstat=cumulative"

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

3668

3656 -#: diff.c:5408

3669 +#: diff.c:5410

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

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

3672

3660 -#: diff.c:5412

3673 +#: diff.c:5414

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

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

3676

3664 -#: diff.c:5415

3677 +#: diff.c:5417

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

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

3680

3668 -#: diff.c:5418

3681 +#: diff.c:5420

3682 msgid "show only names of changed files"

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

3684

3672 -#: diff.c:5421

3685 +#: diff.c:5423

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

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

3688

3676 -#: diff.c:5423

3689 +#: diff.c:5425

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

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

3692

3680 -#: diff.c:5424

3693 +#: diff.c:5426

3694 msgid "generate diffstat"

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

3696

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

3697 +#: diff.c:5428 diff.c:5431 diff.c:5434

3698 msgid "<width>"

3699 msgstr "<寬度>"

3700

3688 -#: diff.c:5427

3701 +#: diff.c:5429

3702 msgid "generate diffstat with a given width"

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

3704

3692 -#: diff.c:5430

3705 +#: diff.c:5432

3706 msgid "generate diffstat with a given name width"

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

3708

3696 -#: diff.c:5433

3709 +#: diff.c:5435

3710 msgid "generate diffstat with a given graph width"

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

3712

3700 -#: diff.c:5435

3713 +#: diff.c:5437

3714 msgid "<count>"

3715 msgstr "<次數>"

3716

3704 -#: diff.c:5436

3717 +#: diff.c:5438

3718 msgid "generate diffstat with limited lines"

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

3720

3708 -#: diff.c:5439

3721 +#: diff.c:5441

3722 msgid "generate compact summary in diffstat"

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

3724

3712 -#: diff.c:5442

3725 +#: diff.c:5444

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

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

3728

3716 -#: diff.c:5445

3729 +#: diff.c:5447

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

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

3732

3720 -#: diff.c:5447

3733 +#: diff.c:5449

3734 msgid "show colored diff"

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

3736

3724 -#: diff.c:5448

3737 +#: diff.c:5450

3738 msgid "<kind>"

3739 msgstr "<類型>"

3740

3728 -#: diff.c:5449

3741 +#: diff.c:5451

3742 msgid ""

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

3744 "diff"

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

3746

3734 -#: diff.c:5452

3747 +#: diff.c:5454

3748 msgid ""

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

3750 "--numstat"

@@ -3739,311 +3752,311 @@ msgstr ""

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

3753 "符"

3754

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

3755 +#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572

3756 msgid "<prefix>"

3757 msgstr "<前綴>"

3758

3746 -#: diff.c:5456

3759 +#: diff.c:5458

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

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

3762

3750 -#: diff.c:5459

3763 +#: diff.c:5461

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

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

3766

3754 -#: diff.c:5462

3767 +#: diff.c:5464

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

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

3770

3758 -#: diff.c:5465

3771 +#: diff.c:5467

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

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

3774

3762 -#: diff.c:5468

3775 +#: diff.c:5470

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

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

3778

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

3779 +#: diff.c:5474 diff.c:5479 diff.c:5484

3780 msgid "<char>"

3781 msgstr "<字元>"

3782

3770 -#: diff.c:5473

3783 +#: diff.c:5475

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

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

3786

3774 -#: diff.c:5478

3787 +#: diff.c:5480

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

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

3790

3778 -#: diff.c:5483

3791 +#: diff.c:5485

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

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

3794

3782 -#: diff.c:5486

3795 +#: diff.c:5488

3796 msgid "Diff rename options"

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

3798

3786 -#: diff.c:5487

3799 +#: diff.c:5489

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

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

3802

3790 -#: diff.c:5488

3803 +#: diff.c:5490

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

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

3806

3794 -#: diff.c:5492

3807 +#: diff.c:5494

3808 msgid "detect renames"

3809 msgstr "檢測重新命名"

3810

3798 -#: diff.c:5496

3811 +#: diff.c:5498

3812 msgid "omit the preimage for deletes"

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

3814

3802 -#: diff.c:5499

3815 +#: diff.c:5501

3816 msgid "detect copies"

3817 msgstr "檢測複製"

3818

3806 -#: diff.c:5503

3819 +#: diff.c:5505

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

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

3822

3810 -#: diff.c:5505

3823 +#: diff.c:5507

3824 msgid "disable rename detection"

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

3826

3814 -#: diff.c:5508

3827 +#: diff.c:5510

3828 msgid "use empty blobs as rename source"

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

3830

3818 -#: diff.c:5510

3831 +#: diff.c:5512

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

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

3834

3822 -#: diff.c:5513

3835 +#: diff.c:5515

3836 msgid ""

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

3838 "given limit"

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

3840

3828 -#: diff.c:5515

3841 +#: diff.c:5517

3842 msgid "Diff algorithm options"

3843 msgstr "差異演算法選項"

3844

3832 -#: diff.c:5517

3845 +#: diff.c:5519

3846 msgid "produce the smallest possible diff"

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

3848

3836 -#: diff.c:5520

3849 +#: diff.c:5522

3850 msgid "ignore whitespace when comparing lines"

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

3852

3840 -#: diff.c:5523

3853 +#: diff.c:5525

3854 msgid "ignore changes in amount of whitespace"

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

3856

3844 -#: diff.c:5526

3857 +#: diff.c:5528

3858 msgid "ignore changes in whitespace at EOL"

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

3860

3848 -#: diff.c:5529

3861 +#: diff.c:5531

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

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

3864

3852 -#: diff.c:5532

3865 +#: diff.c:5534

3866 msgid "ignore changes whose lines are all blank"

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

3868

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

3869 +#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606

3870 msgid "<regex>"

3871 msgstr "<正則>"

3872

3860 -#: diff.c:5535

3873 +#: diff.c:5537

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

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

3876

3864 -#: diff.c:5538

3877 +#: diff.c:5540

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

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

3880

3868 -#: diff.c:5541

3881 +#: diff.c:5543

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

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

3884

3872 -#: diff.c:5545

3885 +#: diff.c:5547

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

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

3888

3876 -#: diff.c:5547

3889 +#: diff.c:5549

3890 msgid "<algorithm>"

3891 msgstr "<演算法>"

3892

3880 -#: diff.c:5548

3893 +#: diff.c:5550

3894 msgid "choose a diff algorithm"

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

3896

3884 -#: diff.c:5550

3897 +#: diff.c:5552

3898 msgid "<text>"

3899 msgstr "<文字>"

3900

3888 -#: diff.c:5551

3901 +#: diff.c:5553

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

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

3904

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

3905 +#: diff.c:5555 diff.c:5564 diff.c:5567

3906 msgid "<mode>"

3907 msgstr "<模式>"

3908

3896 -#: diff.c:5554

3909 +#: diff.c:5556

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

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

3912

3900 -#: diff.c:5557

3913 +#: diff.c:5559

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

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

3916

3904 -#: diff.c:5560

3917 +#: diff.c:5562

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

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

3920

3908 -#: diff.c:5563

3921 +#: diff.c:5565

3922 msgid "moved lines of code are colored differently"

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

3924

3912 -#: diff.c:5566

3925 +#: diff.c:5568

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

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

3928

3916 -#: diff.c:5569

3929 +#: diff.c:5571

3930 msgid "Other diff options"

3931 msgstr "其它差異選項"

3932

3920 -#: diff.c:5571

3933 +#: diff.c:5573

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

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

3936

3924 -#: diff.c:5575

3937 +#: diff.c:5577

3938 msgid "treat all files as text"

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

3940

3928 -#: diff.c:5577

3941 +#: diff.c:5579

3942 msgid "swap two inputs, reverse the diff"

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

3944

3932 -#: diff.c:5579

3945 +#: diff.c:5581

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

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

3948

3936 -#: diff.c:5581

3949 +#: diff.c:5583

3950 msgid "disable all output of the program"

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

3952

3940 -#: diff.c:5583

3953 +#: diff.c:5585

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

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

3956

3944 -#: diff.c:5585

3957 +#: diff.c:5587

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

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

3960

3948 -#: diff.c:5587

3961 +#: diff.c:5589

3962 msgid "<when>"

3963 msgstr "<何時>"

3964

3952 -#: diff.c:5588

3965 +#: diff.c:5590

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

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

3968

3956 -#: diff.c:5591

3969 +#: diff.c:5593

3970 msgid "<format>"

3971 msgstr "<格式>"

3972

3960 -#: diff.c:5592

3973 +#: diff.c:5594

3974 msgid "specify how differences in submodules are shown"

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

3976

3964 -#: diff.c:5596

3977 +#: diff.c:5598

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

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

3980

3968 -#: diff.c:5599

3981 +#: diff.c:5601

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

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

3984

3972 -#: diff.c:5601

3985 +#: diff.c:5603

3986 msgid "<string>"

3987 msgstr "<字串>"

3988

3976 -#: diff.c:5602

3989 +#: diff.c:5604

3990 msgid ""

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

3992 "string"

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

3994

3982 -#: diff.c:5605

3995 +#: diff.c:5607

3996 msgid ""

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

3998 "regex"

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

4000

3988 -#: diff.c:5608

4001 +#: diff.c:5610

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

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

4004

3992 -#: diff.c:5611

4005 +#: diff.c:5613

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

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

4008

3996 -#: diff.c:5614

4009 +#: diff.c:5616

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

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

4012

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

4013 +#: diff.c:5617 diff.c:5620

4014 msgid "<path>"

4015 msgstr "<路徑>"

4016

4004 -#: diff.c:5616

4017 +#: diff.c:5618

4018 msgid "show the change in the specified path first"

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

4020

4008 -#: diff.c:5619

4021 +#: diff.c:5621

4022 msgid "skip the output to the specified path"

4010 -msgstr ""

4023 +msgstr "略過輸出至指定路徑"

4024

4012 -#: diff.c:5621

4025 +#: diff.c:5623

4026 msgid "<object-id>"

4027 msgstr "<物件 ID>"

4028

4016 -#: diff.c:5622

4029 +#: diff.c:5624

4030 msgid ""

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

4032 "object"

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

4034

4022 -#: diff.c:5624

4035 +#: diff.c:5626

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

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

4038

4026 -#: diff.c:5625

4039 +#: diff.c:5627

4040 msgid "select files by diff type"

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

4042

4030 -#: diff.c:5627

4043 +#: diff.c:5629

4044 msgid "<file>"

4045 msgstr "<檔案>"

4046

4034 -#: diff.c:5628

4047 +#: diff.c:5630

4048 msgid "Output to a specific file"

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

4050

4038 -#: diff.c:6285

4051 +#: diff.c:6287

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

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

4054

4042 -#: diff.c:6288

4055 +#: diff.c:6290

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

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

4058

4046 -#: diff.c:6291

4059 +#: diff.c:6293

4060 #, c-format

4061 msgid ""

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

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

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

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

4069

4057 -#: diffcore-rename.c:786

4070 +#: diffcore-rename.c:1418

4071 msgid "Performing inexact rename detection"

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

4073

@@ -4087,35 +4100,35 @@ msgstr "您的稀疏檢出檔案可能有問題：「%s」樣式重複"

4100 msgid "disabling cone pattern matching"

4101 msgstr "停用 cone 樣式符合模式"

4102

4090 -#: dir.c:1198

4103 +#: dir.c:1206

4104 #, c-format

4105 msgid "cannot use %s as an exclude file"

4106 msgstr "不能將 %s 用作排除檔案"

4107

4095 -#: dir.c:2305

4108 +#: dir.c:2314

4109 #, c-format

4110 msgid "could not open directory '%s'"

4111 msgstr "不能開啟目錄 '%s'"

4112

4100 -#: dir.c:2605

4113 +#: dir.c:2614

4114 msgid "failed to get kernel name and information"

4115 msgstr "無法獲得核心名稱和訊息"

4116

4104 -#: dir.c:2729

4117 +#: dir.c:2738

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

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

4120

4108 -#: dir.c:3534

4121 +#: dir.c:3543

4122 #, c-format

4123 msgid "index file corrupt in repo %s"

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

4125

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

4126 +#: dir.c:3590 dir.c:3595

4127 #, c-format

4128 msgid "could not create directories for %s"

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

4130

4118 -#: dir.c:3613

4131 +#: dir.c:3624

4132 #, c-format

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

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

@@ -4125,11 +4138,11 @@ msgstr "不能從 '%s' 遷移 git 目錄到 '%s'"

4138 msgid "hint: Waiting for your editor to close the file...%c"

4139 msgstr "提示：等待您的編輯器關閉檔案...%c"

4140

4128 -#: entry.c:177

4141 +#: entry.c:179

4142 msgid "Filtering content"

4143 msgstr "過濾內容"

4144

4132 -#: entry.c:478

4145 +#: entry.c:500

4146 #, c-format

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

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

@@ -4149,249 +4162,257 @@ msgstr "不能設定 GIT_DIR 為 '%s'"

4162 msgid "too many args to run %s"

4163 msgstr "執行 %s 的參數太多"

4164

4152 -#: fetch-pack.c:177

4165 +#: fetch-pack.c:182

4166 msgid "git fetch-pack: expected shallow list"

4167 msgstr "git fetch-pack：應為 shallow 列表"

4168

4156 -#: fetch-pack.c:180

4169 +#: fetch-pack.c:185

4170 msgid "git fetch-pack: expected a flush packet after shallow list"

4171 msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"

4172

4160 -#: fetch-pack.c:191

4173 +#: fetch-pack.c:196

4174 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

4175 msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包"

4176

4164 -#: fetch-pack.c:211

4177 +#: fetch-pack.c:216

4178 #, c-format

4179 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

4180 msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'"

4181

4169 -#: fetch-pack.c:222

4182 +#: fetch-pack.c:227

4183 msgid "unable to write to remote"

4184 msgstr "無法寫到遠端"

4185

4173 -#: fetch-pack.c:283

4186 +#: fetch-pack.c:288

4187 msgid "--stateless-rpc requires multi_ack_detailed"

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

4189

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

4190 +#: fetch-pack.c:383 fetch-pack.c:1423

4191 #, c-format

4192 msgid "invalid shallow line: %s"

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

4194

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

4195 +#: fetch-pack.c:389 fetch-pack.c:1429

4196 #, c-format

4197 msgid "invalid unshallow line: %s"

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

4199

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

4200 +#: fetch-pack.c:391 fetch-pack.c:1431

4201 #, c-format

4202 msgid "object not found: %s"

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

4204

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

4205 +#: fetch-pack.c:394 fetch-pack.c:1434

4206 #, c-format

4207 msgid "error in object: %s"

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

4209

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

4210 +#: fetch-pack.c:396 fetch-pack.c:1436

4211 #, c-format

4212 msgid "no shallow found: %s"

4213 msgstr "未發現 shallow：%s"

4214

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

4215 +#: fetch-pack.c:399 fetch-pack.c:1440

4216 #, c-format

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

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

4219

4207 -#: fetch-pack.c:434

4220 +#: fetch-pack.c:439

4221 #, c-format

4222 msgid "got %s %d %s"

4223 msgstr "得到 %s %d %s"

4224

4212 -#: fetch-pack.c:451

4225 +#: fetch-pack.c:456

4226 #, c-format

4227 msgid "invalid commit %s"

4228 msgstr "無效提交 %s"

4229

4217 -#: fetch-pack.c:482

4230 +#: fetch-pack.c:487

4231 msgid "giving up"

4232 msgstr "放棄"

4233

4221 -#: fetch-pack.c:495 progress.c:339

4234 +#: fetch-pack.c:500 progress.c:339

4235 msgid "done"

4236 msgstr "完成"

4237

4225 -#: fetch-pack.c:507

4238 +#: fetch-pack.c:512

4239 #, c-format

4240 msgid "got %s (%d) %s"

4241 msgstr "得到 %s (%d) %s"

4242

4230 -#: fetch-pack.c:543

4243 +#: fetch-pack.c:548

4244 #, c-format

4245 msgid "Marking %s as complete"

4246 msgstr "標記 %s 為完成"

4247

4235 -#: fetch-pack.c:758

4248 +#: fetch-pack.c:763

4249 #, c-format

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

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

4252

4240 -#: fetch-pack.c:844

4253 +#: fetch-pack.c:849

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

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

4256

4244 -#: fetch-pack.c:852

4257 +#: fetch-pack.c:857

4258 msgid "protocol error: bad pack header"

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

4260

4248 -#: fetch-pack.c:946

4261 +#: fetch-pack.c:951

4262 #, c-format

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

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

4265

4253 -#: fetch-pack.c:952

4266 +#: fetch-pack.c:957

4267 msgid "fetch-pack: invalid index-pack output"

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

4269

4257 -#: fetch-pack.c:969

4270 +#: fetch-pack.c:974

4271 #, c-format

4272 msgid "%s failed"

4273 msgstr "%s 失敗"

4274

4262 -#: fetch-pack.c:971

4275 +#: fetch-pack.c:976

4276 msgid "error in sideband demultiplexer"

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

4278

4266 -#: fetch-pack.c:1031

4279 +#: fetch-pack.c:1019

4280 #, c-format

4281 msgid "Server version is %.*s"

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

4283

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

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

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

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

4284 +#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042

4285 +#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058

4286 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074

4287 +#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096

4288 #, c-format

4289 msgid "Server supports %s"

4290 msgstr "伺服器支援 %s"

4291

4279 -#: fetch-pack.c:1041

4292 +#: fetch-pack.c:1029

4293 msgid "Server does not support shallow clients"

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

4295

4283 -#: fetch-pack.c:1101

4296 +#: fetch-pack.c:1089

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

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

4299

4287 -#: fetch-pack.c:1106

4300 +#: fetch-pack.c:1094

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

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

4303

4291 -#: fetch-pack.c:1110

4304 +#: fetch-pack.c:1098

4305 msgid "Server does not support --deepen"

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

4307

4295 -#: fetch-pack.c:1112

4308 +#: fetch-pack.c:1100

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

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

4311

4299 -#: fetch-pack.c:1125

4312 +#: fetch-pack.c:1113

4313 msgid "no common commits"

4314 msgstr "沒有共同的提交"

4315

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

4316 +#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238

4317 +msgid "source repository is shallow, reject to clone."

4318 +msgstr "來源版本庫是淺版本庫 (shallow)。拒絕 clone。"

4319 +

4320 +#: fetch-pack.c:1128 fetch-pack.c:1651

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

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

4323

4307 -#: fetch-pack.c:1265

4324 +#: fetch-pack.c:1242

4325 #, c-format

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

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

4328

4312 -#: fetch-pack.c:1269

4329 +#: fetch-pack.c:1246

4330 #, c-format

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

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

4333

4317 -#: fetch-pack.c:1289

4334 +#: fetch-pack.c:1279

4335 msgid "Server does not support shallow requests"

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

4337

4321 -#: fetch-pack.c:1296

4338 +#: fetch-pack.c:1286

4339 msgid "Server supports filter"

4340 msgstr "伺服器支援 filter"

4341

4325 -#: fetch-pack.c:1335

4342 +#: fetch-pack.c:1329 fetch-pack.c:2034

4343 msgid "unable to write request to remote"

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

4345

4329 -#: fetch-pack.c:1353

4346 +#: fetch-pack.c:1347

4347 #, c-format

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

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

4350

4334 -#: fetch-pack.c:1359

4351 +#: fetch-pack.c:1353

4352 #, c-format

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

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

4355

4339 -#: fetch-pack.c:1420

4356 +#: fetch-pack.c:1387

4357 #, c-format

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

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

4360

4344 -#: fetch-pack.c:1425

4361 +#: fetch-pack.c:1392

4362 #, c-format

4363 msgid "error processing acks: %d"

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

4365

4349 -#: fetch-pack.c:1435

4366 +#: fetch-pack.c:1402

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

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

4369

4353 -#: fetch-pack.c:1437

4370 +#: fetch-pack.c:1404

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

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

4373

4357 -#: fetch-pack.c:1479

4374 +#: fetch-pack.c:1445

4375 #, c-format

4376 msgid "error processing shallow info: %d"

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

4378

4362 -#: fetch-pack.c:1526

4379 +#: fetch-pack.c:1494

4380 #, c-format

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

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

4383

4367 -#: fetch-pack.c:1531

4384 +#: fetch-pack.c:1499

4385 #, c-format

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

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

4388

4372 -#: fetch-pack.c:1536

4389 +#: fetch-pack.c:1504

4390 #, c-format

4391 msgid "error processing wanted refs: %d"

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

4393

4377 -#: fetch-pack.c:1566

4394 +#: fetch-pack.c:1534

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

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

4397

4381 -#: fetch-pack.c:1960

4398 +#: fetch-pack.c:1930

4399 msgid "no matching remote head"

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

4401

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

4402 +#: fetch-pack.c:1953 builtin/clone.c:697

4403 msgid "remote did not send all necessary objects"

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

4405

4389 -#: fetch-pack.c:2010

4406 +#: fetch-pack.c:2056

4407 +msgid "unexpected 'ready' from remote"

4408 +msgstr "從遠端收到非預期的 ‘ready’"

4409 +

4410 +#: fetch-pack.c:2079

4411 #, c-format

4412 msgid "no such remote ref %s"

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

4414

4394 -#: fetch-pack.c:2013

4415 +#: fetch-pack.c:2082

4416 #, c-format

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

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

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

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

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

4437

4417 -#: grep.c:543

4438 +#: grep.c:531

4439 msgid ""

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

4441 "with -P under PCRE v2"

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

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

4444 "功能"

4445

4425 -#: grep.c:1906

4446 +#: grep.c:1893

4447 #, c-format

4448 msgid "'%s': unable to read %s"

4449 msgstr "'%s'：無法讀取 %s"

4450

4430 -#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90

4431 -#: builtin/rm.c:135

4451 +#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4452 +#: builtin/rm.c:136

4453 #, c-format

4454 msgid "failed to stat '%s'"

4455 msgstr "對 '%s' 呼叫 stat 失敗"

4456

4436 -#: grep.c:1934

4457 +#: grep.c:1921

4458 #, c-format

4459 msgid "'%s': short read"

4460 msgstr "'%s'：讀取不完整"

@@ -4649,47 +4670,52 @@ msgstr "不允許空的姓名（對於 <%s>）"

4670 msgid "name consists only of disallowed characters: %s"

4671 msgstr "姓名中僅包含停用字元：%s"

4672

4652 -#: ident.c:454 builtin/commit.c:634

4673 +#: ident.c:454 builtin/commit.c:647

4674 #, c-format

4675 msgid "invalid date format: %s"

4676 msgstr "無效的日期格式：%s"

4677

4657 -#: list-objects-filter-options.c:81

4678 +#: list-objects-filter-options.c:83

4679 msgid "expected 'tree:<depth>'"

4680 msgstr "期望 'tree:<深度>'"

4681

4661 -#: list-objects-filter-options.c:96

4682 +#: list-objects-filter-options.c:98

4683 msgid "sparse:path filters support has been dropped"

4684 msgstr "sparse:path 過濾器支援已被刪除"

4685

4665 -#: list-objects-filter-options.c:109

4686 +#: list-objects-filter-options.c:105

4687 +#, c-format

4688 +msgid "'%s' for 'object:type=<type>' isnot a valid object type"

4689 +msgstr "“object:type=<type>” 的 “%s” 不是有效的物件格式"

4690 +

4691 +#: list-objects-filter-options.c:124

4692 #, c-format

4693 msgid "invalid filter-spec '%s'"

4694 msgstr "無效的過濾器表達式 '%s'"

4695

4670 -#: list-objects-filter-options.c:125

4696 +#: list-objects-filter-options.c:140

4697 #, c-format

4698 msgid "must escape char in sub-filter-spec: '%c'"

4699 msgstr "必須對 sub-filter-spec 中的字元進行轉義：'%c'"

4700

4675 -#: list-objects-filter-options.c:167

4701 +#: list-objects-filter-options.c:182

4702 msgid "expected something after combine:"

4703 msgstr "期望在組合後有一些東西："

4704

4679 -#: list-objects-filter-options.c:249

4705 +#: list-objects-filter-options.c:264

4706 msgid "multiple filter-specs cannot be combined"

4707 msgstr "不能混用多種過濾規格"

4708

4683 -#: list-objects-filter-options.c:361

4709 +#: list-objects-filter-options.c:376

4710 msgid "unable to upgrade repository format to support partial clone"

4711 msgstr "無法升級版本庫格式，以致不支援部分複製"

4712

4687 -#: list-objects-filter.c:492

4713 +#: list-objects-filter.c:532

4714 #, c-format

4715 msgid "unable to access sparse blob in '%s'"

4716 msgstr "不能存取 '%s' 中的稀疏資料物件"

4717

4692 -#: list-objects-filter.c:495

4718 +#: list-objects-filter.c:535

4719 #, c-format

4720 msgid "unable to parse sparse filter data in %s"

4721 msgstr "無法解析 %s 中的稀疏過濾器資料"

@@ -4704,7 +4730,7 @@ msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性，但不是一個樹狀

4730 msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4731 msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性，但不是一個資料物件"

4732

4707 -#: list-objects.c:375

4733 +#: list-objects.c:395

4734 #, c-format

4735 msgid "unable to load root tree for commit %s"

4736 msgstr "無法為提交 %s 載入根樹"

@@ -4741,32 +4767,41 @@ msgstr "lsrefs.unborn 的值「%s」無效"

4767 msgid "expected flush after ls-refs arguments"

4768 msgstr "在 ls-refs 引數之後應該有一個 flush 包"

4769

4744 -#: merge-ort.c:888 merge-recursive.c:1191

4770 +#: mailinfo.c:1050

4771 +msgid "quoted CRLF detected"

4772 +msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF"

4773 +

4774 +#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46

4775 +#, c-format

4776 +msgid "bad action '%s' for '%s'"

4777 +msgstr "「%s」動作對「%s」無效"

4778 +

4779 +#: merge-ort.c:1116 merge-recursive.c:1205

4780 #, c-format

4781 msgid "Failed to merge submodule %s (not checked out)"

4782 msgstr "無法合併子模組 %s （沒有檢出）"

4783

4749 -#: merge-ort.c:897 merge-recursive.c:1198

4784 +#: merge-ort.c:1125 merge-recursive.c:1212

4785 #, c-format

4786 msgid "Failed to merge submodule %s (commits not present)"

4787 msgstr "無法合併子模組 %s（提交不存在）"

4788

4754 -#: merge-ort.c:906 merge-recursive.c:1205

4789 +#: merge-ort.c:1134 merge-recursive.c:1219

4790 #, c-format

4791 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4792 msgstr "無法合併子模組 %s （提交未跟隨合併基礎）"

4793

4759 -#: merge-ort.c:916 merge-ort.c:923

4794 +#: merge-ort.c:1144 merge-ort.c:1151

4795 #, c-format

4796 msgid "Note: Fast-forwarding submodule %s to %s"

4797 msgstr "注意：正在將 %s 子模組快轉到 %s"

4798

4764 -#: merge-ort.c:944

4799 +#: merge-ort.c:1172

4800 #, c-format

4801 msgid "Failed to merge submodule %s"

4802 msgstr "無法合併 %s 子模組"

4803

4769 -#: merge-ort.c:951

4804 +#: merge-ort.c:1179

4805 #, c-format

4806 msgid ""

4807 "Failed to merge submodule %s, but a possible merge resolution exists:\n"

@@ -4775,7 +4810,7 @@ msgstr ""

4810 "無法合併 %s 子模組，但有找到一個可行的合併方案：\n"

4811 "%s\n"

4812

4778 -#: merge-ort.c:955 merge-recursive.c:1259

4813 +#: merge-ort.c:1183 merge-recursive.c:1273

4814 #, c-format

4815 msgid ""

4816 "If this is correct simply add it to the index for example\n"

@@ -4791,7 +4826,7 @@ msgstr ""

4826 "\n"

4827 "以接受此建議。\n"

4828

4794 -#: merge-ort.c:968

4829 +#: merge-ort.c:1196

4830 #, c-format

4831 msgid ""

4832 "Failed to merge submodule %s, but multiple possible merges exist:\n"

@@ -4800,21 +4835,21 @@ msgstr ""

4835 "無法合併 %s 子模組，但有找到幾個可行的合併方案：\n"

4836 "%s"

4837

4803 -#: merge-ort.c:1127 merge-recursive.c:1341

4838 +#: merge-ort.c:1415 merge-recursive.c:1362

4839 msgid "Failed to execute internal merge"

4840 msgstr "無法執行內部合併"

4841

4807 -#: merge-ort.c:1132 merge-recursive.c:1346

4842 +#: merge-ort.c:1420 merge-recursive.c:1367

4843 #, c-format

4844 msgid "Unable to add %s to database"

4845 msgstr "不能新增 %s 至物件庫"

4846

4812 -#: merge-ort.c:1139 merge-recursive.c:1378

4847 +#: merge-ort.c:1427 merge-recursive.c:1400

4848 #, c-format

4849 msgid "Auto-merging %s"

4850 msgstr "自動合併 %s"

4851

4817 -#: merge-ort.c:1278 merge-recursive.c:2100

4852 +#: merge-ort.c:1566 merge-recursive.c:2122

4853 #, c-format

4854 msgid ""

4855 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -4823,7 +4858,7 @@ msgstr ""

4858 "衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑"

4859 "放在：%s。"

4860

4826 -#: merge-ort.c:1288 merge-recursive.c:2110

4861 +#: merge-ort.c:1576 merge-recursive.c:2132

4862 #, c-format

4863 msgid ""

4864 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -4832,28 +4867,24 @@ msgstr ""

4867 "衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這"

4868 "些路徑放置於此：%s"

4869

4835 -#: merge-ort.c:1471

4870 +#: merge-ort.c:1634

4871 #, fuzzy, c-format

4837 -#| msgid ""

4838 -#| "CONFLICT (directory rename split): Unclear where to place %s because "

4839 -#| "directory %s was renamed to multiple other directories, with no "

4840 -#| "destination getting a majority of the files."

4872 msgid ""

4873 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "

4874 "renamed to multiple other directories, with no destination getting a "

4875 "majority of the files."

4876 msgstr ""

4846 -"衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到"

4847 -"多個其它目錄，沒有目錄包含大部分檔案。"

4877 +"衝突（分割的目錄重新命名）：未知 %s 應重新命名成什麼。其已重新命名為多個其他"

4878 +"目錄，卻沒有目的地取得檔案的主要部分。"

4879

4849 -#: merge-ort.c:1637 merge-recursive.c:2447

4880 +#: merge-ort.c:1788 merge-recursive.c:2468

4881 #, c-format

4882 msgid ""

4883 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

4884 "renamed."

4885 msgstr "警告：避免應用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。"

4886

4856 -#: merge-ort.c:1781 merge-recursive.c:3215

4887 +#: merge-ort.c:1932 merge-recursive.c:3244

4888 #, c-format

4889 msgid ""

4890 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -4861,7 +4892,7 @@ msgid ""

4892 msgstr ""

4893 "路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"

4894

4864 -#: merge-ort.c:1788 merge-recursive.c:3222

4895 +#: merge-ort.c:1939 merge-recursive.c:3251

4896 #, c-format

4897 msgid ""

4898 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4870,7 +4901,7 @@ msgstr ""

4901 "路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將"

4902 "其移動到 %5$s。"

4903

4873 -#: merge-ort.c:1801 merge-recursive.c:3218

4904 +#: merge-ort.c:1952 merge-recursive.c:3247

4905 #, c-format

4906 msgid ""

4907 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4879,7 +4910,7 @@ msgstr ""

4910 "衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移"

4911 "動到 %s。"

4912

4882 -#: merge-ort.c:1809 merge-recursive.c:3225

4913 +#: merge-ort.c:1960 merge-recursive.c:3254

4914 #, c-format

4915 msgid ""

4916 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4888,89 +4919,106 @@ msgstr ""

4919 "衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s "

4920 "中，建議將其移動到 %5$s。"

4921

4891 -#: merge-ort.c:1952

4892 -#, fuzzy, c-format

4893 -#| msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

4922 +#: merge-ort.c:2103

4923 +#, c-format

4924 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."

4925 msgstr ""

4896 -"衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 "

4897 -"%4$s->%5$s"

4926 +"衝突（重新命名/重新命名）：%1$s 已重新命名為 %3$s 中的 %2$s 和 %5$s 中的 "

4927 +"%4$s。"

4928

4899 -#: merge-ort.c:2047

4929 +#: merge-ort.c:2198

4930 #, c-format

4931 msgid ""

4932 "CONFLICT (rename involved in collision): rename of %s -> %s has content "

4933 "conflicts AND collides with another path; this may result in nested conflict "

4934 "markers."

4935 msgstr ""

4936 +"衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可"

4937 +"能會因此出現巢狀衝突標記。"

4938

4907 -#: merge-ort.c:2066 merge-ort.c:2090

4908 -#, fuzzy, c-format

4909 -#| msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

4939 +#: merge-ort.c:2217 merge-ort.c:2241

4940 +#, c-format

4941 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

4942 msgstr ""

4912 -"衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"

4943 +"衝突（重新命名/刪除）：%1$s 已重新命名為 %3$s 中的 %2$s 卻在 %4$s 中被刪除。"

4944 +

4945 +#: merge-ort.c:2550 merge-recursive.c:3002

4946 +#, c-format

4947 +msgid "cannot read object %s"

4948 +msgstr "不能讀取物件 %s"

4949

4914 -#: merge-ort.c:2735

4950 +#: merge-ort.c:2553 merge-recursive.c:3005

4951 #, c-format

4952 +msgid "object %s is not a blob"

4953 +msgstr "物件 %s 不是一個資料物件"

4954 +

4955 +#: merge-ort.c:2981

4956 +#, fuzzy, c-format

4957 msgid ""

4958 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "

4959 "%s instead."

4919 -msgstr ""

4960 +msgstr "衝突（檔案/目錄）：目錄擋住來自 %2$s 的 %1$s。改移動到 %3$s。"

4961

4921 -#: merge-ort.c:2808

4922 -#, c-format

4962 +#: merge-ort.c:3055

4963 +#, fuzzy, c-format

4964 msgid ""

4924 -"CONFLICT (distinct types): %s had different types on each side; renamed %s "

4965 +"CONFLICT (distinct types): %s had different types on each side; renamed both "

4966 "of them so each can be recorded somewhere."

4967 msgstr ""

4968 +"衝突（類型有異）：每個來源的 %s 類型不同。已經重新命名這兩個來源，這樣每個來"

4969 +"源都可以分別記錄。"

4970

4928 -#: merge-ort.c:2812

4929 -msgid "both"

4930 -msgstr "雙方"

4931 -

4932 -#: merge-ort.c:2812

4933 -msgid "one"

4934 -msgstr "一方"

4971 +#: merge-ort.c:3062

4972 +#, fuzzy, c-format

4973 +msgid ""

4974 +"CONFLICT (distinct types): %s had different types on each side; renamed one "

4975 +"of them so each can be recorded somewhere."

4976 +msgstr ""

4977 +"衝突（類型有異）：每個來源的 %s 類型不同。已經重新命名其中一個來源，這樣每個"

4978 +"來源都可以分別記錄。"

4979

4936 -#: merge-ort.c:2907 merge-recursive.c:3052

4980 +#: merge-ort.c:3162 merge-recursive.c:3081

4981 msgid "content"

4982 msgstr "內容"

4983

4940 -#: merge-ort.c:2909 merge-recursive.c:3056

4984 +#: merge-ort.c:3164 merge-recursive.c:3085

4985 msgid "add/add"

4986 msgstr "新增/新增"

4987

4944 -#: merge-ort.c:2911 merge-recursive.c:3101

4988 +#: merge-ort.c:3166 merge-recursive.c:3130

4989 msgid "submodule"

4990 msgstr "子模組"

4991

4948 -#: merge-ort.c:2913 merge-recursive.c:3102

4992 +#: merge-ort.c:3168 merge-recursive.c:3131

4993 #, c-format

4994 msgid "CONFLICT (%s): Merge conflict in %s"

4995 msgstr "衝突（%s）：合併衝突於 %s"

4996

4953 -#: merge-ort.c:2938

4954 -#, fuzzy, c-format

4955 -#| msgid ""

4956 -#| "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s "

4957 -#| "left in tree."

4997 +#: merge-ort.c:3198

4998 +#, c-format

4999 msgid ""

5000 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

5001 "of %s left in tree."

5002 msgstr ""

4962 -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

4963 -"本被保留。"

5003 +"衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹"

5004 +"上。"

5005 +

5006 +#: merge-ort.c:3433

5007 +#, c-format

5008 +msgid ""

5009 +"Note: %s not up to date and in way of checking out conflicted version; old "

5010 +"copy renamed to %s"

5011 +msgstr "註：%s 不是最新且干擾到簽出衝突版本。已將舊拷貝重新命名至 %s"

5012

5013 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

5014 #. base, and 2-3) the trees for the two trees we're merging.

5015 #.

4968 -#: merge-ort.c:3406

5016 +#: merge-ort.c:3730

5017 #, c-format

5018 msgid "collecting merge info failed for trees %s, %s, %s"

5019 msgstr "%s, %s, %s 樹的合併資訊收集失敗"

5020

4973 -#: merge-ort-wrappers.c:13 merge-recursive.c:3661

5021 +#: merge-ort-wrappers.c:13 merge-recursive.c:3699

5022 #, c-format

5023 msgid ""

5024 "Your local changes to the following files would be overwritten by merge:\n"

@@ -4979,10 +5027,9 @@ msgstr ""

5027 "您對下列檔案的本機修改將被合併動作覆蓋：\n"

5028 " %s"

5029

4982 -#: merge-ort-wrappers.c:33 merge-recursive.c:3436

4983 -#, c-format

4984 -msgid "Already up to date!"

4985 -msgstr "已經是最新的！"

5030 +#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402

5031 +msgid "Already up to date."

5032 +msgstr "已經是最新的。"

5033

5034 #: merge-recursive.c:356

5035 msgid "(bad commit)\n"

@@ -4998,85 +5045,85 @@ msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。"

5045 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

5046 msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。"

5047

5001 -#: merge-recursive.c:874

5048 +#: merge-recursive.c:876

5049 #, c-format

5050 msgid "failed to create path '%s'%s"

5051 msgstr "建立路徑 '%s'%s 失敗"

5052

5006 -#: merge-recursive.c:885

5053 +#: merge-recursive.c:887

5054 #, c-format

5055 msgid "Removing %s to make room for subdirectory\n"

5056 msgstr "刪除 %s 以便為子目錄留出空間\n"

5057

5011 -#: merge-recursive.c:899 merge-recursive.c:918

5058 +#: merge-recursive.c:901 merge-recursive.c:920

5059 msgid ": perhaps a D/F conflict?"

5060 msgstr "：可能是一個目錄/檔案衝突？"

5061

5015 -#: merge-recursive.c:908

5062 +#: merge-recursive.c:910

5063 #, c-format

5064 msgid "refusing to lose untracked file at '%s'"

5065 msgstr "拒絕捨棄 '%s' 中的未追蹤檔案"

5066

5020 -#: merge-recursive.c:949 builtin/cat-file.c:41

5067 +#: merge-recursive.c:951 builtin/cat-file.c:41

5068 #, c-format

5069 msgid "cannot read object %s '%s'"

5070 msgstr "不能讀取物件 %s '%s'"

5071

5025 -#: merge-recursive.c:954

5072 +#: merge-recursive.c:956

5073 #, c-format

5074 msgid "blob expected for %s '%s'"

5075 msgstr "%s '%s' 應為資料物件"

5076

5030 -#: merge-recursive.c:979

5077 +#: merge-recursive.c:981

5078 #, c-format

5079 msgid "failed to open '%s': %s"

5080 msgstr "開啟 '%s' 失敗：%s"

5081

5035 -#: merge-recursive.c:990

5082 +#: merge-recursive.c:992

5083 #, c-format

5084 msgid "failed to symlink '%s': %s"

5085 msgstr "建立符號連結 '%s' 失敗：%s"

5086

5040 -#: merge-recursive.c:995

5087 +#: merge-recursive.c:997

5088 #, c-format

5089 msgid "do not know what to do with %06o %s '%s'"

5090 msgstr "不知道如何處理 %06o %s '%s'"

5091

5045 -#: merge-recursive.c:1213 merge-recursive.c:1225

5092 +#: merge-recursive.c:1227 merge-recursive.c:1239

5093 #, c-format

5094 msgid "Fast-forwarding submodule %s to the following commit:"

5095 msgstr "子模組 %s 快轉到如下提交："

5096

5050 -#: merge-recursive.c:1216 merge-recursive.c:1228

5097 +#: merge-recursive.c:1230 merge-recursive.c:1242

5098 #, c-format

5099 msgid "Fast-forwarding submodule %s"

5100 msgstr "快轉子模組 %s"

5101

5055 -#: merge-recursive.c:1251

5102 +#: merge-recursive.c:1265

5103 #, c-format

5104 msgid "Failed to merge submodule %s (merge following commits not found)"

5105 msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）"

5106

5060 -#: merge-recursive.c:1255

5107 +#: merge-recursive.c:1269

5108 #, c-format

5109 msgid "Failed to merge submodule %s (not fast-forward)"

5110 msgstr "無法合併子模組 %s（非快轉）"

5111

5065 -#: merge-recursive.c:1256

5112 +#: merge-recursive.c:1270

5113 msgid "Found a possible merge resolution for the submodule:\n"

5114 msgstr "找到子模組的一個可能的合併方案：\n"

5115

5069 -#: merge-recursive.c:1268

5116 +#: merge-recursive.c:1282

5117 #, c-format

5118 msgid "Failed to merge submodule %s (multiple merges found)"

5119 msgstr "無法合併子模組 %s （發現多個合併）"

5120

5074 -#: merge-recursive.c:1402

5121 +#: merge-recursive.c:1424

5122 #, c-format

5123 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

5124 msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。"

5125

5079 -#: merge-recursive.c:1474

5126 +#: merge-recursive.c:1496

5127 #, c-format

5128 msgid ""

5129 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -5085,7 +5132,7 @@ msgstr ""

5132 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

5133 "本被保留。"

5134

5088 -#: merge-recursive.c:1479

5135 +#: merge-recursive.c:1501

5136 #, c-format

5137 msgid ""

5138 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -5094,7 +5141,7 @@ msgstr ""

5141 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

5142 "%7$s 版本被保留。"

5143

5097 -#: merge-recursive.c:1486

5144 +#: merge-recursive.c:1508

5145 #, c-format

5146 msgid ""

5147 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -5103,7 +5150,7 @@ msgstr ""

5150 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"

5151 "本保留在 %8$s 中。"

5152

5106 -#: merge-recursive.c:1491

5153 +#: merge-recursive.c:1513

5154 #, c-format

5155 msgid ""

5156 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -5112,41 +5159,41 @@ msgstr ""

5159 "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "

5160 "%7$s 版本保留在 %9$s 中。"

5161

5115 -#: merge-recursive.c:1526

5162 +#: merge-recursive.c:1548

5163 msgid "rename"

5164 msgstr "重新命名"

5165

5119 -#: merge-recursive.c:1526

5166 +#: merge-recursive.c:1548

5167 msgid "renamed"

5168 msgstr "重新命名"

5169

5123 -#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129

5170 +#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158

5171 #, c-format

5172 msgid "Refusing to lose dirty file at %s"

5173 msgstr "拒絕遺失髒檔案 '%s'"

5174

5128 -#: merge-recursive.c:1587

5175 +#: merge-recursive.c:1609

5176 #, c-format

5177 msgid "Refusing to lose untracked file at %s, even though it's in the way."

5178 msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。"

5179

5133 -#: merge-recursive.c:1645

5180 +#: merge-recursive.c:1667

5181 #, c-format

5182 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

5183 msgstr ""

5184 "衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"

5185

5139 -#: merge-recursive.c:1676

5186 +#: merge-recursive.c:1698

5187 #, c-format

5188 msgid "%s is a directory in %s adding as %s instead"

5189 msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增"

5190

5144 -#: merge-recursive.c:1681

5191 +#: merge-recursive.c:1703

5192 #, c-format

5193 msgid "Refusing to lose untracked file at %s; adding as %s instead"

5194 msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s"

5195

5149 -#: merge-recursive.c:1708

5196 +#: merge-recursive.c:1730

5197 #, c-format

5198 msgid ""

5199 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -5155,18 +5202,18 @@ msgstr ""

5202 "衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在"

5203 "分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s"

5204

5158 -#: merge-recursive.c:1713

5205 +#: merge-recursive.c:1735

5206 msgid " (left unresolved)"

5207 msgstr " （留下未解決）"

5208

5162 -#: merge-recursive.c:1805

5209 +#: merge-recursive.c:1827

5210 #, c-format

5211 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

5212 msgstr ""

5213 "衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 "

5214 "%4$s->%5$s"

5215

5169 -#: merge-recursive.c:2068

5216 +#: merge-recursive.c:2090

5217 #, c-format

5218 msgid ""

5219 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -5176,7 +5223,7 @@ msgstr ""

5223 "衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到"

5224 "多個其它目錄，沒有目錄包含大部分檔案。"

5225

5179 -#: merge-recursive.c:2202

5226 +#: merge-recursive.c:2224

5227 #, c-format

5228 msgid ""

5229 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -5185,88 +5232,78 @@ msgstr ""

5232 "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新"

5233 "命名目錄 %4$s->%5$s"

5234

5188 -#: merge-recursive.c:2973

5189 -#, c-format

5190 -msgid "cannot read object %s"

5191 -msgstr "不能讀取物件 %s"

5192 -

5193 -#: merge-recursive.c:2976

5194 -#, c-format

5195 -msgid "object %s is not a blob"

5196 -msgstr "物件 %s 不是一個資料物件"

5197 -

5198 -#: merge-recursive.c:3040

5235 +#: merge-recursive.c:3069

5236 msgid "modify"

5237 msgstr "修改"

5238

5202 -#: merge-recursive.c:3040

5239 +#: merge-recursive.c:3069

5240 msgid "modified"

5241 msgstr "修改"

5242

5206 -#: merge-recursive.c:3079

5243 +#: merge-recursive.c:3108

5244 #, c-format

5245 msgid "Skipped %s (merged same as existing)"

5246 msgstr "略過 %s（已經做過相同合併）"

5247

5211 -#: merge-recursive.c:3132

5248 +#: merge-recursive.c:3161

5249 #, c-format

5250 msgid "Adding as %s instead"

5251 msgstr "而是以 %s 為名新增"

5252

5216 -#: merge-recursive.c:3339

5253 +#: merge-recursive.c:3368

5254 #, c-format

5255 msgid "Removing %s"

5256 msgstr "刪除 %s"

5257

5221 -#: merge-recursive.c:3362

5258 +#: merge-recursive.c:3391

5259 msgid "file/directory"

5260 msgstr "檔案/目錄"

5261

5225 -#: merge-recursive.c:3367

5262 +#: merge-recursive.c:3396

5263 msgid "directory/file"

5264 msgstr "目錄/檔案"

5265

5229 -#: merge-recursive.c:3374

5266 +#: merge-recursive.c:3403

5267 #, c-format

5268 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

5269 msgstr "衝突（%1$s）：在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s"

5270

5234 -#: merge-recursive.c:3383

5271 +#: merge-recursive.c:3412

5272 #, c-format

5273 msgid "Adding %s"

5274 msgstr "新增 %s"

5275

5239 -#: merge-recursive.c:3392

5276 +#: merge-recursive.c:3421

5277 #, c-format

5278 msgid "CONFLICT (add/add): Merge conflict in %s"

5279 msgstr "衝突（add/add）：合併衝突於 %s"

5280

5244 -#: merge-recursive.c:3445

5281 +#: merge-recursive.c:3474

5282 #, c-format

5283 msgid "merging of trees %s and %s failed"

5284 msgstr "無法合併樹 %s 和 %s"

5285

5249 -#: merge-recursive.c:3539

5286 +#: merge-recursive.c:3568

5287 msgid "Merging:"

5288 msgstr "合併："

5289

5253 -#: merge-recursive.c:3552

5290 +#: merge-recursive.c:3581

5291 #, c-format

5292 msgid "found %u common ancestor:"

5293 msgid_plural "found %u common ancestors:"

5294 msgstr[0] "發現 %u 個共同祖先："

5295

5259 -#: merge-recursive.c:3602

5296 +#: merge-recursive.c:3631

5297 msgid "merge returned no commit"

5298 msgstr "合併未返回提交"

5299

5263 -#: merge-recursive.c:3758

5300 +#: merge-recursive.c:3796

5301 #, c-format

5302 msgid "Could not parse object '%s'"

5303 msgstr "不能解析物件 '%s'"

5304

5268 -#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896

5269 -#: builtin/stash.c:471

5305 +#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900

5306 +#: builtin/stash.c:473

5307 msgid "Unable to write index."

5308 msgstr "不能寫入索引。"

5309

@@ -5274,178 +5311,195 @@ msgstr "不能寫入索引。"

5311 msgid "failed to read the cache"

5312 msgstr "讀取快取失敗"

5313

5277 -#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917

5278 -#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817

5279 -#: builtin/stash.c:265

5314 +#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965

5315 +#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821

5316 +#: builtin/stash.c:267

5317 msgid "unable to write new index file"

5318 msgstr "無法寫新的索引檔案"

5319

5283 -#: midx.c:62

5284 -#, fuzzy

5285 -#| msgid "multi-pack-index version %d not recognized"

5320 +#: midx.c:74

5321 msgid "multi-pack-index OID fanout is of the wrong size"

5287 -msgstr "multi-pack-index 版本 %d 不能被識別"

5322 +msgstr "多包索引的物件 ID fanout 大小錯誤"

5323

5289 -#: midx.c:93

5324 +#: midx.c:105

5325 #, c-format

5326 msgid "multi-pack-index file %s is too small"

5327 msgstr "多包索引檔案 %s 太小"

5328

5294 -#: midx.c:109

5329 +#: midx.c:121

5330 #, c-format

5331 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

5332 msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合"

5333

5299 -#: midx.c:114

5334 +#: midx.c:126

5335 #, c-format

5336 msgid "multi-pack-index version %d not recognized"

5337 msgstr "multi-pack-index 版本 %d 不能被識別"

5338

5304 -#: midx.c:119

5339 +#: midx.c:131

5340 #, c-format

5341 msgid "multi-pack-index hash version %u does not match version %u"

5342 msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合"

5343

5309 -#: midx.c:136

5344 +#: midx.c:148

5345 msgid "multi-pack-index missing required pack-name chunk"

5346 msgstr "多包索引缺少必需的包名塊"

5347

5313 -#: midx.c:138

5348 +#: midx.c:150

5349 msgid "multi-pack-index missing required OID fanout chunk"

5350 msgstr "多包索引缺少必需的物件 ID 扇出塊"

5351

5317 -#: midx.c:140

5352 +#: midx.c:152

5353 msgid "multi-pack-index missing required OID lookup chunk"

5354 msgstr "多包索引缺少必需的物件 ID 查詢塊"

5355

5321 -#: midx.c:142

5356 +#: midx.c:154

5357 msgid "multi-pack-index missing required object offsets chunk"

5358 msgstr "多包索引缺少必需的物件位移塊"

5359

5325 -#: midx.c:158

5360 +#: midx.c:170

5361 #, c-format

5362 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

5363 msgstr "多包索引包名無序：'%s' 在 '%s' 之前"

5364

5330 -#: midx.c:202

5365 +#: midx.c:214

5366 #, c-format

5367 msgid "bad pack-int-id: %u (%u total packs)"

5368 msgstr "錯的 pack-int-id：%u（共有 %u 個包）"

5369

5335 -#: midx.c:252

5370 +#: midx.c:264

5371 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5372 msgstr "多包索引儲存一個64位位移，但是 off_t 太小"

5373

5339 -#: midx.c:467

5374 +#: midx.c:490

5375 #, c-format

5376 msgid "failed to add packfile '%s'"

5377 msgstr "新增 packfile '%s' 失敗"

5378

5344 -#: midx.c:473

5379 +#: midx.c:496

5380 #, c-format

5381 msgid "failed to open pack-index '%s'"

5382 msgstr "開啟包索引 '%s' 失敗"

5383

5349 -#: midx.c:533

5384 +#: midx.c:564

5385 #, c-format

5386 msgid "failed to locate object %d in packfile"

5387 msgstr "在 packfile 中定位物件 %d 失敗"

5388

5354 -#: midx.c:821

5389 +#: midx.c:880 builtin/index-pack.c:1535

5390 +msgid "cannot store reverse index file"

5391 +msgstr "無法儲存倒排索引檔案"

5392 +

5393 +#: midx.c:933

5394 msgid "Adding packfiles to multi-pack-index"

5395 msgstr "正在新增 packfile 至多包索引"

5396

5358 -#: midx.c:855

5397 +#: midx.c:979

5398 #, c-format

5399 msgid "did not see pack-file %s to drop"

5400 msgstr "沒有看到要捨棄的包檔案 %s"

5401

5363 -#: midx.c:904

5402 +#: midx.c:1024

5403 +#, c-format

5404 +msgid "unknown preferred pack: '%s'"

5405 +msgstr "未知偏好包：「%s」"

5406 +

5407 +#: midx.c:1029

5408 +#, c-format

5409 +msgid "preferred pack '%s' is expired"

5410 +msgstr "偏好包「%s」已經過期"

5411 +

5412 +#: midx.c:1045

5413 msgid "no pack files to index."

5414 msgstr "沒有要索引的 pack 檔案。"

5415

5367 -#: midx.c:965

5416 +#: midx.c:1125 builtin/clean.c:37

5417 +#, c-format

5418 +msgid "failed to remove %s"

5419 +msgstr "刪除 %s 失敗"

5420 +

5421 +#: midx.c:1156

5422 #, c-format

5423 msgid "failed to clear multi-pack-index at %s"

5424 msgstr "清理位於 %s 的多包索引失敗"

5425

5372 -#: midx.c:1021

5426 +#: midx.c:1214

5427 msgid "multi-pack-index file exists, but failed to parse"

5428 msgstr "有 multi-pack-index 檔案，但無法解析"

5429

5376 -#: midx.c:1029

5430 +#: midx.c:1222

5431 msgid "Looking for referenced packfiles"

5432 msgstr "正在尋找引用的 packfile"

5433

5380 -#: midx.c:1044

5434 +#: midx.c:1237

5435 #, c-format

5436 msgid ""

5437 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5438 msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5439

5386 -#: midx.c:1049

5440 +#: midx.c:1242

5441 msgid "the midx contains no oid"

5442 msgstr "midx 沒有 oid"

5443

5390 -#: midx.c:1058

5444 +#: midx.c:1251

5445 msgid "Verifying OID order in multi-pack-index"

5446 msgstr "正在驗證多包索引中的物件 ID 順序"

5447

5394 -#: midx.c:1067

5448 +#: midx.c:1260

5449 #, c-format

5450 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5451 msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]"

5452

5399 -#: midx.c:1087

5453 +#: midx.c:1280

5454 msgid "Sorting objects by packfile"

5455 msgstr "透過 packfile 為物件排序"

5456

5403 -#: midx.c:1094

5457 +#: midx.c:1287

5458 msgid "Verifying object offsets"

5459 msgstr "正在驗證物件位移"

5460

5407 -#: midx.c:1110

5461 +#: midx.c:1303

5462 #, c-format

5463 msgid "failed to load pack entry for oid[%d] = %s"

5464 msgstr "為 oid[%d] = %s 載入包條目失敗"

5465

5412 -#: midx.c:1116

5466 +#: midx.c:1309

5467 #, c-format

5468 msgid "failed to load pack-index for packfile %s"

5469 msgstr "為 packfile %s 載入包索引失敗"

5470

5417 -#: midx.c:1125

5471 +#: midx.c:1318

5472 #, c-format

5473 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5474 msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"

5475

5422 -#: midx.c:1150

5476 +#: midx.c:1343

5477 msgid "Counting referenced objects"

5478 msgstr "正在計算引用物件"

5479

5426 -#: midx.c:1160

5480 +#: midx.c:1353

5481 msgid "Finding and deleting unreferenced packfiles"

5482 msgstr "正在尋找並刪除沒有參考的 packfile"

5483

5430 -#: midx.c:1351

5484 +#: midx.c:1544

5485 msgid "could not start pack-objects"

5486 msgstr "不能開始 pack-objects"

5487

5434 -#: midx.c:1371

5488 +#: midx.c:1564

5489 msgid "could not finish pack-objects"

5490 msgstr "不能結束 pack-objects"

5491

5438 -#: name-hash.c:538

5492 +#: name-hash.c:542

5493 #, c-format

5494 msgid "unable to create lazy_dir thread: %s"

5495 msgstr "不能建立 lazy_dir 執行緒：%s"

5496

5443 -#: name-hash.c:560

5497 +#: name-hash.c:564

5498 #, c-format

5499 msgid "unable to create lazy_name thread: %s"

5500 msgstr "不能建立 lazy_name 執行緒：%s"

5501

5448 -#: name-hash.c:566

5502 +#: name-hash.c:570

5503 #, c-format

5504 msgid "unable to join lazy_name thread: %s"

5505 msgstr "不能加入 lasy_name 執行緒：%s"

@@ -5489,256 +5543,256 @@ msgstr "拒絕向 %s（在 refs/notes/ 之外）寫入註解"

5543 msgid "Bad %s value: '%s'"

5544 msgstr "壞的 %s 值：'%s'"

5545

5492 -#: object-file.c:480

5546 +#: object-file.c:526

5547 #, c-format

5548 msgid "object directory %s does not exist; check .git/objects/info/alternates"

5549 msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates"

5550

5497 -#: object-file.c:531

5551 +#: object-file.c:577

5552 #, c-format

5553 msgid "unable to normalize alternate object path: %s"

5554 msgstr "無法規範化備用物件路徑：%s"

5555

5502 -#: object-file.c:603

5556 +#: object-file.c:649

5557 #, c-format

5558 msgid "%s: ignoring alternate object stores, nesting too deep"

5559 msgstr "%s：忽略備用物件庫，嵌套太深"

5560

5507 -#: object-file.c:610

5561 +#: object-file.c:656

5562 #, c-format

5563 msgid "unable to normalize object directory: %s"

5564 msgstr "無法規範化物件目錄: %s"

5565

5512 -#: object-file.c:653

5566 +#: object-file.c:699

5567 msgid "unable to fdopen alternates lockfile"

5568 msgstr "無法 fdopen 取代鎖檔案"

5569

5516 -#: object-file.c:671

5570 +#: object-file.c:717

5571 msgid "unable to read alternates file"

5572 msgstr "無法讀取替代檔案"

5573

5520 -#: object-file.c:678

5574 +#: object-file.c:724

5575 msgid "unable to move new alternates file into place"

5576 msgstr "無法將新的替代檔案移動到位"

5577

5524 -#: object-file.c:713

5578 +#: object-file.c:759

5579 #, c-format

5580 msgid "path '%s' does not exist"

5581 msgstr "路徑 '%s' 不存在"

5582

5529 -#: object-file.c:734

5583 +#: object-file.c:780

5584 #, c-format

5585 msgid "reference repository '%s' as a linked checkout is not supported yet."

5586 msgstr "尚不支援將參考版本庫 '%s' 作為一個連結檢出。"

5587

5534 -#: object-file.c:740

5588 +#: object-file.c:786

5589 #, c-format

5590 msgid "reference repository '%s' is not a local repository."

5591 msgstr "參考版本庫 '%s' 不是一個本機版本庫。"

5592

5539 -#: object-file.c:746

5593 +#: object-file.c:792

5594 #, c-format

5595 msgid "reference repository '%s' is shallow"

5596 msgstr "參考版本庫 '%s' 是一個淺複製"

5597

5544 -#: object-file.c:754

5598 +#: object-file.c:800

5599 #, c-format

5600 msgid "reference repository '%s' is grafted"

5601 msgstr "參考版本庫 '%s' 已被移植"

5602

5549 -#: object-file.c:814

5603 +#: object-file.c:860

5604 #, c-format

5605 msgid "invalid line while parsing alternate refs: %s"

5606 msgstr "解析備用引用時無效的行：%s"

5607

5554 -#: object-file.c:964

5608 +#: object-file.c:1010

5609 #, c-format

5610 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5611 msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>"

5612

5559 -#: object-file.c:985

5613 +#: object-file.c:1031

5614 msgid "mmap failed"

5615 msgstr "mmap 失敗"

5616

5563 -#: object-file.c:1149

5617 +#: object-file.c:1195

5618 #, c-format

5619 msgid "object file %s is empty"

5620 msgstr "物件檔案 %s 為空"

5621

5568 -#: object-file.c:1284 object-file.c:2477

5622 +#: object-file.c:1330 object-file.c:2524

5623 #, c-format

5624 msgid "corrupt loose object '%s'"

5625 msgstr "損壞的鬆散物件 '%s'"

5626

5573 -#: object-file.c:1286 object-file.c:2481

5627 +#: object-file.c:1332 object-file.c:2528

5628 #, c-format

5629 msgid "garbage at end of loose object '%s'"

5630 msgstr "鬆散物件 '%s' 後面有垃圾資料"

5631

5578 -#: object-file.c:1328

5632 +#: object-file.c:1374

5633 msgid "invalid object type"

5634 msgstr "無效的物件類型"

5635

5582 -#: object-file.c:1412

5636 +#: object-file.c:1458

5637 #, c-format

5638 msgid "unable to unpack %s header with --allow-unknown-type"

5639 msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息"

5640

5587 -#: object-file.c:1415

5641 +#: object-file.c:1461

5642 #, c-format

5643 msgid "unable to unpack %s header"

5644 msgstr "無法解開 %s 頭部"

5645

5592 -#: object-file.c:1421

5646 +#: object-file.c:1467

5647 #, c-format

5648 msgid "unable to parse %s header with --allow-unknown-type"

5649 msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息"

5650

5597 -#: object-file.c:1424

5651 +#: object-file.c:1470

5652 #, c-format

5653 msgid "unable to parse %s header"

5654 msgstr "無法解析 %s 頭部"

5655

5602 -#: object-file.c:1651

5656 +#: object-file.c:1697

5657 #, c-format

5658 msgid "failed to read object %s"

5659 msgstr "讀取物件 %s 失敗"

5660

5607 -#: object-file.c:1655

5661 +#: object-file.c:1701

5662 #, c-format

5663 msgid "replacement %s not found for %s"

5664 msgstr "找不到 %2$s 的替代 %1$s"

5665

5612 -#: object-file.c:1659

5666 +#: object-file.c:1705

5667 #, c-format

5668 msgid "loose object %s (stored in %s) is corrupt"

5669 msgstr "鬆散物件 %s（儲存在 %s）已損壞"

5670

5617 -#: object-file.c:1663

5671 +#: object-file.c:1709

5672 #, c-format

5673 msgid "packed object %s (stored in %s) is corrupt"

5674 msgstr "打包物件 %s（儲存在 %s）已損壞"

5675

5622 -#: object-file.c:1768

5676 +#: object-file.c:1814

5677 #, c-format

5678 msgid "unable to write file %s"

5679 msgstr "無法寫檔案 %s"

5680

5627 -#: object-file.c:1775

5681 +#: object-file.c:1821

5682 #, c-format

5683 msgid "unable to set permission to '%s'"

5684 msgstr "無法為 '%s' 設定權限"

5685

5632 -#: object-file.c:1782

5686 +#: object-file.c:1828

5687 msgid "file write error"

5688 msgstr "檔案寫錯誤"

5689

5636 -#: object-file.c:1802

5690 +#: object-file.c:1848

5691 msgid "error when closing loose object file"

5692 msgstr "關閉鬆散物件檔案時發生錯誤"

5693

5640 -#: object-file.c:1867

5694 +#: object-file.c:1913

5695 #, c-format

5696 msgid "insufficient permission for adding an object to repository database %s"

5697 msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件"

5698

5645 -#: object-file.c:1869

5699 +#: object-file.c:1915

5700 msgid "unable to create temporary file"

5701 msgstr "無法建立暫存檔"

5702

5649 -#: object-file.c:1893

5703 +#: object-file.c:1939

5704 msgid "unable to write loose object file"

5705 msgstr "不能寫鬆散物件檔案"

5706

5653 -#: object-file.c:1899

5707 +#: object-file.c:1945

5708 #, c-format

5709 msgid "unable to deflate new object %s (%d)"

5710 msgstr "不能壓縮新物件 %s（%d）"

5711

5658 -#: object-file.c:1903

5712 +#: object-file.c:1949

5713 #, c-format

5714 msgid "deflateEnd on object %s failed (%d)"

5715 msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）"

5716

5663 -#: object-file.c:1907

5717 +#: object-file.c:1953

5718 #, c-format

5719 msgid "confused by unstable object source data for %s"

5720 msgstr "被 %s 的不穩定物件源資料搞糊塗了"

5721

5668 -#: object-file.c:1917 builtin/pack-objects.c:1097

5722 +#: object-file.c:1963 builtin/pack-objects.c:1097

5723 #, c-format

5724 msgid "failed utime() on %s"

5725 msgstr "在 %s 上呼叫 utime() 失敗"

5726

5673 -#: object-file.c:1994

5727 +#: object-file.c:2040

5728 #, c-format

5729 msgid "cannot read object for %s"

5730 msgstr "不能讀取物件 %s"

5731

5678 -#: object-file.c:2045

5732 +#: object-file.c:2091

5733 msgid "corrupt commit"

5734 msgstr "損壞的提交"

5735

5682 -#: object-file.c:2053

5736 +#: object-file.c:2099

5737 msgid "corrupt tag"

5738 msgstr "損壞的標籤"

5739

5686 -#: object-file.c:2153

5740 +#: object-file.c:2199

5741 #, c-format

5742 msgid "read error while indexing %s"

5743 msgstr "索引 %s 時讀取錯誤"

5744

5691 -#: object-file.c:2156

5745 +#: object-file.c:2202

5746 #, c-format

5747 msgid "short read while indexing %s"

5748 msgstr "索引 %s 時讀入不完整"

5749

5696 -#: object-file.c:2229 object-file.c:2239

5750 +#: object-file.c:2275 object-file.c:2285

5751 #, c-format

5752 msgid "%s: failed to insert into database"

5753 msgstr "%s：插入資料庫失敗"

5754

5701 -#: object-file.c:2245

5755 +#: object-file.c:2291

5756 #, c-format

5757 msgid "%s: unsupported file type"

5758 msgstr "%s：不支援的檔案類型"

5759

5706 -#: object-file.c:2269

5760 +#: object-file.c:2315

5761 #, c-format

5762 msgid "%s is not a valid object"

5763 msgstr "%s 不是一個有效的物件"

5764

5711 -#: object-file.c:2271

5765 +#: object-file.c:2317

5766 #, c-format

5767 msgid "%s is not a valid '%s' object"

5768 msgstr "%s 不是一個有效的 '%s' 物件"

5769

5716 -#: object-file.c:2298 builtin/index-pack.c:192

5770 +#: object-file.c:2344 builtin/index-pack.c:192

5771 #, c-format

5772 msgid "unable to open %s"

5773 msgstr "不能開啟 %s"

5774

5721 -#: object-file.c:2488 object-file.c:2541

5775 +#: object-file.c:2535 object-file.c:2588

5776 #, c-format

5777 msgid "hash mismatch for %s (expected %s)"

5778 msgstr "%s 的雜湊值不符合（預期 %s）"

5779

5726 -#: object-file.c:2512

5780 +#: object-file.c:2559

5781 #, c-format

5782 msgid "unable to mmap %s"

5783 msgstr "不能 mmap %s"

5784

5731 -#: object-file.c:2517

5785 +#: object-file.c:2564

5786 #, c-format

5787 msgid "unable to unpack header of %s"

5788 msgstr "無法解壓縮 %s 的頭部"

5789

5736 -#: object-file.c:2523

5790 +#: object-file.c:2570

5791 #, c-format

5792 msgid "unable to parse header of %s"

5793 msgstr "無法解析 %s 的頭部"

5794

5741 -#: object-file.c:2534

5795 +#: object-file.c:2581

5796 #, c-format

5797 msgid "unable to unpack contents of %s"

5798 msgstr "無法解壓縮 %s 的內容"

@@ -5850,71 +5904,71 @@ msgstr "無效的物件類型 \"%s\""

5904 msgid "object %s is a %s, not a %s"

5905 msgstr "物件 %s 是一個 %s，不是一個 %s"

5906

5853 -#: object.c:233

5907 +#: object.c:232

5908 #, c-format

5909 msgid "object %s has unknown type id %d"

5910 msgstr "物件 %s 有未知的類型 id %d"

5911

5858 -#: object.c:246

5912 +#: object.c:245

5913 #, c-format

5914 msgid "unable to parse object: %s"

5915 msgstr "不能解析物件：%s"

5916

5863 -#: object.c:266 object.c:278

5917 +#: object.c:265 object.c:277

5918 #, c-format

5919 msgid "hash mismatch %s"

5920 msgstr "雜湊值與 %s 不符合"

5921

5868 -#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226

5922 +#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251

5923 #, c-format

5924 msgid "unable to get size of %s"

5925 msgstr "不能得到 %s 的大小"

5926

5873 -#: pack-bitmap.c:1489 builtin/rev-list.c:92

5927 +#: pack-bitmap.c:1547 builtin/rev-list.c:92

5928 #, c-format

5929 msgid "unable to get disk usage of %s"

5930 msgstr "無法取得 %s 的磁碟用量"

5931

5878 -#: pack-revindex.c:220

5932 +#: pack-revindex.c:221

5933 #, c-format

5934 msgid "reverse-index file %s is too small"

5935 msgstr "%s 倒排索引檔案過小"

5936

5883 -#: pack-revindex.c:225

5937 +#: pack-revindex.c:226

5938 #, c-format

5939 msgid "reverse-index file %s is corrupt"

5940 msgstr "%s 倒排索引檔案損壞"

5941

5888 -#: pack-revindex.c:233

5942 +#: pack-revindex.c:234

5943 #, c-format

5944 msgid "reverse-index file %s has unknown signature"

5945 msgstr "%s 倒排索引檔案有未知簽章"

5946

5893 -#: pack-revindex.c:237

5947 +#: pack-revindex.c:238

5948 #, c-format

5949 msgid "reverse-index file %s has unsupported version %<PRIu32>"

5950 msgstr "倒排索引檔案 %s 有不支援的版本 %<PRIu32>"

5951

5898 -#: pack-revindex.c:242

5952 +#: pack-revindex.c:243

5953 #, c-format

5954 msgid "reverse-index file %s has unsupported hash id %<PRIu32>"

5955 msgstr "倒排索引檔案 %s 有不支援的雜湊 ID %<PRIu32>"

5956

5903 -#: pack-write.c:236

5957 +#: pack-write.c:250

5958 msgid "cannot both write and verify reverse index"

5959 msgstr "無法同時寫入和驗證倒排索引"

5960

5907 -#: pack-write.c:257

5961 +#: pack-write.c:271

5962 #, c-format

5963 msgid "could not stat: %s"

5964 msgstr "無法 stat：%s"

5965

5912 -#: pack-write.c:269

5966 +#: pack-write.c:283

5967 #, c-format

5968 msgid "failed to make %s readable"

5969 msgstr "無法讓 %s 能夠寫入"

5970

5917 -#: pack-write.c:508

5971 +#: pack-write.c:522

5972 #, c-format

5973 msgid "could not write '%s' promisor file"

5974 msgstr "無法寫入「%s」promisor 檔案"

@@ -5923,12 +5977,12 @@ msgstr "無法寫入「%s」promisor 檔案"

5977 msgid "offset before end of packfile (broken .idx?)"

5978 msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"

5979

5926 -#: packfile.c:1934

5980 +#: packfile.c:1937

5981 #, c-format

5982 msgid "offset before start of pack index for %s (corrupt index?)"

5983 msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"

5984

5931 -#: packfile.c:1938

5985 +#: packfile.c:1941

5986 #, c-format

5987 msgid "offset beyond end of pack index for %s (truncated index?)"

5988 msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"

@@ -5993,31 +6047,31 @@ msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）"

6047 msgid "did you mean `--%s` (with two dashes)?"

6048 msgstr "你的意思是 `--%s`（有兩個短線）嗎？"

6049

5996 -#: parse-options.c:666 parse-options.c:971

6050 +#: parse-options.c:668 parse-options.c:988

6051 #, c-format

6052 msgid "alias of --%s"

6053 msgstr "--%s 的別名"

6054

6001 -#: parse-options.c:862

6055 +#: parse-options.c:879

6056 #, c-format

6057 msgid "unknown option `%s'"

6058 msgstr "未知選項 `%s'"

6059

6006 -#: parse-options.c:864

6060 +#: parse-options.c:881

6061 #, c-format

6062 msgid "unknown switch `%c'"

6063 msgstr "未知開關 `%c'"

6064

6011 -#: parse-options.c:866

6065 +#: parse-options.c:883

6066 #, c-format

6067 msgid "unknown non-ascii option in string: `%s'"

6068 msgstr "字串中未知的非 ascii 字元選項：`%s'"

6069

6016 -#: parse-options.c:890

6070 +#: parse-options.c:907

6071 msgid "..."

6072 msgstr "..."

6073

6020 -#: parse-options.c:909

6074 +#: parse-options.c:926

6075 #, c-format

6076 msgid "usage: %s"

6077 msgstr "用法：%s"

@@ -6025,18 +6079,18 @@ msgstr "用法：%s"

6079 #. TRANSLATORS: the colon here should align with the

6080 #. one in "usage: %s" translation.

6081 #.

6028 -#: parse-options.c:915

6082 +#: parse-options.c:932

6083 #, c-format

6084 msgid " or: %s"

6085 msgstr " 或：%s"

6086

6087 # 譯者：為保證在輸出中對齊，注意調整句中空格！

6034 -#: parse-options.c:918

6088 +#: parse-options.c:935

6089 #, c-format

6090 msgid " %s"

6091 msgstr " %s"

6092

6039 -#: parse-options.c:957

6093 +#: parse-options.c:974

6094 msgid "-NUM"

6095 msgstr "-數字"

6096

@@ -6045,78 +6099,78 @@ msgstr "-數字"

6099 msgid "Could not make %s writable by group"

6100 msgstr "不能設定 %s 為組可寫"

6101

6048 -#: pathspec.c:130

6102 +#: pathspec.c:151

6103 msgid "Escape character '\\' not allowed as last character in attr value"

6104 msgstr "跳脫字元 '\\' 不能作為屬性值的最後一個字元"

6105

6052 -#: pathspec.c:148

6106 +#: pathspec.c:169

6107 msgid "Only one 'attr:' specification is allowed."

6108 msgstr "只允許一個 'attr:' 規格。"

6109

6056 -#: pathspec.c:151

6110 +#: pathspec.c:172

6111 msgid "attr spec must not be empty"

6112 msgstr "屬性規格不能為空"

6113

6060 -#: pathspec.c:194

6114 +#: pathspec.c:215

6115 #, c-format

6116 msgid "invalid attribute name %s"

6117 msgstr "無效的屬性名 %s"

6118

6065 -#: pathspec.c:259

6119 +#: pathspec.c:280

6120 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

6121 msgstr "全域的 'glob' 和 'noglob' 路徑規格設定不相容"

6122

6069 -#: pathspec.c:266

6123 +#: pathspec.c:287

6124 msgid ""

6125 "global 'literal' pathspec setting is incompatible with all other global "

6126 "pathspec settings"

6127 msgstr "全域的 'literal' 路徑規格設定和其它的全域路徑規格設定不相容"

6128

6075 -#: pathspec.c:306

6129 +#: pathspec.c:327

6130 msgid "invalid parameter for pathspec magic 'prefix'"

6131 msgstr "路徑規格包含無效的神奇前綴"

6132

6079 -#: pathspec.c:327

6133 +#: pathspec.c:348

6134 #, c-format

6135 msgid "Invalid pathspec magic '%.*s' in '%s'"

6136 msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'"

6137

6084 -#: pathspec.c:332

6138 +#: pathspec.c:353

6139 #, c-format

6140 msgid "Missing ')' at the end of pathspec magic in '%s'"

6141 msgstr "路徑規格 '%s' 的神奇前綴結尾少了一個 ')'"

6142

6089 -#: pathspec.c:370

6143 +#: pathspec.c:391

6144 #, c-format

6145 msgid "Unimplemented pathspec magic '%c' in '%s'"

6146 msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'"

6147

6094 -#: pathspec.c:429

6148 +#: pathspec.c:450

6149 #, c-format

6150 msgid "%s: 'literal' and 'glob' are incompatible"

6151 msgstr "%s：'literal' 和 'glob' 不相容"

6152

6099 -#: pathspec.c:445

6153 +#: pathspec.c:466

6154 #, c-format

6155 msgid "%s: '%s' is outside repository at '%s'"

6156 msgstr "%s：'%s' 在位於 '%s' 的版本庫之外"

6157

6104 -#: pathspec.c:521

6158 +#: pathspec.c:542

6159 #, c-format

6160 msgid "'%s' (mnemonic: '%c')"

6161 msgstr "'%s'（助記符：'%c'）"

6162

6109 -#: pathspec.c:531

6163 +#: pathspec.c:552

6164 #, c-format

6165 msgid "%s: pathspec magic not supported by this command: %s"

6166 msgstr "%s：路徑規格神奇前綴不被此指令支援：%s"

6167

6114 -#: pathspec.c:598

6168 +#: pathspec.c:619

6169 #, c-format

6170 msgid "pathspec '%s' is beyond a symbolic link"

6171 msgstr "路徑規格 '%s' 位於符號連結中"

6172

6119 -#: pathspec.c:643

6173 +#: pathspec.c:664

6174 #, c-format

6175 msgid "line is badly quoted: %s"

6176 msgstr "某行不應該被括號括住：%s"

@@ -6137,7 +6191,7 @@ msgstr "無法寫入無狀態的分隔符號封包"

6191 msgid "flush packet write failed"

6192 msgstr "flush 包寫錯誤"

6193

6140 -#: pkt-line.c:153 pkt-line.c:239

6194 +#: pkt-line.c:153 pkt-line.c:265

6195 msgid "protocol error: impossibly long line"

6196 msgstr "協定錯誤：不可能的長行"

6197

@@ -6145,33 +6199,34 @@ msgstr "協定錯誤：不可能的長行"

6199 msgid "packet write with format failed"

6200 msgstr "格式化包寫入錯誤"

6201

6148 -#: pkt-line.c:203

6202 +#: pkt-line.c:204

6203 msgid "packet write failed - data exceeds max packet size"

6204 msgstr "寫封包失敗：資料超過了包的最大長度"

6205

6152 -#: pkt-line.c:210 pkt-line.c:217

6153 -msgid "packet write failed"

6154 -msgstr "封包寫入失敗"

6206 +#: pkt-line.c:222

6207 +#, c-format

6208 +msgid "packet write failed: %s"

6209 +msgstr "封包寫入失敗：%s"

6210

6156 -#: pkt-line.c:302

6211 +#: pkt-line.c:328 pkt-line.c:329

6212 msgid "read error"

6213 msgstr "讀取錯誤"

6214

6160 -#: pkt-line.c:310

6215 +#: pkt-line.c:339 pkt-line.c:340

6216 msgid "the remote end hung up unexpectedly"

6217 msgstr "遠端意外掛斷了"

6218

6164 -#: pkt-line.c:338

6219 +#: pkt-line.c:369 pkt-line.c:371

6220 #, c-format

6221 msgid "protocol error: bad line length character: %.4s"

6222 msgstr "協定錯誤：錯誤的行長度字串：%.4s"

6223

6169 -#: pkt-line.c:352 pkt-line.c:357

6224 +#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396

6225 #, c-format

6226 msgid "protocol error: bad line length %d"

6227 msgstr "協定錯誤：錯誤的行長度 %d"

6228

6174 -#: pkt-line.c:373 sideband.c:165

6229 +#: pkt-line.c:413 sideband.c:165

6230 #, c-format

6231 msgid "remote error: %s"

6232 msgstr "遠端錯誤：%s"

@@ -6185,7 +6240,7 @@ msgstr "正在重新整理索引"

6240 msgid "unable to create threaded lstat: %s"

6241 msgstr "無法建立執行緒 lstat：%s"

6242

6188 -#: pretty.c:984

6243 +#: pretty.c:988

6244 msgid "unable to parse --pretty format"

6245 msgstr "不能解析 --pretty 格式"

6246

@@ -6206,6 +6261,10 @@ msgstr "promisor-remote: 無法關閉 fetch 子處理程序的 stdin"

6261 msgid "promisor remote name cannot begin with '/': %s"

6262 msgstr "promisor 遠端名稱不能以 '/' 開始：%s"

6263

6264 +#: protocol-caps.c:103

6265 +msgid "object-info: expected flush after arguments"

6266 +msgstr "object-info：引數後預期要有 flush"

6267 +

6268 #: prune-packed.c:35

6269 msgid "Removing duplicate objects"

6270 msgstr "正在刪除重複物件"

@@ -6218,7 +6277,7 @@ msgstr "不能啟動 `log`"

6277 msgid "could not read `log` output"

6278 msgstr "不能讀取 `log` 的輸出"

6279

6221 -#: range-diff.c:101 sequencer.c:5318

6280 +#: range-diff.c:101 sequencer.c:5551

6281 #, c-format

6282 msgid "could not parse commit '%s'"

6283 msgstr "不能解析提交 '%s'"

@@ -6248,50 +6307,50 @@ msgstr "--left-only 和 --right-only 互斥"

6307 msgid "could not parse log for '%s'"

6308 msgstr "不能解析 '%s' 的日誌"

6309

6251 -#: read-cache.c:682

6310 +#: read-cache.c:708

6311 #, c-format

6312 msgid "will not add file alias '%s' ('%s' already exists in index)"

6313 msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）"

6314

6256 -#: read-cache.c:698

6315 +#: read-cache.c:724

6316 msgid "cannot create an empty blob in the object database"

6317 msgstr "不能在物件資料庫中建立空的資料物件"

6318

6260 -#: read-cache.c:720

6319 +#: read-cache.c:746

6320 #, c-format

6321 msgid "%s: can only add regular files, symbolic links or git-directories"

6322 msgstr "%s：只能新增一般檔案、符號連結或 git 目錄"

6323

6265 -#: read-cache.c:725

6324 +#: read-cache.c:751

6325 #, c-format

6326 msgid "'%s' does not have a commit checked out"

6327 msgstr "'%s' 沒有檢出一個提交"

6328

6270 -#: read-cache.c:777

6329 +#: read-cache.c:803

6330 #, c-format

6331 msgid "unable to index file '%s'"

6332 msgstr "無法索引檔案 '%s'"

6333

6275 -#: read-cache.c:796

6334 +#: read-cache.c:822

6335 #, c-format

6336 msgid "unable to add '%s' to index"

6337 msgstr "無法在索引中新增 '%s'"

6338

6280 -#: read-cache.c:807

6339 +#: read-cache.c:833

6340 #, c-format

6341 msgid "unable to stat '%s'"

6342 msgstr "無法對 %s 執行 stat"

6343

6285 -#: read-cache.c:1318

6344 +#: read-cache.c:1356

6345 #, c-format

6346 msgid "'%s' appears as both a file and as a directory"

6347 msgstr "'%s' 看起來既是檔案又是目錄"

6348

6290 -#: read-cache.c:1532

6349 +#: read-cache.c:1571

6350 msgid "Refresh index"

6351 msgstr "重新整理索引"

6352

6294 -#: read-cache.c:1657

6353 +#: read-cache.c:1700

6354 #, c-format

6355 msgid ""

6356 "index.version set, but the value is invalid.\n"

@@ -6300,7 +6359,7 @@ msgstr ""

6359 "設定了 index.version，但是取值無效。\n"

6360 "使用版本 %i"

6361

6303 -#: read-cache.c:1667

6362 +#: read-cache.c:1710

6363 #, c-format

6364 msgid ""

6365 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -6309,140 +6368,144 @@ msgstr ""

6368 "設定了 GIT_INDEX_VERSION，但是取值無效。\n"

6369 "使用版本 %i"

6370

6312 -#: read-cache.c:1723

6371 +#: read-cache.c:1766

6372 #, c-format

6373 msgid "bad signature 0x%08x"

6374 msgstr "壞的簽名 0x%08x"

6375

6317 -#: read-cache.c:1726

6376 +#: read-cache.c:1769

6377 #, c-format

6378 msgid "bad index version %d"

6379 msgstr "壞的索引版本 %d"

6380

6322 -#: read-cache.c:1735

6381 +#: read-cache.c:1778

6382 msgid "bad index file sha1 signature"

6383 msgstr "壞的索引檔案 sha1 簽名"

6384

6326 -#: read-cache.c:1765

6385 +#: read-cache.c:1812

6386 #, c-format

6387 msgid "index uses %.4s extension, which we do not understand"

6388 msgstr "索引使用不被支援的 %.4s 擴展"

6389

6390 #

6332 -#: read-cache.c:1767

6391 +#: read-cache.c:1814

6392 #, c-format

6393 msgid "ignoring %.4s extension"

6394 msgstr "忽略 %.4s 擴展"

6395

6337 -#: read-cache.c:1804

6396 +#: read-cache.c:1851

6397 #, c-format

6398 msgid "unknown index entry format 0x%08x"

6399 msgstr "未知的索引條目格式 0x%08x"

6400

6342 -#: read-cache.c:1820

6401 +#: read-cache.c:1867

6402 #, c-format

6403 msgid "malformed name field in the index, near path '%s'"

6404 msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位"

6405

6347 -#: read-cache.c:1877

6406 +#: read-cache.c:1924

6407 msgid "unordered stage entries in index"

6408 msgstr "索引中有未排序的暫存條目"

6409

6351 -#: read-cache.c:1880

6410 +#: read-cache.c:1927

6411 #, c-format

6412 msgid "multiple stage entries for merged file '%s'"

6413 msgstr "合併檔案 '%s' 有多個暫存條目"

6414

6356 -#: read-cache.c:1883

6415 +#: read-cache.c:1930

6416 #, c-format

6417 msgid "unordered stage entries for '%s'"

6418 msgstr "'%s' 的未排序暫存條目"

6419

6361 -#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095

6362 -#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181

6363 -#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991

6364 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505

6365 -#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290

6420 +#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095

6421 +#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183

6422 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991

6423 +#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505

6424 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291

6425 #: builtin/submodule--helper.c:332

6426 msgid "index file corrupt"

6427 msgstr "索引檔案損壞"

6428

6370 -#: read-cache.c:2133

6429 +#: read-cache.c:2180

6430 #, c-format

6431 msgid "unable to create load_cache_entries thread: %s"

6432 msgstr "無法建立 load_cache_entries 執行緒：%s"

6433

6375 -#: read-cache.c:2146

6434 +#: read-cache.c:2193

6435 #, c-format

6436 msgid "unable to join load_cache_entries thread: %s"

6437 msgstr "無法加入 load_cache_entries 執行緒：%s"

6438

6380 -#: read-cache.c:2179

6439 +#: read-cache.c:2226

6440 #, c-format

6441 msgid "%s: index file open failed"

6442 msgstr "%s：開啟索引檔案失敗"

6443

6385 -#: read-cache.c:2183

6444 +#: read-cache.c:2230

6445 #, c-format

6446 msgid "%s: cannot stat the open index"

6447 msgstr "%s：不能對開啟的索引執行 stat 動作"

6448

6390 -#: read-cache.c:2187

6449 +#: read-cache.c:2234

6450 #, c-format

6451 msgid "%s: index file smaller than expected"

6452 msgstr "%s：索引檔案比預期的小"

6453

6395 -#: read-cache.c:2191

6454 +#: read-cache.c:2238

6455 #, c-format

6456 msgid "%s: unable to map index file"

6457 msgstr "%s：無法對索引檔案執行 map 動作"

6458

6400 -#: read-cache.c:2233

6459 +#: read-cache.c:2280

6460 #, c-format

6461 msgid "unable to create load_index_extensions thread: %s"

6462 msgstr "無法建立 load_index_extensions 執行緒：%s"

6463

6405 -#: read-cache.c:2260

6464 +#: read-cache.c:2307

6465 #, c-format

6466 msgid "unable to join load_index_extensions thread: %s"

6467 msgstr "無法加入 load_index_extensions 執行緒：%s"

6468

6410 -#: read-cache.c:2292

6469 +#: read-cache.c:2345

6470 #, c-format

6471 msgid "could not freshen shared index '%s'"

6472 msgstr "無法重新整理共享索引 '%s'"

6473

6415 -#: read-cache.c:2339

6474 +#: read-cache.c:2392

6475 #, c-format

6476 msgid "broken index, expect %s in %s, got %s"

6477 msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"

6478

6420 -#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141

6479 +#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145

6480 #, c-format

6481 msgid "could not close '%s'"

6482 msgstr "不能關閉 '%s'"

6483

6425 -#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239

6484 +#: read-cache.c:3138

6485 +msgid "failed to convert to a sparse-index"

6486 +msgstr "無法轉換成稀疏索引"

6487 +

6488 +#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441

6489 #, c-format

6490 msgid "could not stat '%s'"

6491 msgstr "不能對 '%s' 呼叫 stat"

6492

6430 -#: read-cache.c:3151

6493 +#: read-cache.c:3222

6494 #, c-format

6495 msgid "unable to open git dir: %s"

6496 msgstr "不能開啟 git 目錄：%s"

6497

6435 -#: read-cache.c:3163

6498 +#: read-cache.c:3234

6499 #, c-format

6500 msgid "unable to unlink: %s"

6501 msgstr "無法刪除：%s"

6502

6440 -#: read-cache.c:3188

6503 +#: read-cache.c:3263

6504 #, c-format

6505 msgid "cannot fix permission bits on '%s'"

6506 msgstr "不能修復 '%s' 的權限位"

6507

6445 -#: read-cache.c:3337

6508 +#: read-cache.c:3412

6509 #, c-format

6510 msgid "%s: cannot drop to stage #0"

6511 msgstr "%s：不能落到暫存區 #0"

@@ -6470,7 +6533,10 @@ msgid ""

6533 "r, reword <commit> = use commit, but edit the commit message\n"

6534 "e, edit <commit> = use commit, but stop for amending\n"

6535 "s, squash <commit> = use commit, but meld into previous commit\n"

6473 -"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"

6536 +"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n"

6537 +" commit's log message, unless -C is used, in which case\n"

6538 +" keep only this commit's message; -c is same as -C but\n"

6539 +" opens the editor\n"

6540 "x, exec <command> = run command (the rest of the line) using shell\n"

6541 "b, break = stop here (continue rebase later with 'git rebase --continue')\n"

6542 "d, drop <commit> = remove commit\n"

@@ -6479,36 +6545,38 @@ msgid ""

6545 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

6546 ". create a merge commit using the original merge commit's\n"

6547 ". message (or the oneline, if no original merge commit was\n"

6482 -". specified). Use -c <commit> to reword the commit message.\n"

6548 +". specified); use -c <commit> to reword the commit message\n"

6549 "\n"

6550 "These lines can be re-ordered; they are executed from top to bottom.\n"

6551 msgstr ""

6552 "\n"

6487 -"指令:\n"

6553 +"指令：\n"

6554 "p, pick <提交> = 使用提交\n"

6489 -"r, reword <提交> = 使用提交，但修改提交說明\n"

6490 -"e, edit <提交> = 使用提交，進入 shell 以便進行提交修補\n"

6491 -"s, squash <提交> = 使用提交，但融合到前一個提交\n"

6492 -"f, fixup <提交> = 類似於 \"squash\"，但捨棄提交說明日誌\n"

6493 -"x, exec <命令> = 使用 shell 執行指令（此行剩餘部分）\n"

6494 -"b, break = 在此處停止（使用 'git rebase --continue' 繼續重定基底）\n"

6495 -"d, drop <提交> = 刪除提交\n"

6496 -"l, label <label> = 為目前 HEAD 打上標記\n"

6497 -"t, reset <label> = 重設 HEAD 到該標記\n"

6555 +"r, reword <提交> = 使用提交，但編輯提交說明\n"

6556 +"e, edit <提交> = 使用提交，但不直接修補 (amend) \n"

6557 +"s, squash <提交> = 使用提交，但融合至上個提交\n"

6558 +"f, fixup [-C | -c] <提交> = 跟 “squash” 相似，但除非傳入「-C」\n"

6559 +" 否則只保留上一個提交的日誌訊息。傳入 -C 表示只保留這個\n"

6560 +" 提交的訊息；傳入 -c 與 -C 功能相同，但會開啟編輯器\n"

6561 +"x, exec <命令> = 使用 shell 執行指令（這一行的剩餘部分）\n"

6562 +"b, break = 在這停止（使用 'git rebase --continue' 繼續重定基底）\n"

6563 +"d, drop <提交> = 移除提交\n"

6564 +"l, label <標籤> = 為目前 HEAD 打上指定名字標籤\n"

6565 +"t, reset <標籤> = 重設 HEAD 到指定標籤\n"

6566 "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

6567 ". 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n"

6568 ". 原始提交，使用備註部分的 oneline 作為提交說明）。使用\n"

6501 -". -c <提交> 可以編輯提交說明。\n"

6569 +". -c <commit> 可以編輯提交說明。\n"

6570 "\n"

6503 -"可以對這些行重新排序，將從上至下執行。\n"

6571 +"可以對這些行重新排序，會從上至下執行。\n"

6572

6505 -#: rebase-interactive.c:63

6573 +#: rebase-interactive.c:66

6574 #, c-format

6575 msgid "Rebase %s onto %s (%d command)"

6576 msgid_plural "Rebase %s onto %s (%d commands)"

6577 msgstr[0] "重定基底 %s 到 %s（%d 個提交）"

6578

6511 -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218

6579 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:218

6580 msgid ""

6581 "\n"

6582 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

@@ -6516,7 +6584,7 @@ msgstr ""

6584 "\n"

6585 "不要刪除任意一行。使用 'drop' 顯式地刪除一個提交。\n"

6586

6519 -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222

6587 +#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222

6588 msgid ""

6589 "\n"

6590 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

@@ -6524,7 +6592,7 @@ msgstr ""

6592 "\n"

6593 "如果您在這裡刪除一行，對應的提交將會遺失。\n"

6594

6527 -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861

6595 +#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861

6596 msgid ""

6597 "\n"

6598 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -6538,7 +6606,7 @@ msgstr ""

6606 " git rebase --continue\n"

6607 "\n"

6608

6541 -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938

6609 +#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938

6610 msgid ""

6611 "\n"

6612 "However, if you remove everything, the rebase will be aborted.\n"

@@ -6548,19 +6616,19 @@ msgstr ""

6616 "然而，如果您刪除全部內容，重定基底動作將會終止。\n"

6617 "\n"

6618

6551 -#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615

6552 -#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272

6619 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816

6620 +#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271

6621 #, c-format

6622 msgid "could not write '%s'"

6623 msgstr "不能寫入 '%s'"

6624

6557 -#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230

6558 -#: builtin/rebase.c:254

6625 +#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229

6626 +#: builtin/rebase.c:253

6627 #, c-format

6628 msgid "could not write '%s'."

6629 msgstr "不能寫入 '%s'。"

6630

6563 -#: rebase-interactive.c:193

6631 +#: rebase-interactive.c:196

6632 #, c-format

6633 msgid ""

l10n: zh_TW.po: v2.32.0 round 1 (11 untranslated)