4dcdc3d8cc · matheusbsbs/matheus-bagliano

@@ -12,7 +12,7 @@ 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: 2013-04-10 15:16+0800\n"

15 +"POT-Creation-Date: 2013-04-30 08:25+0800\n"

16 "PO-Revision-Date: 2013-04-12 09:23+0800\n"

17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"

18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"

@@ -68,7 +68,7 @@ msgstr "格式"

68 msgid "archive format"

69 msgstr "归档格式"

70

71 -#: archive.c:324 builtin/log.c:1117

71 +#: archive.c:324 builtin/log.c:1126

72 msgid "prefix"

73 msgstr "前缀"

74

@@ -76,10 +76,10 @@ msgstr "前缀"

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

77 msgstr "为归档中每个路径名加上前缀"

78

79 -#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2366

80 -#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:659

81 -#: builtin/fast-export.c:661 builtin/grep.c:715 builtin/hash-object.c:77

82 -#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536

79 +#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371

80 +#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665

81 +#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77

82 +#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536

83 #: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149

84 msgid "file"

85 msgstr "文件"

@@ -136,6 +136,75 @@ msgstr ""

136 "负值模版在 git attributes 中被忽略\n"

137 "当字符串确实要以感叹号开始时，使用 '\\!'。"

138

139 +#: branch.c:60

140 +#, c-format

141 +msgid "Not setting branch %s as its own upstream."

142 +msgstr "未设置分支 %s 作为它自己的上游。"

143 +

144 +#: branch.c:82

145 +#, c-format

146 +msgid "Branch %s set up to track remote branch %s from %s by rebasing."

147 +msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"

148 +

149 +#: branch.c:83

150 +#, c-format

151 +msgid "Branch %s set up to track remote branch %s from %s."

152 +msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"

153 +

154 +#: branch.c:87

155 +#, c-format

156 +msgid "Branch %s set up to track local branch %s by rebasing."

157 +msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"

158 +

159 +#: branch.c:88

160 +#, c-format

161 +msgid "Branch %s set up to track local branch %s."

162 +msgstr "分支 %s 设置为跟踪本地分支 %s。"

163 +

164 +#: branch.c:92

165 +#, c-format

166 +msgid "Branch %s set up to track remote ref %s by rebasing."

167 +msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"

168 +

169 +#: branch.c:93

170 +#, c-format

171 +msgid "Branch %s set up to track remote ref %s."

172 +msgstr "分支 %s 设置为跟踪远程引用 %s。"

173 +

174 +#: branch.c:97

175 +#, c-format

176 +msgid "Branch %s set up to track local ref %s by rebasing."

177 +msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"

178 +

179 +#: branch.c:98

180 +#, c-format

181 +msgid "Branch %s set up to track local ref %s."

182 +msgstr "分支 %s 设置为跟踪本地引用 %s。"

183 +

184 +#: branch.c:118

185 +#, c-format

186 +msgid "Tracking not set up: name too long: %s"

187 +msgstr "跟踪未设置：名字太长：%s"

188 +

189 +#: branch.c:137

190 +#, c-format

191 +msgid "Not tracking: ambiguous information for ref %s"

192 +msgstr "未跟踪：引用 %s 有歧义"

193 +

194 +#: branch.c:182

195 +#, c-format

196 +msgid "'%s' is not a valid branch name."

197 +msgstr "'%s' 不是一个有效的分支名称。"

198 +

199 +#: branch.c:187

200 +#, c-format

201 +msgid "A branch named '%s' already exists."

202 +msgstr "一个分支名 '%s' 已经存在。"

203 +

204 +#: branch.c:195

205 +msgid "Cannot force update the current branch."

206 +msgstr "无法强制更新当前分支。"

207 +

208 #: branch.c:201

209 #, c-format

210 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

@@ -164,6 +233,29 @@ msgstr ""

233 "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"

234 "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"

235

236 +#: branch.c:250

237 +#, c-format

238 +msgid "Not a valid object name: '%s'."

239 +msgstr "不是一个有效的对象名：'%s'。"

240 +

241 +#: branch.c:270

242 +#, c-format

243 +msgid "Ambiguous object name: '%s'."

244 +msgstr "歧义的对象名：'%s'。"

245 +

246 +#: branch.c:275

247 +#, c-format

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

249 +msgstr "无效的分支点：'%s'。"

250 +

251 +#: branch.c:281

252 +msgid "Failed to lock ref for update"

253 +msgstr "无法为更新锁定引用"

254 +

255 +#: branch.c:299

256 +msgid "Failed to write ref"

257 +msgstr "不能写引用"

258 +

259 #: bundle.c:36

260 #, c-format

261 msgid "'%s' does not look like a v2 bundle file"

@@ -183,9 +275,9 @@ msgstr "不能打开 '%s'"

275 msgid "Repository lacks these prerequisite commits:"

276 msgstr "版本库缺少这些必备的提交："

277

186 -#: bundle.c:164 sequencer.c:651 sequencer.c:1083 builtin/log.c:300

187 -#: builtin/log.c:754 builtin/log.c:1350 builtin/log.c:1566 builtin/merge.c:349

188 -#: builtin/shortlog.c:157

278 +#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300

279 +#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349

280 +#: builtin/shortlog.c:155

281 msgid "revision walk setup failed"

282 msgstr "版本遍历设置失败"

283

@@ -211,7 +303,7 @@ msgstr[1] "这个包需要 %d 个引用："

303 msgid "rev-list died"

304 msgstr "rev-list 终止"

305

214 -#: bundle.c:300 builtin/log.c:1246 builtin/shortlog.c:260

306 +#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258

307 #, c-format

308 msgid "unrecognized argument: %s"

309 msgstr "未能识别的参数：%s"

@@ -363,7 +455,7 @@ msgstr ""

455 "发现配置变量 'diff.dirstat' 中的错误：\n"

456 "%s"

457

366 -#: diff.c:3480

458 +#: diff.c:3481

459 #, c-format

460 msgid ""

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

@@ -372,7 +464,7 @@ msgstr ""

464 "无法解析 --dirstat/-X 选项的参数：\n"

465 "%s"

466

375 -#: diff.c:3494

467 +#: diff.c:3495

468 #, c-format

469 msgid "Failed to parse --submodule option parameter: '%s'"

470 msgstr "无法解析 --submodule 选项的参数：'%s'"

@@ -477,8 +569,8 @@ msgstr[1] ""

569 msgid "failed to read the cache"

570 msgstr "无法读取缓存"

571

480 -#: merge.c:110 builtin/checkout.c:362 builtin/checkout.c:563

481 -#: builtin/clone.c:635

572 +#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566

573 +#: builtin/clone.c:645

574 msgid "unable to write new index file"

575 msgstr "无法写新的索引文件"

576

@@ -527,7 +619,7 @@ msgstr "不能读取对象 %s '%s'"

619 msgid "blob expected for %s '%s'"

620 msgstr "%s '%s' 应为数据（blob）对象"

621

530 -#: merge-recursive.c:773 builtin/clone.c:303

622 +#: merge-recursive.c:773 builtin/clone.c:313

623 #, c-format

624 msgid "failed to open '%s'"

625 msgstr "无法打开 '%s'"

@@ -1049,11 +1141,21 @@ msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"

1141 msgid "Could not format %s."

1142 msgstr "不能格式化 %s。"

1143

1052 -#: sequencer.c:1101

1144 +#: sequencer.c:1083

1145 +#, c-format

1146 +msgid "%s: can't cherry-pick a %s"

1147 +msgstr "%s：不能拣选一个%s"

1148 +

1149 +#: sequencer.c:1085

1150 +#, c-format

1151 +msgid "%s: bad revision"

1152 +msgstr "%s：错误的版本"

1153 +

1154 +#: sequencer.c:1119

1155 msgid "Can't revert as initial commit"

1156 msgstr "不能作为初始提交还原"

1157

1056 -#: sequencer.c:1102

1158 +#: sequencer.c:1120

1159 msgid "Can't cherry-pick into empty head"

1160 msgstr "不能拣选到空分支"

1161

@@ -1260,281 +1362,276 @@ msgstr "未合并： %s"

1362 msgid "bug: unhandled diff status %c"

1363 msgstr "bug：未处理的差异状态 %c"

1364

1263 -#: wt-status.c:805

1365 +#: wt-status.c:803

1366 msgid "You have unmerged paths."

1367 msgstr "您有尚未合并的路径。"

1368

1369 # 译者：注意保持前导空格

1268 -#: wt-status.c:808 wt-status.c:960

1370 +#: wt-status.c:806 wt-status.c:958

1371 msgid " (fix conflicts and run \"git commit\")"

1372 msgstr " （解决冲突并运行 \"git commit\"）"

1373

1272 -#: wt-status.c:811

1374 +#: wt-status.c:809

1375 msgid "All conflicts fixed but you are still merging."

1376 msgstr "所有冲突已解决但您仍处于合并中。"

1377

1378 # 译者：注意保持前导空格

1277 -#: wt-status.c:814

1379 +#: wt-status.c:812

1380 msgid " (use \"git commit\" to conclude merge)"

1381 msgstr " （使用 \"git commit\" 结束合并）"

1382

1281 -#: wt-status.c:824

1383 +#: wt-status.c:822

1384 msgid "You are in the middle of an am session."

1385 msgstr "您正处于一个 am 过程中。"

1386

1285 -#: wt-status.c:827

1387 +#: wt-status.c:825

1388 msgid "The current patch is empty."

1389 msgstr "当前的补丁为空。"

1390

1391 # 译者：注意保持前导空格

1290 -#: wt-status.c:831

1392 +#: wt-status.c:829

1393 msgid " (fix conflicts and then run \"git am --resolved\")"

1394 msgstr " （解决冲突，然后运行 \"git am --resolved\"）"

1395

1396 # 译者：注意保持前导空格

1295 -#: wt-status.c:833

1397 +#: wt-status.c:831

1398 msgid " (use \"git am --skip\" to skip this patch)"

1399 msgstr " （使用 \"git am --skip\" 跳过此补丁）"

1400

1401 # 译者：注意保持前导空格

1300 -#: wt-status.c:835

1402 +#: wt-status.c:833

1403 msgid " (use \"git am --abort\" to restore the original branch)"

1404 msgstr " （使用 \"git am --abort\" 恢复原有分支）"

1405

1304 -#: wt-status.c:895 wt-status.c:912

1406 +#: wt-status.c:893 wt-status.c:910

1407 #, c-format

1408 msgid "You are currently rebasing branch '%s' on '%s'."

1409 msgstr "您正在将分支 '%s' 变基到 '%s'。"

1410

1309 -#: wt-status.c:900 wt-status.c:917

1411 +#: wt-status.c:898 wt-status.c:915

1412 msgid "You are currently rebasing."

1413 msgstr "您正在变基。"

1414

1415 # 译者：注意保持前导空格

1314 -#: wt-status.c:903

1416 +#: wt-status.c:901

1417 msgid " (fix conflicts and then run \"git rebase --continue\")"

1418 msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"

1419

1420 # 译者：注意保持前导空格

1319 -#: wt-status.c:905

1421 +#: wt-status.c:903

1422 msgid " (use \"git rebase --skip\" to skip this patch)"

1423 msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"

1424

1425 # 译者：注意保持前导空格

1324 -#: wt-status.c:907

1426 +#: wt-status.c:905

1427 msgid " (use \"git rebase --abort\" to check out the original branch)"

1428 msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"

1429

1430 # 译者：注意保持前导空格

1329 -#: wt-status.c:920

1431 +#: wt-status.c:918

1432 msgid " (all conflicts fixed: run \"git rebase --continue\")"

1433 msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"

1434

1333 -#: wt-status.c:924

1435 +#: wt-status.c:922

1436 #, c-format

1437 msgid ""

1438 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

1439 msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。"

1440

1339 -#: wt-status.c:929

1441 +#: wt-status.c:927

1442 msgid "You are currently splitting a commit during a rebase."

1443 msgstr "您正在变基过程中拆分一个提交。"

1444

1445 # 译者：注意保持前导空格

1344 -#: wt-status.c:932

1446 +#: wt-status.c:930

1447 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

1448 msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"

1449

1348 -#: wt-status.c:936

1450 +#: wt-status.c:934

1451 #, c-format

1452 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

1453 msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。"

1454

1353 -#: wt-status.c:941

1455 +#: wt-status.c:939

1456 msgid "You are currently editing a commit during a rebase."

1457 msgstr "您正在变基过程中编辑一个提交。"

1458

1459 # 译者：注意保持前导空格

1358 -#: wt-status.c:944

1460 +#: wt-status.c:942

1461 msgid " (use \"git commit --amend\" to amend the current commit)"

1462 msgstr " （使用 \"git commit --amend\" 修补当前提交）"

1463

1464 # 译者：注意保持前导空格

1363 -#: wt-status.c:946

1465 +#: wt-status.c:944

1466 msgid ""

1467 " (use \"git rebase --continue\" once you are satisfied with your changes)"

1468 msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"

1469

1368 -#: wt-status.c:956

1470 +#: wt-status.c:954

1471 msgid "You are currently cherry-picking."

1472 msgstr "您正在做拣选操作。"

1473

1474 # 译者：注意保持前导空格

1373 -#: wt-status.c:963

1475 +#: wt-status.c:961

1476 msgid " (all conflicts fixed: run \"git commit\")"

1477 msgstr " （解决所有冲突后，执行 \"git commit\"）"

1478

1377 -#: wt-status.c:972

1479 +#: wt-status.c:970

1480 #, c-format

1481 msgid "You are currently reverting commit %s."

1482 msgstr "您正在反转提交 %s 。"

1483

1484 # 译者：注意保持前导空格

1383 -#: wt-status.c:977

1485 +#: wt-status.c:975

1486 msgid " (fix conflicts and run \"git revert --continue\")"

1487 msgstr " （解决冲突并运行 \"git revert --continue\"）"

1488

1489 # 译者：注意保持前导空格

1388 -#: wt-status.c:980

1490 +#: wt-status.c:978

1491 msgid " (all conflicts fixed: run \"git revert --continue\")"

1492 msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"

1493

1494 # 译者：注意保持前导空格

1393 -#: wt-status.c:982

1495 +#: wt-status.c:980

1496 msgid " (use \"git revert --abort\" to cancel the revert operation)"

1497 msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"

1498

1397 -#: wt-status.c:993

1499 +#: wt-status.c:991

1500 #, c-format

