@matheusbsbs / matheus-bagliano / commits / 814ff3141e

l10n: zh_CN: translations for git v2.4.0-rc0

Translate 99 updated messages (2305t0f0u) for git v2.4.0-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Feb 16, 2015 at 21:34 UTC 814ff3141e119d81d8ed8b85dfec7644626eec73
1 file changed +887 -1233
po/zh_CN.po
+887 -1233
@@ -2,7 +2,7 @@
2 # Git 软件包的简体中文翻译.
3 # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
4 # This file is distributed under the same license as the Git package.
5 -# Contributers:
5 +# Contributors:
6 # - Jiang Xin <worldhello.net AT gmail.com>
7 # - Riku <lu.riku AT gmail.com>
8 # - Zhuang Ya <zhuangya AT me.com>
@@ -12,8 +12,8 @@ msgid ""
12 msgstr ""
13 "Project-Id-Version: Git\n"
14 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15 -"POT-Creation-Date: 2015-01-21 14:21+0800\n"
16 -"PO-Revision-Date: 2015-01-21 14:58+0800\n"
15 +"POT-Creation-Date: 2015-03-27 13:33+0800\n"
16 +"PO-Revision-Date: 2015-03-31 09:43+0800\n"
17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
19 "Language: zh_CN\n"
@@ -36,8 +36,8 @@ msgstr ""
36 "解决方案并提交。"
37
38 #: archive.c:11
39 -msgid "git archive [options] <tree-ish> [<path>...]"
40 -msgstr "git archive [选项] <树或提交> [<路径>...]"
39 +msgid "git archive [<options>] <tree-ish> [<path>...]"
40 +msgstr "git archive [<选项>] <树或提交> [<路径>...]"
41
42 #: archive.c:12
43 msgid "git archive --list"
@@ -45,9 +45,9 @@ msgstr "git archive --list"
45
46 #: archive.c:13
47 msgid ""
48 -"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
48 +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
49 msgstr ""
50 -"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
50 +"git archive --remote <版本库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
51
52 #: archive.c:14
53 msgid "git archive --remote <repo> [--exec <cmd>] --list"
@@ -74,10 +74,10 @@ msgstr "前缀"
74 msgid "prepend prefix to each pathname in the archive"
75 msgstr "为归档中每个路径名加上前缀"
76
77 -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517
78 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986
77 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516
78 +#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986
79 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101
80 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394
80 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394
81 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151
82 msgid "file"
83 msgstr "文件"
@@ -126,7 +126,7 @@ msgstr "命令"
126 msgid "path to the remote git-upload-archive command"
127 msgstr "远程 git-upload-archive 命令的路径"
128
129 -#: attr.c:258
129 +#: attr.c:264
130 msgid ""
131 "Negative patterns are ignored in git attributes\n"
132 "Use '\\!' for literal leading exclamation."
@@ -251,7 +251,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"
251 msgid "unrecognized header: %s%s (%d)"
252 msgstr "未能识别的包头：%s%s (%d)"
253
254 -#: bundle.c:87 builtin/commit.c:770
254 +#: bundle.c:87 builtin/commit.c:764
255 #, c-format
256 msgid "could not open '%s'"
257 msgstr "不能打开 '%s'"
@@ -260,8 +260,8 @@ msgstr "不能打开 '%s'"
260 msgid "Repository lacks these prerequisite commits:"
261 msgstr "版本库缺少这些必备的提交："
262
263 -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706
264 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330
263 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
264 +#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330
265 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358
266 #: builtin/shortlog.c:158
267 msgid "revision walk setup failed"
@@ -302,21 +302,21 @@ msgstr "rev-list 终止"
302 msgid "ref '%s' is excluded by the rev-list options"
303 msgstr "引用 '%s' 被 rev-list 选项排除"
304
305 -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
305 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261
306 #, c-format
307 msgid "unrecognized argument: %s"
308 msgstr "未能识别的参数：%s"
309
310 -#: bundle.c:444
310 +#: bundle.c:443
311 msgid "Refusing to create empty bundle."
312 msgstr "不能创建空包。"
313
314 -#: bundle.c:454
314 +#: bundle.c:453
315 #, c-format
316 msgid "cannot create '%s'"
317 msgstr "不能创建 '%s'"
318
319 -#: bundle.c:475
319 +#: bundle.c:474
320 msgid "index-pack died"
321 msgstr "index-pack 终止"
322
@@ -339,55 +339,55 @@ msgstr "%s %s 不是一个提交!"
339 msgid "memory exhausted"
340 msgstr "内存耗尽"
341
342 -#: config.c:469 config.c:471
342 +#: config.c:474 config.c:476
343 #, c-format
344 msgid "bad config file line %d in %s"
345 msgstr "配置文件 %2$s 出错于第 %1$d 行"
346
347 -#: config.c:587
347 +#: config.c:592
348 #, c-format
349 msgid "bad numeric config value '%s' for '%s' in %s: %s"
350 msgstr "文件 %3$s 中配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %4$s"
351
352 -#: config.c:589
352 +#: config.c:594
353 #, c-format
354 msgid "bad numeric config value '%s' for '%s': %s"
355 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误: %3$s"
356
357 -#: config.c:674
357 +#: config.c:679
358 #, c-format
359 msgid "failed to expand user dir in: '%s'"
360 msgstr "无法扩展 '%s' 中的用户目录"
361
362 -#: config.c:752 config.c:763
362 +#: config.c:757 config.c:768
363 #, c-format
364 msgid "bad zlib compression level %d"
365 msgstr "错误的 zlib 压缩级别 %d"
366
367 -#: config.c:885
367 +#: config.c:890
368 #, c-format
369 msgid "invalid mode for object creation: %s"
370 msgstr "无效的对象创建模式：%s"
371
372 -#: config.c:1211
372 +#: config.c:1216
373 msgid "unable to parse command-line config"
374 msgstr "无法解析命令行中的配置"
375
376 -#: config.c:1272
376 +#: config.c:1277
377 msgid "unknown error occured while reading the configuration files"
378 msgstr "在读取配置文件时遇到未知错误"
379
380 -#: config.c:1596
380 +#: config.c:1601
381 #, c-format
382 msgid "unable to parse '%s' from command-line config"
383 msgstr "无法解析命令行配置中的 '%s'"
384
385 -#: config.c:1598
385 +#: config.c:1603
386 #, c-format
387 msgid "bad config variable '%s' in file '%s' at line %d"
388 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
389
390 -#: config.c:1657
390 +#: config.c:1662
391 #, c-format
392 msgid "%s has multiple values"
393 msgstr "%s 有多个取值"
@@ -479,7 +479,7 @@ msgstr[1] "%lu 年前"
479 msgid "failed to read orderfile '%s'"
480 msgstr "无法读取排序文件 '%s'"
481
482 -#: diffcore-rename.c:516
482 +#: diffcore-rename.c:536
483 msgid "Performing inexact rename detection"
484 msgstr "正在进行非精确的重命名检测"
485
@@ -509,16 +509,16 @@ msgstr ""
509 "发现配置变量 'diff.dirstat' 中的错误：\n"
510 "%s"
511
512 -#: diff.c:2957
512 +#: diff.c:2956
513 #, c-format
514 msgid "external diff died, stopping at %s"
515 msgstr "外部 diff 退出，停止在 %s"
516
517 -#: diff.c:3352
517 +#: diff.c:3351
518 msgid "--follow requires exactly one pathspec"
519 msgstr "--follow 参数后只跟一个 pathspec"
520
521 -#: diff.c:3515
521 +#: diff.c:3514
522 #, c-format
523 msgid ""
524 "Failed to parse --dirstat/-X option parameter:\n"
@@ -527,7 +527,7 @@ msgstr ""
527 "无法解析 --dirstat/-X 选项的参数：\n"
528 "%s"
529
530 -#: diff.c:3529
530 +#: diff.c:3528
531 #, c-format
532 msgid "Failed to parse --submodule option parameter: '%s'"
533 msgstr "无法解析 --submodule 选项的参数：'%s'"
@@ -1024,7 +1024,7 @@ msgstr "不能解析 --pretty 格式"
1024 msgid "done"
1025 msgstr "完成"
1026
1027 -#: read-cache.c:1267
1027 +#: read-cache.c:1273
1028 #, c-format
1029 msgid ""
1030 "index.version set, but the value is invalid.\n"
@@ -1033,7 +1033,7 @@ msgstr ""
1033 "设置了 index.version，但是取值无效。\n"
1034 "使用版本 %i"
1035
1036 -#: read-cache.c:1277
1036 +#: read-cache.c:1283
1037 #, c-format
1038 msgid ""
1039 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -1119,23 +1119,31 @@ msgstr[1] ""
1119 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1120 msgstr " （使用 \"git pull\" 来合并远程分支）\n"
1121
1122 -#: run-command.c:87
1122 +#: revision.c:2348
1123 +msgid "--first-parent is incompatible with --bisect"
1124 +msgstr "--first-parent 与 --bisect 不兼容"
1125 +
1126 +#: run-command.c:83
1127 msgid "open /dev/null failed"
1128 msgstr "不能打开 /dev/null"
1129
1126 -#: run-command.c:89
1130 +#: run-command.c:85
1131 #, c-format
1132 msgid "dup2(%d,%d) failed"
1133 msgstr "不能调用 dup2(%d,%d)"
1134
1131 -#: send-pack.c:268
1135 +#: send-pack.c:272
1136 msgid "failed to sign the push certificate"
1137 msgstr "无法为推送证书签名"
1138
1135 -#: send-pack.c:325
1139 +#: send-pack.c:356
1140 msgid "the receiving end does not support --signed push"
1141 msgstr "接收端不支持签名推送"
1142
1143 +#: send-pack.c:366
1144 +msgid "server does not support --atomic push"
1145 +msgstr "服务器端不支持原子（--atomic）推送"
1146 +
1147 #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
1148 #: builtin/merge.c:1005
1149 #, c-format
@@ -1165,7 +1173,7 @@ msgstr ""
1173 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
1174 "对修正后的文件做标记，然后用 'git commit' 提交"
1175
1168 -#: sequencer.c:211 sequencer.c:856 sequencer.c:939
1176 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944
1177 #, c-format
1178 msgid "Could not write to %s"
1179 msgstr "不能写入 %s"
@@ -1201,184 +1209,184 @@ msgstr "不能解析 HEAD 提交\n"
1209 msgid "Unable to update cache tree\n"
1210 msgstr "不能更新缓存\n"
1211
1204 -#: sequencer.c:406
1212 +#: sequencer.c:411
1213 #, c-format
1214 msgid "Could not parse commit %s\n"
1215 msgstr "不能解析提交 %s\n"
1216
1209 -#: sequencer.c:411
1217 +#: sequencer.c:416
1218 #, c-format
1219 msgid "Could not parse parent commit %s\n"
1220 msgstr "不能解析父提交 %s\n"
1221
1214 -#: sequencer.c:477
1222 +#: sequencer.c:482
1223 msgid "Your index file is unmerged."
1224 msgstr "您的索引文件未完成合并。"
1225
1218 -#: sequencer.c:496
1226 +#: sequencer.c:501
1227 #, c-format
1228 msgid "Commit %s is a merge but no -m option was given."
1229 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
1230
1223 -#: sequencer.c:504
1231 +#: sequencer.c:509
1232 #, c-format
1233 msgid "Commit %s does not have parent %d"
1234 msgstr "提交 %s 没有父提交 %d"
1235
1228 -#: sequencer.c:508
1236 +#: sequencer.c:513
1237 #, c-format
1238 msgid "Mainline was specified but commit %s is not a merge."
1239 msgstr "指定了主线但提交 %s 不是一个合并。"
1240
1241 #. TRANSLATORS: The first %s will be "revert" or
1242 #. "cherry-pick", the second %s a SHA1
1235 -#: sequencer.c:521
1243 +#: sequencer.c:526
1244 #, c-format
1245 msgid "%s: cannot parse parent commit %s"
1246 msgstr "%s：不能解析父提交 %s"
1247
1240 -#: sequencer.c:525
1248 +#: sequencer.c:530
1249 #, c-format
1250 msgid "Cannot get commit message for %s"
1251 msgstr "不能得到 %s 的提交说明"
1252
1245 -#: sequencer.c:611
1253 +#: sequencer.c:616
1254 #, c-format
1255 msgid "could not revert %s... %s"
1256 msgstr "不能还原 %s... %s"
1257
1250 -#: sequencer.c:612
1258 +#: sequencer.c:617
1259 #, c-format
1260 msgid "could not apply %s... %s"
1261 msgstr "不能应用 %s... %s"
1262
1255 -#: sequencer.c:648
1263 +#: sequencer.c:653
1264 msgid "empty commit set passed"
1265 msgstr "提供了空的提交集"
1266
1259 -#: sequencer.c:656
1267 +#: sequencer.c:661
1268 #, c-format
1269 msgid "git %s: failed to read the index"
1270 msgstr "git %s：无法读取索引"
1271
1264 -#: sequencer.c:660
1272 +#: sequencer.c:665
1273 #, c-format
1274 msgid "git %s: failed to refresh the index"
1275 msgstr "git %s：无法刷新索引"
1276
1269 -#: sequencer.c:720
1277 +#: sequencer.c:725
1278 #, c-format
1279 msgid "Cannot %s during a %s"
1280 msgstr "无法 %s 在一个 %s 过程中"
1281
1274 -#: sequencer.c:742
1282 +#: sequencer.c:747
1283 #, c-format
1284 msgid "Could not parse line %d."
1285 msgstr "不能解析第 %d 行。"
1286
1279 -#: sequencer.c:747
1287 +#: sequencer.c:752
1288 msgid "No commits parsed."
1289 msgstr "没有提交被解析。"
1290
1283 -#: sequencer.c:760
1291 +#: sequencer.c:765
1292 #, c-format
1293 msgid "Could not open %s"
1294 msgstr "不能打开 %s"
1295
1288 -#: sequencer.c:764
1296 +#: sequencer.c:769
1297 #, c-format
1298 msgid "Could not read %s."
1299 msgstr "不能读取 %s。"
1300
1293 -#: sequencer.c:771
1301 +#: sequencer.c:776
1302 #, c-format
1303 msgid "Unusable instruction sheet: %s"
1304 msgstr "无用的指令表单：%s"
1305
1298 -#: sequencer.c:801
1306 +#: sequencer.c:806
1307 #, c-format
1308 msgid "Invalid key: %s"
1309 msgstr "无效键名：%s"
1310
1303 -#: sequencer.c:804
1311 +#: sequencer.c:809
1312 #, c-format
1313 msgid "Invalid value for %s: %s"
1314 msgstr "%s 的值无效：%s"
1315
1308 -#: sequencer.c:816
1316 +#: sequencer.c:821
1317 #, c-format
1318 msgid "Malformed options sheet: %s"
1319 msgstr "非法的选项表单：%s"
1320
1313 -#: sequencer.c:837
1321 +#: sequencer.c:842
1322 msgid "a cherry-pick or revert is already in progress"
1323 msgstr "一个拣选或还原操作已在进行"
1324
1317 -#: sequencer.c:838
1325 +#: sequencer.c:843
1326 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1327 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
1328
1321 -#: sequencer.c:842
1329 +#: sequencer.c:847
1330 #, c-format
1331 msgid "Could not create sequencer directory %s"
1332 msgstr "不能创建序列目录 %s"
1333
1326 -#: sequencer.c:858 sequencer.c:943
1334 +#: sequencer.c:863 sequencer.c:948
1335 #, c-format
1336 msgid "Error wrapping up %s."
1337 msgstr "错误收尾 %s。"
1338
1331 -#: sequencer.c:877 sequencer.c:1013
1339 +#: sequencer.c:882 sequencer.c:1018
1340 msgid "no cherry-pick or revert in progress"
1341 msgstr "拣选或还原操作并未进行"
1342
1335 -#: sequencer.c:879
1343 +#: sequencer.c:884
1344 msgid "cannot resolve HEAD"
1345 msgstr "不能解析 HEAD"
1346
1339 -#: sequencer.c:881
1347 +#: sequencer.c:886
1348 msgid "cannot abort from a branch yet to be born"
1349 msgstr "不能从尚未建立的分支终止"
1350
1343 -#: sequencer.c:903 builtin/apply.c:4128
1351 +#: sequencer.c:908 builtin/apply.c:4286
1352 #, c-format
1353 msgid "cannot open %s: %s"
1354 msgstr "不能打开 %s：%s"
1355
1348 -#: sequencer.c:906
1356 +#: sequencer.c:911
1357 #, c-format
1358 msgid "cannot read %s: %s"
1359 msgstr "不能读取 %s：%s"
1360
1353 -#: sequencer.c:907
1361 +#: sequencer.c:912
1362 msgid "unexpected end of file"
1363 msgstr "意外的文件结束"
1364
1357 -#: sequencer.c:913
1365 +#: sequencer.c:918
1366 #, c-format
1367 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1368 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
1369
1362 -#: sequencer.c:936
1370 +#: sequencer.c:941
1371 #, c-format
1372 msgid "Could not format %s."
1373 msgstr "不能格式化 %s。"
1374
1367 -#: sequencer.c:1081
1375 +#: sequencer.c:1086
1376 #, c-format
1377 msgid "%s: can't cherry-pick a %s"
1378 msgstr "%s：不能拣选一个%s"
1379
1372 -#: sequencer.c:1084
1380 +#: sequencer.c:1089
1381 #, c-format
1382 msgid "%s: bad revision"
1383 msgstr "%s：错误的版本"
1384
1377 -#: sequencer.c:1118
1385 +#: sequencer.c:1123
1386 msgid "Can't revert as initial commit"
1387 msgstr "不能作为初始提交还原"
1388
1381 -#: sequencer.c:1119
1389 +#: sequencer.c:1124
1390 msgid "Can't cherry-pick into empty head"
1391 msgstr "不能拣选到空分支"
1392
@@ -1445,38 +1453,38 @@ msgstr "无法移除 %s 的 .gitmodules 条目"
1453 msgid "staging updated .gitmodules failed"
1454 msgstr "将更新后 .gitmodules 添加暂存区失败"
1455
1448 -#: submodule.c:1111 builtin/init-db.c:371
1456 +#: submodule.c:1109 builtin/init-db.c:371
1457 #, c-format
1458 msgid "Could not create git link %s"
1459 msgstr "不能创建 git link %s"
1460
1453 -#: submodule.c:1122
1461 +#: submodule.c:1120
1462 #, c-format
1463 msgid "Could not set core.worktree in %s"
1464 msgstr "不能在 %s 中设置 core.worktree"
1465
1458 -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566
1459 -#: trailer.c:570
1466 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557
1467 +#: trailer.c:561
1468 #, c-format
1469 msgid "unknown value '%s' for key '%s'"
1470 msgstr "键 '%2$s' 的未知取值 '%1$s'"
1471
1464 -#: trailer.c:552 trailer.c:557 builtin/remote.c:290
1472 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290
1473 #, c-format
1474 msgid "more than one %s"
1475 msgstr "多于一个 %s"
1476
1469 -#: trailer.c:590
1477 +#: trailer.c:581
1478 #, c-format
1479 msgid "empty trailer token in trailer '%.*s'"
1480 msgstr "签名 '%.*s' 的键为空"
1481
1474 -#: trailer.c:710
1482 +#: trailer.c:701
1483 #, c-format
1484 msgid "could not read input file '%s'"
1485 msgstr "不能读取输入文件 '%s'"
1486
1479 -#: trailer.c:713
1487 +#: trailer.c:704
1488 msgid "could not read from stdin"
1489 msgstr "不能自标准输入读取"
1490
@@ -1513,26 +1521,26 @@ msgstr "无效的端口号"
1521 msgid "invalid '..' path segment"
1522 msgstr "无效的 '..' 路径片段"
1523
1516 -#: wrapper.c:509
1524 +#: wrapper.c:523
1525 #, c-format
1526 msgid "unable to access '%s': %s"
1527 msgstr "不能访问 '%s'：%s"
1528
1521 -#: wrapper.c:530
1529 +#: wrapper.c:544
1530 #, c-format
1531 msgid "unable to access '%s'"
1532 msgstr "不能访问 '%s'"
1533
1526 -#: wrapper.c:541
1534 +#: wrapper.c:555
1535 #, c-format
1536 msgid "unable to look up current user in the passwd file: %s"
1537 msgstr "无法在口令文件中查询到当前用户：%s"
1538
1531 -#: wrapper.c:542
1539 +#: wrapper.c:556
1540 msgid "no such user"
1541 msgstr "无此用户"
1542
1535 -#: wrapper.c:550
1543 +#: wrapper.c:564
1544 msgid "unable to get current working directory"
1545 msgstr "不能获取当前工作目录"
1546
@@ -1566,11 +1574,11 @@ msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
1574 msgid " (use \"git rm <file>...\" to mark resolution)"
1575 msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
1576
1569 -#: wt-status.c:198
1577 +#: wt-status.c:198 wt-status.c:878
1578 msgid "Changes to be committed:"
1579 msgstr "要提交的变更："
1580
1573 -#: wt-status.c:216
1581 +#: wt-status.c:216 wt-status.c:887
1582 msgid "Changes not staged for commit:"
1583 msgstr "尚未暂存以备提交的变更："
1584
@@ -1686,15 +1694,15 @@ msgstr "未跟踪的内容, "
1694 msgid "bug: unhandled diff status %c"
1695 msgstr "bug：无法处理的差异状态 %c"
1696
1689 -#: wt-status.c:758
1697 +#: wt-status.c:753
1698 msgid "Submodules changed but not updated:"
1699 msgstr "子模组已修改但尚未更新："
1700
1693 -#: wt-status.c:760
1701 +#: wt-status.c:755
1702 msgid "Submodule changes to be committed:"
1703 msgstr "要提交的子模组变更："
1704
1697 -#: wt-status.c:839
1705 +#: wt-status.c:835
1706 msgid ""
1707 "Do not touch the line above.\n"
1708 "Everything below will be removed."
@@ -1702,198 +1710,198 @@ msgstr ""
1710 "不要改动上面的一行。\n"
1711 "下面的所有内容均将被删除。"
1712
1705 -#: wt-status.c:930
1713 +#: wt-status.c:946
1714 msgid "You have unmerged paths."
1715 msgstr "您有尚未合并的路径。"
1716
1717 # 译者：注意保持前导空格
1710 -#: wt-status.c:933
1718 +#: wt-status.c:949
1719 msgid " (fix conflicts and run \"git commit\")"
1720 msgstr " （解决冲突并运行 \"git commit\"）"
1721
1714 -#: wt-status.c:936
1722 +#: wt-status.c:952
1723 msgid "All conflicts fixed but you are still merging."
1724 msgstr "所有冲突已解决但您仍处于合并中。"
1725
1726 # 译者：注意保持前导空格
1719 -#: wt-status.c:939
1727 +#: wt-status.c:955
1728 msgid " (use \"git commit\" to conclude merge)"
1729 msgstr " （使用 \"git commit\" 结束合并）"
1730
1723 -#: wt-status.c:949
1731 +#: wt-status.c:965
1732 msgid "You are in the middle of an am session."
1733 msgstr "您正处于 am 操作过程中。"
1734
1727 -#: wt-status.c:952
1735 +#: wt-status.c:968
1736 msgid "The current patch is empty."
1737 msgstr "当前的补丁为空。"
1738
1739 # 译者：注意保持前导空格
1732 -#: wt-status.c:956
1740 +#: wt-status.c:972
1741 msgid " (fix conflicts and then run \"git am --continue\")"
1742 msgstr " （解决冲突，然后运行 \"git am --continue\"）"
1743
1744 # 译者：注意保持前导空格
1737 -#: wt-status.c:958
1745 +#: wt-status.c:974
1746 msgid " (use \"git am --skip\" to skip this patch)"
1747 msgstr " （使用 \"git am --skip\" 跳过此补丁）"
1748
1749 # 译者：注意保持前导空格
1742 -#: wt-status.c:960
1750 +#: wt-status.c:976
1751 msgid " (use \"git am --abort\" to restore the original branch)"
1752 msgstr " （使用 \"git am --abort\" 恢复原有分支）"
1753
1746 -#: wt-status.c:1020 wt-status.c:1037
1754 +#: wt-status.c:1036 wt-status.c:1053
1755 #, c-format
1756 msgid "You are currently rebasing branch '%s' on '%s'."
1757 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
1758
1751 -#: wt-status.c:1025 wt-status.c:1042
1759 +#: wt-status.c:1041 wt-status.c:1058
1760 msgid "You are currently rebasing."
1761 msgstr "您在执行变基操作。"
1762
1763 # 译者：注意保持前导空格
1756 -#: wt-status.c:1028
1764 +#: wt-status.c:1044
1765 msgid " (fix conflicts and then run \"git rebase --continue\")"
1766 msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
1767
1768 # 译者：注意保持前导空格
1761 -#: wt-status.c:1030
1769 +#: wt-status.c:1046
1770 msgid " (use \"git rebase --skip\" to skip this patch)"
1771 msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
1772
1773 # 译者：注意保持前导空格
1766 -#: wt-status.c:1032
1774 +#: wt-status.c:1048
1775 msgid " (use \"git rebase --abort\" to check out the original branch)"
1776 msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
1777
1778 # 译者：注意保持前导空格
1771 -#: wt-status.c:1045
1779 +#: wt-status.c:1061
1780 msgid " (all conflicts fixed: run \"git rebase --continue\")"
1781 msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
1782
1775 -#: wt-status.c:1049
1783 +#: wt-status.c:1065
1784 #, c-format
1785 msgid ""
1786 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
1787 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
1788
1781 -#: wt-status.c:1054
1789 +#: wt-status.c:1070
1790 msgid "You are currently splitting a commit during a rebase."
1791 msgstr "您在执行变基操作时拆分提交。"
1792
1793 # 译者：注意保持前导空格
1786 -#: wt-status.c:1057
1794 +#: wt-status.c:1073
1795 msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1796 msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
1797
1790 -#: wt-status.c:1061
1798 +#: wt-status.c:1077
1799 #, c-format
1800 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1801 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
1802
1795 -#: wt-status.c:1066
1803 +#: wt-status.c:1082
1804 msgid "You are currently editing a commit during a rebase."
1805 msgstr "您在执行变基操作时编辑提交。"
1806
1807 # 译者：注意保持前导空格
1800 -#: wt-status.c:1069
1808 +#: wt-status.c:1085
1809 msgid " (use \"git commit --amend\" to amend the current commit)"
1810 msgstr " （使用 \"git commit --amend\" 修补当前提交）"
1811
1812 # 译者：注意保持前导空格
1805 -#: wt-status.c:1071
1813 +#: wt-status.c:1087
1814 msgid ""
1815 " (use \"git rebase --continue\" once you are satisfied with your changes)"
1816 msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
1817
1810 -#: wt-status.c:1081
1818 +#: wt-status.c:1097
1819 #, c-format
1820 msgid "You are currently cherry-picking commit %s."
1821 msgstr "您在执行拣选提交 %s 的操作。"
1822
1823 # 译者：注意保持前导空格
1816 -#: wt-status.c:1086
1824 +#: wt-status.c:1102
1825 msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1826 msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
1827
1828 # 译者：注意保持前导空格
1821 -#: wt-status.c:1089
1829 +#: wt-status.c:1105
1830 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1831 msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
1832
1833 # 译者：注意保持前导空格
1826 -#: wt-status.c:1091
1834 +#: wt-status.c:1107
1835 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1836 msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
1837
1830 -#: wt-status.c:1100
1838 +#: wt-status.c:1116
1839 #, c-format
1840 msgid "You are currently reverting commit %s."
1841 msgstr "您在执行反转提交 %s 的操作。"
1842
1843 # 译者：注意保持前导空格
1836 -#: wt-status.c:1105
1844 +#: wt-status.c:1121
1845 msgid " (fix conflicts and run \"git revert --continue\")"
1846 msgstr " （解决冲突并运行 \"git revert --continue\"）"
1847
1848 # 译者：注意保持前导空格
1841 -#: wt-status.c:1108
1849 +#: wt-status.c:1124
1850 msgid " (all conflicts fixed: run \"git revert --continue\")"
1851 msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"
1852
1853 # 译者：注意保持前导空格
1846 -#: wt-status.c:1110
1854 +#: wt-status.c:1126
1855 msgid " (use \"git revert --abort\" to cancel the revert operation)"
1856 msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
1857
1850 -#: wt-status.c:1121
1858 +#: wt-status.c:1137
1859 #, c-format
1860 msgid "You are currently bisecting, started from branch '%s'."
1861 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
1862
1855 -#: wt-status.c:1125
1863 +#: wt-status.c:1141
1864 msgid "You are currently bisecting."
1865 msgstr "您在执行二分查找操作。"
1866
1867 # 译者：注意保持前导空格
1860 -#: wt-status.c:1128
1868 +#: wt-status.c:1144
1869 msgid " (use \"git bisect reset\" to get back to the original branch)"
1870 msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
1871
1864 -#: wt-status.c:1303
1872 +#: wt-status.c:1321
1873 msgid "On branch "
1874 msgstr "位于分支 "
1875
1868 -#: wt-status.c:1310
1876 +#: wt-status.c:1328
1877 msgid "rebase in progress; onto "
1878 msgstr "变基操作正在进行中；至 "
1879
1872 -#: wt-status.c:1317
1880 +#: wt-status.c:1333
1881 msgid "HEAD detached at "
1882 msgstr "头指针分离于 "
1883
1876 -#: wt-status.c:1319
1884 +#: wt-status.c:1335
1885 msgid "HEAD detached from "
1886 msgstr "头指针分离自 "
1887
1880 -#: wt-status.c:1322
1888 +#: wt-status.c:1338
1889 msgid "Not currently on any branch."
1890 msgstr "当前不在任何分支上。"
1891
1884 -#: wt-status.c:1339
1892 +#: wt-status.c:1355
1893 msgid "Initial commit"
1894 msgstr "初始提交"
1895
1888 -#: wt-status.c:1353
1896 +#: wt-status.c:1369
1897 msgid "Untracked files"
1898 msgstr "未跟踪的文件"
1899
1892 -#: wt-status.c:1355
1900 +#: wt-status.c:1371
1901 msgid "Ignored files"
1902 msgstr "忽略的文件"
1903
1896 -#: wt-status.c:1359
1904 +#: wt-status.c:1375
1905 #, c-format
1906 msgid ""
1907 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -1903,80 +1911,80 @@ msgstr ""
1911 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
1912 "但您需要小心不要忘了添加新文件（参见 'git help status'）。"
1913
1906 -#: wt-status.c:1365
1914 +#: wt-status.c:1381
1915 #, c-format
1916 msgid "Untracked files not listed%s"
1917 msgstr "未跟踪的文件没有列出%s"
1918
1919 # 译者：中文字符串拼接，可删除前导空格
1912 -#: wt-status.c:1367
1920 +#: wt-status.c:1383
1921 msgid " (use -u option to show untracked files)"
1922 msgstr "（使用 -u 参数显示未跟踪的文件）"
1923
1916 -#: wt-status.c:1373
1924 +#: wt-status.c:1389
1925 msgid "No changes"
1926 msgstr "没有修改"
1927
1920 -#: wt-status.c:1378
1928 +#: wt-status.c:1394
1929 #, c-format
1930 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1931 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
1932
1925 -#: wt-status.c:1381
1933 +#: wt-status.c:1397
1934 #, c-format
1935 msgid "no changes added to commit\n"
1936 msgstr "修改尚未加入提交\n"
1937
1930 -#: wt-status.c:1384
1938 +#: wt-status.c:1400
1939 #, c-format
1940 msgid ""
1941 "nothing added to commit but untracked files present (use \"git add\" to "
1942 "track)\n"
1943 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
1944
1937 -#: wt-status.c:1387
1945 +#: wt-status.c:1403
1946 #, c-format
1947 msgid "nothing added to commit but untracked files present\n"
1948 msgstr "提交为空，但是存在尚未跟踪的文件\n"
1949
1950 # 译者：中文字符串拼接，可删除前导空格
1943 -#: wt-status.c:1390
1951 +#: wt-status.c:1406
1952 #, c-format
1953 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1954 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
1955
1948 -#: wt-status.c:1393 wt-status.c:1398
1956 +#: wt-status.c:1409 wt-status.c:1414
1957 #, c-format
1958 msgid "nothing to commit\n"
1959 msgstr "无文件要提交\n"
1960
1961 # 译者：中文字符串拼接，可删除前导空格
1954 -#: wt-status.c:1396
1962 +#: wt-status.c:1412
1963 #, c-format
1964 msgid "nothing to commit (use -u to show untracked files)\n"
1965 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
1966
1967 # 译者：中文字符串拼接，可删除前导空格
1960 -#: wt-status.c:1400
1968 +#: wt-status.c:1416
1969 #, c-format
1970 msgid "nothing to commit, working directory clean\n"
1971 msgstr "无文件要提交，干净的工作区\n"
1972
1965 -#: wt-status.c:1509
1973 +#: wt-status.c:1525
1974 msgid "HEAD (no branch)"
1975 msgstr "HEAD（非分支）"
1976
1977 # 译者：注意保持句尾空格
1970 -#: wt-status.c:1515
1978 +#: wt-status.c:1531
1979 msgid "Initial commit on "
1980 msgstr "初始提交于 "
1981
1974 -#: wt-status.c:1547
1982 +#: wt-status.c:1563
1983 msgid "gone"
1984 msgstr "丢失"
1985
1986 # 译者：注意保持句尾空格
1979 -#: wt-status.c:1549 wt-status.c:1557
1987 +#: wt-status.c:1565 wt-status.c:1573
1988 msgid "behind "
1989 msgstr "落后 "
1990
@@ -1986,8 +1994,8 @@ msgid "failed to unlink '%s'"
1994 msgstr "无法删除 '%s'"
1995
1996 #: builtin/add.c:22
1989 -msgid "git add [options] [--] <pathspec>..."
1990 -msgstr "git add [选项] [--] <路径规则>..."
1997 +msgid "git add [<options>] [--] <pathspec>..."
1998 +msgstr "git add [<选项>] [--] <路径规则>..."
1999
2000 #: builtin/add.c:65
2001 #, c-format
@@ -2038,14 +2046,14 @@ msgstr "不能应用 '%s'"
2046 msgid "The following paths are ignored by one of your .gitignore files:\n"
2047 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
2048
2041 -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110
2042 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372
2049 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110
2050 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372
2051 #: builtin/rm.c:269
2052 msgid "dry run"
2053 msgstr "演习"
2054
2047 -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19
2048 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608
2055 +#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19
2056 +#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608
2057 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
2058 msgid "be verbose"
2059 msgstr "冗长输出"
@@ -2121,75 +2129,75 @@ msgstr "没有指定文件，也没有文件被添加。\n"
2129 msgid "Maybe you wanted to say 'git add .'?\n"
2130 msgstr "也许您想要执行 'git add .'？\n"
2131
2124 -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
2132 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920
2133 #: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
2134 msgid "index file corrupt"
2135 msgstr "索引文件损坏"
2136
2129 -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431
2137 +#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431
2138 msgid "Unable to write new index file"
2139 msgstr "无法写入新索引文件"
2140
2133 -#: builtin/apply.c:58
2134 -msgid "git apply [options] [<patch>...]"
2135 -msgstr "git apply [选项] [<补丁>...]"
2141 +#: builtin/apply.c:59
2142 +msgid "git apply [<options>] [<patch>...]"
2143 +msgstr "git apply [<选项>] [<补丁>...]"
2144
2137 -#: builtin/apply.c:111
2145 +#: builtin/apply.c:112
2146 #, c-format
2147 msgid "unrecognized whitespace option '%s'"
2148 msgstr "未能识别的空白字符选项 '%s'"
2149
2142 -#: builtin/apply.c:126
2150 +#: builtin/apply.c:127
2151 #, c-format
2152 msgid "unrecognized whitespace ignore option '%s'"
2153 msgstr "未能识别的空白字符忽略选项 '%s'"
2154
2147 -#: builtin/apply.c:826
2155 +#: builtin/apply.c:822
2156 #, c-format
2157 msgid "Cannot prepare timestamp regexp %s"
2158 msgstr "无法准备时间戳正则表达式 %s"
2159
2152 -#: builtin/apply.c:835
2160 +#: builtin/apply.c:831
2161 #, c-format
2162 msgid "regexec returned %d for input: %s"
2163 msgstr "regexec 返回 %d，输入为：%s"
2164
2157 -#: builtin/apply.c:916
2165 +#: builtin/apply.c:912
2166 #, c-format
2167 msgid "unable to find filename in patch at line %d"
2168 msgstr "不能在补丁的第 %d 行找到文件名"
2169
2162 -#: builtin/apply.c:948
2170 +#: builtin/apply.c:944
2171 #, c-format
2172 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
2173 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
2174
2167 -#: builtin/apply.c:952
2175 +#: builtin/apply.c:948
2176 #, c-format
2177 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
2178 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
2179
2172 -#: builtin/apply.c:953
2180 +#: builtin/apply.c:949
2181 #, c-format
2182 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
2183 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
2184
2177 -#: builtin/apply.c:960
2185 +#: builtin/apply.c:956
2186 #, c-format
2187 msgid "git apply: bad git-diff - expected /dev/null on line %d"
2188 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
2189
2182 -#: builtin/apply.c:1423
2190 +#: builtin/apply.c:1419
2191 #, c-format
2192 msgid "recount: unexpected line: %.*s"
2193 msgstr "recount：意外的行：%.*s"
2194
2187 -#: builtin/apply.c:1480
2195 +#: builtin/apply.c:1476
2196 #, c-format
2197 msgid "patch fragment without header at line %d: %.*s"
2198 msgstr "第 %d 行的补丁片段没有头信息：%.*s"
2199
2192 -#: builtin/apply.c:1497
2200 +#: builtin/apply.c:1493
2201 #, c-format
2202 msgid ""
2203 "git diff header lacks filename information when removing %d leading pathname "
@@ -2200,77 +2208,77 @@ msgid_plural ""
2208 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
2209 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
2210
2203 -#: builtin/apply.c:1657
2211 +#: builtin/apply.c:1656
2212 msgid "new file depends on old contents"
2213 msgstr "新文件依赖旧内容"
2214
2207 -#: builtin/apply.c:1659
2215 +#: builtin/apply.c:1658
2216 msgid "deleted file still has contents"
2217 msgstr "删除的文件仍有内容"
2218
2211 -#: builtin/apply.c:1685
2219 +#: builtin/apply.c:1684
2220 #, c-format
2221 msgid "corrupt patch at line %d"
2222 msgstr "补丁在第 %d 行损坏"
2223
2216 -#: builtin/apply.c:1721
2224 +#: builtin/apply.c:1720
2225 #, c-format
2226 msgid "new file %s depends on old contents"
2227 msgstr "新文件 %s 依赖旧内容"
2228
2221 -#: builtin/apply.c:1723
2229 +#: builtin/apply.c:1722
2230 #, c-format
2231 msgid "deleted file %s still has contents"
2232 msgstr "删除的文件 %s 仍有内容"
2233
2226 -#: builtin/apply.c:1726
2234 +#: builtin/apply.c:1725
2235 #, c-format
2236 msgid "** warning: file %s becomes empty but is not deleted"
2237 msgstr "** 警告：文件 %s 成为空文件但并未删除"
2238
2231 -#: builtin/apply.c:1872
2239 +#: builtin/apply.c:1871
2240 #, c-format
2241 msgid "corrupt binary patch at line %d: %.*s"
2242 msgstr "二进制补丁在第 %d 行损坏：%.*s"
2243
2236 -#: builtin/apply.c:1901
2244 +#: builtin/apply.c:1900
2245 #, c-format
2246 msgid "unrecognized binary patch at line %d"
2247 msgstr "未能识别的二进制补丁位于第 %d 行"
2248
2241 -#: builtin/apply.c:2052
2249 +#: builtin/apply.c:2051
2250 #, c-format
2251 msgid "patch with only garbage at line %d"
2252 msgstr "补丁文件的第 %d 行只有垃圾数据"
2253
2246 -#: builtin/apply.c:2142
2254 +#: builtin/apply.c:2141
2255 #, c-format
2256 msgid "unable to read symlink %s"
2257 msgstr "无法读取符号链接 %s"
2258
2251 -#: builtin/apply.c:2146
2259 +#: builtin/apply.c:2145
2260 #, c-format
2261 msgid "unable to open or read %s"
2262 msgstr "不能打开或读取 %s"
2263
2256 -#: builtin/apply.c:2754
2264 +#: builtin/apply.c:2778
2265 #, c-format
2266 msgid "invalid start of line: '%c'"
2267 msgstr "无效的行首字符：'%c'"
2268
2261 -#: builtin/apply.c:2872
2269 +#: builtin/apply.c:2896
2270 #, c-format
2271 msgid "Hunk #%d succeeded at %d (offset %d line)."
2272 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2273 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
2274 msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"
2275
2268 -#: builtin/apply.c:2884
2276 +#: builtin/apply.c:2908
2277 #, c-format
2278 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2279 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
2280
2273 -#: builtin/apply.c:2890
2281 +#: builtin/apply.c:2914
2282 #, c-format
2283 msgid ""
2284 "while searching for:\n"
@@ -2279,317 +2287,336 @@ msgstr ""
2287 "当查询：\n"
2288 "%.*s"
2289
2282 -#: builtin/apply.c:2909
2290 +#: builtin/apply.c:2933
2291 #, c-format
2292 msgid "missing binary patch data for '%s'"
2293 msgstr "缺失 '%s' 的二进制补丁数据"
2294
2287 -#: builtin/apply.c:3010
2295 +#: builtin/apply.c:3034
2296 #, c-format
2297 msgid "binary patch does not apply to '%s'"
2298 msgstr "二进制补丁未应用到 '%s'"
2299
2292 -#: builtin/apply.c:3016
2300 +#: builtin/apply.c:3040
2301 #, c-format
2302 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2303 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
2304
2297 -#: builtin/apply.c:3037
2305 +#: builtin/apply.c:3061
2306 #, c-format
2307 msgid "patch failed: %s:%ld"
2308 msgstr "打补丁失败：%s:%ld"
2309
2302 -#: builtin/apply.c:3161
2310 +#: builtin/apply.c:3185
2311 #, c-format
2312 msgid "cannot checkout %s"
2313 msgstr "不能检出 %s"
2314
2307 -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260
2315 +#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286
2316 #, c-format
2317 msgid "read of %s failed"
2318 msgstr "读取 %s 失败"
2319
2312 -#: builtin/apply.c:3240 builtin/apply.c:3462
2320 +#: builtin/apply.c:3238
2321 +#, c-format
2322 +msgid "reading from '%s' beyond a symbolic link"
2323 +msgstr "读取位于符号链接中的 '%s'"
2324 +
2325 +#: builtin/apply.c:3266 builtin/apply.c:3488
2326 #, c-format
2327 msgid "path %s has been renamed/deleted"
2328 msgstr "路径 %s 已经被重命名/删除"
2329
2317 -#: builtin/apply.c:3321 builtin/apply.c:3476
2330 +#: builtin/apply.c:3347 builtin/apply.c:3502
2331 #, c-format
2332 msgid "%s: does not exist in index"
2333 msgstr "%s：不存在于索引中"
2334
2322 -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490
2335 +#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516
2336 #, c-format
2337 msgid "%s: %s"
2338 msgstr "%s：%s"
2339
2327 -#: builtin/apply.c:3330 builtin/apply.c:3484
2340 +#: builtin/apply.c:3356 builtin/apply.c:3510
2341 #, c-format
2342 msgid "%s: does not match index"
2343 msgstr "%s：和索引不匹配"
2344
2332 -#: builtin/apply.c:3432
2345 +#: builtin/apply.c:3458
2346 msgid "removal patch leaves file contents"
2347 msgstr "移除补丁仍留下了文件内容"
2348
2336 -#: builtin/apply.c:3501
2349 +#: builtin/apply.c:3527
2350 #, c-format
2351 msgid "%s: wrong type"
2352 msgstr "%s：错误类型"
2353
2341 -#: builtin/apply.c:3503
2354 +#: builtin/apply.c:3529
2355 #, c-format
2356 msgid "%s has type %o, expected %o"
2357 msgstr "%s 的类型是 %o，应为 %o"
2358
2346 -#: builtin/apply.c:3604
2359 +#: builtin/apply.c:3688 builtin/apply.c:3690
2360 +#, c-format
2361 +msgid "invalid path '%s'"
2362 +msgstr "无效路径 '%s'"
2363 +
2364 +#: builtin/apply.c:3745
2365 #, c-format
2366 msgid "%s: already exists in index"
2367 msgstr "%s：已经存在于索引中"
2368
2351 -#: builtin/apply.c:3607
2369 +#: builtin/apply.c:3748
2370 #, c-format
2371 msgid "%s: already exists in working directory"
2372 msgstr "%s：已经存在于工作区中"
2373
2356 -#: builtin/apply.c:3627
2374 +#: builtin/apply.c:3768
2375 #, c-format
2376 msgid "new mode (%o) of %s does not match old mode (%o)"
2377 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
2378
2361 -#: builtin/apply.c:3632
2379 +#: builtin/apply.c:3773
2380 #, c-format
2381 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2382 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
2383
2366 -#: builtin/apply.c:3640
2384 +#: builtin/apply.c:3793
2385 +#, c-format
2386 +msgid "affected file '%s' is beyond a symbolic link"
2387 +msgstr "受影响的文件 '%s' 位于符号链接中"
2388 +
2389 +#: builtin/apply.c:3797
2390 #, c-format
2391 msgid "%s: patch does not apply"
2392 msgstr "%s：补丁未应用"
2393
2371 -#: builtin/apply.c:3653
2394 +#: builtin/apply.c:3811
2395 #, c-format
2396 msgid "Checking patch %s..."
2397 msgstr "检查补丁 %s..."
2398
2376 -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135
2399 +#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135
2400 #, c-format
2401 msgid "make_cache_entry failed for path '%s'"
2402 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
2403
2381 -#: builtin/apply.c:3889
2404 +#: builtin/apply.c:4047
2405 #, c-format
2406 msgid "unable to remove %s from index"
2407 msgstr "不能从索引中移除 %s"
2408
2386 -#: builtin/apply.c:3918
2409 +#: builtin/apply.c:4076
2410 #, c-format
2411 msgid "corrupt patch for submodule %s"
2412 msgstr "子模组 %s 损坏的补丁"
2413
2391 -#: builtin/apply.c:3922
2414 +#: builtin/apply.c:4080
2415 #, c-format
2416 msgid "unable to stat newly created file '%s'"
2417 msgstr "不能枚举新建文件 '%s' 的状态"
2418
2396 -#: builtin/apply.c:3927
2419 +#: builtin/apply.c:4085
2420 #, c-format
2421 msgid "unable to create backing store for newly created file %s"
2422 msgstr "不能为新建文件 %s 创建后端存储"
2423
2401 -#: builtin/apply.c:3930 builtin/apply.c:4038
2424 +#: builtin/apply.c:4088 builtin/apply.c:4196
2425 #, c-format
2426 msgid "unable to add cache entry for %s"
2427 msgstr "无法为 %s 添加缓存条目"
2428
2406 -#: builtin/apply.c:3963
2429 +#: builtin/apply.c:4121
2430 #, c-format
2431 msgid "closing file '%s'"
2432 msgstr "关闭文件 '%s'"
2433
2411 -#: builtin/apply.c:4012
2434 +#: builtin/apply.c:4170
2435 #, c-format
2436 msgid "unable to write file '%s' mode %o"
2437 msgstr "不能写文件 '%s' 权限 %o"
2438
2416 -#: builtin/apply.c:4099
2439 +#: builtin/apply.c:4257
2440 #, c-format
2441 msgid "Applied patch %s cleanly."
2442 msgstr "成功应用补丁 %s。"
2443
2421 -#: builtin/apply.c:4107
2444 +#: builtin/apply.c:4265
2445 msgid "internal error"
2446 msgstr "内部错误"
2447
2425 -#: builtin/apply.c:4110
2448 +#: builtin/apply.c:4268
2449 #, c-format
2450 msgid "Applying patch %%s with %d reject..."
2451 msgid_plural "Applying patch %%s with %d rejects..."
2452 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
2453 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
2454
2432 -#: builtin/apply.c:4120
2455 +#: builtin/apply.c:4278
2456 #, c-format
2457 msgid "truncating .rej filename to %.*s.rej"
2458 msgstr "截短 .rej 文件名为 %.*s.rej"
2459
2437 -#: builtin/apply.c:4141
2460 +#: builtin/apply.c:4299
2461 #, c-format
2462 msgid "Hunk #%d applied cleanly."
2463 msgstr "第 #%d 个片段成功应用。"
2464
2442 -#: builtin/apply.c:4144
2465 +#: builtin/apply.c:4302
2466 #, c-format
2467 msgid "Rejected hunk #%d."
2468 msgstr "拒绝第 #%d 个片段。"
2469
2447 -#: builtin/apply.c:4234
2470 +#: builtin/apply.c:4392
2471 msgid "unrecognized input"
2472 msgstr "未能识别的输入"
2473
2451 -#: builtin/apply.c:4245
2474 +#: builtin/apply.c:4403
2475 msgid "unable to read index file"
2476 msgstr "无法读取索引文件"
2477
2455 -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92
2456 -#: builtin/fetch.c:93
2478 +#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92
2479 +#: builtin/fetch.c:92
2480 msgid "path"
2481 msgstr "路径"
2482
2460 -#: builtin/apply.c:4363
2483 +#: builtin/apply.c:4521
2484 msgid "don't apply changes matching the given path"
2485 msgstr "不要应用与给出路径向匹配的变更"
2486
2464 -#: builtin/apply.c:4366
2487 +#: builtin/apply.c:4524
2488 msgid "apply changes matching the given path"
2489 msgstr "应用与给出路径向匹配的变更"
2490
2468 -#: builtin/apply.c:4368
2491 +#: builtin/apply.c:4526
2492 msgid "num"
2493 msgstr "数字"
2494
2472 -#: builtin/apply.c:4369
2495 +#: builtin/apply.c:4527
2496 msgid "remove <num> leading slashes from traditional diff paths"
2497 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
2498
2476 -#: builtin/apply.c:4372
2499 +#: builtin/apply.c:4530
2500 msgid "ignore additions made by the patch"
2501 msgstr "忽略补丁中的添加的文件"
2502
2480 -#: builtin/apply.c:4374
2503 +#: builtin/apply.c:4532
2504 msgid "instead of applying the patch, output diffstat for the input"
2505 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
2506
2484 -#: builtin/apply.c:4378
2507 +#: builtin/apply.c:4536
2508 msgid "show number of added and deleted lines in decimal notation"
2509 msgstr "以十进制数显示添加和删除的行数"
2510
2488 -#: builtin/apply.c:4380
2511 +#: builtin/apply.c:4538
2512 msgid "instead of applying the patch, output a summary for the input"
2513 msgstr "不应用补丁，而是显示输入的概要"
2514
2492 -#: builtin/apply.c:4382
2515 +#: builtin/apply.c:4540
2516 msgid "instead of applying the patch, see if the patch is applicable"
2517 msgstr "不应用补丁，而是查看补丁是否可应用"
2518
2496 -#: builtin/apply.c:4384
2519 +#: builtin/apply.c:4542
2520 msgid "make sure the patch is applicable to the current index"
2521 msgstr "确认补丁可以应用到当前索引"
2522
2500 -#: builtin/apply.c:4386
2523 +#: builtin/apply.c:4544
2524 msgid "apply a patch without touching the working tree"
2525 msgstr "应用补丁而不修改工作区"
2526
2504 -#: builtin/apply.c:4388
2527 +#: builtin/apply.c:4546
2528 +msgid "accept a patch that touches outside the working area"
2529 +msgstr "接受修改工作区之外文件的补丁"
2530 +
2531 +#: builtin/apply.c:4548
2532 msgid "also apply the patch (use with --stat/--summary/--check)"
2533 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
2534
2508 -#: builtin/apply.c:4390
2535 +#: builtin/apply.c:4550
2536 msgid "attempt three-way merge if a patch does not apply"
2537 msgstr "如果一个补丁不能应用则尝试三路合并"
2538
2512 -#: builtin/apply.c:4392
2539 +#: builtin/apply.c:4552
2540 msgid "build a temporary index based on embedded index information"
2541 msgstr "创建一个临时索引基于嵌入的索引信息"
2542
2516 -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455
2543 +#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412
2544 msgid "paths are separated with NUL character"
2545 msgstr "路径以 NUL 字符分隔"
2546
2520 -#: builtin/apply.c:4397
2547 +#: builtin/apply.c:4557
2548 msgid "ensure at least <n> lines of context match"
2549 msgstr "确保至少匹配 <n> 行上下文"
2550
2524 -#: builtin/apply.c:4398
2551 +#: builtin/apply.c:4558
2552 msgid "action"
2553 msgstr "动作"
2554
2528 -#: builtin/apply.c:4399
2555 +#: builtin/apply.c:4559
2556 msgid "detect new or modified lines that have whitespace errors"
2557 msgstr "检查新增和修改的行中间的空白字符滥用"
2558
2532 -#: builtin/apply.c:4402 builtin/apply.c:4405
2559 +#: builtin/apply.c:4562 builtin/apply.c:4565
2560 msgid "ignore changes in whitespace when finding context"
2561 msgstr "查找上下文时忽略空白字符的变更"
2562
2536 -#: builtin/apply.c:4408
2563 +#: builtin/apply.c:4568
2564 msgid "apply the patch in reverse"
2565 msgstr "反向应用补丁"
2566
2540 -#: builtin/apply.c:4410
2567 +#: builtin/apply.c:4570
2568 msgid "don't expect at least one line of context"
2569 msgstr "无需至少一行上下文"
2570
2544 -#: builtin/apply.c:4412
2571 +#: builtin/apply.c:4572
2572 msgid "leave the rejected hunks in corresponding *.rej files"
2573 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
2574
2548 -#: builtin/apply.c:4414
2575 +#: builtin/apply.c:4574
2576 msgid "allow overlapping hunks"
2577 msgstr "允许重叠的补丁片段"
2578
2552 -#: builtin/apply.c:4417
2579 +#: builtin/apply.c:4577
2580 msgid "tolerate incorrectly detected missing new-line at the end of file"
2581 msgstr "允许不正确的文件末尾换行符"
2582
2556 -#: builtin/apply.c:4420
2583 +#: builtin/apply.c:4580
2584 msgid "do not trust the line counts in the hunk headers"
2585 msgstr "不信任补丁片段的头信息中的行号"
2586
2560 -#: builtin/apply.c:4422
2587 +#: builtin/apply.c:4582
2588 msgid "root"
2589 msgstr "根目录"
2590
2564 -#: builtin/apply.c:4423
2591 +#: builtin/apply.c:4583
2592 msgid "prepend <root> to all filenames"
2593 msgstr "为所有文件名前添加 <根目录>"
2594
2568 -#: builtin/apply.c:4445
2595 +#: builtin/apply.c:4605
2596 msgid "--3way outside a repository"
2597 msgstr "--3way 在一个版本库之外"
2598
2572 -#: builtin/apply.c:4453
2599 +#: builtin/apply.c:4613
2600 msgid "--index outside a repository"
2601 msgstr "--index 在一个版本库之外"
2602
2576 -#: builtin/apply.c:4456
2603 +#: builtin/apply.c:4616
2604 msgid "--cached outside a repository"
2605 msgstr "--cached 在一个版本库之外"
2606
2580 -#: builtin/apply.c:4472
2607 +#: builtin/apply.c:4635
2608 #, c-format
2609 msgid "can't open patch '%s'"
2610 msgstr "不能打开补丁 '%s'"
2611
2585 -#: builtin/apply.c:4486
2612 +#: builtin/apply.c:4649
2613 #, c-format
2614 msgid "squelched %d whitespace error"
2615 msgid_plural "squelched %d whitespace errors"
2616 msgstr[0] "抑制下仍有 %d 个空白字符误用"
2617 msgstr[1] "抑制下仍有 %d 个空白字符误用"
2618
2592 -#: builtin/apply.c:4492 builtin/apply.c:4502
2619 +#: builtin/apply.c:4655 builtin/apply.c:4665
2620 #, c-format
2621 msgid "%d line adds whitespace errors."
2622 msgid_plural "%d lines add whitespace errors."
@@ -2644,102 +2671,102 @@ msgid "update BISECT_HEAD instead of checking out the current commit"
2671 msgstr "更新 BISECT_HEAD 而非检出当前提交"
2672
2673 #: builtin/blame.c:30
2647 -msgid "git blame [options] [rev-opts] [rev] [--] file"
2648 -msgstr "git blame [选项] [版本选项] [版本] [--] 文件"
2674 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file"
2675 +msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] 文件"
2676
2677 #: builtin/blame.c:35
2651 -msgid "[rev-opts] are documented in git-rev-list(1)"
2652 -msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"
2678 +msgid "<rev-opts> are documented in git-rev-list(1)"
2679 +msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
2680
2654 -#: builtin/blame.c:2501
2681 +#: builtin/blame.c:2500
2682 msgid "Show blame entries as we find them, incrementally"
2683 msgstr "增量式地显示发现的 blame 条目"
2684
2658 -#: builtin/blame.c:2502
2685 +#: builtin/blame.c:2501
2686 msgid "Show blank SHA-1 for boundary commits (Default: off)"
2687 msgstr "边界提交显示空的 SHA-1（默认：关闭）"
2688
2662 -#: builtin/blame.c:2503
2689 +#: builtin/blame.c:2502
2690 msgid "Do not treat root commits as boundaries (Default: off)"
2691 msgstr "不把根提交作为边界（默认：关闭）"
2692
2666 -#: builtin/blame.c:2504
2693 +#: builtin/blame.c:2503
2694 msgid "Show work cost statistics"
2695 msgstr "显示命令消耗统计"
2696
2670 -#: builtin/blame.c:2505
2697 +#: builtin/blame.c:2504
2698 msgid "Show output score for blame entries"
2699 msgstr "显示判断 blame 条目位移的得分诊断信息"
2700
2674 -#: builtin/blame.c:2506
2701 +#: builtin/blame.c:2505
2702 msgid "Show original filename (Default: auto)"
2703 msgstr "显示原始文件名（默认：自动）"
2704
2678 -#: builtin/blame.c:2507
2705 +#: builtin/blame.c:2506
2706 msgid "Show original linenumber (Default: off)"
2707 msgstr "显示原始的行号（默认：关闭）"
2708
2682 -#: builtin/blame.c:2508
2709 +#: builtin/blame.c:2507
2710 msgid "Show in a format designed for machine consumption"
2711 msgstr "显示为一个适合机器读取的格式"
2712
2686 -#: builtin/blame.c:2509
2713 +#: builtin/blame.c:2508
2714 msgid "Show porcelain format with per-line commit information"
2715 msgstr "为每一行显示机器适用的提交信息"
2716
2690 -#: builtin/blame.c:2510
2717 +#: builtin/blame.c:2509
2718 msgid "Use the same output mode as git-annotate (Default: off)"
2719 msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
2720
2694 -#: builtin/blame.c:2511
2721 +#: builtin/blame.c:2510
2722 msgid "Show raw timestamp (Default: off)"
2723 msgstr "显示原始时间戳（默认：关闭）"
2724
2698 -#: builtin/blame.c:2512
2725 +#: builtin/blame.c:2511
2726 msgid "Show long commit SHA1 (Default: off)"
2727 msgstr "显示长的SHA1提交号（默认：关闭）"
2728
2702 -#: builtin/blame.c:2513
2729 +#: builtin/blame.c:2512
2730 msgid "Suppress author name and timestamp (Default: off)"
2731 msgstr "隐藏作者名字和时间戳（默认：关闭）"
2732
2706 -#: builtin/blame.c:2514
2733 +#: builtin/blame.c:2513
2734 msgid "Show author email instead of name (Default: off)"
2735 msgstr "显示作者的邮箱而不是名字（默认：关闭）"
2736
2710 -#: builtin/blame.c:2515
2737 +#: builtin/blame.c:2514
2738 msgid "Ignore whitespace differences"
2739 msgstr "忽略空白差异"
2740
2714 -#: builtin/blame.c:2516
2741 +#: builtin/blame.c:2515
2742 msgid "Spend extra cycles to find better match"
2743 msgstr "花费额外的循环来找到更好的匹配"
2744
2718 -#: builtin/blame.c:2517
2745 +#: builtin/blame.c:2516
2746 msgid "Use revisions from <file> instead of calling git-rev-list"
2747 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
2748
2722 -#: builtin/blame.c:2518
2749 +#: builtin/blame.c:2517
2750 msgid "Use <file>'s contents as the final image"
2751 msgstr "使用 <文件> 的内容作为最终的图片"
2752
2726 -#: builtin/blame.c:2519 builtin/blame.c:2520
2753 +#: builtin/blame.c:2518 builtin/blame.c:2519
2754 msgid "score"
2755 msgstr "得分"
2756
2730 -#: builtin/blame.c:2519
2757 +#: builtin/blame.c:2518
2758 msgid "Find line copies within and across files"
2759 msgstr "找到文件内及跨文件的行拷贝"
2760
2734 -#: builtin/blame.c:2520
2761 +#: builtin/blame.c:2519
2762 msgid "Find line movements within and across files"
2763 msgstr "找到文件内及跨文件的行移动"
2764
2738 -#: builtin/blame.c:2521
2765 +#: builtin/blame.c:2520
2766 msgid "n,m"
2767 msgstr "n,m"
2768
2742 -#: builtin/blame.c:2521
2769 +#: builtin/blame.c:2520
2770 msgid "Process only line range n,m, counting from 1"
2771 msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
2772
@@ -2749,25 +2776,25 @@ msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
2776 #. takes 22 places, is the longest among various forms of
2777 #. relative timestamps, but your language may need more or
2778 #. fewer display columns.
2752 -#: builtin/blame.c:2602
2779 +#: builtin/blame.c:2601
2780 msgid "4 years, 11 months ago"
2781 msgstr "4 年 11 个月前"
2782
2783 #: builtin/branch.c:24
2757 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2758 -msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]"
2784 +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
2785 +msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
2786
2787 #: builtin/branch.c:25
2761 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2762 -msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]"
2788 +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
2789 +msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
2790
2791 #: builtin/branch.c:26
2765 -msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2766 -msgstr "git branch [选项] [-r] (-d | -D) <分支名>..."
2792 +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
2793 +msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
2794
2795 #: builtin/branch.c:27
2769 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2770 -msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"
2796 +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
2797 +msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
2798
2799 # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
2800 #: builtin/branch.c:152
@@ -2909,232 +2936,237 @@ msgstr "（非分支，正变基 %s）"
2936 msgid "(no branch, bisect started on %s)"
2937 msgstr "（非分支，二分查找开始于 %s）"
2938
2912 -#: builtin/branch.c:593
2939 +#: builtin/branch.c:596
2940 #, c-format
2914 -msgid "(detached from %s)"
2915 -msgstr "（分离自 %s）"
2941 +msgid "(HEAD detached at %s)"
2942 +msgstr "（头指针分离于 %s）"
2943
2917 -#: builtin/branch.c:596
2944 +#: builtin/branch.c:599
2945 +#, c-format
2946 +msgid "(HEAD detached from %s)"
2947 +msgstr "（头指针分离自 %s）"
2948 +
2949 +#: builtin/branch.c:603
2950 msgid "(no branch)"
2951 msgstr "（非分支）"
2952
2921 -#: builtin/branch.c:643
2953 +#: builtin/branch.c:650
2954 #, c-format
2955 msgid "object '%s' does not point to a commit"
2956 msgstr "对象 '%s' 没有指向一个提交"
2957
2926 -#: builtin/branch.c:691
2958 +#: builtin/branch.c:698
2959 msgid "some refs could not be read"
2960 msgstr "一些引用不能读取"
2961
2930 -#: builtin/branch.c:704
2962 +#: builtin/branch.c:711
2963 msgid "cannot rename the current branch while not on any."
2964 msgstr "无法重命名当前分支因为不处于任何分支上。"
2965
2934 -#: builtin/branch.c:714
2966 +#: builtin/branch.c:721
2967 #, c-format
2968 msgid "Invalid branch name: '%s'"
2969 msgstr "无效的分支名：'%s'"
2970
2939 -#: builtin/branch.c:729
2971 +#: builtin/branch.c:736
2972 msgid "Branch rename failed"
2973 msgstr "分支重命名失败"
2974
2943 -#: builtin/branch.c:733
2975 +#: builtin/branch.c:740
2976 #, c-format
2977 msgid "Renamed a misnamed branch '%s' away"
2978 msgstr "重命名掉一个错误命名的旧分支 '%s'"
2979
2948 -#: builtin/branch.c:737
2980 +#: builtin/branch.c:744
2981 #, c-format
2982 msgid "Branch renamed to %s, but HEAD is not updated!"
2983 msgstr "分支重命名为 %s，但 HEAD 没有更新！"
2984
2953 -#: builtin/branch.c:744
2985 +#: builtin/branch.c:751
2986 msgid "Branch is renamed, but update of config-file failed"
2987 msgstr "分支被重命名，但更新 config 文件失败"
2988
2957 -#: builtin/branch.c:759
2989 +#: builtin/branch.c:766
2990 #, c-format
2991 msgid "malformed object name %s"
2992 msgstr "非法的对象名 %s"
2993
2962 -#: builtin/branch.c:783
2994 +#: builtin/branch.c:790
2995 #, c-format
2996 msgid "could not write branch description template: %s"
2997 msgstr "不能写分支描述模版：%s"
2998
2967 -#: builtin/branch.c:813
2999 +#: builtin/branch.c:820
3000 msgid "Generic options"
3001 msgstr "通用选项"
3002
2971 -#: builtin/branch.c:815
3003 +#: builtin/branch.c:822
3004 msgid "show hash and subject, give twice for upstream branch"
3005 msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
3006
2975 -#: builtin/branch.c:816
3007 +#: builtin/branch.c:823
3008 msgid "suppress informational messages"
3009 msgstr "不显示信息"
3010
2979 -#: builtin/branch.c:817
3011 +#: builtin/branch.c:824
3012 msgid "set up tracking mode (see git-pull(1))"
3013 msgstr "设置跟踪模式（参见 git-pull(1)）"
3014
2983 -#: builtin/branch.c:819
3015 +#: builtin/branch.c:826
3016 msgid "change upstream info"
3017 msgstr "改变上游信息"
3018
2987 -#: builtin/branch.c:823
3019 +#: builtin/branch.c:830
3020 msgid "use colored output"
3021 msgstr "使用彩色输出"
3022
2991 -#: builtin/branch.c:824
3023 +#: builtin/branch.c:831
3024 msgid "act on remote-tracking branches"
3025 msgstr "作用于远程跟踪分支"
3026
2995 -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854
2996 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587
2997 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616
3027 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861
3028 +#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581
3029 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616
3030 #: builtin/tag.c:622
3031 msgid "commit"
3032 msgstr "提交"
3033
3002 -#: builtin/branch.c:828 builtin/branch.c:834
3034 +#: builtin/branch.c:835 builtin/branch.c:841
3035 msgid "print only branches that contain the commit"
3036 msgstr "只打印包含该提交的分支"
3037
3006 -#: builtin/branch.c:840
3038 +#: builtin/branch.c:847
3039 msgid "Specific git-branch actions:"
3040 msgstr "具体的 git-branch 动作："
3041
3010 -#: builtin/branch.c:841
3042 +#: builtin/branch.c:848
3043 msgid "list both remote-tracking and local branches"
3044 msgstr "列出远程跟踪及本地分支"
3045
3014 -#: builtin/branch.c:843
3046 +#: builtin/branch.c:850
3047 msgid "delete fully merged branch"
3048 msgstr "删除完全合并的分支"
3049
3018 -#: builtin/branch.c:844
3050 +#: builtin/branch.c:851
3051 msgid "delete branch (even if not merged)"
3052 msgstr "删除分支（即使没有合并）"
3053
3022 -#: builtin/branch.c:845
3054 +#: builtin/branch.c:852
3055 msgid "move/rename a branch and its reflog"
3056 msgstr "移动/重命名一个分支，以及它的引用日志"
3057
3026 -#: builtin/branch.c:846
3058 +#: builtin/branch.c:853
3059 msgid "move/rename a branch, even if target exists"
3060 msgstr "移动/重命名一个分支，即使目标已存在"
3061
3030 -#: builtin/branch.c:847
3062 +#: builtin/branch.c:854
3063 msgid "list branch names"
3064 msgstr "列出分支名"
3065
3034 -#: builtin/branch.c:848
3066 +#: builtin/branch.c:855
3067 msgid "create the branch's reflog"
3068 msgstr "创建分支的引用日志"
3069
3038 -#: builtin/branch.c:850
3070 +#: builtin/branch.c:857
3071 msgid "edit the description for the branch"
3072 msgstr "标记分支的描述"
3073
3042 -#: builtin/branch.c:851
3074 +#: builtin/branch.c:858
3075 msgid "force creation, move/rename, deletion"
3076 msgstr "强制创建、移动/重命名、删除"
3077
3046 -#: builtin/branch.c:854
3078 +#: builtin/branch.c:861
3079 msgid "print only not merged branches"
3080 msgstr "只打印没有合并的分支"
3081
3050 -#: builtin/branch.c:860
3082 +#: builtin/branch.c:867
3083 msgid "print only merged branches"
3084 msgstr "只打印合并的分支"
3085
3054 -#: builtin/branch.c:864
3086 +#: builtin/branch.c:871
3087 msgid "list branches in columns"
3088 msgstr "以列的方式显示分支"
3089
3058 -#: builtin/branch.c:877
3090 +#: builtin/branch.c:884
3091 msgid "Failed to resolve HEAD as a valid ref."
3092 msgstr "无法将 HEAD 解析为有效引用。"
3093
3062 -#: builtin/branch.c:881 builtin/clone.c:637
3094 +#: builtin/branch.c:888 builtin/clone.c:637
3095 msgid "HEAD not found below refs/heads!"
3096 msgstr "HEAD 没有位于 /refs/heads 之下！"
3097
3066 -#: builtin/branch.c:903
3098 +#: builtin/branch.c:910
3099 msgid "--column and --verbose are incompatible"
3100 msgstr "--column 和 --verbose 不兼容"
3101
3070 -#: builtin/branch.c:914 builtin/branch.c:953
3102 +#: builtin/branch.c:921 builtin/branch.c:960
3103 msgid "branch name required"
3104 msgstr "必须提供分支名"
3105
3074 -#: builtin/branch.c:929
3106 +#: builtin/branch.c:936
3107 msgid "Cannot give description to detached HEAD"
3108 msgstr "不能向分离头指针提供描述"
3109
3078 -#: builtin/branch.c:934
3110 +#: builtin/branch.c:941
3111 msgid "cannot edit description of more than one branch"
3112 msgstr "不能为一个以上的分支编辑描述"
3113
3082 -#: builtin/branch.c:941
3114 +#: builtin/branch.c:948
3115 #, c-format
3116 msgid "No commit on branch '%s' yet."
3117 msgstr "分支 '%s' 尚无提交。"
3118
3087 -#: builtin/branch.c:944
3119 +#: builtin/branch.c:951
3120 #, c-format
3121 msgid "No branch named '%s'."
3122 msgstr "没有分支 '%s'。"
3123
3092 -#: builtin/branch.c:959
3124 +#: builtin/branch.c:966
3125 msgid "too many branches for a rename operation"
3126 msgstr "为重命名操作提供了太多的分支名"
3127
3096 -#: builtin/branch.c:964
3128 +#: builtin/branch.c:971
3129 msgid "too many branches to set new upstream"
3130 msgstr "为设置新上游提供了太多的分支名"
3131
3100 -#: builtin/branch.c:968
3132 +#: builtin/branch.c:975
3133 #, c-format
3134 msgid ""
3135 "could not set upstream of HEAD to %s when it does not point to any branch."
3136 msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
3137
3106 -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014
3138 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021
3139 #, c-format
3140 msgid "no such branch '%s'"
3141 msgstr "没有此分支 '%s'"
3142
3111 -#: builtin/branch.c:975
3143 +#: builtin/branch.c:982
3144 #, c-format
3145 msgid "branch '%s' does not exist"
3146 msgstr "分支 '%s' 不存在"
3147
3116 -#: builtin/branch.c:987
3148 +#: builtin/branch.c:994
3149 msgid "too many branches to unset upstream"
3150 msgstr "为取消上游设置操作提供了太多的分支名"
3151
3120 -#: builtin/branch.c:991
3152 +#: builtin/branch.c:998
3153 msgid "could not unset upstream of HEAD when it does not point to any branch."
3154 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3155
3124 -#: builtin/branch.c:997
3156 +#: builtin/branch.c:1004
3157 #, c-format
3158 msgid "Branch '%s' has no upstream information"
3159 msgstr "分支 '%s' 没有上游信息"
3160
3129 -#: builtin/branch.c:1011
3161 +#: builtin/branch.c:1018
3162 msgid "it does not make sense to create 'HEAD' manually"
3163 msgstr "手工创建 'HEAD' 没有意义"
3164
3133 -#: builtin/branch.c:1017
3165 +#: builtin/branch.c:1024
3166 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
3167 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
3168
3137 -#: builtin/branch.c:1020
3169 +#: builtin/branch.c:1027
3170 #, c-format
3171 msgid ""
3172 "The --set-upstream flag is deprecated and will be removed. Consider using --"
@@ -3142,7 +3174,7 @@ msgid ""
3174 msgstr ""
3175 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
3176
3145 -#: builtin/branch.c:1037
3177 +#: builtin/branch.c:1044
3178 #, c-format
3179 msgid ""
3180 "\n"
@@ -3153,12 +3185,12 @@ msgstr ""
3185 "如果你想用 '%s' 跟踪 '%s', 这么做：\n"
3186 "\n"
3187
3156 -#: builtin/branch.c:1038
3188 +#: builtin/branch.c:1045
3189 #, c-format
3190 msgid " git branch -d %s\n"
3191 msgstr " git branch -d %s\n"
3192
3161 -#: builtin/branch.c:1039
3193 +#: builtin/branch.c:1046
3194 #, c-format
3195 msgid " git branch --set-upstream-to %s\n"
3196 msgstr " git branch --set-upstream-to %s\n"
@@ -3176,53 +3208,53 @@ msgstr "需要一个版本库来创建包。"
3208 msgid "Need a repository to unbundle."
3209 msgstr "需要一个版本库来解包。"
3210
3179 -#: builtin/cat-file.c:328
3180 -msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
3181 -msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"
3211 +#: builtin/cat-file.c:326
3212 +msgid "git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>"
3213 +msgstr "git cat-file (-t | -s | -e | -p | <类型> | --textconv) <对象>"
3214
3183 -#: builtin/cat-file.c:329
3184 -msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
3185 -msgstr "git cat-file (--batch|--batch-check) < <对象列表>"
3215 +#: builtin/cat-file.c:327
3216 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>"
3217 +msgstr "git cat-file (--batch | --batch-check) < <对象列表>"
3218
3187 -#: builtin/cat-file.c:366
3219 +#: builtin/cat-file.c:364
3220 msgid "<type> can be one of: blob, tree, commit, tag"
3221 msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
3222
3191 -#: builtin/cat-file.c:367
3223 +#: builtin/cat-file.c:365
3224 msgid "show object type"
3225 msgstr "显示对象类型"
3226
3195 -#: builtin/cat-file.c:368
3227 +#: builtin/cat-file.c:366
3228 msgid "show object size"
3229 msgstr "显示对象大小"
3230
3199 -#: builtin/cat-file.c:370
3231 +#: builtin/cat-file.c:368
3232 msgid "exit with zero when there's no error"
3233 msgstr "当没有错误时退出并返回零"
3234
3203 -#: builtin/cat-file.c:371
3235 +#: builtin/cat-file.c:369
3236 msgid "pretty-print object's content"
3237 msgstr "美观地打印对象的内容"
3238
3207 -#: builtin/cat-file.c:373
3239 +#: builtin/cat-file.c:371
3240 msgid "for blob objects, run textconv on object's content"
3241 msgstr "对于数据（blob）对象，对其内容执行 textconv"
3242
3211 -#: builtin/cat-file.c:375
3243 +#: builtin/cat-file.c:373
3244 msgid "show info and content of objects fed from the standard input"
3245 msgstr "显示从标准输入提供的对象的信息和内容"
3246
3215 -#: builtin/cat-file.c:378
3247 +#: builtin/cat-file.c:376
3248 msgid "show info about objects fed from the standard input"
3249 msgstr "显示从标准输入提供的对象的信息"
3250
3251 #: builtin/check-attr.c:11
3220 -msgid "git check-attr [-a | --all | attr...] [--] pathname..."
3221 -msgstr "git check-attr [-a | --all | attr...] [--] 路径名..."
3252 +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
3253 +msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
3254
3255 #: builtin/check-attr.c:12
3224 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
3225 -msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>"
3256 +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"
3257 +msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"
3258
3259 #: builtin/check-attr.c:19
3260 msgid "report all attributes set on file"
@@ -3277,8 +3309,8 @@ msgid "--non-matching is only valid with --verbose"
3309 msgstr "--non-matching 选项只在使用 --verbose 时有效"
3310
3311 #: builtin/check-mailmap.c:8
3280 -msgid "git check-mailmap [options] <contact>..."
3281 -msgstr "git check-mailmap [选项] <联系地址>..."
3312 +msgid "git check-mailmap [<options>] <contact>..."
3313 +msgstr "git check-mailmap [<选项>] <联系地址>..."
3314
3315 #: builtin/check-mailmap.c:13
3316 msgid "also read contacts from stdin"
@@ -3294,8 +3326,8 @@ msgid "no contacts specified"
3326 msgstr "未指定联系地址"
3327
3328 #: builtin/checkout-index.c:126
3297 -msgid "git checkout-index [options] [--] [<file>...]"
3298 -msgstr "git checkout-index [选项] [--] [<文件>...]"
3329 +msgid "git checkout-index [<options>] [--] [<file>...]"
3330 +msgstr "git checkout-index [<选项>] [--] [<文件>...]"
3331
3332 #: builtin/checkout-index.c:188
3333 msgid "check out all files in the index"
@@ -3338,12 +3370,12 @@ msgid "copy out the files from named stage"
3370 msgstr "从指定暂存区中拷出文件"
3371
3372 #: builtin/checkout.c:25
3341 -msgid "git checkout [options] <branch>"
3342 -msgstr "git checkout [选项] <分支>"
3373 +msgid "git checkout [<options>] <branch>"
3374 +msgstr "git checkout [<选项>] <分支>"
3375
3376 #: builtin/checkout.c:26
3345 -msgid "git checkout [options] [<branch>] -- <file>..."
3346 -msgstr "git checkout [选项] [<分支>] -- <文件>..."
3377 +msgid "git checkout [<options>] [<branch>] -- <file>..."
3378 +msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
3379
3380 #: builtin/checkout.c:132 builtin/checkout.c:165
3381 #, c-format
@@ -3471,13 +3503,13 @@ msgid ""
3503 "If you want to keep them by creating a new branch, this may be a good time\n"
3504 "to do so with:\n"
3505 "\n"
3474 -" git branch new_branch_name %s\n"
3506 +" git branch <new-branch-name> %s\n"
3507 "\n"
3508 msgstr ""
3509 "如果您想要通过创建新分支保存他们，这可能是一个好时候。\n"
3510 "如下操作：\n"
3511 "\n"
3480 -" git branch new_branch_name %s\n"
3512 +" git branch <新分支名> %s\n"
3513 "\n"
3514
3515 #: builtin/checkout.c:777
@@ -3593,8 +3625,8 @@ msgid "do not limit pathspecs to sparse entries only"
3625 msgstr "对路径不做稀疏检出的限制"
3626
3627 #: builtin/checkout.c:1130
3596 -msgid "second guess 'git checkout no-such-branch'"
3597 -msgstr "再者猜测'git checkout no-such-branch'"
3628 +msgid "second guess 'git checkout <no-such-branch>'"
3629 +msgstr "二次猜测'git checkout <无此分支>'"
3630
3631 #: builtin/checkout.c:1153
3632 msgid "-b, -B and --orphan are mutually exclusive"
@@ -3715,16 +3747,17 @@ msgstr "警告：无法找到和 %s 匹配的条目"
3747 msgid "Select items to delete"
3748 msgstr "选择要删除的条目"
3749
3718 -#: builtin/clean.c:757
3750 +#. TRANSLATORS: Make sure to keep [y/N] as is
3751 +#: builtin/clean.c:758
3752 #, c-format
3720 -msgid "remove %s? "
3721 -msgstr "删除 %s？"
3753 +msgid "Remove %s [y/N]? "
3754 +msgstr "删除 %s [y/N]？"
3755
3723 -#: builtin/clean.c:782
3756 +#: builtin/clean.c:783
3757 msgid "Bye."
3758 msgstr "再见。"
3759
3727 -#: builtin/clean.c:790
3760 +#: builtin/clean.c:791
3761 msgid ""
3762 "clean - start cleaning\n"
3763 "filter by pattern - exclude items from deletion\n"
@@ -3742,69 +3775,69 @@ msgstr ""
3775 "help - 显示本帮助\n"
3776 "? - 显示如何在提示符下选择的帮助"
3777
3745 -#: builtin/clean.c:817
3778 +#: builtin/clean.c:818
3779 msgid "*** Commands ***"
3780 msgstr "*** 命令 ***"
3781
3749 -#: builtin/clean.c:818
3782 +#: builtin/clean.c:819
3783 msgid "What now"
3784 msgstr "请选择"
3785
3753 -#: builtin/clean.c:826
3786 +#: builtin/clean.c:827
3787 msgid "Would remove the following item:"
3788 msgid_plural "Would remove the following items:"
3789 msgstr[0] "将删除如下条目："
3790 msgstr[1] "将删除如下条目："
3791
3759 -#: builtin/clean.c:843
3792 +#: builtin/clean.c:844
3793 msgid "No more files to clean, exiting."
3794 msgstr "没有要清理的文件，退出。"
3795
3763 -#: builtin/clean.c:874
3796 +#: builtin/clean.c:875
3797 msgid "do not print names of files removed"
3798 msgstr "不打印删除文件的名称"
3799
3767 -#: builtin/clean.c:876
3800 +#: builtin/clean.c:877
3801 msgid "force"
3802 msgstr "强制"
3803
3771 -#: builtin/clean.c:877
3804 +#: builtin/clean.c:878
3805 msgid "interactive cleaning"
3806 msgstr "交互式清除"
3807
3775 -#: builtin/clean.c:879
3808 +#: builtin/clean.c:880
3809 msgid "remove whole directories"
3810 msgstr "删除整个目录"
3811
3779 -#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714
3780 -#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
3812 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714
3813 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185
3814 msgid "pattern"
3815 msgstr "模式"
3816
3784 -#: builtin/clean.c:881
3817 +#: builtin/clean.c:882
3818 msgid "add <pattern> to ignore rules"
3819 msgstr "添加<模式>到忽略规则"
3820
3788 -#: builtin/clean.c:882
3821 +#: builtin/clean.c:883
3822 msgid "remove ignored files, too"
3823 msgstr "也删除忽略的文件"
3824
3792 -#: builtin/clean.c:884
3825 +#: builtin/clean.c:885
3826 msgid "remove only ignored files"
3827 msgstr "只删除忽略的文件"
3828
3796 -#: builtin/clean.c:902
3829 +#: builtin/clean.c:903
3830 msgid "-x and -X cannot be used together"
3831 msgstr "-x 和 -X 不能同时使用"
3832
3800 -#: builtin/clean.c:906
3833 +#: builtin/clean.c:907
3834 msgid ""
3835 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
3836 "clean"
3837 msgstr ""
3838 "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
3839
3807 -#: builtin/clean.c:909
3840 +#: builtin/clean.c:910
3841 msgid ""
3842 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
3843 "refusing to clean"
@@ -3812,11 +3845,11 @@ msgstr ""
3845 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
3846
3847 #: builtin/clone.c:37
3815 -msgid "git clone [options] [--] <repo> [<dir>]"
3816 -msgstr "git clone [选项] [--] <版本库> [<路径>]"
3848 +msgid "git clone [<options>] [--] <repo> [<dir>]"
3849 +msgstr "git clone [<选项>] [--] <版本库> [<路径>]"
3850
3818 -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224
3819 -#: builtin/push.c:514
3851 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224
3852 +#: builtin/push.c:523
3853 msgid "force progress reporting"
3854 msgstr "强制显示进度报告"
3855
@@ -3876,7 +3909,7 @@ msgstr "检出<分支>而不是远程HEAD"
3909 msgid "path to git-upload-pack on the remote"
3910 msgstr "远程 git-upload-pack 路径"
3911
3879 -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659
3912 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659
3913 msgid "depth"
3914 msgstr "深度"
3915
@@ -4020,7 +4053,7 @@ msgstr "--bare 和 --separate-git-dir 选项不兼容。"
4053 msgid "repository '%s' does not exist"
4054 msgstr "版本库 '%s' 不存在"
4055
4023 -#: builtin/clone.c:815 builtin/fetch.c:1155
4056 +#: builtin/clone.c:815 builtin/fetch.c:1156
4057 #, c-format
4058 msgid "depth %s is not a positive number"
4059 msgstr "深度 %s 不是一个正数"
@@ -4035,59 +4068,59 @@ msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
4068 msgid "working tree '%s' already exists."
4069 msgstr "工作区 '%s' 已经存在。"
4070
4038 -#: builtin/clone.c:848 builtin/clone.c:860
4071 +#: builtin/clone.c:850 builtin/clone.c:861
4072 #, c-format
4073 msgid "could not create leading directories of '%s'"
4074 msgstr "不能为 '%s' 创建先导目录"
4075
4043 -#: builtin/clone.c:851
4076 +#: builtin/clone.c:853
4077 #, c-format
4045 -msgid "could not create work tree dir '%s'."
4046 -msgstr "不能为 '%s' 创建工作区目录。"
4078 +msgid "could not create work tree dir '%s'"
4079 +msgstr "不能创建工作区目录 '%s'"
4080
4048 -#: builtin/clone.c:870
4081 +#: builtin/clone.c:871
4082 #, c-format
4083 msgid "Cloning into bare repository '%s'...\n"
4084 msgstr "克隆到纯版本库 '%s'...\n"
4085
4053 -#: builtin/clone.c:872
4086 +#: builtin/clone.c:873
4087 #, c-format
4088 msgid "Cloning into '%s'...\n"
4089 msgstr "正克隆到 '%s'...\n"
4090
4058 -#: builtin/clone.c:897
4091 +#: builtin/clone.c:898
4092 msgid "--dissociate given, but there is no --reference"
4093 msgstr "提供了参数 --dissociate，但未提供 --reference"
4094
4062 -#: builtin/clone.c:912
4095 +#: builtin/clone.c:913
4096 msgid "--depth is ignored in local clones; use file:// instead."
4097 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
4098
4066 -#: builtin/clone.c:915
4099 +#: builtin/clone.c:916
4100 msgid "source repository is shallow, ignoring --local"
4101 msgstr "源版本库是浅克隆，忽略 --local"
4102
4070 -#: builtin/clone.c:920
4103 +#: builtin/clone.c:921
4104 msgid "--local is ignored"
4105 msgstr "--local 被忽略"
4106
4074 -#: builtin/clone.c:924
4107 +#: builtin/clone.c:925
4108 #, c-format
4109 msgid "Don't know how to clone %s"
4110 msgstr "不知道如何克隆 %s"
4111
4079 -#: builtin/clone.c:975 builtin/clone.c:983
4112 +#: builtin/clone.c:976 builtin/clone.c:984
4113 #, c-format
4114 msgid "Remote branch %s not found in upstream %s"
4115 msgstr "远程分支 %s 在上游 %s 未发现"
4116
4084 -#: builtin/clone.c:986
4117 +#: builtin/clone.c:987
4118 msgid "You appear to have cloned an empty repository."
4119 msgstr "您似乎克隆了一个空版本库。"
4120
4121 #: builtin/column.c:9
4089 -msgid "git column [options]"
4090 -msgstr "git column [选项]"
4122 +msgid "git column [<options>]"
4123 +msgstr "git column [<选项>]"
4124
4125 #: builtin/column.c:26
4126 msgid "lookup config vars"
@@ -4118,12 +4151,12 @@ msgid "--command must be the first argument"
4151 msgstr "--command 必须是第一个参数"
4152
4153 #: builtin/commit.c:37
4121 -msgid "git commit [options] [--] <pathspec>..."
4122 -msgstr "git commit [选项] [--] <路径规则>..."
4154 +msgid "git commit [<options>] [--] <pathspec>..."
4155 +msgstr "git commit [<选项>] [--] <路径规则>..."
4156
4157 #: builtin/commit.c:42
4125 -msgid "git status [options] [--] <pathspec>..."
4126 -msgstr "git status [选项] [--] <路径规则>..."
4158 +msgid "git status [<options>] [--] <pathspec>..."
4159 +msgstr "git status [<选项>] [--] <路径规则>..."
4160
4161 #: builtin/commit.c:47
4162 msgid ""
@@ -4259,68 +4292,68 @@ msgstr "无法读取索引"
4292 msgid "unable to write temporary index file"
4293 msgstr "无法写临时索引文件"
4294
4262 -#: builtin/commit.c:584
4295 +#: builtin/commit.c:578
4296 #, c-format
4297 msgid "commit '%s' lacks author header"
4298 msgstr "提交 '%s' 缺少作者信息"
4299
4267 -#: builtin/commit.c:586
4300 +#: builtin/commit.c:580
4301 #, c-format
4302 msgid "commit '%s' has malformed author line"
4303 msgstr "提交 '%s' 有非法的作者信息"
4304
4272 -#: builtin/commit.c:605
4305 +#: builtin/commit.c:599
4306 msgid "malformed --author parameter"
4307 msgstr "非法的 --author 参数"
4308
4276 -#: builtin/commit.c:613
4309 +#: builtin/commit.c:607
4310 #, c-format
4311 msgid "invalid date format: %s"
4312 msgstr "无效的日期格式：%s"
4313
4281 -#: builtin/commit.c:657
4314 +#: builtin/commit.c:651
4315 msgid ""
4316 "unable to select a comment character that is not used\n"
4317 "in the current commit message"
4318 msgstr "无法选择一个未被当前提交说明使用的注释字符"
4319
4287 -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084
4320 +#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078
4321 #, c-format
4322 msgid "could not lookup commit %s"
4323 msgstr "不能查询提交 %s"
4324
4292 -#: builtin/commit.c:706 builtin/shortlog.c:273
4325 +#: builtin/commit.c:700 builtin/shortlog.c:273
4326 #, c-format
4327 msgid "(reading log message from standard input)\n"
4328 msgstr "（正从标准输入中读取日志信息）\n"
4329
4297 -#: builtin/commit.c:708
4330 +#: builtin/commit.c:702
4331 msgid "could not read log from standard input"
4332 msgstr "不能从标准输入中读取日志信息"
4333
4301 -#: builtin/commit.c:712
4334 +#: builtin/commit.c:706
4335 #, c-format
4336 msgid "could not read log file '%s'"
4337 msgstr "不能读取日志文件 '%s'"
4338
4306 -#: builtin/commit.c:734
4339 +#: builtin/commit.c:728
4340 msgid "could not read MERGE_MSG"
4341 msgstr "不能读取 MERGE_MSG"
4342
4310 -#: builtin/commit.c:738
4343 +#: builtin/commit.c:732
4344 msgid "could not read SQUASH_MSG"
4345 msgstr "不能读取 SQUASH_MSG"
4346
4314 -#: builtin/commit.c:742
4347 +#: builtin/commit.c:736
4348 #, c-format
4349 msgid "could not read '%s'"
4350 msgstr "不能读取 '%s'"
4351
4319 -#: builtin/commit.c:789
4352 +#: builtin/commit.c:783
4353 msgid "could not write commit template"
4354 msgstr "不能写提交模版"
4355
4323 -#: builtin/commit.c:807
4356 +#: builtin/commit.c:801
4357 #, c-format
4358 msgid ""
4359 "\n"
@@ -4334,7 +4367,7 @@ msgstr ""
4367 "\t%s\n"
4368 "然后重试。\n"
4369
4337 -#: builtin/commit.c:812
4370 +#: builtin/commit.c:806
4371 #, c-format
4372 msgid ""
4373 "\n"
@@ -4348,7 +4381,7 @@ msgstr ""
4381 "\t%s\n"
4382 "然后重试。\n"
4383
4351 -#: builtin/commit.c:825
4384 +#: builtin/commit.c:819
4385 #, c-format
4386 msgid ""
4387 "Please enter the commit message for your changes. Lines starting\n"
@@ -4357,7 +4390,7 @@ msgstr ""
4390 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
4391 "说明将会终止提交。\n"
4392
4360 -#: builtin/commit.c:832
4393 +#: builtin/commit.c:826
4394 #, c-format
4395 msgid ""
4396 "Please enter the commit message for your changes. Lines starting\n"
@@ -4368,353 +4401,353 @@ msgstr ""
4401 "也可以删除它们。一个空的提交说明将会终止提交。\n"
4402
4403 # 译者：为保证在输出中对齐，注意调整句中空格！
4371 -#: builtin/commit.c:852
4404 +#: builtin/commit.c:846
4405 #, c-format
4406 msgid "%sAuthor: %.*s <%.*s>"
4407 msgstr "%s作者： %.*s <%.*s>"
4408
4409 # 译者：为保证在输出中对齐，注意调整句中空格！
4377 -#: builtin/commit.c:860
4410 +#: builtin/commit.c:854
4411 #, c-format
4412 msgid "%sDate: %s"
4413 msgstr "%s日期： %s"
4414
4415 # 译者：为保证在输出中对齐，注意调整句中空格！
4383 -#: builtin/commit.c:867
4416 +#: builtin/commit.c:861
4417 #, c-format
4418 msgid "%sCommitter: %.*s <%.*s>"
4419 msgstr "%s提交者：%.*s <%.*s>"
4420
4388 -#: builtin/commit.c:885
4421 +#: builtin/commit.c:879
4422 msgid "Cannot read index"
4423 msgstr "无法读取索引"
4424
4392 -#: builtin/commit.c:942
4425 +#: builtin/commit.c:936
4426 msgid "Error building trees"
4427 msgstr "无法创建树对象"
4428
4396 -#: builtin/commit.c:957 builtin/tag.c:495
4429 +#: builtin/commit.c:951 builtin/tag.c:495
4430 #, c-format
4431 msgid "Please supply the message using either -m or -F option.\n"
4432 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
4433
4401 -#: builtin/commit.c:1059
4434 +#: builtin/commit.c:1053
4435 #, c-format
4403 -msgid "No existing author found with '%s'"
4404 -msgstr "没有找到匹配 '%s' 的作者"
4436 +msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4437 +msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"
4438
4406 -#: builtin/commit.c:1074 builtin/commit.c:1314
4439 +#: builtin/commit.c:1068 builtin/commit.c:1308
4440 #, c-format
4441 msgid "Invalid untracked files mode '%s'"
4442 msgstr "无效的未追踪文件参数 '%s'"
4443
4411 -#: builtin/commit.c:1111
4444 +#: builtin/commit.c:1105
4445 msgid "--long and -z are incompatible"
4446 msgstr "--long 和 -z 选项不兼容"
4447
4415 -#: builtin/commit.c:1141
4448 +#: builtin/commit.c:1135
4449 msgid "Using both --reset-author and --author does not make sense"
4450 msgstr "同时使用 --reset-author 和 --author 没有意义"
4451
4419 -#: builtin/commit.c:1150
4452 +#: builtin/commit.c:1144
4453 msgid "You have nothing to amend."
4454 msgstr "您没有可修补的提交。"
4455
4423 -#: builtin/commit.c:1153
4456 +#: builtin/commit.c:1147
4457 msgid "You are in the middle of a merge -- cannot amend."
4458 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
4459
4427 -#: builtin/commit.c:1155
4460 +#: builtin/commit.c:1149
4461 msgid "You are in the middle of a cherry-pick -- cannot amend."
4462 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
4463
4431 -#: builtin/commit.c:1158
4464 +#: builtin/commit.c:1152
4465 msgid "Options --squash and --fixup cannot be used together"
4466 msgstr "选项 --squash 和 --fixup 不能同时使用"
4467
4435 -#: builtin/commit.c:1168
4468 +#: builtin/commit.c:1162
4469 msgid "Only one of -c/-C/-F/--fixup can be used."
4470 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
4471
4439 -#: builtin/commit.c:1170
4472 +#: builtin/commit.c:1164
4473 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4474 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
4475
4443 -#: builtin/commit.c:1178
4476 +#: builtin/commit.c:1172
4477 msgid "--reset-author can be used only with -C, -c or --amend."
4478 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
4479
4447 -#: builtin/commit.c:1195
4480 +#: builtin/commit.c:1189
4481 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4482 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
4483
4451 -#: builtin/commit.c:1197
4484 +#: builtin/commit.c:1191
4485 msgid "No paths with --include/--only does not make sense."
4486 msgstr "参数 --include/--only 不跟路径没有意义。"
4487
4455 -#: builtin/commit.c:1199
4488 +#: builtin/commit.c:1193
4489 msgid "Clever... amending the last one with dirty index."
4490 msgstr "聪明... 在索引不干净下修补最后的提交。"
4491
4459 -#: builtin/commit.c:1201
4492 +#: builtin/commit.c:1195
4493 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4494 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项，认为是 --only paths..."
4495
4463 -#: builtin/commit.c:1213 builtin/tag.c:728
4496 +#: builtin/commit.c:1207 builtin/tag.c:728
4497 #, c-format
4498 msgid "Invalid cleanup mode %s"
4499 msgstr "无效的清理模式 %s"
4500
4468 -#: builtin/commit.c:1218
4501 +#: builtin/commit.c:1212
4502 msgid "Paths with -a does not make sense."
4503 msgstr "路径和 -a 选项同时使用没有意义。"
4504
4472 -#: builtin/commit.c:1328 builtin/commit.c:1608
4505 +#: builtin/commit.c:1322 builtin/commit.c:1602
4506 msgid "show status concisely"
4507 msgstr "以简洁的格式显示状态"
4508
4476 -#: builtin/commit.c:1330 builtin/commit.c:1610
4509 +#: builtin/commit.c:1324 builtin/commit.c:1604
4510 msgid "show branch information"
4511 msgstr "显示分支信息"
4512
4480 -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500
4513 +#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509
4514 msgid "machine-readable output"
4515 msgstr "机器可读的输出"
4516
4484 -#: builtin/commit.c:1335 builtin/commit.c:1614
4517 +#: builtin/commit.c:1329 builtin/commit.c:1608
4518 msgid "show status in long format (default)"
4519 msgstr "以长格式显示状态（默认）"
4520
4488 -#: builtin/commit.c:1338 builtin/commit.c:1617
4521 +#: builtin/commit.c:1332 builtin/commit.c:1611
4522 msgid "terminate entries with NUL"
4523 msgstr "条目以NUL字符结尾"
4524
4492 -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980
4525 +#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980
4526 #: builtin/fast-export.c:983 builtin/tag.c:603
4527 msgid "mode"
4528 msgstr "模式"
4529
4497 -#: builtin/commit.c:1341 builtin/commit.c:1620
4530 +#: builtin/commit.c:1335 builtin/commit.c:1614
4531 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4532 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
4533
4501 -#: builtin/commit.c:1344
4534 +#: builtin/commit.c:1338
4535 msgid "show ignored files"
4536 msgstr "显示忽略的文件"
4537
4505 -#: builtin/commit.c:1345 parse-options.h:153
4538 +#: builtin/commit.c:1339 parse-options.h:153
4539 msgid "when"
4540 msgstr "何时"
4541
4509 -#: builtin/commit.c:1346
4542 +#: builtin/commit.c:1340
4543 msgid ""
4544 "ignore changes to submodules, optional when: all, dirty, untracked. "
4545 "(Default: all)"
4546 msgstr ""
4547 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
4548
4516 -#: builtin/commit.c:1348
4549 +#: builtin/commit.c:1342
4550 msgid "list untracked files in columns"
4551 msgstr "以列的方式显示未跟踪的文件"
4552
4520 -#: builtin/commit.c:1435
4553 +#: builtin/commit.c:1429
4554 msgid "couldn't look up newly created commit"
4555 msgstr "无法找到新创建的提交"
4556
4524 -#: builtin/commit.c:1437
4557 +#: builtin/commit.c:1431
4558 msgid "could not parse newly created commit"
4559 msgstr "不能解析新创建的提交"
4560
4528 -#: builtin/commit.c:1482
4561 +#: builtin/commit.c:1476
4562 msgid "detached HEAD"
4563 msgstr "分离头指针"
4564
4565 # 译者：中文字符串拼接，可删除前导空格
4533 -#: builtin/commit.c:1485
4566 +#: builtin/commit.c:1479
4567 msgid " (root-commit)"
4568 msgstr "（根提交）"
4569
4537 -#: builtin/commit.c:1578
4570 +#: builtin/commit.c:1572
4571 msgid "suppress summary after successful commit"
4572 msgstr "提交成功后不显示概述信息"
4573
4541 -#: builtin/commit.c:1579
4574 +#: builtin/commit.c:1573
4575 msgid "show diff in commit message template"
4576 msgstr "在提交说明模板里显示差异"
4577
4545 -#: builtin/commit.c:1581
4578 +#: builtin/commit.c:1575
4579 msgid "Commit message options"
4580 msgstr "提交说明选项"
4581
4549 -#: builtin/commit.c:1582 builtin/tag.c:601
4582 +#: builtin/commit.c:1576 builtin/tag.c:601
4583 msgid "read message from file"
4584 msgstr "从文件中读取提交说明"
4585
4553 -#: builtin/commit.c:1583
4586 +#: builtin/commit.c:1577
4587 msgid "author"
4588 msgstr "作者"
4589
4557 -#: builtin/commit.c:1583
4590 +#: builtin/commit.c:1577
4591 msgid "override author for commit"
4592 msgstr "提交时覆盖作者"
4593
4561 -#: builtin/commit.c:1584 builtin/gc.c:275
4594 +#: builtin/commit.c:1578 builtin/gc.c:275
4595 msgid "date"
4596 msgstr "日期"
4597
4565 -#: builtin/commit.c:1584
4598 +#: builtin/commit.c:1578
4599 msgid "override date for commit"
4600 msgstr "提交时覆盖日期"
4601
4569 -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391
4602 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391
4603 #: builtin/notes.c:554 builtin/tag.c:599
4604 msgid "message"
4605 msgstr "说明"
4606
4574 -#: builtin/commit.c:1585
4607 +#: builtin/commit.c:1579
4608 msgid "commit message"
4609 msgstr "提交说明"
4610
4578 -#: builtin/commit.c:1586
4611 +#: builtin/commit.c:1580
4612 msgid "reuse and edit message from specified commit"
4613 msgstr "重用并编辑指定提交的提交说明"
4614
4582 -#: builtin/commit.c:1587
4615 +#: builtin/commit.c:1581
4616 msgid "reuse message from specified commit"
4617 msgstr "重用指定提交的提交说明"
4618
4586 -#: builtin/commit.c:1588
4619 +#: builtin/commit.c:1582
4620 msgid "use autosquash formatted message to fixup specified commit"
4621 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
4622
4590 -#: builtin/commit.c:1589
4623 +#: builtin/commit.c:1583
4624 msgid "use autosquash formatted message to squash specified commit"
4625 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
4626
4594 -#: builtin/commit.c:1590
4627 +#: builtin/commit.c:1584
4628 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4629 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
4630
4598 -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86
4631 +#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86
4632 msgid "add Signed-off-by:"
4633 msgstr "添加 Signed-off-by: 签名"
4634
4602 -#: builtin/commit.c:1592
4635 +#: builtin/commit.c:1586
4636 msgid "use specified template file"
4637 msgstr "使用指定的模板文件"
4638
4606 -#: builtin/commit.c:1593
4639 +#: builtin/commit.c:1587
4640 msgid "force edit of commit"
4641 msgstr "强制编辑提交"
4642
4643 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）
4611 -#: builtin/commit.c:1594
4644 +#: builtin/commit.c:1588
4645 msgid "default"
4646 msgstr "default"
4647
4615 -#: builtin/commit.c:1594 builtin/tag.c:604
4648 +#: builtin/commit.c:1588 builtin/tag.c:604
4649 msgid "how to strip spaces and #comments from message"
4650 msgstr "设置如何删除提交说明里的空格和#注释"
4651
4619 -#: builtin/commit.c:1595
4652 +#: builtin/commit.c:1589
4653 msgid "include status in commit message template"
4654 msgstr "在提交说明模板里包含状态信息"
4655
4623 -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92
4656 +#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92
4657 #: builtin/tag.c:605
4658 msgid "key-id"
4659 msgstr "key-id"
4660
4628 -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93
4661 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93
4662 msgid "GPG sign commit"
4663 msgstr "GPG 提交签名"
4664
4632 -#: builtin/commit.c:1600
4665 +#: builtin/commit.c:1594
4666 msgid "Commit contents options"
4667 msgstr "提交内容选项"
4668
4636 -#: builtin/commit.c:1601
4669 +#: builtin/commit.c:1595
4670 msgid "commit all changed files"
4671 msgstr "提交所有改动的文件"
4672
4640 -#: builtin/commit.c:1602
4673 +#: builtin/commit.c:1596
4674 msgid "add specified files to index for commit"
4675 msgstr "添加指定的文件到索引区等待提交"
4676
4644 -#: builtin/commit.c:1603
4677 +#: builtin/commit.c:1597
4678 msgid "interactively add files"
4679 msgstr "交互式添加文件"
4680
4648 -#: builtin/commit.c:1604
4681 +#: builtin/commit.c:1598
4682 msgid "interactively add changes"
4683 msgstr "交互式添加变更"
4684
4652 -#: builtin/commit.c:1605
4685 +#: builtin/commit.c:1599
4686 msgid "commit only specified files"
4687 msgstr "只提交指定的文件"
4688
4656 -#: builtin/commit.c:1606
4689 +#: builtin/commit.c:1600
4690 msgid "bypass pre-commit hook"
4691 msgstr "绕过 pre-commit 钩子"
4692
4660 -#: builtin/commit.c:1607
4693 +#: builtin/commit.c:1601
4694 msgid "show what would be committed"
4695 msgstr "显示将要提交的内容"
4696
4664 -#: builtin/commit.c:1618
4697 +#: builtin/commit.c:1612
4698 msgid "amend previous commit"
4699 msgstr "修改先前的提交"
4700
4668 -#: builtin/commit.c:1619
4701 +#: builtin/commit.c:1613
4702 msgid "bypass post-rewrite hook"
4703 msgstr "绕过 post-rewrite 钩子"
4704
4672 -#: builtin/commit.c:1624
4705 +#: builtin/commit.c:1618
4706 msgid "ok to record an empty change"
4707 msgstr "允许一个空提交"
4708
4676 -#: builtin/commit.c:1626
4709 +#: builtin/commit.c:1620
4710 msgid "ok to record a change with an empty message"
4711 msgstr "允许空的提交说明"
4712
4680 -#: builtin/commit.c:1655
4713 +#: builtin/commit.c:1649
4714 msgid "could not parse HEAD commit"
4715 msgstr "不能解析 HEAD 提交"
4716
4684 -#: builtin/commit.c:1694 builtin/merge.c:519
4717 +#: builtin/commit.c:1688 builtin/merge.c:519
4718 #, c-format
4719 msgid "could not open '%s' for reading"
4720 msgstr "不能为读入打开 '%s'"
4721
4689 -#: builtin/commit.c:1701
4722 +#: builtin/commit.c:1695
4723 #, c-format
4724 msgid "Corrupt MERGE_HEAD file (%s)"
4725 msgstr "损坏的 MERGE_HEAD 文件（%s）"
4726
4694 -#: builtin/commit.c:1708
4727 +#: builtin/commit.c:1702
4728 msgid "could not read MERGE_MODE"
4729 msgstr "不能读取 MERGE_MODE"
4730
4698 -#: builtin/commit.c:1727
4731 +#: builtin/commit.c:1721
4732 #, c-format
4733 msgid "could not read commit message: %s"
4734 msgstr "不能读取提交说明：%s"
4735
4703 -#: builtin/commit.c:1738
4736 +#: builtin/commit.c:1732
4737 #, c-format
4738 msgid "Aborting commit; you did not edit the message.\n"
4739 msgstr "终止提交；您未更改来自模版的提交说明。\n"
4740
4708 -#: builtin/commit.c:1743
4741 +#: builtin/commit.c:1737
4742 #, c-format
4743 msgid "Aborting commit due to empty commit message.\n"
4744 msgstr "终止提交因为提交说明为空。\n"
4745
4713 -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876
4746 +#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876
4747 msgid "failed to write commit object"
4748 msgstr "无法写提交对象"
4749
4717 -#: builtin/commit.c:1791
4750 +#: builtin/commit.c:1785
4751 msgid ""
4752 "Repository has been updated, but unable to write\n"
4753 "new_index file. Check that disk is not full and quota is\n"
@@ -4724,8 +4757,8 @@ msgstr ""
4757 "或磁盘配额已耗尽，然后执行 \"git reset HEAD\" 恢复。"
4758
4759 #: builtin/config.c:8
4727 -msgid "git config [options]"
4728 -msgstr "git config [选项]"
4760 +msgid "git config [<options>]"
4761 +msgstr "git config [<选项>]"
4762
4763 #: builtin/config.c:53
4764 msgid "Config file location"
@@ -4880,12 +4913,12 @@ msgid "print sizes in human readable format"
4913 msgstr "以用户可读的格式显示大小"
4914
4915 #: builtin/describe.c:17
4883 -msgid "git describe [options] <commit-ish>*"
4884 -msgstr "git describe [选项] <提交号>*"
4916 +msgid "git describe [<options>] [<commit-ish>...]"
4917 +msgstr "git describe [<选项>] [<提交号>...]"
4918
4919 #: builtin/describe.c:18
4887 -msgid "git describe [options] --dirty"
4888 -msgstr "git describe [选项] --dirty"
4920 +msgid "git describe [<options>] --dirty"
4921 +msgstr "git describe [<选项>] --dirty"
4922
4923 #: builtin/describe.c:217
4924 #, c-format
@@ -5100,179 +5133,179 @@ msgstr "对导出的引用应用引用表达式"
5133 msgid "anonymize output"
5134 msgstr "匿名输出"
5135
5103 -#: builtin/fetch.c:20
5136 +#: builtin/fetch.c:19
5137 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
5138 msgstr "git fetch [<选项>] [<版本库> [<引用规则>...]]"
5139
5107 -#: builtin/fetch.c:21
5140 +#: builtin/fetch.c:20
5141 msgid "git fetch [<options>] <group>"
5142 msgstr "git fetch [<选项>] <组>"
5143
5111 -#: builtin/fetch.c:22
5144 +#: builtin/fetch.c:21
5145 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
5146 msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"
5147
5115 -#: builtin/fetch.c:23
5148 +#: builtin/fetch.c:22
5149 msgid "git fetch --all [<options>]"
5150 msgstr "git fetch --all [<选项>]"
5151
5119 -#: builtin/fetch.c:90
5152 +#: builtin/fetch.c:89
5153 msgid "fetch from all remotes"
5154 msgstr "从所有的远程抓取"
5155
5123 -#: builtin/fetch.c:92
5156 +#: builtin/fetch.c:91
5157 msgid "append to .git/FETCH_HEAD instead of overwriting"
5158 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
5159
5127 -#: builtin/fetch.c:94
5160 +#: builtin/fetch.c:93
5161 msgid "path to upload pack on remote end"
5162 msgstr "上传包到远程的路径"
5163
5131 -#: builtin/fetch.c:95
5164 +#: builtin/fetch.c:94
5165 msgid "force overwrite of local branch"
5166 msgstr "强制覆盖本地分支"
5167
5135 -#: builtin/fetch.c:97
5168 +#: builtin/fetch.c:96
5169 msgid "fetch from multiple remotes"
5170 msgstr "从多个远程抓取"
5171
5139 -#: builtin/fetch.c:99
5172 +#: builtin/fetch.c:98
5173 msgid "fetch all tags and associated objects"
5174 msgstr "抓取所有的 tags 和关联对象"
5175
5143 -#: builtin/fetch.c:101
5176 +#: builtin/fetch.c:100
5177 msgid "do not fetch all tags (--no-tags)"
5178 msgstr "不抓取任何 tags (--no-tags)"
5179
5147 -#: builtin/fetch.c:103
5180 +#: builtin/fetch.c:102
5181 msgid "prune remote-tracking branches no longer on remote"
5182 msgstr "清除远程已经不存在的分支的跟踪分支"
5183
5184 # 译者：可选值，不能翻译
5152 -#: builtin/fetch.c:104
5185 +#: builtin/fetch.c:103
5186 msgid "on-demand"
5187 msgstr "on-demand"
5188
5156 -#: builtin/fetch.c:105
5189 +#: builtin/fetch.c:104
5190 msgid "control recursive fetching of submodules"
5191 msgstr "控制子模组的递归抓取"
5192
5160 -#: builtin/fetch.c:109
5193 +#: builtin/fetch.c:108
5194 msgid "keep downloaded pack"
5195 msgstr "保持下载包"
5196
5164 -#: builtin/fetch.c:111
5197 +#: builtin/fetch.c:110
5198 msgid "allow updating of HEAD ref"
5199 msgstr "允许更新 HEAD 引用"
5200
5168 -#: builtin/fetch.c:114
5201 +#: builtin/fetch.c:113
5202 msgid "deepen history of shallow clone"
5203 msgstr "深化浅克隆的历史"
5204
5172 -#: builtin/fetch.c:116
5205 +#: builtin/fetch.c:115
5206 msgid "convert to a complete repository"
5207 msgstr "转换为一个完整的版本库"
5208
5176 -#: builtin/fetch.c:118 builtin/log.c:1208
5209 +#: builtin/fetch.c:117 builtin/log.c:1208
5210 msgid "dir"
5211 msgstr "目录"
5212
5180 -#: builtin/fetch.c:119
5213 +#: builtin/fetch.c:118
5214 msgid "prepend this to submodule path output"
5215 msgstr "在子模组路径输出的前面加上此目录"
5216
5184 -#: builtin/fetch.c:122
5217 +#: builtin/fetch.c:121
5218 msgid "default mode for recursion"
5219 msgstr "递归的默认模式"
5220
5188 -#: builtin/fetch.c:124
5221 +#: builtin/fetch.c:123
5222 msgid "accept refs that update .git/shallow"
5223 msgstr "接受更新 .git/shallow 的引用"
5224
5192 -#: builtin/fetch.c:125
5225 +#: builtin/fetch.c:124
5226 msgid "refmap"
5227 msgstr "引用映射"
5228
5196 -#: builtin/fetch.c:126
5229 +#: builtin/fetch.c:125
5230 msgid "specify fetch refmap"
5231 msgstr "指定获取操作的引用映射"
5232
5200 -#: builtin/fetch.c:376
5233 +#: builtin/fetch.c:375
5234 msgid "Couldn't find remote ref HEAD"
5235 msgstr "无法发现远程 HEAD 引用"
5236
5204 -#: builtin/fetch.c:454
5237 +#: builtin/fetch.c:455
5238 #, c-format
5239 msgid "object %s not found"
5240 msgstr "对象 %s 未发现"
5241
5209 -#: builtin/fetch.c:459
5242 +#: builtin/fetch.c:460
5243 msgid "[up to date]"
5244 msgstr "[最新]"
5245
5213 -#: builtin/fetch.c:473
5246 +#: builtin/fetch.c:474
5247 #, c-format
5248 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
5249 msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"
5250
5218 -#: builtin/fetch.c:474 builtin/fetch.c:560
5251 +#: builtin/fetch.c:475 builtin/fetch.c:561
5252 msgid "[rejected]"
5253 msgstr "[已拒绝]"
5254
5222 -#: builtin/fetch.c:485
5255 +#: builtin/fetch.c:486
5256 msgid "[tag update]"
5257 msgstr "[tag更新]"
5258
5259 # 译者：注意保持前导空格
5227 -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540
5260 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541
5261 msgid " (unable to update local ref)"
5262 msgstr " （不能更新本地引用）"
5263
5231 -#: builtin/fetch.c:505
5264 +#: builtin/fetch.c:506
5265 msgid "[new tag]"
5266 msgstr "[新tag]"
5267
5235 -#: builtin/fetch.c:508
5268 +#: builtin/fetch.c:509
5269 msgid "[new branch]"
5270 msgstr "[新分支]"
5271
5239 -#: builtin/fetch.c:511
5272 +#: builtin/fetch.c:512
5273 msgid "[new ref]"
5274 msgstr "[新引用]"
5275
5243 -#: builtin/fetch.c:556
5276 +#: builtin/fetch.c:557
5277 msgid "unable to update local ref"
5278 msgstr "不能更新本地引用"
5279
5247 -#: builtin/fetch.c:556
5280 +#: builtin/fetch.c:557
5281 msgid "forced update"
5282 msgstr "强制更新"
5283
5251 -#: builtin/fetch.c:562
5284 +#: builtin/fetch.c:563
5285 msgid "(non-fast-forward)"
5286 msgstr "（非快进式）"
5287
5255 -#: builtin/fetch.c:595 builtin/fetch.c:828
5288 +#: builtin/fetch.c:596 builtin/fetch.c:829
5289 #, c-format
5290 msgid "cannot open %s: %s\n"
5291 msgstr "无法打开 %s：%s\n"
5292
5260 -#: builtin/fetch.c:604
5293 +#: builtin/fetch.c:605
5294 #, c-format
5295 msgid "%s did not send all necessary objects\n"
5296 msgstr "%s 未发送所有必须的对象\n"
5297
5265 -#: builtin/fetch.c:622
5298 +#: builtin/fetch.c:623
5299 #, c-format
5300 msgid "reject %s because shallow roots are not allowed to be updated"
5301 msgstr "拒绝 %s 因为浅克隆不允许被更新"
5302
5270 -#: builtin/fetch.c:710 builtin/fetch.c:793
5303 +#: builtin/fetch.c:711 builtin/fetch.c:794
5304 #, c-format
5305 msgid "From %.*s\n"
5306 msgstr "来自 %.*s\n"
5307
5275 -#: builtin/fetch.c:721
5308 +#: builtin/fetch.c:722
5309 #, c-format
5310 msgid ""
5311 "some local refs could not be updated; try running\n"
@@ -5282,93 +5315,94 @@ msgstr ""
5315 " 'git remote prune %s' 来删除旧的、有冲突的分支"
5316
5317 # 译者：注意保持前导空格
5285 -#: builtin/fetch.c:773
5318 +#: builtin/fetch.c:774
5319 #, c-format
5320 msgid " (%s will become dangling)"
5321 msgstr " （%s 将成为摇摆状态）"
5322
5323 # 译者：注意保持前导空格
5291 -#: builtin/fetch.c:774
5324 +#: builtin/fetch.c:775
5325 #, c-format
5326 msgid " (%s has become dangling)"
5327 msgstr " （%s 已成为摇摆状态）"
5328
5296 -#: builtin/fetch.c:798
5329 +#: builtin/fetch.c:799
5330 msgid "[deleted]"
5331 msgstr "[已删除]"
5332
5300 -#: builtin/fetch.c:799 builtin/remote.c:1060
5333 +#: builtin/fetch.c:800 builtin/remote.c:1060
5334 msgid "(none)"
5335 msgstr "（无）"
5336
5304 -#: builtin/fetch.c:818
5337 +#: builtin/fetch.c:819
5338 #, c-format
5339 msgid "Refusing to fetch into current branch %s of non-bare repository"
5340 msgstr "拒绝获取到非纯版本库的当前分支 %s"
5341
5309 -#: builtin/fetch.c:837
5342 +#: builtin/fetch.c:838
5343 #, c-format
5344 msgid "Option \"%s\" value \"%s\" is not valid for %s"
5345 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
5346
5314 -#: builtin/fetch.c:840
5347 +#: builtin/fetch.c:841
5348 #, c-format
5349 msgid "Option \"%s\" is ignored for %s\n"
5350 msgstr "选项 \"%s\" 为 %s 所忽略\n"
5351
5319 -#: builtin/fetch.c:896
5352 +#: builtin/fetch.c:897
5353 #, c-format
5354 msgid "Don't know how to fetch from %s"
5355 msgstr "不知道如何从 %s 获取"
5356
5324 -#: builtin/fetch.c:1058
5357 +#: builtin/fetch.c:1059
5358 #, c-format
5359 msgid "Fetching %s\n"
5360 msgstr "正在获取 %s\n"
5361
5329 -#: builtin/fetch.c:1060 builtin/remote.c:90
5362 +#: builtin/fetch.c:1061 builtin/remote.c:90
5363 #, c-format
5364 msgid "Could not fetch %s"
5365 msgstr "不能获取 %s"
5366
5334 -#: builtin/fetch.c:1078
5367 +#: builtin/fetch.c:1079
5368 msgid ""
5369 "No remote repository specified. Please, specify either a URL or a\n"
5370 "remote name from which new revisions should be fetched."
5371 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"
5372
5340 -#: builtin/fetch.c:1101
5373 +#: builtin/fetch.c:1102
5374 msgid "You need to specify a tag name."
5375 msgstr "您需要指定一个 tag 名称。"
5376
5344 -#: builtin/fetch.c:1143
5377 +#: builtin/fetch.c:1144
5378 msgid "--depth and --unshallow cannot be used together"
5379 msgstr "--depth 和 --unshallow 不能同时使用"
5380
5348 -#: builtin/fetch.c:1145
5381 +#: builtin/fetch.c:1146
5382 msgid "--unshallow on a complete repository does not make sense"
5383 msgstr "对于一个完整的版本库，参数 --unshallow 没有意义"
5384
5352 -#: builtin/fetch.c:1168
5385 +#: builtin/fetch.c:1169
5386 msgid "fetch --all does not take a repository argument"
5387 msgstr "fetch --all 不能带一个版本库参数"
5388
5356 -#: builtin/fetch.c:1170
5389 +#: builtin/fetch.c:1171
5390 msgid "fetch --all does not make sense with refspecs"
5391 msgstr "fetch --all 带引用规则没有任何意义"
5392
5360 -#: builtin/fetch.c:1181
5393 +#: builtin/fetch.c:1182
5394 #, c-format
5395 msgid "No such remote or remote group: %s"
5396 msgstr "没有这样的远程或远程组：%s"
5397
5365 -#: builtin/fetch.c:1189
5398 +#: builtin/fetch.c:1190
5399 msgid "Fetching a group and specifying refspecs does not make sense"
5400 msgstr "获取组并指定引用规则没有意义"
5401
5402 #: builtin/fmt-merge-msg.c:13
5370 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5371 -msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>]|--no-log] [--file <文件>]"
5403 +msgid ""
5404 +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
5405 +msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
5406
5407 #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
5408 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
@@ -5397,51 +5431,51 @@ msgstr "使用 <文本> 作为提交说明的开始"
5431 msgid "file to read from"
5432 msgstr "从文件中读取"
5433
5400 -#: builtin/for-each-ref.c:676
5434 +#: builtin/for-each-ref.c:675
5435 msgid "unable to parse format"
5436 msgstr "不能解析格式"
5437
5404 -#: builtin/for-each-ref.c:1064
5405 -msgid "git for-each-ref [options] [<pattern>]"
5406 -msgstr "git for-each-ref [选项] [<模式>]"
5438 +#: builtin/for-each-ref.c:1063
5439 +msgid "git for-each-ref [<options>] [<pattern>]"
5440 +msgstr "git for-each-ref [<选项>] [<模式>]"
5441
5408 -#: builtin/for-each-ref.c:1079
5442 +#: builtin/for-each-ref.c:1078
5443 msgid "quote placeholders suitably for shells"
5444 msgstr "引用占位符适用于 shells"
5445
5412 -#: builtin/for-each-ref.c:1081
5446 +#: builtin/for-each-ref.c:1080
5447 msgid "quote placeholders suitably for perl"
5448 msgstr "引用占位符适用于 perl"
5449
5416 -#: builtin/for-each-ref.c:1083
5450 +#: builtin/for-each-ref.c:1082
5451 msgid "quote placeholders suitably for python"
5452 msgstr "引用占位符适用于 python"
5453
5420 -#: builtin/for-each-ref.c:1085
5454 +#: builtin/for-each-ref.c:1084
5455 msgid "quote placeholders suitably for Tcl"
5456 msgstr "引用占位符适用于 Tcl"
5457
5424 -#: builtin/for-each-ref.c:1088
5458 +#: builtin/for-each-ref.c:1087
5459 msgid "show only <n> matched refs"
5460 msgstr "只显示 <n> 个匹配的引用"
5461
5428 -#: builtin/for-each-ref.c:1089 builtin/replace.c:438
5462 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438
5463 msgid "format"
5464 msgstr "格式"
5465
5432 -#: builtin/for-each-ref.c:1089
5466 +#: builtin/for-each-ref.c:1088
5467 msgid "format to use for the output"
5468 msgstr "输出格式"
5469
5436 -#: builtin/for-each-ref.c:1090
5470 +#: builtin/for-each-ref.c:1089
5471 msgid "key"
5472 msgstr "key"
5473
5440 -#: builtin/for-each-ref.c:1091
5474 +#: builtin/for-each-ref.c:1090
5475 msgid "field name to sort on"
5476 msgstr "排序的字段名"
5477
5444 -#: builtin/fsck.c:147 builtin/prune.c:136
5478 +#: builtin/fsck.c:147 builtin/prune.c:137
5479 msgid "Checking connectivity"
5480 msgstr "检查连接中"
5481
@@ -5450,8 +5484,8 @@ msgid "Checking object directories"
5484 msgstr "检查对象目录中"
5485
5486 #: builtin/fsck.c:603
5453 -msgid "git fsck [options] [<object>...]"
5454 -msgstr "git fsck [选项] [<对象>...]"
5487 +msgid "git fsck [<options>] [<object>...]"
5488 +msgstr "git fsck [<选项>] [<对象>...]"
5489
5490 #: builtin/fsck.c:609
5491 msgid "show unreachable objects"
@@ -5498,8 +5532,8 @@ msgid "Checking objects"
5532 msgstr "检查对象中"
5533
5534 #: builtin/gc.c:24
5501 -msgid "git gc [options]"
5502 -msgstr "git gc [选项]"
5535 +msgid "git gc [<options>]"
5536 +msgstr "git gc [<选项>]"
5537
5538 #: builtin/gc.c:79
5539 #, c-format
@@ -5555,8 +5589,8 @@ msgid ""
5589 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
5590
5591 #: builtin/grep.c:23
5558 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
5559 -msgstr "git grep [选项] [-e] <模式> [<版本>...] [[--] <路径>...]"
5592 +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
5593 +msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
5594
5595 #: builtin/grep.c:218
5596 #, c-format
@@ -5597,8 +5631,8 @@ msgid "search in both tracked and untracked files"
5631 msgstr "在跟踪和未跟踪的文件中搜索"
5632
5633 #: builtin/grep.c:644
5600 -msgid "search also in ignored files"
5601 -msgstr "也在忽略的文件中搜索"
5634 +msgid "ignore files specified via '.gitignore'"
5635 +msgstr "忽略 '.gitignore' 包含的文件"
5636
5637 #: builtin/grep.c:647
5638 msgid "show non-matching lines"
@@ -5782,17 +5816,17 @@ msgstr "同时给出了 --cached 和树对象。"
5816
5817 #: builtin/hash-object.c:82
5818 msgid ""
5785 -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5786 -"<file>..."
5819 +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
5820 +"[--] <file>..."
5821 msgstr ""
5788 -"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] "
5789 -"<文件>..."
5822 +"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
5823 +"[--] <文件>..."
5824
5825 #: builtin/hash-object.c:83
5826 msgid "git hash-object --stdin-paths < <list-of-paths>"
5827 msgstr "git hash-object --stdin-paths < <路径列表>"
5828
5795 -#: builtin/hash-object.c:94 builtin/tag.c:610
5829 +#: builtin/hash-object.c:94 builtin/tag.c:612
5830 msgid "type"
5831 msgstr "类型"
5832
@@ -5842,8 +5876,8 @@ msgid "show info page"
5876 msgstr "显示 info 手册"
5877
5878 #: builtin/help.c:52
5845 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5846 -msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"
5879 +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
5880 +msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
5881
5882 #: builtin/help.c:64
5883 #, c-format
@@ -6051,8 +6085,8 @@ msgstr "解压缩严重的不一致"
6085 msgid "SHA1 COLLISION FOUND WITH %s !"
6086 msgstr "发现 %s 出现 SHA1 冲突！"
6087
6054 -#: builtin/index-pack.c:689 builtin/pack-objects.c:164
6055 -#: builtin/pack-objects.c:256
6088 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162
6089 +#: builtin/pack-objects.c:254
6090 #, c-format
6091 msgid "unable to read %s"
6092 msgstr "不能读 %s"
@@ -6139,97 +6173,97 @@ msgid_plural "pack has %d unresolved deltas"
6173 msgstr[0] "包有 %d 个未解决的 delta"
6174 msgstr[1] "包有 %d 个未解决的 delta"
6175
6142 -#: builtin/index-pack.c:1220
6176 +#: builtin/index-pack.c:1219
6177 #, c-format
6178 msgid "unable to deflate appended object (%d)"
6179 msgstr "不能压缩附加对象（%d）"
6180
6147 -#: builtin/index-pack.c:1299
6181 +#: builtin/index-pack.c:1298
6182 #, c-format
6183 msgid "local object %s is corrupt"
6184 msgstr "本地对象 %s 已损坏"
6185
6152 -#: builtin/index-pack.c:1323
6186 +#: builtin/index-pack.c:1322
6187 msgid "error while closing pack file"
6188 msgstr "关闭包文件时出错"
6189
6156 -#: builtin/index-pack.c:1336
6190 +#: builtin/index-pack.c:1335
6191 #, c-format
6192 msgid "cannot write keep file '%s'"
6193 msgstr "无法写保留文件 '%s'"
6194
6161 -#: builtin/index-pack.c:1344
6195 +#: builtin/index-pack.c:1343
6196 #, c-format
6197 msgid "cannot close written keep file '%s'"
6198 msgstr "无法关闭保留文件 '%s'"
6199
6166 -#: builtin/index-pack.c:1357
6200 +#: builtin/index-pack.c:1356
6201 msgid "cannot store pack file"
6202 msgstr "无法存储包文件"
6203
6170 -#: builtin/index-pack.c:1368
6204 +#: builtin/index-pack.c:1367
6205 msgid "cannot store index file"
6206 msgstr "无法存储索引文件"
6207
6174 -#: builtin/index-pack.c:1401
6208 +#: builtin/index-pack.c:1400
6209 #, c-format
6210 msgid "bad pack.indexversion=%<PRIu32>"
6211 msgstr "坏的 pack.indexversion=%<PRIu32>"
6212
6179 -#: builtin/index-pack.c:1407
6213 +#: builtin/index-pack.c:1406
6214 #, c-format
6215 msgid "invalid number of threads specified (%d)"
6216 msgstr "指定的线程数无效（%d）"
6217
6184 -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590
6218 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589
6219 #, c-format
6220 msgid "no threads support, ignoring %s"
6221 msgstr "没有线程支持，忽略 %s"
6222
6189 -#: builtin/index-pack.c:1469
6223 +#: builtin/index-pack.c:1468
6224 #, c-format
6225 msgid "Cannot open existing pack file '%s'"
6226 msgstr "无法打开现存包文件 '%s'"
6227
6194 -#: builtin/index-pack.c:1471
6228 +#: builtin/index-pack.c:1470
6229 #, c-format
6230 msgid "Cannot open existing pack idx file for '%s'"
6231 msgstr "无法为 %s 打开包索引文件"
6232
6199 -#: builtin/index-pack.c:1518
6233 +#: builtin/index-pack.c:1517
6234 #, c-format
6235 msgid "non delta: %d object"
6236 msgid_plural "non delta: %d objects"
6237 msgstr[0] "非 delta：%d 个对象"
6238 msgstr[1] "非 delta：%d 个对象"
6239
6206 -#: builtin/index-pack.c:1525
6240 +#: builtin/index-pack.c:1524
6241 #, c-format
6242 msgid "chain length = %d: %lu object"
6243 msgid_plural "chain length = %d: %lu objects"
6244 msgstr[0] "链长 = %d: %lu 对象"
6245 msgstr[1] "链长 = %d: %lu 对象"
6246
6213 -#: builtin/index-pack.c:1554
6247 +#: builtin/index-pack.c:1553
6248 msgid "Cannot come back to cwd"
6249 msgstr "无法返回当前工作目录"
6250
6217 -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605
6218 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621
6251 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604
6252 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620
6253 #, c-format
6254 msgid "bad %s"
6255 msgstr "错误选项 %s"
6256
6223 -#: builtin/index-pack.c:1635
6257 +#: builtin/index-pack.c:1634
6258 msgid "--fix-thin cannot be used without --stdin"
6259 msgstr "--fix-thin 不能和 --stdin 同时使用"
6260
6227 -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648
6261 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647
6262 #, c-format
6263 msgid "packfile name '%s' does not end with '.pack'"
6264 msgstr "包名 '%s' 没有以 '.pack' 结尾"
6265
6232 -#: builtin/index-pack.c:1656
6266 +#: builtin/index-pack.c:1655
6267 msgid "--verify with no packfile name given"
6268 msgstr "--verify 没有提供包名参数"
6269
@@ -6342,10 +6376,10 @@ msgstr "共享"
6376 #: builtin/init-db.c:475
6377 msgid ""
6378 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6345 -"shared[=<permissions>]] [directory]"
6379 +"shared[=<permissions>]] [<directory>]"
6380 msgstr ""
6381 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
6348 -"[目录]"
6382 +"[<目录>]"
6383
6384 #: builtin/init-db.c:498
6385 msgid "permissions"
@@ -6406,8 +6440,8 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]"
6440 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
6441
6442 #: builtin/log.c:42
6409 -msgid "git show [options] <object>..."
6410 -msgstr "git show [选项] <对象>..."
6443 +msgid "git show [<options>] <object>..."
6444 +msgstr "git show [<选项>] <对象>..."
6445
6446 #: builtin/log.c:81
6447 #, c-format
@@ -6485,8 +6519,8 @@ msgid "insane in-reply-to: %s"
6519 msgstr "不正常的 in-reply-to：%s"
6520
6521 #: builtin/log.c:1026
6488 -msgid "git format-patch [options] [<since> | <revision range>]"
6489 -msgstr "git format-patch [选项] [<从> | <版本范围>]"
6522 +msgid "git format-patch [<options>] [<since> | <revision-range>]"
6523 +msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
6524
6525 #: builtin/log.c:1071
6526 msgid "Two output directories?"
@@ -6682,95 +6716,95 @@ msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
6716 msgid "Unknown commit %s"
6717 msgstr "未知提交 %s"
6718
6685 -#: builtin/ls-files.c:401
6686 -msgid "git ls-files [options] [<file>...]"
6687 -msgstr "git ls-files [选项] [<文件>...]"
6719 +#: builtin/ls-files.c:358
6720 +msgid "git ls-files [<options>] [<file>...]"
6721 +msgstr "git ls-files [<选项>] [<文件>...]"
6722
6689 -#: builtin/ls-files.c:458
6723 +#: builtin/ls-files.c:415
6724 msgid "identify the file status with tags"
6725 msgstr "用标签标识文件的状态"
6726
6693 -#: builtin/ls-files.c:460
6727 +#: builtin/ls-files.c:417
6728 msgid "use lowercase letters for 'assume unchanged' files"
6729 msgstr "使用小写字母表示 '假设未改变的' 文件"
6730
6697 -#: builtin/ls-files.c:462
6731 +#: builtin/ls-files.c:419
6732 msgid "show cached files in the output (default)"
6733 msgstr "显示缓存的文件（默认）"
6734
6701 -#: builtin/ls-files.c:464
6735 +#: builtin/ls-files.c:421
6736 msgid "show deleted files in the output"
6737 msgstr "显示已删除的文件"
6738
6705 -#: builtin/ls-files.c:466
6739 +#: builtin/ls-files.c:423
6740 msgid "show modified files in the output"
6741 msgstr "显示已修改的文件"
6742
6709 -#: builtin/ls-files.c:468
6743 +#: builtin/ls-files.c:425
6744 msgid "show other files in the output"
6745 msgstr "显示其它文件"
6746
6713 -#: builtin/ls-files.c:470
6747 +#: builtin/ls-files.c:427
6748 msgid "show ignored files in the output"
6749 msgstr "显示忽略的文件"
6750
6717 -#: builtin/ls-files.c:473
6751 +#: builtin/ls-files.c:430
6752 msgid "show staged contents' object name in the output"
6753 msgstr "显示暂存区内容的对象名称"
6754
6721 -#: builtin/ls-files.c:475
6755 +#: builtin/ls-files.c:432
6756 msgid "show files on the filesystem that need to be removed"
6757 msgstr "显示文件系统需要删除的文件"
6758
6725 -#: builtin/ls-files.c:477
6759 +#: builtin/ls-files.c:434
6760 msgid "show 'other' directories' names only"
6761 msgstr "只显示“其他”目录的名称"
6762
6729 -#: builtin/ls-files.c:480
6763 +#: builtin/ls-files.c:437
6764 msgid "don't show empty directories"
6765 msgstr "不显示空目录"
6766
6733 -#: builtin/ls-files.c:483
6767 +#: builtin/ls-files.c:440
6768 msgid "show unmerged files in the output"
6769 msgstr "显示未合并的文件"
6770
6737 -#: builtin/ls-files.c:485
6771 +#: builtin/ls-files.c:442
6772 msgid "show resolve-undo information"
6773 msgstr "显示 resolve-undo 信息"
6774
6741 -#: builtin/ls-files.c:487
6775 +#: builtin/ls-files.c:444
6776 msgid "skip files matching pattern"
6777 msgstr "匹配排除文件的模式"
6778
6745 -#: builtin/ls-files.c:490
6779 +#: builtin/ls-files.c:447
6780 msgid "exclude patterns are read from <file>"
6781 msgstr "从 <文件> 中读取排除模式"
6782
6749 -#: builtin/ls-files.c:493
6783 +#: builtin/ls-files.c:450
6784 msgid "read additional per-directory exclude patterns in <file>"
6785 msgstr "从 <文件> 读取额外的每个目录的排除模式"
6786
6753 -#: builtin/ls-files.c:495
6787 +#: builtin/ls-files.c:452
6788 msgid "add the standard git exclusions"
6789 msgstr "添加标准的 git 排除"
6790
6757 -#: builtin/ls-files.c:498
6791 +#: builtin/ls-files.c:455
6792 msgid "make the output relative to the project top directory"
6793 msgstr "显示相对于顶级目录的文件名"
6794
6761 -#: builtin/ls-files.c:501
6795 +#: builtin/ls-files.c:458
6796 msgid "if any <file> is not in the index, treat this as an error"
6797 msgstr "如果任何 <文件> 都不在索引区，视为错误"
6798
6765 -#: builtin/ls-files.c:502
6799 +#: builtin/ls-files.c:459
6800 msgid "tree-ish"
6801 msgstr "树或提交"
6802
6769 -#: builtin/ls-files.c:503
6803 +#: builtin/ls-files.c:460
6804 msgid "pretend that paths removed since <tree-ish> are still present"
6805 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
6806
6773 -#: builtin/ls-files.c:505
6807 +#: builtin/ls-files.c:462
6808 msgid "show debugging data"
6809 msgstr "显示调试数据"
6810
@@ -6811,12 +6845,12 @@ msgid "list entire tree; not just current directory (implies --full-name)"
6845 msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）"
6846
6847 #: builtin/merge.c:45
6814 -msgid "git merge [options] [<commit>...]"
6815 -msgstr "git merge [选项] [<提交>...]"
6848 +msgid "git merge [<options>] [<commit>...]"
6849 +msgstr "git merge [<选项>] [<提交>...]"
6850
6851 #: builtin/merge.c:46
6818 -msgid "git merge [options] <msg> HEAD <commit>"
6819 -msgstr "git merge [选项] <说明> HEAD <提交>"
6852 +msgid "git merge [<options>] <msg> HEAD <commit>"
6853 +msgstr "git merge [<选项>] <说明> HEAD <提交>"
6854
6855 #: builtin/merge.c:47
6856 msgid "git merge --abort"
@@ -7156,12 +7190,12 @@ msgid "Automatic merge went well; stopped before committing as requested\n"
7190 msgstr "自动合并进展顺利，按要求在提交前停止\n"
7191
7192 #: builtin/merge-base.c:29
7159 -msgid "git merge-base [-a|--all] <commit> <commit>..."
7160 -msgstr "git merge-base [-a|--all] <提交> <提交>..."
7193 +msgid "git merge-base [-a | --all] <commit> <commit>..."
7194 +msgstr "git merge-base [-a | --all] <提交> <提交>..."
7195
7196 #: builtin/merge-base.c:30
7163 -msgid "git merge-base [-a|--all] --octopus <commit>..."
7164 -msgstr "git merge-base [-a|--all] --octopus <提交>..."
7197 +msgid "git merge-base [-a | --all] --octopus <commit>..."
7198 +msgstr "git merge-base [-a | --all] --octopus <提交>..."
7199
7200 #: builtin/merge-base.c:31
7201 msgid "git merge-base --independent <commit>..."
@@ -7197,10 +7231,11 @@ msgstr "查找 <提交> 从<引用>日志的何处分支的"
7231
7232 #: builtin/merge-file.c:8
7233 msgid ""
7200 -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
7201 -"file2"
7234 +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
7235 +"<orig-file> <file2>"
7236 msgstr ""
7203 -"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"
7237 +"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
7238 +"件> <文件2>"
7239
7240 #: builtin/merge-file.c:33
7241 msgid "send results to standard output"
@@ -7231,8 +7266,8 @@ msgid "do not warn about conflicts"
7266 msgstr "不要警告冲突"
7267
7268 #: builtin/merge-file.c:45
7234 -msgid "set labels for file1/orig_file/file2"
7235 -msgstr "为 file1/orig_file/file2 设置标签"
7269 +msgid "set labels for file1/orig-file/file2"
7270 +msgstr "为 文件1/初始文件/文件2 设置标签"
7271
7272 #: builtin/mktree.c:64
7273 msgid "git mktree [-z] [--missing] [--batch]"
@@ -7251,8 +7286,8 @@ msgid "allow creation of more than one tree"
7286 msgstr "允许创建一个以上的树"
7287
7288 #: builtin/mv.c:15
7254 -msgid "git mv [options] <source>... <destination>"
7255 -msgstr "git mv [选项] <源>... <目标>"
7289 +msgid "git mv [<options>] <source>... <destination>"
7290 +msgstr "git mv [<选项>] <源>... <目标>"
7291
7292 #: builtin/mv.c:69
7293 #, c-format
@@ -7337,22 +7372,22 @@ msgstr "%s，源=%s，目标=%s"
7372 msgid "Renaming %s to %s\n"
7373 msgstr "重命名 %s 至 %s\n"
7374
7340 -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355
7375 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359
7376 #, c-format
7377 msgid "renaming '%s' failed"
7378 msgstr "重命名 '%s' 失败"
7379
7380 #: builtin/name-rev.c:255
7346 -msgid "git name-rev [options] <commit>..."
7347 -msgstr "git name-rev [选项] <提交>..."
7381 +msgid "git name-rev [<options>] <commit>..."
7382 +msgstr "git name-rev [<选项>] <提交>..."
7383
7384 #: builtin/name-rev.c:256
7350 -msgid "git name-rev [options] --all"
7351 -msgstr "git name-rev [选项] --all"
7385 +msgid "git name-rev [<options>] --all"
7386 +msgstr "git name-rev [<选项>] --all"
7387
7388 #: builtin/name-rev.c:257
7354 -msgid "git name-rev [options] --stdin"
7355 -msgstr "git name-rev [选项] --stdin"
7389 +msgid "git name-rev [<options>] --stdin"
7390 +msgstr "git name-rev [<选项>] --stdin"
7391
7392 #: builtin/name-rev.c:309
7393 msgid "print only names (no SHA-1)"
@@ -7383,40 +7418,40 @@ msgid "dereference tags in the input (internal use)"
7418 msgstr "反向解析输入中的 tags（内部使用）"
7419
7420 #: builtin/notes.c:24
7386 -msgid "git notes [--ref <notes_ref>] [list [<object>]]"
7421 +msgid "git notes [--ref <notes-ref>] [list [<object>]]"
7422 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
7423
7424 #: builtin/notes.c:25
7425 msgid ""
7391 -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7426 +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
7427 "| (-c | -C) <object>] [<object>]"
7428 msgstr ""
7429 "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
7430 "| (-c | -C) <对象>] [<对象>]"
7431
7432 #: builtin/notes.c:26
7398 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
7433 +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
7434 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
7435
7436 #: builtin/notes.c:27
7437 msgid ""
7403 -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | "
7438 +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
7439 "(-c | -C) <object>] [<object>]"
7440 msgstr ""
7441 "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
7442 "(-c | -C) <对象>] [<对象>]"
7443
7444 #: builtin/notes.c:28
7410 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]"
7445 +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
7446 msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
7447
7448 #: builtin/notes.c:29
7414 -msgid "git notes [--ref <notes_ref>] show [<object>]"
7449 +msgid "git notes [--ref <notes-ref>] show [<object>]"
7450 msgstr "git notes [--ref <注解引用>] show [<对象>]"
7451
7452 #: builtin/notes.c:30
7453 msgid ""
7419 -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
7454 +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
7455 msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
7456
7457 #: builtin/notes.c:31
@@ -7428,15 +7463,15 @@ msgid "git notes merge --abort [-v | -q]"
7463 msgstr "git notes merge --abort [-v | -q]"
7464
7465 #: builtin/notes.c:33
7431 -msgid "git notes [--ref <notes_ref>] remove [<object>...]"
7466 +msgid "git notes [--ref <notes-ref>] remove [<object>...]"
7467 msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
7468
7469 #: builtin/notes.c:34
7435 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
7470 +msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
7471 msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
7472
7473 #: builtin/notes.c:35
7439 -msgid "git notes [--ref <notes_ref>] get-ref"
7474 +msgid "git notes [--ref <notes-ref>] get-ref"
7475 msgstr "git notes [--ref <注解引用>] get-ref"
7476
7477 #: builtin/notes.c:40
@@ -7468,7 +7503,7 @@ msgid "git notes show [<object>]"
7503 msgstr "git notes show [<对象>]"
7504
7505 #: builtin/notes.c:71
7471 -msgid "git notes merge [<options>] <notes_ref>"
7506 +msgid "git notes merge [<options>] <notes-ref>"
7507 msgstr "git notes merge [<选项>] <注解引用>"
7508
7509 #: builtin/notes.c:72
@@ -7699,7 +7734,7 @@ msgid "notes-ref"
7734 msgstr "注解引用"
7735
7736 #: builtin/notes.c:954
7702 -msgid "use notes from <notes_ref>"
7737 +msgid "use notes from <notes-ref>"
7738 msgstr "从 <注解引用> 使用注解"
7739
7740 #: builtin/notes.c:989 builtin/remote.c:1621
@@ -7715,186 +7750,186 @@ msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]"
7750 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7751 msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]"
7752
7718 -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180
7753 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
7754 #, c-format
7755 msgid "deflate error (%d)"
7756 msgstr "压缩错误 (%d)"
7757
7723 -#: builtin/pack-objects.c:773
7758 +#: builtin/pack-objects.c:771
7759 msgid "Writing objects"
7760 msgstr "写入对象中"
7761
7727 -#: builtin/pack-objects.c:1015
7762 +#: builtin/pack-objects.c:1013
7763 msgid "disabling bitmap writing, as some objects are not being packed"
7764 msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
7765
7731 -#: builtin/pack-objects.c:2175
7766 +#: builtin/pack-objects.c:2173
7767 msgid "Compressing objects"
7768 msgstr "压缩对象中"
7769
7735 -#: builtin/pack-objects.c:2572
7770 +#: builtin/pack-objects.c:2570
7771 #, c-format
7772 msgid "unsupported index version %s"
7773 msgstr "不支持的索引版本 %s"
7774
7740 -#: builtin/pack-objects.c:2576
7775 +#: builtin/pack-objects.c:2574
7776 #, c-format
7777 msgid "bad index version '%s'"
7778 msgstr "坏的索引版本 '%s'"
7779
7745 -#: builtin/pack-objects.c:2599
7780 +#: builtin/pack-objects.c:2597
7781 #, c-format
7782 msgid "option %s does not accept negative form"
7783 msgstr "选项 %s 不接受否定格式"
7784
7750 -#: builtin/pack-objects.c:2603
7785 +#: builtin/pack-objects.c:2601
7786 #, c-format
7787 msgid "unable to parse value '%s' for option %s"
7788 msgstr "不能解析选项 %1$s 的值 '%2$s'"
7789
7755 -#: builtin/pack-objects.c:2623
7790 +#: builtin/pack-objects.c:2621
7791 msgid "do not show progress meter"
7792 msgstr "不显示进度表"
7793
7759 -#: builtin/pack-objects.c:2625
7794 +#: builtin/pack-objects.c:2623
7795 msgid "show progress meter"
7796 msgstr "显示进度表"
7797
7763 -#: builtin/pack-objects.c:2627
7798 +#: builtin/pack-objects.c:2625
7799 msgid "show progress meter during object writing phase"
7800 msgstr "在对象写入阶段显示进度表"
7801
7767 -#: builtin/pack-objects.c:2630
7802 +#: builtin/pack-objects.c:2628
7803 msgid "similar to --all-progress when progress meter is shown"
7804 msgstr "当进度表显示时类似于 --all-progress"
7805
7771 -#: builtin/pack-objects.c:2631
7806 +#: builtin/pack-objects.c:2629
7807 msgid "version[,offset]"
7808 msgstr "版本[,偏移]"
7809
7775 -#: builtin/pack-objects.c:2632
7810 +#: builtin/pack-objects.c:2630
7811 msgid "write the pack index file in the specified idx format version"
7812 msgstr "用指定的 idx 格式版本来写包索引文件"
7813
7779 -#: builtin/pack-objects.c:2635
7814 +#: builtin/pack-objects.c:2633
7815 msgid "maximum size of each output pack file"
7816 msgstr "每个输出包的最大尺寸"
7817
7783 -#: builtin/pack-objects.c:2637
7818 +#: builtin/pack-objects.c:2635
7819 msgid "ignore borrowed objects from alternate object store"
7820 msgstr "忽略从替代对象存储里借用对象"
7821
7787 -#: builtin/pack-objects.c:2639
7822 +#: builtin/pack-objects.c:2637
7823 msgid "ignore packed objects"
7824 msgstr "忽略包对象"
7825
7791 -#: builtin/pack-objects.c:2641
7826 +#: builtin/pack-objects.c:2639
7827 msgid "limit pack window by objects"
7828 msgstr "限制打包窗口的对象数"
7829
7795 -#: builtin/pack-objects.c:2643
7830 +#: builtin/pack-objects.c:2641
7831 msgid "limit pack window by memory in addition to object limit"
7832 msgstr "除对象数量限制外设置打包窗口的内存限制"
7833
7799 -#: builtin/pack-objects.c:2645
7834 +#: builtin/pack-objects.c:2643
7835 msgid "maximum length of delta chain allowed in the resulting pack"
7836 msgstr "打包允许的 delta 链的最大长度"
7837
7803 -#: builtin/pack-objects.c:2647
7838 +#: builtin/pack-objects.c:2645
7839 msgid "reuse existing deltas"
7840 msgstr "重用已存在的 deltas"
7841
7807 -#: builtin/pack-objects.c:2649
7842 +#: builtin/pack-objects.c:2647
7843 msgid "reuse existing objects"
7844 msgstr "重用已存在的对象"
7845
7811 -#: builtin/pack-objects.c:2651
7846 +#: builtin/pack-objects.c:2649
7847 msgid "use OFS_DELTA objects"
7848 msgstr "使用 OFS_DELTA 对象"
7849
7815 -#: builtin/pack-objects.c:2653
7850 +#: builtin/pack-objects.c:2651
7851 msgid "use threads when searching for best delta matches"
7852 msgstr "使用线程查询最佳 delta 匹配"
7853
7819 -#: builtin/pack-objects.c:2655
7854 +#: builtin/pack-objects.c:2653
7855 msgid "do not create an empty pack output"
7856 msgstr "不创建空的包输出"
7857
7823 -#: builtin/pack-objects.c:2657
7858 +#: builtin/pack-objects.c:2655
7859 msgid "read revision arguments from standard input"
7860 msgstr "从标准输入读取版本号参数"
7861
7827 -#: builtin/pack-objects.c:2659
7862 +#: builtin/pack-objects.c:2657
7863 msgid "limit the objects to those that are not yet packed"
7864 msgstr "限制那些尚未打包的对象"
7865
7831 -#: builtin/pack-objects.c:2662
7866 +#: builtin/pack-objects.c:2660
7867 msgid "include objects reachable from any reference"
7868 msgstr "包括可以从任何引用访问到的对象"
7869
7835 -#: builtin/pack-objects.c:2665
7870 +#: builtin/pack-objects.c:2663
7871 msgid "include objects referred by reflog entries"
7872 msgstr "包括被引用日志引用到的对象"
7873
7839 -#: builtin/pack-objects.c:2668
7874 +#: builtin/pack-objects.c:2666
7875 msgid "include objects referred to by the index"
7876 msgstr "包括被索引引用到的对象"
7877
7843 -#: builtin/pack-objects.c:2671
7878 +#: builtin/pack-objects.c:2669
7879 msgid "output pack to stdout"
7880 msgstr "输出包到标准输出"
7881
7847 -#: builtin/pack-objects.c:2673
7882 +#: builtin/pack-objects.c:2671
7883 msgid "include tag objects that refer to objects to be packed"
7884 msgstr "包括引用了打包对象的 tag"
7885
7851 -#: builtin/pack-objects.c:2675
7886 +#: builtin/pack-objects.c:2673
7887 msgid "keep unreachable objects"
7888 msgstr "维持不可达的对象"
7889
7855 -#: builtin/pack-objects.c:2676 parse-options.h:140
7890 +#: builtin/pack-objects.c:2674 parse-options.h:140
7891 msgid "time"
7892 msgstr "时间"
7893
7859 -#: builtin/pack-objects.c:2677
7894 +#: builtin/pack-objects.c:2675
7895 msgid "unpack unreachable objects newer than <time>"
7896 msgstr "将比给定 <时间> 新的无法访问的对象解包"
7897
7863 -#: builtin/pack-objects.c:2680
7898 +#: builtin/pack-objects.c:2678
7899 msgid "create thin packs"
7900 msgstr "创建精简包"
7901
7867 -#: builtin/pack-objects.c:2682
7902 +#: builtin/pack-objects.c:2680
7903 msgid "create packs suitable for shallow fetches"
7904 msgstr "创建适合浅克隆版本库获取的包"
7905
7871 -#: builtin/pack-objects.c:2684
7906 +#: builtin/pack-objects.c:2682
7907 msgid "ignore packs that have companion .keep file"
7908 msgstr "忽略配有 .keep 文件的包"
7909
7875 -#: builtin/pack-objects.c:2686
7910 +#: builtin/pack-objects.c:2684
7911 msgid "pack compression level"
7912 msgstr "打包压缩级别"
7913
7879 -#: builtin/pack-objects.c:2688
7914 +#: builtin/pack-objects.c:2686
7915 msgid "do not hide commits by grafts"
7916 msgstr "显示被嫁接隐藏的提交"
7917
7883 -#: builtin/pack-objects.c:2690
7918 +#: builtin/pack-objects.c:2688
7919 msgid "use a bitmap index if available to speed up counting objects"
7920 msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
7921
7887 -#: builtin/pack-objects.c:2692
7922 +#: builtin/pack-objects.c:2690
7923 msgid "write a bitmap index together with the pack index"
7924 msgstr "在建立包索引的同时创建 bitmap 索引"
7925
7891 -#: builtin/pack-objects.c:2783
7926 +#: builtin/pack-objects.c:2781
7927 msgid "Counting objects"
7928 msgstr "对象计数中"
7929
7930 #: builtin/pack-refs.c:6
7896 -msgid "git pack-refs [options]"
7897 -msgstr "git pack-refs [选项]"
7931 +msgid "git pack-refs [<options>]"
7932 +msgstr "git pack-refs [<选项>]"
7933
7934 #: builtin/pack-refs.c:14
7935 msgid "pack everything"
@@ -7905,8 +7940,8 @@ msgid "prune loose refs (default)"
7940 msgstr "清除松散的引用（默认）"
7941
7942 #: builtin/prune-packed.c:7
7908 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7909 -msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"
7943 +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
7944 +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
7945
7946 #: builtin/prune-packed.c:40
7947 msgid "Removing duplicate objects"
@@ -8167,75 +8202,79 @@ msgstr "--mirror 不能和引用规则同时使用"
8202 msgid "--all and --mirror are incompatible"
8203 msgstr "--all 和 --mirror 不兼容"
8204
8170 -#: builtin/push.c:493
8205 +#: builtin/push.c:502
8206 msgid "repository"
8207 msgstr "版本库"
8208
8174 -#: builtin/push.c:494
8209 +#: builtin/push.c:503
8210 msgid "push all refs"
8211 msgstr "推送所有引用"
8212
8178 -#: builtin/push.c:495
8213 +#: builtin/push.c:504
8214 msgid "mirror all refs"
8215 msgstr "镜像所有引用"
8216
8182 -#: builtin/push.c:497
8217 +#: builtin/push.c:506
8218 msgid "delete refs"
8219 msgstr "删除引用"
8220
8186 -#: builtin/push.c:498
8221 +#: builtin/push.c:507
8222 msgid "push tags (can't be used with --all or --mirror)"
8223 msgstr "推送 tags（不能使用 --all or --mirror）"
8224
8190 -#: builtin/push.c:501
8225 +#: builtin/push.c:510
8226 msgid "force updates"
8227 msgstr "强制更新"
8228
8194 -#: builtin/push.c:503
8229 +#: builtin/push.c:512
8230 msgid "refname>:<expect"
8231 msgstr "引用名>:<期望值"
8232
8198 -#: builtin/push.c:504
8233 +#: builtin/push.c:513
8234 msgid "require old value of ref to be at this value"
8235 msgstr "要求引用旧的取值为设定值"
8236
8202 -#: builtin/push.c:507
8237 +#: builtin/push.c:516
8238 msgid "control recursive pushing of submodules"
8239 msgstr "控制子模组的递归推送"
8240
8206 -#: builtin/push.c:509
8241 +#: builtin/push.c:518
8242 msgid "use thin pack"
8243 msgstr "使用精简打包"
8244
8210 -#: builtin/push.c:510 builtin/push.c:511
8245 +#: builtin/push.c:519 builtin/push.c:520
8246 msgid "receive pack program"
8247 msgstr "接收包程序"
8248
8214 -#: builtin/push.c:512
8249 +#: builtin/push.c:521
8250 msgid "set upstream for git pull/status"
8251 msgstr "设置 git pull/status 的上游"
8252
8218 -#: builtin/push.c:515
8253 +#: builtin/push.c:524
8254 msgid "prune locally removed refs"
8255 msgstr "清除本地删除的引用"
8256
8222 -#: builtin/push.c:517
8257 +#: builtin/push.c:526
8258 msgid "bypass pre-push hook"
8259 msgstr "绕过 pre-push 钩子"
8260
8226 -#: builtin/push.c:518
8261 +#: builtin/push.c:527
8262 msgid "push missing but relevant tags"
8263 msgstr "推送缺失的有关的 tags"
8264
8230 -#: builtin/push.c:520
8265 +#: builtin/push.c:529
8266 msgid "GPG sign the push"
8267 msgstr "用 GPG 为推送签名"
8268
8234 -#: builtin/push.c:529
8269 +#: builtin/push.c:530
8270 +msgid "request atomic transaction on remote side"
8271 +msgstr "需要远端支持原子事务"
8272 +
8273 +#: builtin/push.c:539
8274 msgid "--delete is incompatible with --all, --mirror and --tags"
8275 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
8276
8238 -#: builtin/push.c:531
8277 +#: builtin/push.c:541
8278 msgid "--delete doesn't make sense without any refs"
8279 msgstr "--delete 未接任何引用没有意义"
8280
@@ -8313,12 +8352,12 @@ msgstr "跳过应用稀疏检出过滤器"
8352 msgid "debug unpack-trees"
8353 msgstr "调试 unpack-trees"
8354
8316 -#: builtin/reflog.c:499
8355 +#: builtin/reflog.c:429
8356 #, c-format
8357 msgid "%s' for '%s' is not a valid timestamp"
8358 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
8359
8321 -#: builtin/reflog.c:615 builtin/reflog.c:620
8360 +#: builtin/reflog.c:546 builtin/reflog.c:551
8361 #, c-format
8362 msgid "'%s' is not a valid timestamp"
8363 msgstr "'%s' 不是一个有效的时间戳"
@@ -8329,10 +8368,10 @@ msgstr "git remote [-v | --verbose]"
8368
8369 #: builtin/remote.c:13
8370 msgid ""
8332 -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
8371 +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
8372 "mirror=<fetch|push>] <name> <url>"
8373 msgstr ""
8335 -"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"
8374 +"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
8375 "mirror=<fetch|push>] <名称> <地址>"
8376
8377 #: builtin/remote.c:14 builtin/remote.c:33
@@ -8343,9 +8382,9 @@ msgstr "git remote rename <旧名称> <新名称>"
8382 msgid "git remote remove <name>"
8383 msgstr "git remote remove <名称>"
8384
8346 -#: builtin/remote.c:16
8347 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
8348 -msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)"
8385 +#: builtin/remote.c:16 builtin/remote.c:43
8386 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8387 +msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8388
8389 #: builtin/remote.c:17
8390 msgid "git remote [-v | --verbose] show [-n] <name>"
@@ -8380,10 +8419,6 @@ msgstr "git remote set-url --delete <名称> <地址>"
8419 msgid "git remote add [<options>] <name> <url>"
8420 msgstr "git remote add [<选项>] <名称> <地址>"
8421
8383 -#: builtin/remote.c:43
8384 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
8385 -msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
8386 -
8422 #: builtin/remote.c:48
8423 msgid "git remote set-branches <name> <branch>..."
8424 msgstr "git remote set-branches <名称> <分支>..."
@@ -8815,8 +8850,8 @@ msgid "be verbose; must be placed before a subcommand"
8850 msgstr "冗长输出；必须置于子命令之前"
8851
8852 #: builtin/repack.c:17
8818 -msgid "git repack [options]"
8819 -msgstr "git repack [选项]"
8853 +msgid "git repack [<options>]"
8854 +msgstr "git repack [<选项>]"
8855
8856 #: builtin/repack.c:159
8857 msgid "pack everything in a single pack"
@@ -8882,7 +8917,7 @@ msgstr "每个包的最大尺寸"
8917 msgid "repack objects in packs marked with .keep"
8918 msgstr "对标记为 .keep 的包中的对象重新打包"
8919
8885 -#: builtin/repack.c:371
8920 +#: builtin/repack.c:375
8921 #, c-format
8922 msgid "removing '%s' failed"
8923 msgstr "删除 '%s' 失败"
@@ -8972,8 +9007,8 @@ msgid "use this format"
9007 msgstr "使用此格式"
9008
9009 #: builtin/rerere.c:12
8975 -msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
8976 -msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]"
9010 +msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
9011 +msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
9012
9013 #: builtin/rerere.c:57
9014 msgid "register clean resolutions in index"
@@ -9113,8 +9148,8 @@ msgid "Could not write new index file."
9148 msgstr "不能写入新的索引文件。"
9149
9150 #: builtin/rev-parse.c:361
9116 -msgid "git rev-parse --parseopt [options] -- [<args>...]"
9117 -msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"
9151 +msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
9152 +msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
9153
9154 #: builtin/rev-parse.c:366
9155 msgid "keep the `--` passed as an arg"
@@ -9130,29 +9165,29 @@ msgstr "以固定长格式输出"
9165
9166 #: builtin/rev-parse.c:499
9167 msgid ""
9133 -"git rev-parse --parseopt [options] -- [<args>...]\n"
9168 +"git rev-parse --parseopt [<options>] -- [<args>...]\n"
9169 " or: git rev-parse --sq-quote [<arg>...]\n"
9135 -" or: git rev-parse [options] [<arg>...]\n"
9170 +" or: git rev-parse [<options>] [<arg>...]\n"
9171 "\n"
9172 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
9173 msgstr ""
9139 -"git rev-parse --parseopt [选项] -- [<参数>...]\n"
9174 +"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
9175 " 或者：git rev-parse --sq-quote [<参数>...]\n"
9141 -" 或者：git rev-parse [选项] [<参数>...]\n"
9176 +" 或者：git rev-parse [<选项>] [<参数>...]\n"
9177 "\n"
9178 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
9179
9180 #: builtin/revert.c:22
9146 -msgid "git revert [options] <commit-ish>..."
9147 -msgstr "git revert [选项] <提交号>..."
9181 +msgid "git revert [<options>] <commit-ish>..."
9182 +msgstr "git revert [<选项>] <提交号>..."
9183
9184 #: builtin/revert.c:23
9185 msgid "git revert <subcommand>"
9186 msgstr "git revert <子命令>"
9187
9188 #: builtin/revert.c:28
9154 -msgid "git cherry-pick [options] <commit-ish>..."
9155 -msgstr "git cherry-pick [选项] <提交号>..."
9189 +msgid "git cherry-pick [<options>] <commit-ish>..."
9190 +msgstr "git cherry-pick [<选项>] <提交号>..."
9191
9192 #: builtin/revert.c:29
9193 msgid "git cherry-pick <subcommand>"
@@ -9232,8 +9267,8 @@ msgid "cherry-pick failed"
9267 msgstr "拣选失败"
9268
9269 #: builtin/rm.c:17
9235 -msgid "git rm [options] [--] <file>..."
9236 -msgstr "git rm [选项] [--] <文件>..."
9270 +msgid "git rm [<options>] [--] <file>..."
9271 +msgstr "git rm [<选项>] [--] <文件>..."
9272
9273 #: builtin/rm.c:65
9274 msgid ""
@@ -9326,7 +9361,7 @@ msgid "git rm: unable to remove %s"
9361 msgstr "git rm：不能删除 %s"
9362
9363 #: builtin/shortlog.c:13
9329 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
9364 +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
9365 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
9366
9367 #: builtin/shortlog.c:131
@@ -9356,19 +9391,19 @@ msgstr "折行输出"
9391
9392 #: builtin/show-branch.c:9
9393 msgid ""
9359 -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9394 +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9395 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9396 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9397 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9398 msgstr ""
9364 -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9399 +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
9400 "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9401 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9402 "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
9403
9404 #: builtin/show-branch.c:13
9370 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
9371 -msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<引用>]"
9405 +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
9406 +msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
9407
9408 #: builtin/show-branch.c:652
9409 msgid "show remote-tracking and local branches"
@@ -9436,11 +9471,11 @@ msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
9471
9472 #: builtin/show-ref.c:10
9473 msgid ""
9439 -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9440 -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9474 +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9475 +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
9476 msgstr ""
9442 -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9443 -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9477 +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
9478 +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
9479
9480 #: builtin/show-ref.c:11
9481 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
@@ -9479,12 +9514,12 @@ msgid "show refs from stdin that aren't in local repository"
9514 msgstr "显示从标准输入中读入的不在本地版本库中的引用"
9515
9516 #: builtin/symbolic-ref.c:7
9482 -msgid "git symbolic-ref [options] name [ref]"
9483 -msgstr "git symbolic-ref [选项] 名称 [引用]"
9517 +msgid "git symbolic-ref [<options>] <name> [<ref>]"
9518 +msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
9519
9520 #: builtin/symbolic-ref.c:8
9486 -msgid "git symbolic-ref -d [-q] name"
9487 -msgstr "git symbolic-ref -d [-q] 名称"
9521 +msgid "git symbolic-ref -d [-q] <name>"
9522 +msgstr "git symbolic-ref -d [-q] <名称>"
9523
9524 #: builtin/symbolic-ref.c:40
9525 msgid "suppress error message for non-symbolic (detached) refs"
@@ -9508,8 +9543,10 @@ msgstr "更新的原因"
9543
9544 #: builtin/tag.c:22
9545 msgid ""
9511 -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
9512 -msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"
9546 +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
9547 +"[<head>]"
9548 +msgstr ""
9549 +"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
9550
9551 #: builtin/tag.c:23
9552 msgid "git tag -d <tagname>..."
@@ -9517,11 +9554,10 @@ msgstr "git tag -d <标签名>..."
9554
9555 #: builtin/tag.c:24
9556 msgid ""
9520 -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
9557 +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
9558 "\t\t[<pattern>...]"
9559 msgstr ""
9523 -"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] \n"
9524 -"\t\t[<模式>...]"
9560 +"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>] [<模式>...]"
9561
9562 #: builtin/tag.c:26
9563 msgid "git tag -v <tagname>..."
@@ -9663,18 +9699,18 @@ msgstr "使用另外的私钥签名 tag"
9699 msgid "replace the tag if exists"
9700 msgstr "如果存在，替换现有的 tag"
9701
9666 -#: builtin/tag.c:608
9702 +#: builtin/tag.c:609
9703 +msgid "Tag listing options"
9704 +msgstr "Tag 列表选项"
9705 +
9706 +#: builtin/tag.c:610
9707 msgid "show tag list in columns"
9708 msgstr "以列的方式显示 tag"
9709
9670 -#: builtin/tag.c:610
9710 +#: builtin/tag.c:612
9711 msgid "sort tags"
9712 msgstr "排序 tags"
9713
9674 -#: builtin/tag.c:614
9675 -msgid "Tag listing options"
9676 -msgstr "Tag 列表选项"
9677 -
9714 #: builtin/tag.c:617 builtin/tag.c:623
9715 msgid "print only tags that contain the commit"
9716 msgstr "只打印包含提交的tags"
@@ -9731,8 +9767,8 @@ msgid "Unpacking objects"
9767 msgstr "展开对象中"
9768
9769 #: builtin/update-index.c:403
9734 -msgid "git update-index [options] [--] [<file>...]"
9735 -msgstr "git update-index [选项] [--] [<文件>...]"
9770 +msgid "git update-index [<options>] [--] [<file>...]"
9771 +msgstr "git update-index [<选项>] [--] [<文件>...]"
9772
9773 #: builtin/update-index.c:756
9774 msgid "continue refresh even when index needs update"
@@ -9847,16 +9883,16 @@ msgid "enable or disable split index"
9883 msgstr "启用或禁用索引拆分"
9884
9885 #: builtin/update-ref.c:9
9850 -msgid "git update-ref [options] -d <refname> [<oldval>]"
9851 -msgstr "git update-ref [选项] -d <引用名> [<旧值>]"
9886 +msgid "git update-ref [<options>] -d <refname> [<old-val>]"
9887 +msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
9888
9889 #: builtin/update-ref.c:10
9854 -msgid "git update-ref [options] <refname> <newval> [<oldval>]"
9855 -msgstr "git update-ref [选项] <引用名> <新值> [<旧值>]"
9890 +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
9891 +msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
9892
9893 #: builtin/update-ref.c:11
9858 -msgid "git update-ref [options] --stdin [-z]"
9859 -msgstr "git update-ref [选项] --stdin [-z]"
9894 +msgid "git update-ref [<options>] --stdin [-z]"
9895 +msgstr "git update-ref [<选项>] --stdin [-z]"
9896
9897 #: builtin/update-ref.c:359
9898 msgid "delete the reference"
@@ -9883,16 +9919,16 @@ msgid "update the info files from scratch"
9919 msgstr "从头开始更新文件信息"
9920
9921 #: builtin/verify-commit.c:17
9886 -msgid "git verify-commit [-v|--verbose] <commit>..."
9887 -msgstr "git verify-commit [-v|--verbose] <提交>..."
9922 +msgid "git verify-commit [-v | --verbose] <commit>..."
9923 +msgstr "git verify-commit [-v | --verbose] <提交>..."
9924
9925 #: builtin/verify-commit.c:75
9926 msgid "print commit contents"
9927 msgstr "打印提交内容"
9928
9929 #: builtin/verify-pack.c:54
9894 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9895 -msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <包>..."
9930 +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
9931 +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
9932
9933 #: builtin/verify-pack.c:64
9934 msgid "verbose"
@@ -9903,8 +9939,8 @@ msgid "show statistics only"
9939 msgstr "只显示统计"
9940
9941 #: builtin/verify-tag.c:17
9906 -msgid "git verify-tag [-v|--verbose] <tag>..."
9907 -msgstr "git verify-tag [-v|--verbose] <标签>..."
9942 +msgid "git verify-tag [-v | --verbose] <tag>..."
9943 +msgstr "git verify-tag [-v | --verbose] <标签>..."
9944
9945 #: builtin/verify-tag.c:73
9946 msgid "print tag contents"
@@ -10248,7 +10284,7 @@ msgstr "坏的 HEAD - 我需要一个 HEAD"
10284 #: git-bisect.sh:130
10285 #, sh-format
10286 msgid ""
10251 -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
10287 +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
10288 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
10289
10290 #: git-bisect.sh:140
@@ -10981,385 +11017,3 @@ msgstr "无法递归进子模组路径 '$sm_path'"
11017 #, sh-format
11018 msgid "Synchronizing submodule url for '$displaypath'"
11019 msgstr "为 '$displaypath' 同步子模组 url"
10984 -
10985 -#~ msgid "no files added"
10986 -#~ msgstr "没有文件被添加"
10987 -
10988 -#~ msgid "force creation (when already exists)"
10989 -#~ msgstr "强制创建（当已经存在）"
10990 -
10991 -#~ msgid "Malformed ident string: '%s'"
10992 -#~ msgstr "非法的身份字符串：'%s'"
10993 -
10994 -#~ msgid "slot"
10995 -#~ msgstr "slot"
10996 -
10997 -#~ msgid "Failed to lock ref for update"
10998 -#~ msgstr "无法为更新锁定引用"
10999 -
11000 -#~ msgid "Failed to write ref"
11001 -#~ msgstr "不能写引用"
11002 -
11003 -#~ msgid "Failed to lock HEAD during fast_forward_to"
11004 -#~ msgstr "在快进时无法为 HEAD 加锁"
11005 -
11006 -#~ msgid "invalid commit: %s"
11007 -#~ msgstr "无效的提交：%s"
11008 -
11009 -#~ msgid "cannot lock HEAD ref"
11010 -#~ msgstr "无法锁定 HEAD 引用"
11011 -
11012 -#~ msgid "cannot update HEAD ref"
11013 -#~ msgstr "无法更新 HEAD 引用"
11014 -
11015 -#~ msgid "Invalid %s: '%s'"
11016 -#~ msgstr "无效的 %s：'%s'"
11017 -
11018 -#~ msgid "cannot tell cwd"
11019 -#~ msgstr "无法获知当前路径"
11020 -
11021 -#~ msgid "%s: cannot lock the ref"
11022 -#~ msgstr "%s：不能锁定引用"
11023 -
11024 -#~ msgid "%s: cannot update the ref"
11025 -#~ msgstr "%s：不能更新引用"
11026 -
11027 -#~ msgid "commit has empty message"
11028 -#~ msgstr "提交说明为空"
11029 -
11030 -#~ msgid "Failed to chdir: %s"
11031 -#~ msgstr "无法切换目录：%s"
11032 -
11033 -#~ msgid "key id"
11034 -#~ msgstr "key id"
11035 -
11036 -#~ msgid "Tracking not set up: name too long: %s"
11037 -#~ msgstr "跟踪未设置：名字太长：%s"
11038 -
11039 -#~ msgid "bug"
11040 -#~ msgstr "bug"
11041 -
11042 -# 译者：注意保持句尾空格
11043 -#~ msgid "ahead "
11044 -#~ msgstr "领先 "
11045 -
11046 -# 译者：注意保持句尾空格
11047 -#~ msgid ", behind "
11048 -#~ msgstr "，落后 "
11049 -
11050 -#~ msgid "could not find .gitmodules in index"
11051 -#~ msgstr "无法在索引中找到 .gitmodules"
11052 -
11053 -#~ msgid "reading updated .gitmodules failed"
11054 -#~ msgstr "读取更新后的 .gitmodules 失败"
11055 -
11056 -#~ msgid "unable to stat updated .gitmodules"
11057 -#~ msgstr "不能枚举更新后的 .gitmodules"
11058 -
11059 -#~ msgid "unable to remove .gitmodules from index"
11060 -#~ msgstr "不能从索引中移除 .gitmodules"
11061 -
11062 -#~ msgid "adding updated .gitmodules failed"
11063 -#~ msgstr "添加更新后的 .gitmodules 失败"
11064 -
11065 -# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短
11066 -#~ msgid ""
11067 -#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
11068 -#~ "subdirectory of the tree will change in Git 2.0 and should not be used "
11069 -#~ "anymore.\n"
11070 -#~ "To add content for the whole tree, run:\n"
11071 -#~ "\n"
11072 -#~ " git add %s :/\n"
11073 -#~ " (or git add %s :/)\n"
11074 -#~ "\n"
11075 -#~ "To restrict the command to the current directory, run:\n"
11076 -#~ "\n"
11077 -#~ " git add %s .\n"
11078 -#~ " (or git add %s .)\n"
11079 -#~ "\n"
11080 -#~ "With the current Git version, the command is restricted to the current "
11081 -#~ "directory.\n"
11082 -#~ msgstr ""
11083 -#~ "在 Git 2.0 版本，位于一个子目录下不带任何路径参数地执行命令\n"
11084 -#~ "'git add %s (或 %s)' 的行为将被改变，不要再继续使用了。\n"
11085 -#~ "如果要添加整个目录树的内容，执行：\n"
11086 -#~ "\n"
11087 -#~ " git add %s :/\n"
11088 -#~ " (或 git add %s :/)\n"
11089 -#~ "\n"
11090 -#~ "如果要限制该命令只作用于当前目录，执行：\n"
11091 -#~ "\n"
11092 -#~ " git add %s .\n"
11093 -#~ " (或 git add %s .)\n"
11094 -#~ "\n"
11095 -#~ "对于当前版本的 Git，这条命令只作用于当前目录。\n"
11096 -
11097 -#~ msgid ""
11098 -#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
11099 -#~ "whose behaviour will change in Git 2.0 with respect to paths you "
11100 -#~ "removed.\n"
11101 -#~ "Paths like '%s' that are\n"
11102 -#~ "removed from your working tree are ignored with this version of Git.\n"
11103 -#~ "\n"
11104 -#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
11105 -#~ " ignores paths you removed from your working tree.\n"
11106 -#~ "\n"
11107 -#~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
11108 -#~ "\n"
11109 -#~ "Run 'git status' to check the paths you removed from your working tree.\n"
11110 -#~ msgstr ""
11111 -#~ "您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal'，\n"
11112 -#~ "针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"
11113 -#~ "像本地工作区移除的路径 '%s'\n"
11114 -#~ "在此版本的 Git 中被忽略。\n"
11115 -#~ "\n"
11116 -#~ "* 'git add --ignore-removal <路径规则>'，是当前版本的默认操作，\n"
11117 -#~ " 忽略您本地工作区中移除的文件。\n"
11118 -#~ "\n"
11119 -#~ "* 'git add --all <路径规则>' 将让您同时对删除操作进行记录。\n"
11120 -#~ "\n"
11121 -#~ "运行 'git status' 来检查您本地工作区中移除的路径。\n"
11122 -
11123 -#~ msgid ""
11124 -#~ "Auto packing the repository for optimum performance. You may also\n"
11125 -#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
11126 -#~ msgstr ""
11127 -#~ "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
11128 -#~ "参见 \"git help gc\" 以获取更多信息。\n"
11129 -
11130 -#~ msgid ""
11131 -#~ "Updates were rejected because a pushed branch tip is behind its remote\n"
11132 -#~ "counterpart. If you did not intend to push that branch, you may want to\n"
11133 -#~ "specify branches to push or set the 'push.default' configuration "
11134 -#~ "variable\n"
11135 -#~ "to 'simple', 'current' or 'upstream' to push only the current branch."
11136 -#~ msgstr ""
11137 -#~ "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
11138 -#~ "如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n"
11139 -#~ "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
11140 -#~ "以便只推送当前分支。"
11141 -
11142 -# 译者：为保证在输出中对齐，注意调整句中空格！
11143 -#~ msgid "copied: %s -> %s"
11144 -#~ msgstr "拷贝： %s -> %s"
11145 -
11146 -# 译者：为保证在输出中对齐，注意调整句中空格！
11147 -#~ msgid "deleted: %s"
11148 -#~ msgstr "删除： %s"
11149 -
11150 -# 译者：为保证在输出中对齐，注意调整句中空格！
11151 -#~ msgid "modified: %s"
11152 -#~ msgstr "修改： %s"
11153 -
11154 -# 译者：为保证在输出中对齐，注意调整句中空格！
11155 -#~ msgid "renamed: %s -> %s"
11156 -#~ msgstr "重命名： %s -> %s"
11157 -
11158 -# 译者：为保证在输出中对齐，注意调整句中空格！
11159 -#~ msgid "unmerged: %s"
11160 -#~ msgstr "未合并： %s"
11161 -
11162 -# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短
11163 -#~ msgid ""
11164 -#~ "push.default is unset; its implicit value is changing in\n"
11165 -#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
11166 -#~ "and maintain the current behavior after the default changes, use:\n"
11167 -#~ "\n"
11168 -#~ " git config --global push.default matching\n"
11169 -#~ "\n"
11170 -#~ "To squelch this message and adopt the new behavior now, use:\n"
11171 -#~ "\n"
11172 -#~ " git config --global push.default simple\n"
11173 -#~ "\n"
11174 -#~ "See 'git help config' and search for 'push.default' for further "
11175 -#~ "information.\n"
11176 -#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
11177 -#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
11178 -#~ msgstr ""
11179 -#~ "push.default 未设置，它的默认值将在 Git 2.0 由 'matching'\n"
11180 -#~ "改变为 'simple'。若要不再显示本信息并保持传统习惯，进行如下设置：\n"
11181 -#~ "\n"
11182 -#~ " git config --global push.default matching\n"
11183 -#~ "\n"
11184 -#~ "若要不再显示本信息并从现在开始采用新的使用习惯，设置：\n"
11185 -#~ "\n"
11186 -#~ " git config --global push.default simple\n"
11187 -#~ "\n"
11188 -#~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
11189 -#~ "（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n"
11190 -#~ "为保持兼容，请用 'current' 代替 'simple'）"
11191 -
11192 -#~ msgid "input paths are terminated by a null character"
11193 -#~ msgstr "输入路径以null字符终止"
11194 -
11195 -#~ msgid ""
11196 -#~ "The following untracked files would NOT be saved but need to be removed "
11197 -#~ "by stash save:"
11198 -#~ msgstr "如下未跟踪文件将不会被保存但是将会因为进度保存而需要被删除："
11199 -
11200 -#~ msgid ""
11201 -#~ "Aborting. Consider using either the --force or --include-untracked option."
11202 -#~ msgstr "终止。考虑使用 --force 或者 --include-untracked 选项。"
11203 -
11204 -#~ msgid ""
11205 -#~ "the following submodule (or one of its nested submodule)\n"
11206 -#~ "uses a .git directory:"
11207 -#~ msgid_plural ""
11208 -#~ "the following submodules (or one of its nested submodule)\n"
11209 -#~ "use a .git directory:"
11210 -#~ msgstr[0] "如下子模组（或一个其嵌套的子模组）使用了一个 .git 目录："
11211 -#~ msgstr[1] "如下子模组（或一个其嵌套的子模组）使用了一个 .git 目录："
11212 -
11213 -# 译者：注意保持前导空格
11214 -#~ msgid " (fix conflicts and then run \"git am --resolved\")"
11215 -#~ msgstr " （解决冲突，然后运行 \"git am --resolved\"）"
11216 -
11217 -# 译者：注意保持前导空格
11218 -#~ msgid " (all conflicts fixed: run \"git commit\")"
11219 -#~ msgstr " （解决所有冲突后，执行 \"git commit\"）"
11220 -
11221 -#~ msgid "more than %d trees given: '%s'"
11222 -#~ msgstr "提供了超过 %d 个树对象：'%s'"
11223 -
11224 -#~ msgid "You cannot combine --no-ff with --ff-only."
11225 -#~ msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
11226 -
11227 -#~ msgid ""
11228 -#~ "submodule '%s' (or one of its nested submodules) uses a .git directory\n"
11229 -#~ "(use 'rm -rf' if you really want to remove it including all of its "
11230 -#~ "history)"
11231 -#~ msgstr ""
11232 -#~ "子模组 '%s'（或者它的一个嵌套子模组）使用一个 .git 目录\n"
11233 -#~ "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"
11234 -
11235 -#~ msgid ""
11236 -#~ "'%s' has changes staged in the index\n"
11237 -#~ "(use --cached to keep the file, or -f to force removal)"
11238 -#~ msgstr ""
11239 -#~ "'%s' 有变更已暂存至索引中\n"
11240 -#~ "（使用 --cached 保存文件，或用 -f 强制删除）"
11241 -
11242 -#~ msgid "show commits where no parent comes before its children"
11243 -#~ msgstr "显示提交时以时间为序且父提交不能领先子提交"
11244 -
11245 -#~ msgid "show the HEAD reference"
11246 -#~ msgstr "显示 HEAD 引用"
11247 -
11248 -#~ msgid "Submodule '$name' ($url) registered for path '$sm_path'"
11249 -#~ msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
11250 -
11251 -#~ msgid "Change flags"
11252 -#~ msgstr "修改参数"
11253 -
11254 -#~ msgid ""
11255 -#~ "NOTE: no more files to clean; press \"t\" to toggle flags of git-clean."
11256 -#~ msgstr "注意：没有要清理的文件；尝试按 \"t\" 切换 git-clean 的选项。"
11257 -
11258 -#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
11259 -#~ msgstr "无法递归进子模组路径 '$prefix$sm_path'"
11260 -
11261 -#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
11262 -#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"
11263 -
11264 -#~ msgid "See 'git help <command>' for more information on a specific command."
11265 -#~ msgstr "参见 'git help <命令>' 以获得该特定命令的详细信息。"
11266 -
11267 -#~ msgid "BUG: impossible combination of %d and %p"
11268 -#~ msgstr "BUG: 无法组合 %d 和 %p"
11269 -
11270 -# 译者：以下三条实际为一个段落
11271 -#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
11272 -#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"
11273 -
11274 -# 译者：为对齐，下面两句内容有调整
11275 -#~ msgid "may speed it up, but you have to be careful not to forget to add"
11276 -#~ msgstr "也许能提高速度，但您需要小心不要忘了添加新文件"
11277 -
11278 -#~ msgid "new files yourself (see 'git help status')."
11279 -#~ msgstr "（参见 'git help status'）。"
11280 -
11281 -#~ msgid "use any ref in .git/refs"
11282 -#~ msgstr "使用 .git/refs 里的任意引用"
11283 -
11284 -#~ msgid "use any tag in .git/refs/tags"
11285 -#~ msgstr "使用 .git/refs/tags 里的任意 tag"
11286 -
11287 -#~ msgid "bad object %s"
11288 -#~ msgstr "坏对象 %s"
11289 -
11290 -#~ msgid "bogus committer info %s"
11291 -#~ msgstr "虚假的提交者信息 %s"
11292 -
11293 -#~ msgid "can't fdopen 'show' output fd"
11294 -#~ msgstr "不能打开 'show' 输出文件句柄"
11295 -
11296 -#~ msgid "failed to close pipe to 'show' for object '%s'"
11297 -#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"
11298 -
11299 -#~ msgid " 0 files changed"
11300 -#~ msgstr " 0 个文件被修改"
11301 -
11302 -#~ msgid " %d file changed"
11303 -#~ msgid_plural " %d files changed"
11304 -#~ msgstr[0] " %d 个文件被修改"
11305 -#~ msgstr[1] " %d 个文件被修改"
11306 -
11307 -#~ msgid ", %d insertion(+)"
11308 -#~ msgid_plural ", %d insertions(+)"
11309 -#~ msgstr[0] "，插入 %d 行(+)"
11310 -#~ msgstr[1] "，插入 %d 行(+)"
11311 -
11312 -#~ msgid ", %d deletion(-)"
11313 -#~ msgid_plural ", %d deletions(-)"
11314 -#~ msgstr[0] "，删除 %d 行(-)"
11315 -#~ msgstr[1] "，删除 %d 行(-)"
11316 -
11317 -#~ msgid "You do not have a valid HEAD"
11318 -#~ msgstr "您没有一个有效的 HEAD"
11319 -
11320 -#~ msgid "oops"
11321 -#~ msgstr "哎哟"
11322 -
11323 -#~ msgid "Would not remove %s\n"
11324 -#~ msgstr "不会删除 %s\n"
11325 -
11326 -#~ msgid "Not removing %s\n"
11327 -#~ msgstr "未删除 %s\n"
11328 -
11329 -#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
11330 -#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])"
11331 -
11332 -#~ msgid "Could not read index"
11333 -#~ msgstr "不能读取索引"
11334 -
11335 -# 译者：中文字符串拼接，可删除前导空格
11336 -#~ msgid " (use \"git add\" to track)"
11337 -#~ msgstr "（使用 \"git add\" 建立跟踪）"
11338 -
11339 -#~ msgid "--detach cannot be used with -b/-B/--orphan"
11340 -#~ msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
11341 -
11342 -#~ msgid "--detach cannot be used with -t"

This file is too large to show in full.