1501 msgid "You are currently bisecting, started from branch '%s'."

1502 msgstr "您正在从分支 '%s' 开始做二分查找。"

1503

1402 -#: wt-status.c:997

1504 +#: wt-status.c:995

1505 msgid "You are currently bisecting."

1506 msgstr "您正在做二分查找。"

1507

1508 # 译者：注意保持前导空格

1407 -#: wt-status.c:1000

1509 +#: wt-status.c:998

1510 msgid " (use \"git bisect reset\" to get back to the original branch)"

1511 msgstr " （使用 \"git bisect reset\" 以回到原有分支）"

1512

1411 -#: wt-status.c:1175

1513 +#: wt-status.c:1173

1514 msgid "On branch "

1515 msgstr "位于分支 "

1516

1415 -#: wt-status.c:1186

1517 +#: wt-status.c:1184

1518 msgid "HEAD detached at "

1519 msgstr "头指针分离于 "

1520

1419 -#: wt-status.c:1188

1521 +#: wt-status.c:1186

1522 msgid "HEAD detached from "

1523 msgstr "头指针分离自 "

1524

1423 -#: wt-status.c:1191

1525 +#: wt-status.c:1189

1526 msgid "Not currently on any branch."

1527 msgstr "当前不在任何分支上。"

1528

1427 -#: wt-status.c:1208

1529 +#: wt-status.c:1206

1530 msgid "Initial commit"

1531 msgstr "初始提交"

1532

1431 -#: wt-status.c:1222

1533 +#: wt-status.c:1220

1534 msgid "Untracked files"

1535 msgstr "未跟踪的文件"

1536

1435 -#: wt-status.c:1224

1537 +#: wt-status.c:1222

1538 msgid "Ignored files"

1539 msgstr "忽略的文件"

1540

1439 -# 译者：以下三条实际为一个段落

1440 -#: wt-status.c:1228

1541 +#: wt-status.c:1226

1542 #, c-format

1442 -msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"

1443 -msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"

1543 +msgid ""

1544 +"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

1545 +"may speed it up, but you have to be careful not to forget to add\n"

1546 +"new files yourself (see 'git help status')."

1547 +msgstr ""

1548 +"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"

1549 +"但您需要小心不要忘了添加新文件（参见 'git help status'）。"

1550

1445 -# 译者：为对齐，下面两句内容有调整

1551 #: wt-status.c:1232

1447 -msgid "may speed it up, but you have to be careful not to forget to add"

1448 -msgstr "也许能提高速度，但您需要小心不要忘了添加新文件"

1449 -

1450 -#: wt-status.c:1235

1451 -msgid "new files yourself (see 'git help status')."

1452 -msgstr "（参见 'git help status'）。"

1453 -

1454 -#: wt-status.c:1238

1552 #, c-format

1553 msgid "Untracked files not listed%s"

1554 msgstr "未跟踪的文件没有列出%s"

1555

1556 # 译者：中文字符串拼接，可删除前导空格

1460 -#: wt-status.c:1240

1557 +#: wt-status.c:1234

1558 msgid " (use -u option to show untracked files)"

1559 msgstr "（使用 -u 参数显示未跟踪的文件）"

1560

1464 -#: wt-status.c:1246

1561 +#: wt-status.c:1240

1562 msgid "No changes"

1563 msgstr "没有修改"

1564

1468 -#: wt-status.c:1251

1565 +#: wt-status.c:1245

1566 #, c-format

1567 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

1568 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"

1569

1473 -#: wt-status.c:1254

1570 +#: wt-status.c:1248

1571 #, c-format

1572 msgid "no changes added to commit\n"

1573 msgstr "修改尚未加入提交\n"

1574

1478 -#: wt-status.c:1257

1575 +#: wt-status.c:1251

1576 #, c-format

1577 msgid ""

1578 "nothing added to commit but untracked files present (use \"git add\" to "

1579 "track)\n"

1580 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"

1581

1485 -#: wt-status.c:1260

1582 +#: wt-status.c:1254

1583 #, c-format

1584 msgid "nothing added to commit but untracked files present\n"

1585 msgstr "提交为空，但是存在尚未跟踪的文件\n"

1586

1587 # 译者：中文字符串拼接，可删除前导空格

1491 -#: wt-status.c:1263

1588 +#: wt-status.c:1257

1589 #, c-format

1590 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

1591 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"

1592

1496 -#: wt-status.c:1266 wt-status.c:1271

1593 +#: wt-status.c:1260 wt-status.c:1265

1594 #, c-format

1595 msgid "nothing to commit\n"

1596 msgstr "无文件要提交\n"

1597

1598 # 译者：中文字符串拼接，可删除前导空格

1502 -#: wt-status.c:1269

1599 +#: wt-status.c:1263

1600 #, c-format

1601 msgid "nothing to commit (use -u to show untracked files)\n"

1602 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"

1603

1604 # 译者：中文字符串拼接，可删除前导空格

1508 -#: wt-status.c:1273

1605 +#: wt-status.c:1267

1606 #, c-format

1607 msgid "nothing to commit, working directory clean\n"

1608 msgstr "无文件要提交，干净的工作区\n"

1609

1513 -#: wt-status.c:1381

1610 +#: wt-status.c:1375

1611 msgid "HEAD (no branch)"

1612 msgstr "HEAD（非分支）"

1613

1614 # 译者：注意保持句尾空格

1518 -#: wt-status.c:1387

1615 +#: wt-status.c:1381

1616 msgid "Initial commit on "

1617 msgstr "初始提交于 "

1618

1619 # 译者：注意保持句尾空格

1523 -#: wt-status.c:1402

1620 +#: wt-status.c:1396

1621 msgid "behind "

1622 msgstr "落后 "

1623

1624 # 译者：注意保持句尾空格

1528 -#: wt-status.c:1405 wt-status.c:1408

1625 +#: wt-status.c:1399 wt-status.c:1402

1626 msgid "ahead "

1627 msgstr "领先 "

1628

1629 # 译者：注意保持句尾空格

1533 -#: wt-status.c:1410

1630 +#: wt-status.c:1404

1631 msgid ", behind "

1632 msgstr "，落后 "

1633

1537 -#: compat/precompose_utf8.c:58 builtin/clone.c:342

1634 +#: compat/precompose_utf8.c:58 builtin/clone.c:352

1635 #, c-format

1636 msgid "failed to unlink '%s'"

1637 msgstr "无法删除 '%s'"

@@ -1543,193 +1640,225 @@ msgstr "无法删除 '%s'"

1640 msgid "git add [options] [--] <pathspec>..."

1641 msgstr "git add [选项] [--] <路径匹配>..."

1642

1546 -#: builtin/add.c:63

1643 +# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短

1644 +#.

1645 +#. * To be consistent with "git add -p" and most Git

1646 +#. * commands, we should default to being tree-wide, but

1647 +#. * this is not the original behavior and can't be

1648 +#. * changed until users trained themselves not to type

1649 +#. * "git add -u" or "git add -A". For now, we warn and

1650 +#. * keep the old behavior. Later, the behavior can be changed

1651 +#. * to tree-wide, keeping the warning for a while, and

1652 +#. * eventually we can drop the warning.

1653 +#.

1654 +#: builtin/add.c:58

1655 +#, c-format

1656 +msgid ""

1657 +"The behavior of 'git add %s (or %s)' with no path argument from a\n"

1658 +"subdirectory of the tree will change in Git 2.0 and should not be used "

1659 +"anymore.\n"

1660 +"To add content for the whole tree, run:\n"

1661 +"\n"

1662 +" git add %s :/\n"

1663 +" (or git add %s :/)\n"

1664 +"\n"

1665 +"To restrict the command to the current directory, run:\n"

1666 +"\n"

1667 +" git add %s .\n"

1668 +" (or git add %s .)\n"

1669 +"\n"

1670 +"With the current Git version, the command is restricted to the current "

1671 +"directory.\n"

1672 +msgstr ""

1673 +"在 Git 2.0 版本，位于一个子目录下不带任何路径参数地执行命令\n"

1674 +"'git add %s (或 %s)' 的行为将被改变，不要再继续使用了。\n"

1675 +"如果要添加整个目录树的内容，执行：\n"

1676 +"\n"

1677 +" git add %s :/\n"

1678 +" (或 git add %s :/)\n"

1679 +"\n"

1680 +"如果要限制该命令只作用于当前目录，执行：\n"

1681 +"\n"

1682 +" git add %s .\n"

1683 +" (或 git add %s .)\n"

1684 +"\n"

1685 +"对于当前版本的 Git，这条命令只作用于当前目录。\n"

1686 +

1687 +#: builtin/add.c:100

1688 +#, c-format

1689 +msgid ""

1690 +"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"

1691 +"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"

1692 +"Paths like '%s' that are\n"

1693 +"removed from your working tree are ignored with this version of Git.\n"

1694 +"\n"

1695 +"* 'git add --ignore-removal <pathspec>', which is the current default,\n"

1696 +" ignores paths you removed from your working tree.\n"

1697 +"\n"

1698 +"* 'git add --all <pathspec>' will let you also record the removals.\n"

1699 +"\n"

1700 +"Run 'git status' to check the paths you removed from your working tree.\n"

1701 +msgstr ""

1702 +"您在运行 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal'，\n"

1703 +"针对其中本地移除路径的行为将在 Git 2.0 版本库发生变化。\n"

1704 +"像本地工作区移除的路径 '%s'\n"

1705 +"在此版本的 Git 中被忽略。\n"

1706 +"\n"

1707 +"* 'git add --ignore-removal <pathspec>'，是当前版本的默认操作，\n"

1708 +" 忽略您本地工作区中移除的文件。\n"

1709 +"\n"

1710 +"* 'git add --all <pathspec>' 将让您同时对删除操作进行记录。\n"

1711 +"\n"

1712 +"运行 'git status' 来检查您本地工作区中移除的路径。\n"

1713 +

1714 +#: builtin/add.c:144

1715 #, c-format

1716 msgid "unexpected diff status %c"

1717 msgstr "意外的差异状态 %c"

1718

1551 -#: builtin/add.c:68 builtin/commit.c:233

1719 +#: builtin/add.c:149 builtin/commit.c:233

1720 msgid "updating files failed"

1721 msgstr "更新文件失败"

1722

1555 -#: builtin/add.c:78

1723 +#: builtin/add.c:163

1724 #, c-format

1725 msgid "remove '%s'\n"

1726 msgstr "删除 '%s'\n"

1727

1560 -#: builtin/add.c:148

1728 +#: builtin/add.c:253

1729 msgid "Unstaged changes after refreshing the index:"

1730 msgstr "刷新索引之后尚未被暂存的变更："

1731

1564 -#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275

1732 +#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275

1733 #, c-format

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

1735 msgstr "路径 '%s' 未匹配任何文件"

1736

1569 -#: builtin/add.c:234

1737 +#: builtin/add.c:339

1738 msgid "Could not read the index"

1739 msgstr "不能读取索引"

1740

1573 -#: builtin/add.c:244

1741 +#: builtin/add.c:349

1742 #, c-format

1743 msgid "Could not open '%s' for writing."

1744 msgstr "不能打开 '%s' 以写入。"

1745

1578 -#: builtin/add.c:248

1746 +#: builtin/add.c:353

1747 msgid "Could not write patch"

1748 msgstr "不能生成补丁"

1749

1582 -#: builtin/add.c:253

1750 +#: builtin/add.c:358

1751 #, c-format

1752 msgid "Could not stat '%s'"

1753 msgstr "不能查看文件状态 '%s'"

1754

1587 -#: builtin/add.c:255

1755 +#: builtin/add.c:360

1756 msgid "Empty patch. Aborted."

1757 msgstr "空补丁。异常终止。"

1758

1591 -#: builtin/add.c:261

1759 +#: builtin/add.c:366

1760 #, c-format

1761 msgid "Could not apply '%s'"

1762 msgstr "不能应用 '%s'"

1763

1596 -#: builtin/add.c:271

1764 +#: builtin/add.c:376

1765 msgid "The following paths are ignored by one of your .gitignore files:\n"

1766 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"

1767

1600 -#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63

1768 +#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63

1769 #: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253

1770 #: builtin/rm.c:206

1771 msgid "dry run"

1772 msgstr "演习"

1773

1606 -#: builtin/add.c:278 builtin/apply.c:4409 builtin/check-ignore.c:19

1774 +#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19

1775 #: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613

1608 -#: builtin/log.c:1514 builtin/mv.c:62 builtin/read-tree.c:112

1776 +#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112

1777 msgid "be verbose"

1778 msgstr "冗长输出"

1779

1612 -#: builtin/add.c:280

1780 +#: builtin/add.c:396

1781 msgid "interactive picking"

1782 msgstr "交互式拣选"

1783

1616 -#: builtin/add.c:281 builtin/checkout.c:1060 builtin/reset.c:258

1784 +#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258

1785 msgid "select hunks interactively"

1786 msgstr "交互式挑选数据块"

1787

1620 -#: builtin/add.c:282

1788 +#: builtin/add.c:398

1789 msgid "edit current diff and apply"

1790 msgstr "编辑当前差异并应用"

1791

1624 -#: builtin/add.c:283

1792 +#: builtin/add.c:399

1793 msgid "allow adding otherwise ignored files"

1794 msgstr "允许添加忽略的文件"

1795

1628 -#: builtin/add.c:284

1796 +#: builtin/add.c:400

1797 msgid "update tracked files"

1798 msgstr "更新已跟踪的文件"

1799

1632 -#: builtin/add.c:285

1800 +#: builtin/add.c:401

1801 msgid "record only the fact that the path will be added later"

1802 msgstr "只记录，该路径稍后再添加"

1803

1636 -#: builtin/add.c:286

1804 +#: builtin/add.c:402

1805 msgid "add changes from all tracked and untracked files"

1806 msgstr "添加所有改变的已跟踪文件和未跟踪文件"

1807

1640 -#: builtin/add.c:287

1808 +#. takes no arguments

1809 +#: builtin/add.c:405

1810 +msgid "ignore paths removed in the working tree (same as --no-all)"

1811 +msgstr "忽略工作区中移除的路径（和 --no-all 相同）"

1812 +

1813 +#: builtin/add.c:407

1814 msgid "don't add, only refresh the index"

1815 msgstr "不添加，只刷新索引"

1816

1644 -#: builtin/add.c:288

1817 +#: builtin/add.c:408

1818 msgid "just skip files which cannot be added because of errors"

1819 msgstr "跳过因出错不能添加的文件"

1820

1648 -#: builtin/add.c:289

1821 +#: builtin/add.c:409

1822 msgid "check if - even missing - files are ignored in dry run"

1823 msgstr "检查在演习模式下文件（即使不存在）是否被忽略"

1824

1652 -#: builtin/add.c:311

1825 +#: builtin/add.c:431

1826 #, c-format

1827 msgid "Use -f if you really want to add them.\n"

1828 msgstr "使用 -f 参数如果您确实要添加它们。\n"

1829

1657 -#: builtin/add.c:312

1830 +#: builtin/add.c:432

1831 msgid "no files added"

1832 msgstr "没有文件被添加"

1833

1661 -#: builtin/add.c:318

1834 +#: builtin/add.c:438

1835 msgid "adding files failed"

1836 msgstr "添加文件失败"

1837

1665 -# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短

1666 -#.

1667 -#. * To be consistent with "git add -p" and most Git

1668 -#. * commands, we should default to being tree-wide, but

1669 -#. * this is not the original behavior and can't be

1670 -#. * changed until users trained themselves not to type

1671 -#. * "git add -u" or "git add -A". For now, we warn and

1672 -#. * keep the old behavior. Later, the behavior can be changed

1673 -#. * to tree-wide, keeping the warning for a while, and

1674 -#. * eventually we can drop the warning.

1675 -#.

1676 -#: builtin/add.c:335

1677 -#, c-format

1678 -msgid ""

1679 -"The behavior of 'git add %s (or %s)' with no path argument from a\n"

1680 -"subdirectory of the tree will change in Git 2.0 and should not be used "

1681 -"anymore.\n"

1682 -"To add content for the whole tree, run:\n"

1683 -"\n"

1684 -" git add %s :/\n"

1685 -" (or git add %s :/)\n"

1686 -"\n"

1687 -"To restrict the command to the current directory, run:\n"

1688 -"\n"

1689 -" git add %s .\n"

1690 -" (or git add %s .)\n"

1691 -"\n"

1692 -"With the current Git version, the command is restricted to the current "

1693 -"directory."

1694 -msgstr ""

1695 -"在 Git 2.0 版本，将不再允许在一个子目录下不带任何路径参数地执行\n"

1696 -"命令 'git add %s (或 %s)'。所以不要再继续使用了。\n"

1697 -"如果要添加整个目录树的内容，执行：\n"

1698 -"\n"

1699 -" git add %s :/\n"

1700 -" (或 git add %s :/)\n"

1701 -"\n"

1702 -"如果要限制该命令只作用于当前目录，执行：\n"

1703 -"\n"

1704 -" git add %s .\n"

1705 -" (或 git add %s .)\n"

1706 -"\n"

1707 -"对于当前版本的 Git，这条命令只作用于当前目录。"

1708 -

1709 -#: builtin/add.c:381

1838 +#: builtin/add.c:477

1839 msgid "-A and -u are mutually incompatible"

1840 msgstr "-A 和 -u 选项互斥"

1841

1713 -#: builtin/add.c:383

1842 +#: builtin/add.c:495

1843 msgid "Option --ignore-missing can only be used together with --dry-run"

1844 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"

1845

1717 -#: builtin/add.c:414

1846 +#: builtin/add.c:525

1847 #, c-format

1848 msgid "Nothing specified, nothing added.\n"

1849 msgstr "没有指定文件，也没有文件被添加。\n"

1850

1722 -#: builtin/add.c:415

1851 +#: builtin/add.c:526

1852 #, c-format

1853 msgid "Maybe you wanted to say 'git add .'?\n"

1854 msgstr "也许您想要执行 'git add .'？\n"

1855

1727 -#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204

1856 +#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204

1857 #: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235

1858 msgid "index file corrupt"

1859 msgstr "索引文件损坏"

1860

1732 -#: builtin/add.c:481 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370

1861 +#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370

1862 msgid "Unable to write new index file"

1863 msgstr "无法写入新索引文件"

1864

@@ -1977,7 +2106,7 @@ msgstr "%s：补丁未应用"

2106 msgid "Checking patch %s..."

2107 msgstr "检查补丁 %s..."

2108

1980 -#: builtin/apply.c:3679 builtin/checkout.c:215 builtin/reset.c:124

2109 +#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124

2110 #, c-format

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

2112 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"

@@ -2118,7 +2247,7 @@ msgstr "如果一个补丁不能应用则尝试三路合并"

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

2248 msgstr "创建一个临时索引基于嵌入的索引信息"

2249

2121 -#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:463

2250 +#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456

2251 msgid "paths are separated with NUL character"

2252 msgstr "路径以 NUL 字符分隔"

2253

@@ -2252,99 +2381,99 @@ msgstr "更新 BISECT_HEAD 而非检出当前提交"

2381 msgid "git blame [options] [rev-opts] [rev] [--] file"

2382 msgstr "git blame [选项] [版本选项] [版本] [--] 文件"

2383

2255 -#: builtin/blame.c:30 builtin/shortlog.c:15

2384 +#: builtin/blame.c:30

2385 msgid "[rev-opts] are documented in git-rev-list(1)"

2386 msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中"

2387

2259 -#: builtin/blame.c:2350

2388 +#: builtin/blame.c:2355

2389 msgid "Show blame entries as we find them, incrementally"

2390 msgstr "增量式地显示发现的 blame 条目"

2391

2263 -#: builtin/blame.c:2351

2392 +#: builtin/blame.c:2356

2393 msgid "Show blank SHA-1 for boundary commits (Default: off)"

2394 msgstr "边界提交显示空的 SHA-1（默认：关闭）"

2395

2267 -#: builtin/blame.c:2352

2396 +#: builtin/blame.c:2357

2397 msgid "Do not treat root commits as boundaries (Default: off)"

2398 msgstr "不把根提交作为边界（默认：关闭）"

2399

2271 -#: builtin/blame.c:2353

2400 +#: builtin/blame.c:2358

2401 msgid "Show work cost statistics"

2402 msgstr "显示命令消耗统计"

2403

2275 -#: builtin/blame.c:2354

2404 +#: builtin/blame.c:2359

2405 msgid "Show output score for blame entries"

2406 msgstr "显示判断 blame 条目位移的得分诊断信息"

2407

2279 -#: builtin/blame.c:2355

2408 +#: builtin/blame.c:2360

2409 msgid "Show original filename (Default: auto)"

2410 msgstr "显示原始文件名（默认：自动）"

2411

2283 -#: builtin/blame.c:2356

2412 +#: builtin/blame.c:2361

2413 msgid "Show original linenumber (Default: off)"

2414 msgstr "显示原始的行号（默认：关闭）"

2415

2287 -#: builtin/blame.c:2357

2416 +#: builtin/blame.c:2362

2417 msgid "Show in a format designed for machine consumption"

2418 msgstr "显示为一个适合机器读取的格式"

2419

2291 -#: builtin/blame.c:2358

2420 +#: builtin/blame.c:2363

2421 msgid "Show porcelain format with per-line commit information"

2422 msgstr "为每一行显示机器适用的提交信息"

2423

2295 -#: builtin/blame.c:2359

2424 +#: builtin/blame.c:2364

2425 msgid "Use the same output mode as git-annotate (Default: off)"

2426 msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"

2427

2299 -#: builtin/blame.c:2360

2428 +#: builtin/blame.c:2365

2429 msgid "Show raw timestamp (Default: off)"

2430 msgstr "显示原始时间戳（默认：关闭）"

2431

2303 -#: builtin/blame.c:2361

2432 +#: builtin/blame.c:2366

2433 msgid "Show long commit SHA1 (Default: off)"

2434 msgstr "显示长的SHA1提交号（默认：关闭）"

2435

2307 -#: builtin/blame.c:2362

2436 +#: builtin/blame.c:2367

2437 msgid "Suppress author name and timestamp (Default: off)"

2438 msgstr "隐藏作者名字和时间戳（默认：关闭）"

2439

2311 -#: builtin/blame.c:2363

2440 +#: builtin/blame.c:2368

2441 msgid "Show author email instead of name (Default: off)"

2442 msgstr "显示作者的邮箱而不是名字（默认：关闭）"

2443

2315 -#: builtin/blame.c:2364

2444 +#: builtin/blame.c:2369

2445 msgid "Ignore whitespace differences"

2446 msgstr "忽略空白差异"

2447

2319 -#: builtin/blame.c:2365

2448 +#: builtin/blame.c:2370

2449 msgid "Spend extra cycles to find better match"

2450 msgstr "花费额外的循环来找到更好的匹配"

2451

2323 -#: builtin/blame.c:2366

2452 +#: builtin/blame.c:2371

2453 msgid "Use revisions from <file> instead of calling git-rev-list"

2454 msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list"

2455

2327 -#: builtin/blame.c:2367

2456 +#: builtin/blame.c:2372

2457 msgid "Use <file>'s contents as the final image"

2458 msgstr "使用 <file> 的内容作为最终的图片"

2459

2331 -#: builtin/blame.c:2368 builtin/blame.c:2369

2460 +#: builtin/blame.c:2373 builtin/blame.c:2374

2461 msgid "score"

2462 msgstr "得分"

2463

2335 -#: builtin/blame.c:2368

2464 +#: builtin/blame.c:2373

2465 msgid "Find line copies within and across files"

2466 msgstr "找到文件内及跨文件的行拷贝"

2467

2339 -#: builtin/blame.c:2369

2468 +#: builtin/blame.c:2374

2469 msgid "Find line movements within and across files"

2470 msgstr "找到文件内及跨文件的行移动"

2471

2343 -#: builtin/blame.c:2370

2472 +#: builtin/blame.c:2375

2473 msgid "n,m"

2474 msgstr "n,m"

2475

2347 -#: builtin/blame.c:2370

2476 +#: builtin/blame.c:2375

2477 msgid "Process only line range n,m, counting from 1"

2478 msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"

2479

@@ -2365,7 +2494,7 @@ msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"

2494 msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>"

2495

2496 # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长

2368 -#: builtin/branch.c:146

2497 +#: builtin/branch.c:150

2498 #, c-format

2499 msgid ""

2500 "deleting branch '%s' that has been merged to\n"

@@ -2375,7 +2504,7 @@ msgstr ""

2504 " '%s'，但未合并到 HEAD。"

2505

2506 # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长

2378 -#: builtin/branch.c:150

2507 +#: builtin/branch.c:154

2508 #, c-format

2509 msgid ""

2510 "not deleting branch '%s' that is not yet merged to\n"

@@ -2384,12 +2513,12 @@ msgstr ""

2513 "并未删除分支 '%s'，虽然它已经合并到 HEAD，\n"

2514 " 然而却尚未被合并到分支 '%s' 。"

2515

2387 -#: builtin/branch.c:164

2516 +#: builtin/branch.c:168

2517 #, c-format

2518 msgid "Couldn't look up commit object for '%s'"

2519 msgstr "无法查询 '%s' 指向的提交对象"

2520

2392 -#: builtin/branch.c:168

2521 +#: builtin/branch.c:172

2522 #, c-format

2523 msgid ""

2524 "The branch '%s' is not fully merged.\n"

@@ -2398,327 +2527,327 @@ msgstr ""

2527 "分支 '%s' 没有完全合并。\n"

2528 "如果您确认要删除它，执行 'git branch -D %s'。"

2529

2401 -#: builtin/branch.c:181

2530 +#: builtin/branch.c:185

2531 msgid "Update of config-file failed"

2532 msgstr "无法更新 config 文件"

2533

2405 -#: builtin/branch.c:209

2534 +#: builtin/branch.c:213

2535 msgid "cannot use -a with -d"

2536 msgstr "不能将 -a 和 -d 同时使用"

2537

2409 -#: builtin/branch.c:215

2538 +#: builtin/branch.c:219

2539 msgid "Couldn't look up commit object for HEAD"

2540 msgstr "无法查询 HEAD 指向的提交对象"

2541

2413 -#: builtin/branch.c:223

2542 +#: builtin/branch.c:227

2543 #, c-format

2544 msgid "Cannot delete the branch '%s' which you are currently on."

2545 msgstr "无法删除您当前所在的分支 '%s'。"

2546

2418 -#: builtin/branch.c:236

2547 +#: builtin/branch.c:240

2548 #, c-format

2549 msgid "remote branch '%s' not found."

2550 msgstr "远程分支 '%s' 未发现。"

2551

2423 -#: builtin/branch.c:237

2552 +#: builtin/branch.c:241

2553 #, c-format

2554 msgid "branch '%s' not found."

2555 msgstr "分支 '%s' 未发现。"

2556

2428 -#: builtin/branch.c:251

2557 +#: builtin/branch.c:255

2558 #, c-format

2559 msgid "Error deleting remote branch '%s'"

2560 msgstr "删除远程分支 '%s' 时出错"

2561

2433 -#: builtin/branch.c:252

2562 +#: builtin/branch.c:256

2563 #, c-format

2564 msgid "Error deleting branch '%s'"

2565 msgstr "删除分支 '%s' 时出错"

2566

2438 -#: builtin/branch.c:259

2567 +#: builtin/branch.c:263

2568 #, c-format

2569 msgid "Deleted remote branch %s (was %s).\n"

2570 msgstr "已删除远程分支 %s（曾为 %s）。\n"

2571

2443 -#: builtin/branch.c:260

2572 +#: builtin/branch.c:264

2573 #, c-format

2574 msgid "Deleted branch %s (was %s).\n"

2575 msgstr "已删除分支 %s（曾为 %s）。\n"

2576

2448 -#: builtin/branch.c:362

2577 +#: builtin/branch.c:366

2578 #, c-format

2579 msgid "branch '%s' does not point at a commit"

2580 msgstr "分支 '%s' 未指向一个提交"

2581

2453 -#: builtin/branch.c:434

2582 +#: builtin/branch.c:453

2583 #, c-format

2584 msgid "[%s: behind %d]"

2585 msgstr "[%s：落后 %d]"

2586

2458 -#: builtin/branch.c:436

2587 +#: builtin/branch.c:455

2588 #, c-format

2589 msgid "[behind %d]"

2590 msgstr "[落后 %d]"

2591

2463 -#: builtin/branch.c:440

2592 +#: builtin/branch.c:459

2593 #, c-format

2594 msgid "[%s: ahead %d]"

2595 msgstr "[%s：领先 %d]"

2596

2468 -#: builtin/branch.c:442

2597 +#: builtin/branch.c:461

2598 #, c-format

2599 msgid "[ahead %d]"

2600 msgstr "[领先 %d]"

2601

2473 -#: builtin/branch.c:445

2602 +#: builtin/branch.c:464

2603 #, c-format

2604 msgid "[%s: ahead %d, behind %d]"

2605 msgstr "[%s：领先 %d，落后 %d]"

2606

2478 -#: builtin/branch.c:448

2607 +#: builtin/branch.c:467

2608 #, c-format

2609 msgid "[ahead %d, behind %d]"

2610 msgstr "[领先 %d，落后 %d]"

2611

2483 -#: builtin/branch.c:470

2612 +#: builtin/branch.c:490

2613 msgid " **** invalid ref ****"

2614 msgstr " **** 无效引用 ****"

2615

2487 -#: builtin/branch.c:562

2616 +#: builtin/branch.c:582

2617 #, c-format

2618 msgid "(no branch, rebasing %s)"

2619 msgstr "（非分支，正变基 %s）"

2620

2492 -#: builtin/branch.c:565

2621 +#: builtin/branch.c:585

2622 #, c-format

2623 msgid "(no branch, bisect started on %s)"

2624 msgstr "（非分支，二分查找开始于 %s）"

2625

2497 -#: builtin/branch.c:568

2626 +#: builtin/branch.c:588

2627 #, c-format

2628 msgid "(detached from %s)"

2629 msgstr "（分离自 %s）"

2630

2502 -#: builtin/branch.c:571

2631 +#: builtin/branch.c:591

2632 msgid "(no branch)"

2633 msgstr "（非分支）"

2634

2506 -#: builtin/branch.c:617

2635 +#: builtin/branch.c:637

2636 #, c-format

2637 msgid "object '%s' does not point to a commit"

2638 msgstr "对象 '%s' 没有指向一个提交"

2639

2511 -#: builtin/branch.c:649

2640 +#: builtin/branch.c:669

2641 msgid "some refs could not be read"

2642 msgstr "一些引用不能读取"

2643

2515 -#: builtin/branch.c:662

2644 +#: builtin/branch.c:682

2645 msgid "cannot rename the current branch while not on any."

2646 msgstr "无法重命名当前分支因为不处于任何分支上。"

2647

2519 -#: builtin/branch.c:672

2648 +#: builtin/branch.c:692

2649 #, c-format

2650 msgid "Invalid branch name: '%s'"

2651 msgstr "无效的分支名：'%s'"

2652

2524 -#: builtin/branch.c:687

2653 +#: builtin/branch.c:707

2654 msgid "Branch rename failed"

2655 msgstr "分支重命名失败"

2656

2528 -#: builtin/branch.c:691

2657 +#: builtin/branch.c:711

2658 #, c-format

2659 msgid "Renamed a misnamed branch '%s' away"

2660 msgstr "重命名掉一个错误命名的旧分支 '%s'"

2661

2533 -#: builtin/branch.c:695

2662 +#: builtin/branch.c:715

2663 #, c-format

2664 msgid "Branch renamed to %s, but HEAD is not updated!"

2665 msgstr "分支重命名为 %s，但 HEAD 没有更新！"

2666

2538 -#: builtin/branch.c:702

2667 +#: builtin/branch.c:722

2668 msgid "Branch is renamed, but update of config-file failed"

2669 msgstr "分支被重命名，但更新 config 文件失败"

2670

2542 -#: builtin/branch.c:717

2671 +#: builtin/branch.c:737

2672 #, c-format

2673 msgid "malformed object name %s"

2674 msgstr "非法的对象名 %s"

2675

2547 -#: builtin/branch.c:741

2676 +#: builtin/branch.c:761

2677 #, c-format

2678 msgid "could not write branch description template: %s"

2679 msgstr "不能写分支描述模版：%s"

2680

2552 -#: builtin/branch.c:771

2681 +#: builtin/branch.c:791

2682 msgid "Generic options"

2683 msgstr "通用选项"

2684

2556 -#: builtin/branch.c:773

2685 +#: builtin/branch.c:793

2686 msgid "show hash and subject, give twice for upstream branch"

2687 msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"

2688

2560 -#: builtin/branch.c:774

2689 +#: builtin/branch.c:794

2690 msgid "suppress informational messages"

2691 msgstr "不显示信息"

2692

2564 -#: builtin/branch.c:775

2693 +#: builtin/branch.c:795

2694 msgid "set up tracking mode (see git-pull(1))"

2695 msgstr "设置跟踪模式（参见 git-pull(1)）"

2696

2568 -#: builtin/branch.c:777

2697 +#: builtin/branch.c:797

2698 msgid "change upstream info"

2699 msgstr "改变上游信息"

2700

2572 -#: builtin/branch.c:781

2701 +#: builtin/branch.c:801

2702 msgid "use colored output"

2703 msgstr "使用彩色输出"

2704

2576 -#: builtin/branch.c:782

2705 +#: builtin/branch.c:802

2706 msgid "act on remote-tracking branches"

2707 msgstr "作用于远程跟踪分支"

2708

2580 -#: builtin/branch.c:785 builtin/branch.c:791 builtin/branch.c:812

2581 -#: builtin/branch.c:818 builtin/commit.c:1368 builtin/commit.c:1369

2709 +#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832

2710 +#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369

2711 #: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468

2712 msgid "commit"

2713 msgstr "提交"

2714

2586 -#: builtin/branch.c:786 builtin/branch.c:792

2715 +#: builtin/branch.c:806 builtin/branch.c:812

2716 msgid "print only branches that contain the commit"

2717 msgstr "只打印包含该提交的分支"

2718

2590 -#: builtin/branch.c:798

2719 +#: builtin/branch.c:818

2720 msgid "Specific git-branch actions:"

2721 msgstr "具体的 git-branch 动作："

2722

2594 -#: builtin/branch.c:799

2723 +#: builtin/branch.c:819

2724 msgid "list both remote-tracking and local branches"

2725 msgstr "列出远程跟踪及本地分支"

2726

2598 -#: builtin/branch.c:801

2727 +#: builtin/branch.c:821

2728 msgid "delete fully merged branch"

2729 msgstr "删除完全合并的分支"

2730

2602 -#: builtin/branch.c:802

2731 +#: builtin/branch.c:822

2732 msgid "delete branch (even if not merged)"

2733 msgstr "删除分支（即使没有合并）"

2734

2606 -#: builtin/branch.c:803

2735 +#: builtin/branch.c:823

2736 msgid "move/rename a branch and its reflog"

2737 msgstr "移动/重命名一个分支，以及它的引用日志"

2738

2610 -#: builtin/branch.c:804

2739 +#: builtin/branch.c:824

2740 msgid "move/rename a branch, even if target exists"

2741 msgstr "移动/重命名一个分支，即使目标已存在"

2742

2614 -#: builtin/branch.c:805

2743 +#: builtin/branch.c:825

2744 msgid "list branch names"

2745 msgstr "列出分支名"

2746

2618 -#: builtin/branch.c:806

2747 +#: builtin/branch.c:826

2748 msgid "create the branch's reflog"

2749 msgstr "创建分支的引用日志"

2750

2622 -#: builtin/branch.c:808

2751 +#: builtin/branch.c:828

2752 msgid "edit the description for the branch"

2753 msgstr "标记分支的描述"

2754

2626 -#: builtin/branch.c:809

2755 +#: builtin/branch.c:829

2756 msgid "force creation (when already exists)"

2757 msgstr "强制创建（当已经存在）"

2758

2630 -#: builtin/branch.c:812

2759 +#: builtin/branch.c:832

2760 msgid "print only not merged branches"

2761 msgstr "只打印没有合并的分支"

2762

2634 -#: builtin/branch.c:818

2763 +#: builtin/branch.c:838

2764 msgid "print only merged branches"

2765 msgstr "只打印合并的分支"

2766

2638 -#: builtin/branch.c:822

2767 +#: builtin/branch.c:842

2768 msgid "list branches in columns"

2769 msgstr "以列的方式显示分支"

2770

2642 -#: builtin/branch.c:835

2771 +#: builtin/branch.c:855

2772 msgid "Failed to resolve HEAD as a valid ref."

2773 msgstr "无法将 HEAD 解析为有效引用。"

2774

2646 -#: builtin/branch.c:840 builtin/clone.c:609

2775 +#: builtin/branch.c:860 builtin/clone.c:619

2776 msgid "HEAD not found below refs/heads!"

2777 msgstr "HEAD 没有位于 /refs/heads 之下！"

2778

2650 -#: builtin/branch.c:863

2779 +#: builtin/branch.c:883

2780 msgid "--column and --verbose are incompatible"

2781 msgstr "--column 和 --verbose 不兼容"

2782

2654 -#: builtin/branch.c:869 builtin/branch.c:908

2783 +#: builtin/branch.c:889 builtin/branch.c:928

2784 msgid "branch name required"

2785 msgstr "必须提供分支名"

2786

2658 -#: builtin/branch.c:884

2787 +#: builtin/branch.c:904

2788 msgid "Cannot give description to detached HEAD"

2789 msgstr "不能向分离头指针提供描述"

2790

2662 -#: builtin/branch.c:889

2791 +#: builtin/branch.c:909

2792 msgid "cannot edit description of more than one branch"

2793 msgstr "不能为一个以上的分支编辑描述"

2794

2666 -#: builtin/branch.c:896

2795 +#: builtin/branch.c:916

2796 #, c-format

2797 msgid "No commit on branch '%s' yet."

2798 msgstr "分支 '%s' 尚无提交。"

2799

2671 -#: builtin/branch.c:899

2800 +#: builtin/branch.c:919

2801 #, c-format

2802 msgid "No branch named '%s'."

2803 msgstr "没有分支 '%s'。"

2804

2676 -#: builtin/branch.c:914

2805 +#: builtin/branch.c:934

2806 msgid "too many branches for a rename operation"

2807 msgstr "为重命名操作提供了太多的分支名"

2808

2680 -#: builtin/branch.c:919

2809 +#: builtin/branch.c:939

2810 msgid "too many branches to set new upstream"

2811 msgstr "为设置新上游提供了太多的分支名"

2812

2684 -#: builtin/branch.c:923

2813 +#: builtin/branch.c:943

2814 #, c-format

2815 msgid ""

2816 "could not set upstream of HEAD to %s when it does not point to any branch."

2817 msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"

2818

2690 -#: builtin/branch.c:926 builtin/branch.c:948 builtin/branch.c:970

2819 +#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990

2820 #, c-format

2821 msgid "no such branch '%s'"

2822 msgstr "没有此分支 '%s'"

2823

2695 -#: builtin/branch.c:930

2824 +#: builtin/branch.c:950

2825 #, c-format

2826 msgid "branch '%s' does not exist"

2827 msgstr "分支 '%s' 不存在"

2828

2700 -#: builtin/branch.c:942

2829 +#: builtin/branch.c:962

2830 msgid "too many branches to unset upstream"

2831 msgstr "为取消上游设置操作提供了太多的分支名"

2832

2704 -#: builtin/branch.c:946

2833 +#: builtin/branch.c:966

2834 msgid "could not unset upstream of HEAD when it does not point to any branch."

2835 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"

2836

2708 -#: builtin/branch.c:952

2837 +#: builtin/branch.c:972

2838 #, c-format

2839 msgid "Branch '%s' has no upstream information"

2840 msgstr "分支 '%s' 没有上游信息"

2841

2713 -#: builtin/branch.c:967

2842 +#: builtin/branch.c:987

2843 msgid "it does not make sense to create 'HEAD' manually"

2844 msgstr "手工创建 'HEAD' 没有意义"

2845

2717 -#: builtin/branch.c:973

2846 +#: builtin/branch.c:993

2847 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

2848 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"

2849

2721 -#: builtin/branch.c:976

2850 +#: builtin/branch.c:996

2851 #, c-format

2852 msgid ""

2853 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -2726,7 +2855,7 @@ msgid ""

2855 msgstr ""

2856 "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"

2857

2729 -#: builtin/branch.c:993

2858 +#: builtin/branch.c:1013

2859 #, c-format

2860 msgid ""

2861 "\n"

@@ -2737,12 +2866,12 @@ msgstr ""

2866 "如果你想用 '%s' 跟踪 '%s', 这么做：\n"

2867 "\n"

2868

2740 -#: builtin/branch.c:994

2869 +#: builtin/branch.c:1014

2870 #, c-format

2871 msgid " git branch -d %s\n"

2872 msgstr " git branch -d %s\n"

2873

2745 -#: builtin/branch.c:995

2874 +#: builtin/branch.c:1015

2875 #, c-format

2876 msgid " git branch --set-upstream-to %s\n"

2877 msgstr " git branch --set-upstream-to %s\n"

@@ -2760,43 +2889,43 @@ msgstr "需要一个版本库来创建包。"

2889 msgid "Need a repository to unbundle."

2890 msgstr "需要一个版本库来解包。"

2891

2763 -#: builtin/cat-file.c:247

2892 +#: builtin/cat-file.c:176

2893 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"

2894 msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>"

2895

2767 -#: builtin/cat-file.c:248

2896 +#: builtin/cat-file.c:177

2897 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"

2898 msgstr "git cat-file (--batch|--batch-check) < <对象列表>"

2899

2771 -#: builtin/cat-file.c:266

2900 +#: builtin/cat-file.c:195

2901 msgid "<type> can be one of: blob, tree, commit, tag"

2902 msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"

2903

2775 -#: builtin/cat-file.c:267

2904 +#: builtin/cat-file.c:196

2905 msgid "show object type"

2906 msgstr "显示对象类型"

2907

2779 -#: builtin/cat-file.c:268

2908 +#: builtin/cat-file.c:197

2909 msgid "show object size"

2910 msgstr "显示对象大小"

2911

2783 -#: builtin/cat-file.c:270

2912 +#: builtin/cat-file.c:199

2913 msgid "exit with zero when there's no error"

2914 msgstr "当没有错误时退出并返回零"

2915

2787 -#: builtin/cat-file.c:271

2916 +#: builtin/cat-file.c:200

2917 msgid "pretty-print object's content"

2918 msgstr "美观地打印对象的内容"

2919

2791 -#: builtin/cat-file.c:273

2920 +#: builtin/cat-file.c:202

2921 msgid "for blob objects, run textconv on object's content"

2922 msgstr "对于数据（blob）对象，对其内容执行 textconv"

2923

2795 -#: builtin/cat-file.c:275

2924 +#: builtin/cat-file.c:204

2925 msgid "show info and content of objects fed from the standard input"

2926 msgstr "显示从标准输入提供的对象的信息和内容"

2927

2799 -#: builtin/cat-file.c:278

2928 +#: builtin/cat-file.c:207

2929 msgid "show info about objects fed from the standard input"

2930 msgstr "显示从标准输入提供的对象的信息"

2931

@@ -2824,27 +2953,27 @@ msgstr "从标准输入读出文件名"

2953 msgid "input paths are terminated by a null character"

2954 msgstr "输入路径以null字符终止"

2955

2827 -#: builtin/check-ignore.c:18 builtin/checkout.c:1041 builtin/gc.c:177

2956 +#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177

2957 msgid "suppress progress reporting"

2958 msgstr "不显示进度报告"

2959

2831 -#: builtin/check-ignore.c:151

2960 +#: builtin/check-ignore.c:146

2961 msgid "cannot specify pathnames with --stdin"

2962 msgstr "不能同时提供路径及 --stdin 参数"

2963

2835 -#: builtin/check-ignore.c:154

2964 +#: builtin/check-ignore.c:149

2965 msgid "-z only makes sense with --stdin"

2966 msgstr "-z 需要和 --stdin 参数共用才有意义"

2967

2839 -#: builtin/check-ignore.c:156

2968 +#: builtin/check-ignore.c:151

2969 msgid "no path specified"

2970 msgstr "未指定路径"

2971

2843 -#: builtin/check-ignore.c:160

2972 +#: builtin/check-ignore.c:155

2973 msgid "--quiet is only valid with a single pathname"

2974 msgstr "参数 --quiet 只在提供一个路径名时有效"

2975

2847 -#: builtin/check-ignore.c:162

2976 +#: builtin/check-ignore.c:157

2977 msgid "cannot have both --quiet and --verbose"

2978 msgstr "不能同时提供 --quiet 和 --verbose 参数"

2979

@@ -2900,107 +3029,107 @@ msgstr "git checkout [选项] <分支>"

3029 msgid "git checkout [options] [<branch>] -- <file>..."

3030 msgstr "git checkout [选项] [<分支>] -- <文件>..."

3031

2903 -#: builtin/checkout.c:116 builtin/checkout.c:149

3032 +#: builtin/checkout.c:117 builtin/checkout.c:150

3033 #, c-format

3034 msgid "path '%s' does not have our version"

3035 msgstr "路径 '%s' 没有我们的版本"

3036

2908 -#: builtin/checkout.c:118 builtin/checkout.c:151

3037 +#: builtin/checkout.c:119 builtin/checkout.c:152

3038 #, c-format

3039 msgid "path '%s' does not have their version"

3040 msgstr "路径 '%s' 没有他们的版本"

3041

2913 -#: builtin/checkout.c:134

3042 +#: builtin/checkout.c:135

3043 #, c-format

3044 msgid "path '%s' does not have all necessary versions"

3045 msgstr "路径 '%s' 没有全部必须的版本"

3046

2918 -#: builtin/checkout.c:178

3047 +#: builtin/checkout.c:179

3048 #, c-format

3049 msgid "path '%s' does not have necessary versions"

3050 msgstr "路径 '%s' 没有必须的版本"

3051

2923 -#: builtin/checkout.c:195

3052 +#: builtin/checkout.c:196

3053 #, c-format

3054 msgid "path '%s': cannot merge"

3055 msgstr "path '%s'：无法合并"

3056

2928 -#: builtin/checkout.c:212

3057 +#: builtin/checkout.c:213

3058 #, c-format

3059 msgid "Unable to add merge result for '%s'"

3060 msgstr "无法为 '%s' 添加合并结果"

3061

2933 -#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242

2934 -#: builtin/checkout.c:245

3062 +#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243

3063 +#: builtin/checkout.c:246

3064 #, c-format

3065 msgid "'%s' cannot be used with updating paths"

3066 msgstr "'%s' 不能在更新路径时使用"

3067

2939 -#: builtin/checkout.c:248 builtin/checkout.c:251

3068 +#: builtin/checkout.c:249 builtin/checkout.c:252

3069 #, c-format

3070 msgid "'%s' cannot be used with %s"

3071 msgstr "'%s' 不能和 %s 同时使用"

3072

2944 -#: builtin/checkout.c:254

3073 +#: builtin/checkout.c:255

3074 #, c-format

3075 msgid "Cannot update paths and switch to branch '%s' at the same time."

3076 msgstr "不能同时更新路径并切换到分支'%s'。"

3077

2949 -#: builtin/checkout.c:265 builtin/checkout.c:455

3078 +#: builtin/checkout.c:266 builtin/checkout.c:458

3079 msgid "corrupt index file"

3080 msgstr "损坏的索引文件"

3081

2953 -#: builtin/checkout.c:326 builtin/checkout.c:333

3082 +#: builtin/checkout.c:329 builtin/checkout.c:336

3083 #, c-format

3084 msgid "path '%s' is unmerged"

3085 msgstr "路径 '%s' 未合并"

3086

2958 -#: builtin/checkout.c:477

3087 +#: builtin/checkout.c:480

3088 msgid "you need to resolve your current index first"

3089 msgstr "您需要先解决当前索引的冲突"

3090

2962 -#: builtin/checkout.c:598

3091 +#: builtin/checkout.c:601

3092 #, c-format

3093 msgid "Can not do reflog for '%s'\n"

3094 msgstr "不能对 '%s' 执行 reflog 操作\n"

3095

2967 -#: builtin/checkout.c:631

3096 +#: builtin/checkout.c:634

3097 msgid "HEAD is now at"

3098 msgstr "HEAD 目前位于"

3099

2971 -#: builtin/checkout.c:638

3100 +#: builtin/checkout.c:641

3101 #, c-format

3102 msgid "Reset branch '%s'\n"

3103 msgstr "重置分支 '%s'\n"

3104

2976 -#: builtin/checkout.c:641

3105 +#: builtin/checkout.c:644

3106 #, c-format

3107 msgid "Already on '%s'\n"

3108 msgstr "已经位于 '%s'\n"

3109

2981 -#: builtin/checkout.c:645

3110 +#: builtin/checkout.c:648

3111 #, c-format

3112 msgid "Switched to and reset branch '%s'\n"

3113 msgstr "切换并重置分支 '%s'\n"

3114

2986 -#: builtin/checkout.c:647 builtin/checkout.c:984

3115 +#: builtin/checkout.c:650 builtin/checkout.c:987

3116 #, c-format

3117 msgid "Switched to a new branch '%s'\n"

3118 msgstr "切换到一个新分支 '%s'\n"

3119

2991 -#: builtin/checkout.c:649

3120 +#: builtin/checkout.c:652

3121 #, c-format

3122 msgid "Switched to branch '%s'\n"

3123 msgstr "切换到分支 '%s'\n"

3124

3125 # 译者：注意保持前导空格

2997 -#: builtin/checkout.c:705

3126 +#: builtin/checkout.c:708

3127 #, c-format

3128 msgid " ... and %d more.\n"

3129 msgstr " ... 及其它 %d 个。\n"

3130

3131 #. The singular version

3003 -#: builtin/checkout.c:711

3132 +#: builtin/checkout.c:714

3133 #, c-format

3134 msgid ""

3135 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3021,7 +3150,7 @@ msgstr[1] ""

3150 "\n"

3151 "%s\n"

3152

3024 -#: builtin/checkout.c:729

3153 +#: builtin/checkout.c:732

3154 #, c-format

3155 msgid ""

3156 "If you want to keep them by creating a new branch, this may be a good time\n"

@@ -3036,132 +3165,136 @@ msgstr ""

3165 " git branch new_branch_name %s\n"

3166 "\n"

3167

3039 -#: builtin/checkout.c:759

3168 +#: builtin/checkout.c:762

3169 msgid "internal error in revision walk"

3170 msgstr "在版本遍历时遇到内部错误"

3171

3043 -#: builtin/checkout.c:763

3172 +#: builtin/checkout.c:766

3173 msgid "Previous HEAD position was"

3174 msgstr "之前的 HEAD 位置是"

3175

3047 -#: builtin/checkout.c:790 builtin/checkout.c:979

3176 +#: builtin/checkout.c:793 builtin/checkout.c:982

3177 msgid "You are on a branch yet to be born"

3178 msgstr "您位于一个尚未初始化的分支"

3179

3180 #. case (1)

3052 -#: builtin/checkout.c:915

3181 +#: builtin/checkout.c:918

3182 #, c-format

3183 msgid "invalid reference: %s"

3184 msgstr "无效引用：%s"

3185

3186 #. case (1): want a tree

3058 -#: builtin/checkout.c:954

3187 +#: builtin/checkout.c:957

3188 #, c-format

3189 msgid "reference is not a tree: %s"

3190 msgstr "引用不是一个树：%s"

3191

3063 -#: builtin/checkout.c:993

3192 +#: builtin/checkout.c:996

3193 msgid "paths cannot be used with switching branches"

3194 msgstr "路径不能和切换分支同时使用"

3195

3067 -#: builtin/checkout.c:996 builtin/checkout.c:1000

3196 +#: builtin/checkout.c:999 builtin/checkout.c:1003

3197 #, c-format

3198 msgid "'%s' cannot be used with switching branches"

3199 msgstr "'%s' 不能和切换分支同时使用"

3200

3072 -#: builtin/checkout.c:1004 builtin/checkout.c:1007 builtin/checkout.c:1012

3073 -#: builtin/checkout.c:1015

3201 +#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015

3202 +#: builtin/checkout.c:1018

3203 #, c-format

3204 msgid "'%s' cannot be used with '%s'"

3205 msgstr "'%s' 不能和 '%s' 同时使用"

3206

3078 -#: builtin/checkout.c:1020

3207 +#: builtin/checkout.c:1023

3208 #, c-format

3209 msgid "Cannot switch branch to a non-commit '%s'"

3210 msgstr "不能切换分支到一个非提交 '%s'"

3211

3083 -#: builtin/checkout.c:1042 builtin/checkout.c:1044 builtin/clone.c:90

3212 +#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90

3213 #: builtin/remote.c:169 builtin/remote.c:171

3214 msgid "branch"

3215 msgstr "分支"

3216

3088 -#: builtin/checkout.c:1043

3217 +#: builtin/checkout.c:1046

3218 msgid "create and checkout a new branch"

3219 msgstr "创建并检出一个新的分支"

3220

3092 -#: builtin/checkout.c:1045

3221 +#: builtin/checkout.c:1048

3222 msgid "create/reset and checkout a branch"

3223 msgstr "创建/重置并检出一个分支"

3224

3096 -#: builtin/checkout.c:1046

3225 +#: builtin/checkout.c:1049

3226 msgid "create reflog for new branch"

3227 msgstr "为新的分支创建引用日志"

3228

3100 -#: builtin/checkout.c:1047

3229 +#: builtin/checkout.c:1050

3230 msgid "detach the HEAD at named commit"

3231 msgstr "成为指向该提交的分离头指针"

3232

3104 -#: builtin/checkout.c:1048

3233 +#: builtin/checkout.c:1051

3234 msgid "set upstream info for new branch"

3235 msgstr "为新的分支设置上游信息"

3236

3108 -#: builtin/checkout.c:1050

3237 +#: builtin/checkout.c:1053

3238 msgid "new branch"

3239 msgstr "新分支"

3240

3112 -#: builtin/checkout.c:1050

3241 +#: builtin/checkout.c:1053

3242 msgid "new unparented branch"

3243 msgstr "新的没有父提交的分支"

3244

3116 -#: builtin/checkout.c:1051

3245 +#: builtin/checkout.c:1054

3246 msgid "checkout our version for unmerged files"

3247 msgstr "对尚未合并的文件检出我们的版本"

3248

3120 -#: builtin/checkout.c:1053

3249 +#: builtin/checkout.c:1056

3250 msgid "checkout their version for unmerged files"

3251 msgstr "对尚未合并的文件检出他们的版本"

3252

3124 -#: builtin/checkout.c:1055

3253 +#: builtin/checkout.c:1058

3254 msgid "force checkout (throw away local modifications)"

3255 msgstr "强制检出（丢弃本地修改）"

3256

3128 -#: builtin/checkout.c:1056

3257 +#: builtin/checkout.c:1059

3258 msgid "perform a 3-way merge with the new branch"

3259 msgstr "和新的分支执行三路合并"

3260

3132 -#: builtin/checkout.c:1057 builtin/merge.c:217

3261 +#: builtin/checkout.c:1060 builtin/merge.c:217

3262 msgid "update ignored files (default)"

3263 msgstr "更新忽略的文件（默认）"

3264

3136 -#: builtin/checkout.c:1058 builtin/log.c:1149 parse-options.h:245

3265 +#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245

3266 msgid "style"

3267 msgstr "风格"

3268

3140 -#: builtin/checkout.c:1059

3269 +#: builtin/checkout.c:1062

3270 msgid "conflict style (merge or diff3)"

3271 msgstr "冲突输出风格（merge 或 diff3）"

3272

3144 -#: builtin/checkout.c:1062

3273 +#: builtin/checkout.c:1065

3274 +msgid "do not limit pathspecs to sparse entries only"

3275 +msgstr "对路径不做稀疏检出的限制"

3276 +

3277 +#: builtin/checkout.c:1067

3278 msgid "second guess 'git checkout no-such-branch'"

3279 msgstr "再者猜测'git checkout no-such-branch'"

3280

3148 -#: builtin/checkout.c:1086

3281 +#: builtin/checkout.c:1091

3282 msgid "-b, -B and --orphan are mutually exclusive"

3283 msgstr "-b、-B 和 --orphan 是互斥的"

3284

3152 -#: builtin/checkout.c:1103

3285 +#: builtin/checkout.c:1108

3286 msgid "--track needs a branch name"

3287 msgstr "--track 需要一个分支名"

3288

3156 -#: builtin/checkout.c:1110

3289 +#: builtin/checkout.c:1115

3290 msgid "Missing branch name; try -b"

3291 msgstr "缺少分支名；尝试 -b"

3292

3160 -#: builtin/checkout.c:1145

3293 +#: builtin/checkout.c:1150

3294 msgid "invalid path specification"

3295 msgstr "无效的路径规格"

3296

3164 -#: builtin/checkout.c:1152

3297 +#: builtin/checkout.c:1157

3298 #, c-format

3299 msgid ""

3300 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3170,12 +3303,12 @@ msgstr ""

3303 "不能同时更新路径并切换到分支'%s'。\n"

3304 "您是想要检出 '%s' 但其未能解析为提交么？"

3305

3173 -#: builtin/checkout.c:1157

3306 +#: builtin/checkout.c:1162

3307 #, c-format

3308 msgid "git checkout: --detach does not take a path argument '%s'"

3309 msgstr "git checkout：--detach 不能接收路径参数 '%s'"

3310

3178 -#: builtin/checkout.c:1161

3311 +#: builtin/checkout.c:1166

3312 msgid ""

3313 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

3314 "checking out of the index."

@@ -3224,7 +3357,7 @@ msgid "remove whole directories"

3357 msgstr "删除整个目录"

3358

3359 #: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717

3227 -#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182

3360 +#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182

3361 msgid "pattern"

3362 msgstr "模式"

3363

@@ -3350,47 +3483,47 @@ msgstr "key=value"

3483 msgid "set config inside the new repository"

3484 msgstr "在新版本库中设置配置信息"

3485

3353 -#: builtin/clone.c:244

3486 +#: builtin/clone.c:254

3487 #, c-format

3355 -msgid "reference repository '%s' is not a local directory."

3356 -msgstr "引用版本库 '%s' 不是一个本地目录。"

3488 +msgid "reference repository '%s' is not a local repository."

3489 +msgstr "引用版本库 '%s' 不是一个本地版本库。"

3490

3358 -#: builtin/clone.c:307

3491 +#: builtin/clone.c:317

3492 #, c-format

3493 msgid "failed to create directory '%s'"

3494 msgstr "无法创建目录 '%s'"

3495

3363 -#: builtin/clone.c:309 builtin/diff.c:77

3496 +#: builtin/clone.c:319 builtin/diff.c:77

3497 #, c-format

3498 msgid "failed to stat '%s'"

3499 msgstr "无法枚举 '%s' 状态"

3500

3368 -#: builtin/clone.c:311

3501 +#: builtin/clone.c:321

3502 #, c-format

3503 msgid "%s exists and is not a directory"

3504 msgstr "%s 存在且不是一个目录"

3505

3373 -#: builtin/clone.c:325

3506 +#: builtin/clone.c:335

3507 #, c-format

3508 msgid "failed to stat %s\n"

3509 msgstr "无法枚举 %s 状态\n"

3510

3378 -#: builtin/clone.c:347

3511 +#: builtin/clone.c:357

3512 #, c-format

3513 msgid "failed to create link '%s'"

3514 msgstr "无法创建链接 '%s'"

3515

3383 -#: builtin/clone.c:351

3516 +#: builtin/clone.c:361

3517 #, c-format

3518 msgid "failed to copy file to '%s'"

3519 msgstr "无法拷贝文件至 '%s'"

3520

3388 -#: builtin/clone.c:374

3521 +#: builtin/clone.c:384

3522 #, c-format

3523 msgid "done.\n"

3524 msgstr "完成。\n"

3525

3393 -#: builtin/clone.c:387

3526 +#: builtin/clone.c:397

3527 msgid ""

3528 "Clone succeeded, but checkout failed.\n"

3529 "You can inspect what was checked out with 'git status'\n"

@@ -3400,90 +3533,90 @@ msgstr ""

3533 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"

3534 "'git checkout -f HEAD' 重试\n"

3535

3403 -#: builtin/clone.c:466

3536 +#: builtin/clone.c:476

3537 #, c-format

3538 msgid "Could not find remote branch %s to clone."

3539 msgstr "不能发现要克隆的远程分支 %s。"

3540

3408 -#: builtin/clone.c:540

3541 +#: builtin/clone.c:550

3542 msgid "remote did not send all necessary objects"

3543 msgstr "远程没有发送所有必须的对象"

3544

3412 -#: builtin/clone.c:600

3545 +#: builtin/clone.c:610

3546 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

3547 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"

3548

3416 -#: builtin/clone.c:631

3549 +#: builtin/clone.c:641

3550 msgid "unable to checkout working tree"

3551 msgstr "不能检出工作区"

3552

3420 -#: builtin/clone.c:739

3553 +#: builtin/clone.c:749

3554 msgid "Too many arguments."

3555 msgstr "太多参数。"

3556

3424 -#: builtin/clone.c:743

3557 +#: builtin/clone.c:753

3558 msgid "You must specify a repository to clone."

3559 msgstr "您必须指定一个版本库来克隆。"

3560

3428 -#: builtin/clone.c:754

3561 +#: builtin/clone.c:764

3562 #, c-format

3563 msgid "--bare and --origin %s options are incompatible."

3564 msgstr "--bare 和 --origin %s 选项不兼容。"

3565

3433 -#: builtin/clone.c:757

3566 +#: builtin/clone.c:767

3567 msgid "--bare and --separate-git-dir are incompatible."

3568 msgstr "--bare 和 --separate-git-dir 选项不兼容。"

3569

3437 -#: builtin/clone.c:770

3570 +#: builtin/clone.c:780

3571 #, c-format

3572 msgid "repository '%s' does not exist"

3573 msgstr "版本库 '%s' 不存在"

3574

3442 -#: builtin/clone.c:775

3575 +#: builtin/clone.c:785

3576 msgid "--depth is ignored in local clones; use file:// instead."

3577 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"

3578

3446 -#: builtin/clone.c:785

3579 +#: builtin/clone.c:795

3580 #, c-format

3581 msgid "destination path '%s' already exists and is not an empty directory."

3582 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

3583

3451 -#: builtin/clone.c:795

3584 +#: builtin/clone.c:805

3585 #, c-format

3586 msgid "working tree '%s' already exists."

3587 msgstr "工作区 '%s' 已经存在。"

3588

3456 -#: builtin/clone.c:808 builtin/clone.c:820

3589 +#: builtin/clone.c:818 builtin/clone.c:830

3590 #, c-format

3591 msgid "could not create leading directories of '%s'"

3592 msgstr "不能为 '%s' 创建先导目录"

3593

3461 -#: builtin/clone.c:811

3594 +#: builtin/clone.c:821

3595 #, c-format

3596 msgid "could not create work tree dir '%s'."

3597 msgstr "不能为 '%s' 创建工作区目录。"

3598

3466 -#: builtin/clone.c:830

3599 +#: builtin/clone.c:840

3600 #, c-format

3601 msgid "Cloning into bare repository '%s'...\n"

3602 msgstr "克隆到裸版本库 '%s'...\n"

3603

3471 -#: builtin/clone.c:832

3604 +#: builtin/clone.c:842

3605 #, c-format

3606 msgid "Cloning into '%s'...\n"

3607 msgstr "正克隆到 '%s'...\n"

3608

3476 -#: builtin/clone.c:867

3609 +#: builtin/clone.c:877

3610 #, c-format

3611 msgid "Don't know how to clone %s"

3612 msgstr "不知道如何克隆 %s"

3613

3481 -#: builtin/clone.c:916

3614 +#: builtin/clone.c:926

3615 #, c-format

3616 msgid "Remote branch %s not found in upstream %s"

3617 msgstr "远程分支 %s 在上游 %s 未发现"

3618

3486 -#: builtin/clone.c:923

3619 +#: builtin/clone.c:933

3620 msgid "You appear to have cloned an empty repository."

3621 msgstr "您似乎克隆了一个空版本库。"

3622

@@ -3626,7 +3759,7 @@ msgstr "非法的身份字符串：'%s'"

3759 msgid "could not lookup commit %s"

3760 msgstr "不能查询提交 %s"

3761

3629 -#: builtin/commit.c:612 builtin/shortlog.c:272

3762 +#: builtin/commit.c:612 builtin/shortlog.c:270

3763 #, c-format

3764 msgid "(reading log message from standard input)\n"

3765 msgstr "（正从标准输入中读取日志信息）\n"

@@ -3824,8 +3957,8 @@ msgstr "以长格式显示状态（默认）"

3957 msgid "terminate entries with NUL"

3958 msgstr "条目以NUL字符结尾"

3959

3827 -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:653

3828 -#: builtin/fast-export.c:656 builtin/tag.c:459

3960 +#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659

3961 +#: builtin/fast-export.c:662 builtin/tag.c:459

3962 msgid "mode"

3963 msgstr "模式"

3964

@@ -3930,7 +4063,7 @@ msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

4063 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4064 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"

4065

3933 -#: builtin/commit.c:1373 builtin/log.c:1104 builtin/revert.c:109

4066 +#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109

4067 msgid "add Signed-off-by:"

4068 msgstr "添加 Signed-off-by: 签名"

4069

@@ -4183,8 +4316,12 @@ msgid "respect include directives on lookup"

4316 msgstr "查询时参照 include 指令递归查找"

4317

4318 #: builtin/count-objects.c:82

4186 -msgid "git count-objects [-v]"

4187 -msgstr "git count-objects [-v]"

4319 +msgid "git count-objects [-v] [-H | --human-readable]"

4320 +msgstr "git count-objects [-v] [-H | --human-readable]"

4321 +

4322 +#: builtin/count-objects.c:97

4323 +msgid "print sizes in human readable format"

4324 +msgstr "以用户可读的格式显示大小"

4325

4326 #: builtin/describe.c:15

4327 msgid "git describe [options] <committish>*"

@@ -4360,39 +4497,39 @@ msgstr "提供了无法处理的对象 '%s'。"

4497 msgid "git fast-export [rev-list-opts]"

4498 msgstr "git fast-export [rev-list-opts]"

4499

4363 -#: builtin/fast-export.c:652

4500 +#: builtin/fast-export.c:658

4501 msgid "show progress after <n> objects"

4502 msgstr "在 <n> 个对象之后显示进度"

4503

4367 -#: builtin/fast-export.c:654

4504 +#: builtin/fast-export.c:660

4505 msgid "select handling of signed tags"

4506 msgstr "选择如何处理签名 tags"

4507

4371 -#: builtin/fast-export.c:657

4508 +#: builtin/fast-export.c:663

4509 msgid "select handling of tags that tag filtered objects"

4510 msgstr "选择当 tag 指向被过滤时 tags 的处理方式"

4511

4375 -#: builtin/fast-export.c:660

4512 +#: builtin/fast-export.c:666

4513 msgid "Dump marks to this file"

4514 msgstr "把标记存储到这个文件"

4515

4379 -#: builtin/fast-export.c:662

4516 +#: builtin/fast-export.c:668

4517 msgid "Import marks from this file"

4518 msgstr "从这个文件导入标记"

4519

4383 -#: builtin/fast-export.c:664

4520 +#: builtin/fast-export.c:670

4521 msgid "Fake a tagger when tags lack one"

4522 msgstr "当 tags 缺少标记者字段时，假装提供一个"

4523

4387 -#: builtin/fast-export.c:666

4524 +#: builtin/fast-export.c:672

4525 msgid "Output full tree for each commit"

4526 msgstr "每次提交都输出整个树"

4527

4391 -#: builtin/fast-export.c:668

4528 +#: builtin/fast-export.c:674

4529 msgid "Use the done feature to terminate the stream"

4530 msgstr "使用 done 功能来终止流"

4531

4395 -#: builtin/fast-export.c:669

4532 +#: builtin/fast-export.c:675

4533 msgid "Skip output of blob data"

4534 msgstr "跳过数据对象的输出"

4535

@@ -4469,7 +4606,7 @@ msgstr "深化浅克隆的历史"

4606 msgid "convert to a complete repository"

4607 msgstr "转换为一个完整的版本库"

4608

4472 -#: builtin/fetch.c:88 builtin/log.c:1121

4609 +#: builtin/fetch.c:88 builtin/log.c:1130

4610 msgid "dir"

4611 msgstr "目录"

4612

@@ -4650,29 +4787,29 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

4787 msgstr ""

4788 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

4789

4653 -#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701

4654 -#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175

4790 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701

4791 +#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175

4792 #: builtin/tag.c:446 parse-options.h:133 parse-options.h:239

4793 msgid "n"

4794 msgstr "n"

4795

4659 -#: builtin/fmt-merge-msg.c:660

4796 +#: builtin/fmt-merge-msg.c:664

4797 msgid "populate log with at most <n> entries from shortlog"

4798 msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"

4799

4663 -#: builtin/fmt-merge-msg.c:663

4800 +#: builtin/fmt-merge-msg.c:667

4801 msgid "alias for --log (deprecated)"

4802 msgstr "参数 --log 的别名（已弃用）"

4803

4667 -#: builtin/fmt-merge-msg.c:666

4804 +#: builtin/fmt-merge-msg.c:670

4805 msgid "text"

4806 msgstr "文本"

4807

4671 -#: builtin/fmt-merge-msg.c:667

4808 +#: builtin/fmt-merge-msg.c:671

4809 msgid "use <text> as start of message"

4810 msgstr "使用 <文本> 作为提交说明的开始"

4811

4675 -#: builtin/fmt-merge-msg.c:668

4812 +#: builtin/fmt-merge-msg.c:672

4813 msgid "file to read from"

4814 msgstr "从文件中读取"

4815

@@ -5063,50 +5200,54 @@ msgstr "原样存储文件不使用过滤器"

5200 msgid "process file as it were from this path"

5201 msgstr "处理文件并假设其来自于此路径"

5202

5066 -#: builtin/help.c:42

5203 +#: builtin/help.c:43

5204 msgid "print all available commands"

5205 msgstr "打印所有可用的命令"

5206

5070 -#: builtin/help.c:43

5207 +#: builtin/help.c:44

5208 +msgid "print list of useful guides"

5209 +msgstr "显示有用的指南列表"

5210 +

5211 +#: builtin/help.c:45

5212 msgid "show man page"

5213 msgstr "显示 man 手册"

5214

5074 -#: builtin/help.c:44

5215 +#: builtin/help.c:46

5216 msgid "show manual in web browser"

5217 msgstr "在 web 浏览器中显示手册"

5218

5078 -#: builtin/help.c:46

5219 +#: builtin/help.c:48

5220 msgid "show info page"

5221 msgstr "显示 info 手册"

5222

5082 -#: builtin/help.c:52

5083 -msgid "git help [--all] [--man|--web|--info] [command]"

5084 -msgstr "git help [--all] [--man|--web|--info] [命令]"

5223 +#: builtin/help.c:54

5224 +msgid "git help [--all] [--guides] [--man|--web|--info] [command]"

5225 +msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]"

5226

5086 -#: builtin/help.c:64

5227 +#: builtin/help.c:66

5228 #, c-format

5229 msgid "unrecognized help format '%s'"

5230 msgstr "未能识别的帮助格式 '%s'"

5231

5091 -#: builtin/help.c:92

5232 +#: builtin/help.c:94

5233 msgid "Failed to start emacsclient."

5234 msgstr "无法启动 emacsclient。"

5235

5095 -#: builtin/help.c:105

5236 +#: builtin/help.c:107

5237 msgid "Failed to parse emacsclient version."

5238 msgstr "无法解析 emacsclient 版本。"

5239

5099 -#: builtin/help.c:113

5240 +#: builtin/help.c:115

5241 #, c-format

5242 msgid "emacsclient version '%d' too old (< 22)."

5243 msgstr "emacsclient 版本 '%d' 太老（< 22）。"

5244

5104 -#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176

5245 +#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178

5246 #, c-format

5247 msgid "failed to exec '%s': %s"

5248 msgstr "无法执行 '%s'：%s"

5249

5109 -#: builtin/help.c:216

5250 +#: builtin/help.c:218

5251 #, c-format

5252 msgid ""

5253 "'%s': path for unsupported man viewer.\n"

@@ -5115,7 +5256,7 @@ msgstr ""

5256 "'%s'：不支持的 man 手册查看器的路径。\n"

5257 "请使用 'man.<tool>.cmd'。"

5258

5118 -#: builtin/help.c:228

5259 +#: builtin/help.c:230

5260 #, c-format

5261 msgid ""

5262 "'%s': cmd for supported man viewer.\n"

@@ -5124,25 +5265,57 @@ msgstr ""

5265 "'%s': 支持的 man 手册查看器命令。\n"

5266 "请使用 'man.<tool>.path'。"

5267

5127 -#: builtin/help.c:349

5268 +#: builtin/help.c:351

5269 #, c-format

5270 msgid "'%s': unknown man viewer."

5271 msgstr "'%s'：未知的 man 查看器。"

5272

5132 -#: builtin/help.c:366

5273 +#: builtin/help.c:368

5274 msgid "no man viewer handled the request"

5275 msgstr "没有 man 查看器处理此请求"

5276

5136 -#: builtin/help.c:374

5277 +#: builtin/help.c:376

5278 msgid "no info viewer handled the request"

5279 msgstr "没有 info 查看器处理此请求"

5280

5140 -#: builtin/help.c:429 builtin/help.c:436

5281 +#: builtin/help.c:422

5282 +msgid "Defining attributes per path"

5283 +msgstr "定义路径的属性"

5284 +

5285 +#: builtin/help.c:423

5286 +msgid "A Git glossary"

5287 +msgstr "Git 词汇表"

5288 +

5289 +#: builtin/help.c:424

5290 +msgid "Specifies intentionally untracked files to ignore"

5291 +msgstr "忽略指定的未跟踪文件"

5292 +

5293 +#: builtin/help.c:425

5294 +msgid "Defining submodule properties"

5295 +msgstr "定义子模组属性"

5296 +

5297 +#: builtin/help.c:426

5298 +msgid "Specifying revisions and ranges for Git"

5299 +msgstr "指定 Git 的版本和版本范围"

5300 +

5301 +#: builtin/help.c:427

5302 +msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

5303 +msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"

5304 +

5305 +#: builtin/help.c:428

5306 +msgid "An overview of recommended workflows with Git"

5307 +msgstr "Git 推荐的工作流概览"

5308 +

5309 +#: builtin/help.c:440

5310 +msgid "The common Git guides are:\n"

5311 +msgstr "最常用的 Git 向导有：\n"

5312 +

5313 +#: builtin/help.c:462 builtin/help.c:478

5314 #, c-format

5315 msgid "usage: %s%s"

5316 msgstr "用法：%s%s"

5317

5145 -#: builtin/help.c:452

5318 +#: builtin/help.c:494

5319 #, c-format

5320 msgid "`git %s' is aliased to `%s'"

5321 msgstr "`git %s' 是 `%s' 的别名"

@@ -5590,8 +5763,8 @@ msgid "Cannot access work tree '%s'"

5763 msgstr "不能访问工作区 '%s'"

5764

5765 #: builtin/log.c:40

5593 -msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"

5594 -msgstr "git log [<选项>] [<从>..<到>] [[--] <路径>...]\n"

5766 +msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"

5767 +msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n"

5768

5769 #: builtin/log.c:41

5770 msgid " or: git show [options] <object>..."

@@ -5628,301 +5801,301 @@ msgstr "不能读取对象 %s"

5801 msgid "Unknown type: %d"

5802 msgstr "未知类型：%d"

5803

5631 -#: builtin/log.c:630

5804 +#: builtin/log.c:638

5805 msgid "format.headers without value"

5806 msgstr "format.headers 没有值"

5807

5635 -#: builtin/log.c:704

5808 +#: builtin/log.c:720

5809 msgid "name of output directory is too long"

5810 msgstr "输出目录名太长"

5811

5639 -#: builtin/log.c:720

5812 +#: builtin/log.c:736

5813 #, c-format

5814 msgid "Cannot open patch file %s"

5815 msgstr "无法打开补丁文件 %s"

5816

5644 -#: builtin/log.c:734

5817 +#: builtin/log.c:750

5818 msgid "Need exactly one range."

5819 msgstr "只需要一个范围。"

5820

5648 -#: builtin/log.c:742

5821 +#: builtin/log.c:758

5822 msgid "Not a range."

5823 msgstr "不是一个范围。"

5824

5652 -#: builtin/log.c:815

5825 +#: builtin/log.c:860

5826 msgid "Cover letter needs email format"

5827 msgstr "信封需要邮件地址格式"

5828

5656 -#: builtin/log.c:888

5829 +#: builtin/log.c:936

5830 #, c-format

5831 msgid "insane in-reply-to: %s"

5832 msgstr "不正常的 in-reply-to：%s"

5833

5661 -#: builtin/log.c:916

5834 +#: builtin/log.c:964

5835 msgid "git format-patch [options] [<since> | <revision range>]"

5836 msgstr "git format-patch [选项] [<从> | <修订集范围>]"

5837

5665 -#: builtin/log.c:961

5838 +#: builtin/log.c:1009

5839 msgid "Two output directories?"

5840 msgstr "两个输出目录？"

5841

5669 -#: builtin/log.c:1099

5842 +#: builtin/log.c:1108

5843 msgid "use [PATCH n/m] even with a single patch"

5844 msgstr "使用 [PATCH n/m]，即使只有一个补丁"

5845

5673 -#: builtin/log.c:1102

5846 +#: builtin/log.c:1111

5847 msgid "use [PATCH] even with multiple patches"

5848 msgstr "使用 [PATCH]，即使有多个补丁"

5849

5677 -#: builtin/log.c:1106

5850 +#: builtin/log.c:1115

5851 msgid "print patches to standard out"

5852 msgstr "打印补丁到标准输出"

5853

5681 -#: builtin/log.c:1108

5854 +#: builtin/log.c:1117

5855 msgid "generate a cover letter"

5856 msgstr "生成一封附信"

5857

5685 -#: builtin/log.c:1110

5858 +#: builtin/log.c:1119

5859 msgid "use simple number sequence for output file names"

5860 msgstr "使用简单的数字序列作为输出文件名"

5861

5689 -#: builtin/log.c:1111

5862 +#: builtin/log.c:1120

5863 msgid "sfx"

5864 msgstr "后缀"

5865

5693 -#: builtin/log.c:1112

5866 +#: builtin/log.c:1121

5867 msgid "use <sfx> instead of '.patch'"

5868 msgstr "使用 <后缀> 代替 '.patch'"

5869

5697 -#: builtin/log.c:1114

5870 +#: builtin/log.c:1123

5871 msgid "start numbering patches at <n> instead of 1"

5872 msgstr "补丁以 <n> 开始编号，而不是1"

5873

5701 -#: builtin/log.c:1116

5874 +#: builtin/log.c:1125

5875 msgid "mark the series as Nth re-roll"

5876 msgstr "标记补丁系列是第几次重制"

5877

5705 -#: builtin/log.c:1118

5878 +#: builtin/log.c:1127

5879 msgid "Use [<prefix>] instead of [PATCH]"

5880 msgstr "使用 [<前缀>] 代替 [PATCH]"

5881

5709 -#: builtin/log.c:1121

5882 +#: builtin/log.c:1130

5883 msgid "store resulting files in <dir>"

5884 msgstr "把结果文件存储在 <dir>"

5885

5713 -#: builtin/log.c:1124

5886 +#: builtin/log.c:1133

5887 msgid "don't strip/add [PATCH]"

5888 msgstr "不删除/添加 [PATCH]"

5889

5717 -#: builtin/log.c:1127

5890 +#: builtin/log.c:1136

5891 msgid "don't output binary diffs"

5892 msgstr "不输出二进制差异"

5893

5721 -#: builtin/log.c:1129

5894 +#: builtin/log.c:1138

5895 msgid "don't include a patch matching a commit upstream"

5896 msgstr "不包含已在上游提交中的补丁"

5897

5725 -#: builtin/log.c:1131

5898 +#: builtin/log.c:1140

5899 msgid "show patch format instead of default (patch + stat)"

5900 msgstr "显示纯补丁格式而非默认的（补丁+状态）"

5901

5729 -#: builtin/log.c:1133

5902 +#: builtin/log.c:1142

5903 msgid "Messaging"

5904 msgstr "邮件发送"

5905

5733 -#: builtin/log.c:1134

5906 +#: builtin/log.c:1143

5907 msgid "header"

5908 msgstr "header"

5909

5737 -#: builtin/log.c:1135

5910 +#: builtin/log.c:1144

5911 msgid "add email header"

5912 msgstr "添加邮件头"

5913

5741 -#: builtin/log.c:1136 builtin/log.c:1138

5914 +#: builtin/log.c:1145 builtin/log.c:1147

5915 msgid "email"

5916 msgstr "邮件地址"

5917

5745 -#: builtin/log.c:1136

5918 +#: builtin/log.c:1145

5919 msgid "add To: header"

5920 msgstr "添加收件人"

5921

5749 -#: builtin/log.c:1138

5922 +#: builtin/log.c:1147

5923 msgid "add Cc: header"

5924 msgstr "添加抄送"

5925

5753 -#: builtin/log.c:1140

5926 +#: builtin/log.c:1149

5927 msgid "message-id"

5928 msgstr "message-id"

5929

5757 -#: builtin/log.c:1141

5930 +#: builtin/log.c:1150

5931 msgid "make first mail a reply to <message-id>"

5932 msgstr "使第一封邮件作为对 <message-id> 的回复"

5933

5761 -#: builtin/log.c:1142 builtin/log.c:1145

5934 +#: builtin/log.c:1151 builtin/log.c:1154

5935 msgid "boundary"

5936 msgstr "边界"

5937

5765 -#: builtin/log.c:1143

5938 +#: builtin/log.c:1152

5939 msgid "attach the patch"

5940 msgstr "附件方式添加补丁"

5941

5769 -#: builtin/log.c:1146

5942 +#: builtin/log.c:1155

5943 msgid "inline the patch"

5944 msgstr "内联显示补丁"

5945

5773 -#: builtin/log.c:1150

5946 +#: builtin/log.c:1159

5947 msgid "enable message threading, styles: shallow, deep"

5948 msgstr "启用邮件线索，风格：浅，深"

5949

5777 -#: builtin/log.c:1152

5950 +#: builtin/log.c:1161

5951 msgid "signature"

5952 msgstr "签名"

5953

5781 -#: builtin/log.c:1153

5954 +#: builtin/log.c:1162

5955 msgid "add a signature"

5956 msgstr "添加一个签名"

5957

5785 -#: builtin/log.c:1155

5958 +#: builtin/log.c:1164

5959 msgid "don't print the patch filenames"

5960 msgstr "不要打印补丁文件名"

5961

5789 -#: builtin/log.c:1239

5962 +#: builtin/log.c:1248

5963 msgid "-n and -k are mutually exclusive."

5964 msgstr "-n 和 -k 互斥。"

5965

5793 -#: builtin/log.c:1241

5966 +#: builtin/log.c:1250

5967 msgid "--subject-prefix and -k are mutually exclusive."

5968 msgstr "--subject-prefix 和 -k 互斥。"

5969

5797 -#: builtin/log.c:1249

5970 +#: builtin/log.c:1258

5971 msgid "--name-only does not make sense"

5972 msgstr "--name-only 无意义"

5973

5801 -#: builtin/log.c:1251

5974 +#: builtin/log.c:1260

5975 msgid "--name-status does not make sense"

5976 msgstr "--name-status 无意义"

5977

5805 -#: builtin/log.c:1253

5978 +#: builtin/log.c:1262

5979 msgid "--check does not make sense"

5980 msgstr "--check 无意义"

5981

5809 -#: builtin/log.c:1276

5982 +#: builtin/log.c:1285

5983 msgid "standard output, or directory, which one?"

5984 msgstr "标准输出或目录，哪一个？"

5985

5813 -#: builtin/log.c:1278

5986 +#: builtin/log.c:1287

5987 #, c-format

5988 msgid "Could not create directory '%s'"

5989 msgstr "不能创建目录 '%s'"

5990

5818 -#: builtin/log.c:1431

5991 +#: builtin/log.c:1435

5992 msgid "Failed to create output files"

5993 msgstr "无法创建输出文件"

5994

5822 -#: builtin/log.c:1480

5995 +#: builtin/log.c:1484

5996 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

5997 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"

5998

5826 -#: builtin/log.c:1535

5999 +#: builtin/log.c:1539

6000 #, c-format

6001 msgid ""

6002 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

6003 msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"

6004

5832 -#: builtin/log.c:1548 builtin/log.c:1550 builtin/log.c:1562

6005 +#: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566

6006 #, c-format

6007 msgid "Unknown commit %s"

6008 msgstr "未知提交 %s"

6009

5837 -#: builtin/ls-files.c:409

6010 +#: builtin/ls-files.c:402

6011 msgid "git ls-files [options] [<file>...]"

6012 msgstr "git ls-files [选项] [<文件>...]"

6013

5841 -#: builtin/ls-files.c:466

6014 +#: builtin/ls-files.c:459

6015 msgid "identify the file status with tags"

6016 msgstr "用标签标识文件的状态"

6017

5845 -#: builtin/ls-files.c:468

6018 +#: builtin/ls-files.c:461

6019 msgid "use lowercase letters for 'assume unchanged' files"

6020 msgstr "使用小写字母表示 '假设未改变的' 文件"

6021

5849 -#: builtin/ls-files.c:470

6022 +#: builtin/ls-files.c:463

6023 msgid "show cached files in the output (default)"

6024 msgstr "显示缓存的文件（默认）"

6025

5853 -#: builtin/ls-files.c:472

6026 +#: builtin/ls-files.c:465

6027 msgid "show deleted files in the output"

6028 msgstr "显示已删除的文件"

6029

5857 -#: builtin/ls-files.c:474

6030 +#: builtin/ls-files.c:467

6031 msgid "show modified files in the output"

6032 msgstr "显示已修改的文件"

6033

5861 -#: builtin/ls-files.c:476

6034 +#: builtin/ls-files.c:469

6035 msgid "show other files in the output"

6036 msgstr "显示其它文件"

6037

5865 -#: builtin/ls-files.c:478

6038 +#: builtin/ls-files.c:471

6039 msgid "show ignored files in the output"

6040 msgstr "显示忽略的文件"

6041

5869 -#: builtin/ls-files.c:481

6042 +#: builtin/ls-files.c:474

6043 msgid "show staged contents' object name in the output"

6044 msgstr "显示暂存区内容的对象名称"

6045

5873 -#: builtin/ls-files.c:483

6046 +#: builtin/ls-files.c:476

6047 msgid "show files on the filesystem that need to be removed"

6048 msgstr "显示文件系统需要删除的文件"

6049

5877 -#: builtin/ls-files.c:485

6050 +#: builtin/ls-files.c:478

6051 msgid "show 'other' directories' name only"

6052 msgstr "只显示“其他”目录的名称"

6053

5881 -#: builtin/ls-files.c:488

6054 +#: builtin/ls-files.c:481

6055 msgid "don't show empty directories"

6056 msgstr "不显示空目录"

6057

5885 -#: builtin/ls-files.c:491

6058 +#: builtin/ls-files.c:484

6059 msgid "show unmerged files in the output"

6060 msgstr "显示未合并的文件"

6061

5889 -#: builtin/ls-files.c:493

6062 +#: builtin/ls-files.c:486

6063 msgid "show resolve-undo information"

6064 msgstr "显示 resolve-undo 信息"

6065

5893 -#: builtin/ls-files.c:495

6066 +#: builtin/ls-files.c:488

6067 msgid "skip files matching pattern"

6068 msgstr "匹配排除文件的模式"

6069

5897 -#: builtin/ls-files.c:498

6070 +#: builtin/ls-files.c:491

6071 msgid "exclude patterns are read from <file>"

6072 msgstr "从 <文件> 中读取排除模式"

6073

5901 -#: builtin/ls-files.c:501

6074 +#: builtin/ls-files.c:494

6075 msgid "read additional per-directory exclude patterns in <file>"

6076 msgstr "从 <文件> 读取额外的每个目录的排除模式"

6077

5905 -#: builtin/ls-files.c:503

6078 +#: builtin/ls-files.c:496

6079 msgid "add the standard git exclusions"

6080 msgstr "添加标准的 git 排除"

6081

5909 -#: builtin/ls-files.c:506

6082 +#: builtin/ls-files.c:499

6083 msgid "make the output relative to the project top directory"

6084 msgstr "显示相对于顶级目录的文件名"

6085

5913 -#: builtin/ls-files.c:509

6086 +#: builtin/ls-files.c:502

6087 msgid "if any <file> is not in the index, treat this as an error"

6088 msgstr "如果任何 <文件> 都不在索引区，视为错误"

6089

5917 -#: builtin/ls-files.c:510

6090 +#: builtin/ls-files.c:503

6091 msgid "tree-ish"

6092 msgstr "树或提交"

6093

5921 -#: builtin/ls-files.c:511

6094 +#: builtin/ls-files.c:504

6095 msgid "pretend that paths removed since <tree-ish> are still present"

6096 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"

6097

5925 -#: builtin/ls-files.c:513

6098 +#: builtin/ls-files.c:506

6099 msgid "show debugging data"

6100 msgstr "显示调试数据"

6101

@@ -8084,16 +8257,16 @@ msgstr ""

8257 "初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"

8258

8259 #: builtin/revert.c:22

8087 -msgid "git revert [options] <commit-ish>"

8088 -msgstr "git revert [选项] <提交号>"

8260 +msgid "git revert [options] <commit-ish>..."

8261 +msgstr "git revert [选项] <提交号>..."

8262

8263 #: builtin/revert.c:23

8264 msgid "git revert <subcommand>"

8265 msgstr "git revert <子命令>"

8266

8267 #: builtin/revert.c:28

8095 -msgid "git cherry-pick [options] <commit-ish>"

8096 -msgstr "git cherry-pick [选项] <提交号>"

8268 +msgid "git cherry-pick [options] <commit-ish>..."

8269 +msgstr "git cherry-pick [选项] <提交号>..."

8270

8271 #: builtin/revert.c:29

8272 msgid "git cherry-pick <subcommand>"

@@ -8243,31 +8416,31 @@ msgid "git rm: unable to remove %s"

8416 msgstr "git rm：不能删除 %s"

8417

8418 #: builtin/shortlog.c:13

8246 -msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"

8247 -msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"

8419 +msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"

8420 +msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"

8421

8249 -#: builtin/shortlog.c:133

8422 +#: builtin/shortlog.c:131

8423 #, c-format

8424 msgid "Missing author: %s"

8425 msgstr "缺少作者：%s"

8426

8254 -#: builtin/shortlog.c:229

8427 +#: builtin/shortlog.c:227

8428 msgid "sort output according to the number of commits per author"

8429 msgstr "根据每个作者的提交数量排序"

8430

8258 -#: builtin/shortlog.c:231

8431 +#: builtin/shortlog.c:229

8432 msgid "Suppress commit descriptions, only provides commit count"

8433 msgstr "隐藏提交说明，只提供提交数量"

8434

8262 -#: builtin/shortlog.c:233

8435 +#: builtin/shortlog.c:231

8436 msgid "Show the email address of each author"

8437 msgstr "显示每个作者的电子邮件地址"

8438

8266 -#: builtin/shortlog.c:234

8439 +#: builtin/shortlog.c:232

8440 msgid "w[,i1[,i2]]"

8441 msgstr "w[,i1[,i2]]"

8442

8270 -#: builtin/shortlog.c:235

8443 +#: builtin/shortlog.c:233

8444 msgid "Linewrap output"

8445 msgstr "折行输出"

8446

@@ -8287,67 +8460,67 @@ msgstr ""

8460 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"

8461 msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"

8462

8290 -#: builtin/show-branch.c:651

8463 +#: builtin/show-branch.c:650

8464 msgid "show remote-tracking and local branches"

8465 msgstr "显示远程跟踪的和本地的分支"

8466

8294 -#: builtin/show-branch.c:653

8467 +#: builtin/show-branch.c:652

8468 msgid "show remote-tracking branches"

8469 msgstr "显示远程跟踪的分支"

8470

8298 -#: builtin/show-branch.c:655

8471 +#: builtin/show-branch.c:654

8472 msgid "color '*!+-' corresponding to the branch"

8473 msgstr "着色 '*!+-' 到相应的分支"

8474

8302 -#: builtin/show-branch.c:657

8475 +#: builtin/show-branch.c:656

8476 msgid "show <n> more commits after the common ancestor"

8477 msgstr "显示共同祖先后的 <n> 个提交"

8478

8306 -#: builtin/show-branch.c:659

8479 +#: builtin/show-branch.c:658

8480 msgid "synonym to more=-1"

8481 msgstr "和 more=-1 同义"

8482

8310 -#: builtin/show-branch.c:660

8483 +#: builtin/show-branch.c:659

8484 msgid "suppress naming strings"

8485 msgstr "不显示字符串命名"

8486

8314 -#: builtin/show-branch.c:662

8487 +#: builtin/show-branch.c:661

8488 msgid "include the current branch"

8489 msgstr "包括当前分支"

8490

8318 -#: builtin/show-branch.c:664

8491 +#: builtin/show-branch.c:663

8492 msgid "name commits with their object names"

8493 msgstr "以对象名字命名提交"

8494

8322 -#: builtin/show-branch.c:666

8495 +#: builtin/show-branch.c:665

8496 msgid "show possible merge bases"

8497 msgstr "显示可能合并的基线"

8498

8326 -#: builtin/show-branch.c:668

8499 +#: builtin/show-branch.c:667

8500 msgid "show refs unreachable from any other ref"

8501 msgstr "显示没有任何引用的的引用"

8502

8330 -#: builtin/show-branch.c:670

8503 +#: builtin/show-branch.c:669

8504 msgid "show commits in topological order"

8505 msgstr "以拓扑顺序显示提交"

8506

8334 -#: builtin/show-branch.c:672

8507 +#: builtin/show-branch.c:671

8508 msgid "show only commits not on the first branch"

8509 msgstr "只显示不在第一个分支上的提交"

8510

8338 -#: builtin/show-branch.c:674

8511 +#: builtin/show-branch.c:673

8512 msgid "show merges reachable from only one tip"

8513 msgstr "显示仅一个分支可访问的合并提交"

8514

8342 -#: builtin/show-branch.c:676

8515 +#: builtin/show-branch.c:675

8516 msgid "show commits where no parent comes before its children"

8517 msgstr "显示提交时以时间为序且父提交不能领先子提交"

8518

8346 -#: builtin/show-branch.c:678

8519 +#: builtin/show-branch.c:677

8520 msgid "<n>[,<base>]"

8521 msgstr "<n>[,<base>]"

8522

8350 -#: builtin/show-branch.c:679

8523 +#: builtin/show-branch.c:678

8524 msgid "show <n> most recent ref-log entries starting at base"

8525 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"

8526

@@ -8804,8 +8977,13 @@ msgid "only useful for debugging"

8977 msgstr "只对调试有用"

8978

8979 #: git.c:16

8807 -msgid "See 'git help <command>' for more information on a specific command."

8808 -msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"

8980 +msgid ""

8981 +"'git help -a' and 'git help -g' lists available subcommands and some\n"

8982 +"concept guides. See 'git help <command>' or 'git help <concept>'\n"

8983 +"to read about a specific subcommand or concept."

8984 +msgstr ""

8985 +"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些指南。参见\n"

8986 +"'git help <命令>' 或 'git help <指南>' 来查看给定的子命令帮助或指南。"

8987

8988 #: parse-options.h:156

8989 msgid "no-op (backward compatibility)"

@@ -9164,16 +9342,16 @@ msgstr ""

9342 "然后需要提供我至少一个好版本和一个坏版本。\n"

9343 "（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）"

9344

9167 -#: git-bisect.sh:347 git-bisect.sh:474

9345 +#: git-bisect.sh:363 git-bisect.sh:490

9346 msgid "We are not bisecting."

9347 msgstr "我们没有在二分查找。"

9348

9171 -#: git-bisect.sh:354

9349 +#: git-bisect.sh:370

9350 #, sh-format

9351 msgid "'$invalid' is not a valid commit"

9352 msgstr "'$invalid' 不是一个有效的提交"

9353

9176 -#: git-bisect.sh:363

9354 +#: git-bisect.sh:379

9355 #, sh-format

9356 msgid ""

9357 "Could not check out original HEAD '$branch'.\n"

@@ -9182,25 +9360,25 @@ msgstr ""

9360 "不能检出原始 HEAD '$branch'。\n"

9361 "尝试 'git bisect reset <提交>'。"

9362

9185 -#: git-bisect.sh:390

9363 +#: git-bisect.sh:406

9364 msgid "No logfile given"

9365 msgstr "未提供日志文件"

9366

9189 -#: git-bisect.sh:391

9367 +#: git-bisect.sh:407

9368 #, sh-format

9369 msgid "cannot read $file for replaying"

9370 msgstr "不能读取 $file 来重放"

9371

9194 -#: git-bisect.sh:408

9372 +#: git-bisect.sh:424

9373 msgid "?? what are you talking about?"

9374 msgstr "?? 您在说什么?"

9375

9198 -#: git-bisect.sh:420

9376 +#: git-bisect.sh:436

9377 #, sh-format

9378 msgid "running $command"

9379 msgstr "运行 $command"

9380

9203 -#: git-bisect.sh:427

9381 +#: git-bisect.sh:443

9382 #, sh-format

9383 msgid ""

9384 "bisect run failed:\n"

@@ -9209,11 +9387,11 @@ msgstr ""

9387 "二分查找运行失败：\n"

9388 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"

9389

9212 -#: git-bisect.sh:453

9390 +#: git-bisect.sh:469

9391 msgid "bisect run cannot continue any more"

9392 msgstr "二分查找不能继续运行"

9393

9216 -#: git-bisect.sh:459

9394 +#: git-bisect.sh:475

9395 #, sh-format

9396 msgid ""

9397 "bisect run failed:\n"

@@ -9222,7 +9400,7 @@ msgstr ""

9400 "二分查找运行失败：\n"

9401 "'bisect_state $state' 退出码为 $res"

9402

9225 -#: git-bisect.sh:466

9403 +#: git-bisect.sh:482

9404 msgid "bisect run success"

9405 msgstr "二分查找运行成功"

9406

@@ -9793,6 +9971,26 @@ msgstr "无法递归进子模组路径 '$sm_path'"

9971 msgid "Synchronizing submodule url for '$prefix$sm_path'"

9972 msgstr "为 '$prefix$sm_path' 同步子模组 url"

9973

9974 +#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"

9975 +#~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]"

9976 +

9977 +#~ msgid "See 'git help <command>' for more information on a specific command."

9978 +#~ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"

9979 +

9980 +#~ msgid "BUG: impossible combination of %d and %p"

9981 +#~ msgstr "BUG: 无法组合 %d 和 %p"

9982 +

9983 +# 译者：以下三条实际为一个段落

9984 +#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"

9985 +#~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'"

9986 +

9987 +# 译者：为对齐，下面两句内容有调整

9988 +#~ msgid "may speed it up, but you have to be careful not to forget to add"

9989 +#~ msgstr "也许能提高速度，但您需要小心不要忘了添加新文件"

9990 +

9991 +#~ msgid "new files yourself (see 'git help status')."

9992 +#~ msgstr "（参见 'git help status'）。"

9993 +

9994 #, fuzzy

9995 #~ msgid "aaaSynchronizing submodule url for '$prefix$sm_path'"

9996 #~ msgstr "为 '$prefix$sm_path' 同步子模组 url"

l10n: zh_CN.po: translate 44 messages (2080t0f0u)