a77c07d974 · matheusbsbs/matheus-bagliano

@@ -12,8 +12,8 @@ msgid ""

12 msgstr ""

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

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

15 -"POT-Creation-Date: 2013-01-25 12:33+0800\n"

16 -"PO-Revision-Date: 2013-02-09 00:47+0800\n"

15 +"POT-Creation-Date: 2013-02-14 14:46+0800\n"

16 +"PO-Revision-Date: 2013-02-14 17:43+0800\n"

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

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

19 "Language: zh_CN\n"

@@ -22,7 +22,7 @@ msgstr ""

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

23 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

24

25 -#: advice.c:45

25 +#: advice.c:49

26 #, c-format

27 msgid "hint: %.*s\n"

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

@@ -31,7 +31,7 @@ msgstr "提示：%.*s\n"

31 #. * Message used both when 'git commit' fails and when

32 #. * other commands doing a merge do.

33 #.

34 -#: advice.c:75

34 +#: advice.c:79

35 msgid ""

36 "Fix them up in the work tree,\n"

37 "and then use 'git add/rm <file>' as\n"

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

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

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

78

79 -#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2380

80 -#: builtin/blame.c:2381 builtin/config.c:55 builtin/fast-export.c:653

79 +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366

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

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

82 -#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540

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

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

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

84 msgid "file"

85 msgstr "文件"

86

@@ -120,7 +120,7 @@ msgstr "版本库"

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

121 msgstr "从远程版本库（<版本库>）提取归档文件"

122

123 -#: archive.c:347 builtin/archive.c:95 builtin/notes.c:619

123 +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615

124 msgid "command"

125 msgstr "命令"

126

@@ -349,7 +349,7 @@ msgstr ""

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

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

351

352 -#: gpg-interface.c:59

352 +#: gpg-interface.c:59 gpg-interface.c:127

353 msgid "could not run gpg."

354 msgstr "不能执行 gpg。"

355

@@ -361,6 +361,16 @@ msgstr "gpg 没有接受数据"

361 msgid "gpg failed to sign the data"

362 msgstr "gpg 无法为数据签名"

363

364 +#: gpg-interface.c:112

365 +#, c-format

366 +msgid "could not create temporary file '%s': %s"

367 +msgstr "不能创建临时文件 '%s'：%s"

368 +

369 +#: gpg-interface.c:115

370 +#, c-format

371 +msgid "failed writing detached signature to '%s': %s"

372 +msgstr "无法将分离式签名写入 '%s'：%s"

373 +

374 #: grep.c:1622

375 #, c-format

376 msgid "'%s': unable to read %s"

@@ -385,7 +395,11 @@ msgstr "在 '%s' 下可用的 git 命令"

395 msgid "git commands available from elsewhere on your $PATH"

396 msgstr "在 $PATH 路径中的其他地方可用的 git 命令"

397

388 -#: help.c:275

398 +#: help.c:235

399 +msgid "The most commonly used git commands are:"

400 +msgstr "最常用的 git 命令有："

401 +

402 +#: help.c:292

403 #, c-format

404 msgid ""

405 "'%s' appears to be a git command, but we were not\n"

@@ -394,11 +408,11 @@ msgstr ""

408 "'%s' 像是一个 git 命令，但却无法运行。\n"

409 "可能是 git-%s 受损？"

410

397 -#: help.c:332

411 +#: help.c:349

412 msgid "Uh oh. Your system reports no Git commands at all."

413 msgstr "唉呀，您的系统中未发现 Git 命令。"

414

401 -#: help.c:354

415 +#: help.c:371

416 #, c-format

417 msgid ""

418 "WARNING: You called a Git command named '%s', which does not exist.\n"

@@ -407,17 +421,17 @@ msgstr ""

421 "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"

422 "是 '%s'"

423

410 -#: help.c:359

424 +#: help.c:376

425 #, c-format

426 msgid "in %0.1f seconds automatically..."

427 msgstr "在 %0.1f 秒钟后自动运行..."

428

415 -#: help.c:366

429 +#: help.c:383

430 #, c-format

431 msgid "git: '%s' is not a git command. See 'git --help'."

432 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"

433

420 -#: help.c:370

434 +#: help.c:387

435 msgid ""

436 "\n"

437 "Did you mean this?"

@@ -716,18 +730,28 @@ msgstr " 或：%s"

730 msgid " %s"

731 msgstr " %s"

732

719 -#: remote.c:1686

733 +#: pathspec.c:83

734 +#, c-format

735 +msgid "Path '%s' is in submodule '%.*s'"

736 +msgstr "路径 '%s' 属于模组 '%.*s'"

737 +

738 +#: pathspec.c:99

739 +#, c-format

740 +msgid "'%s' is beyond a symbolic link"

741 +msgstr "'%s' 位于符号链接中"

742 +

743 +#: remote.c:1653

744 #, c-format

745 msgid "Your branch is ahead of '%s' by %d commit.\n"

746 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

747 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"

748 msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"

749

726 -#: remote.c:1692

750 +#: remote.c:1659

751 msgid " (use \"git push\" to publish your local commits)\n"

752 msgstr " （使用 \"git push\" 来发布您的本地提交）\n"

753

730 -#: remote.c:1695

754 +#: remote.c:1662

755 #, c-format

756 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

757 msgid_plural ""

@@ -736,11 +760,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

760 msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"

761

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

739 -#: remote.c:1703

763 +#: remote.c:1670

764 msgid " (use \"git pull\" to update your local branch)\n"

765 msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"

766

743 -#: remote.c:1706

767 +#: remote.c:1673

768 #, c-format

769 msgid ""

770 "Your branch and '%s' have diverged,\n"

@@ -756,18 +780,18 @@ msgstr[1] ""

780 "并且分别有 %d 和 %d 处不同的提交。\n"

781

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

759 -#: remote.c:1716

783 +#: remote.c:1683

784 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

785 msgstr " （使用 \"git pull\" 来合并远程分支）\n"

786

763 -#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:875 builtin/merge.c:985

764 -#: builtin/merge.c:995

787 +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984

788 +#: builtin/merge.c:994

789 #, c-format

790 msgid "Could not open '%s' for writing"

791 msgstr "不能为写入打开 '%s'"

792

769 -#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:987

770 -#: builtin/merge.c:1000

793 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986

794 +#: builtin/merge.c:999

795 #, c-format

796 msgid "Could not write to '%s'"

797 msgstr "不能写入 '%s'"

@@ -964,7 +988,7 @@ msgstr "不能解析 HEAD"

988 msgid "cannot abort from a branch yet to be born"

989 msgstr "不能从尚未建立的分支终止"

990

967 -#: sequencer.c:821 builtin/apply.c:4016

991 +#: sequencer.c:821 builtin/apply.c:4020

992 #, c-format

993 msgid "cannot open %s: %s"

994 msgstr "不能打开 %s：%s"

@@ -1199,355 +1223,394 @@ msgstr "未合并： %s"

1223 msgid "bug: unhandled diff status %c"

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

1225

1202 -#: wt-status.c:787

1226 +#: wt-status.c:789

1227 msgid "You have unmerged paths."

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

1229

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

1207 -#: wt-status.c:790 wt-status.c:914

1231 +#: wt-status.c:792 wt-status.c:916

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

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

1234

1211 -#: wt-status.c:793

1235 +#: wt-status.c:795

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

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

1238

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

1216 -#: wt-status.c:796

1240 +#: wt-status.c:798

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

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

1243

1220 -#: wt-status.c:806

1244 +#: wt-status.c:808

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

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

1247

1224 -#: wt-status.c:809

1248 +#: wt-status.c:811

1249 msgid "The current patch is empty."

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

1251

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

1229 -#: wt-status.c:813

1253 +#: wt-status.c:815

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

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

1256

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

1234 -#: wt-status.c:815

1258 +#: wt-status.c:817

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

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

1261

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

1239 -#: wt-status.c:817

1263 +#: wt-status.c:819

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

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

1266

1243 -#: wt-status.c:875 wt-status.c:885

1267 +#: wt-status.c:877 wt-status.c:887

1268 msgid "You are currently rebasing."

1269 msgstr "您正在变基。"

1270

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

1248 -#: wt-status.c:878

1272 +#: wt-status.c:880

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

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

1275

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

1253 -#: wt-status.c:880

1277 +#: wt-status.c:882

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

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

1280

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

1258 -#: wt-status.c:882

1282 +#: wt-status.c:884

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

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

1285

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

1263 -#: wt-status.c:888

1287 +#: wt-status.c:890

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

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

1290

1267 -#: wt-status.c:890

1291 +#: wt-status.c:892

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

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

1294

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

1272 -#: wt-status.c:893

1296 +#: wt-status.c:895

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

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

1299

1276 -#: wt-status.c:895

1300 +#: wt-status.c:897

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

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

1303

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

1281 -#: wt-status.c:898

1305 +#: wt-status.c:900

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

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

1308

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

1286 -#: wt-status.c:900

1310 +#: wt-status.c:902

1311 msgid ""

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

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

1314

1291 -#: wt-status.c:910

1315 +#: wt-status.c:912

1316 msgid "You are currently cherry-picking."

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

1318

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

1296 -#: wt-status.c:917

1320 +#: wt-status.c:919

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

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

1323

1300 -#: wt-status.c:926

1324 +#: wt-status.c:928

1325 msgid "You are currently bisecting."

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

1327

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

1305 -#: wt-status.c:929

1329 +#: wt-status.c:931

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

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

1332

1309 -#: wt-status.c:980

1333 +#: wt-status.c:982

1334 msgid "On branch "

1335 msgstr "位于分支 "

1336

1313 -#: wt-status.c:987

1337 +#: wt-status.c:989

1338 msgid "Not currently on any branch."

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

1340

1317 -#: wt-status.c:999

1341 +#: wt-status.c:1001

1342 msgid "Initial commit"

1343 msgstr "初始提交"

1344

1321 -#: wt-status.c:1013

1345 +#: wt-status.c:1015

1346 msgid "Untracked files"

1347 msgstr "未跟踪的文件"

1348

1325 -#: wt-status.c:1015

1349 +#: wt-status.c:1017

1350 msgid "Ignored files"

1351 msgstr "忽略的文件"

1352

1329 -#: wt-status.c:1017

1353 +#: wt-status.c:1019

1354 #, c-format

1355 msgid "Untracked files not listed%s"

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

1357

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

1335 -#: wt-status.c:1019

1359 +#: wt-status.c:1021

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

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

1362

1339 -#: wt-status.c:1025

1363 +#: wt-status.c:1027

1364 msgid "No changes"

1365 msgstr "没有修改"

1366

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

1344 -#: wt-status.c:1030

1368 +#: wt-status.c:1032

1369 #, c-format

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

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

1372

1349 -#: wt-status.c:1033

1373 +#: wt-status.c:1035

1374 #, c-format

1375 msgid "no changes added to commit\n"

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

1377

1354 -#: wt-status.c:1036

1378 +#: wt-status.c:1038

1379 #, c-format

1380 msgid ""

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

1382 "track)\n"

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

1384

1361 -#: wt-status.c:1039

1385 +#: wt-status.c:1041

1386 #, c-format

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

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

1389

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

1367 -#: wt-status.c:1042

1391 +#: wt-status.c:1044

1392 #, c-format

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

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

1395

1372 -#: wt-status.c:1045 wt-status.c:1050

1396 +#: wt-status.c:1047 wt-status.c:1052

1397 #, c-format

1398 msgid "nothing to commit\n"

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

1400

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

1378 -#: wt-status.c:1048

1402 +#: wt-status.c:1050

1403 #, c-format

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

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

1406

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

1384 -#: wt-status.c:1052

1408 +#: wt-status.c:1054

1409 #, c-format

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

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

1412

1389 -#: wt-status.c:1160

1413 +#: wt-status.c:1162

1414 msgid "HEAD (no branch)"

1415 msgstr "HEAD（非分支）"

1416

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

1394 -#: wt-status.c:1166

1418 +#: wt-status.c:1168

1419 msgid "Initial commit on "

1420 msgstr "初始提交于 "

1421

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

1399 -#: wt-status.c:1181

1423 +#: wt-status.c:1183

1424 msgid "behind "

1425 msgstr "落后 "

1426

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

1404 -#: wt-status.c:1184 wt-status.c:1187

1428 +#: wt-status.c:1186 wt-status.c:1189

1429 msgid "ahead "

1430 msgstr "领先 "

1431

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

1409 -#: wt-status.c:1189

1433 +#: wt-status.c:1191

1434 msgid ", behind "

1435 msgstr "，落后 "

1436

1413 -#: builtin/add.c:19

1414 -msgid "git add [options] [--] <filepattern>..."

1415 -msgstr "git add [选项] [--] <filepattern>..."

1437 +#: compat/precompose_utf8.c:58 builtin/clone.c:341

1438 +#, c-format

1439 +msgid "failed to unlink '%s'"

1440 +msgstr "无法删除 '%s'"

1441 +

1442 +#: builtin/add.c:20

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

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

1445

1417 -#: builtin/add.c:62

1446 +#: builtin/add.c:63

1447 #, c-format

1448 msgid "unexpected diff status %c"

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

1450

1422 -#: builtin/add.c:67 builtin/commit.c:231

1451 +#: builtin/add.c:68 builtin/commit.c:231

1452 msgid "updating files failed"

1453 msgstr "更新文件失败"

1454

1426 -#: builtin/add.c:77

1455 +#: builtin/add.c:78

1456 #, c-format

1457 msgid "remove '%s'\n"

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

1459

1431 -#: builtin/add.c:176

1432 -#, c-format

1433 -msgid "Path '%s' is in submodule '%.*s'"

1434 -msgstr "路径 '%s' 属于模组 '%.*s'"

1435 -

1436 -#: builtin/add.c:192

1460 +#: builtin/add.c:148

1461 msgid "Unstaged changes after refreshing the index:"

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

1463

1440 -#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275

1464 +#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275

1465 #, c-format

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

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

1468

1445 -#: builtin/add.c:209

1446 -#, c-format

1447 -msgid "'%s' is beyond a symbolic link"

1448 -msgstr "'%s' 位于符号链接中"

1449 -

1450 -#: builtin/add.c:276

1469 +#: builtin/add.c:234

1470 msgid "Could not read the index"

1471 msgstr "不能读取索引"

1472

1454 -#: builtin/add.c:286

1473 +#: builtin/add.c:244

1474 #, c-format

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

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

1477

1459 -#: builtin/add.c:290

1478 +#: builtin/add.c:248

1479 msgid "Could not write patch"

1480 msgstr "不能生成补丁"

1481

1463 -#: builtin/add.c:295

1482 +#: builtin/add.c:253

1483 #, c-format

1484 msgid "Could not stat '%s'"

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

1486

1468 -#: builtin/add.c:297

1487 +#: builtin/add.c:255

1488 msgid "Empty patch. Aborted."

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

1490

1472 -#: builtin/add.c:303

1491 +#: builtin/add.c:261

1492 #, c-format

1493 msgid "Could not apply '%s'"

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

1495

1477 -#: builtin/add.c:313

1496 +#: builtin/add.c:271

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

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

1499

1481 -#: builtin/add.c:319 builtin/clean.c:160 builtin/fetch.c:78 builtin/mv.c:63

1482 -#: builtin/prune-packed.c:76 builtin/push.c:396 builtin/remote.c:1253

1500 +#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63

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

1502 #: builtin/rm.c:206

1503 msgid "dry run"

1504 msgstr "演习"

1505

1487 -#: builtin/add.c:320 builtin/apply.c:4365 builtin/commit.c:1160

1488 -#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1522

1489 -#: builtin/mv.c:62 builtin/read-tree.c:112

1506 +#: builtin/add.c:278 builtin/apply.c:4369 builtin/check-ignore.c:19

1507 +#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613

1508 +#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112

1509 msgid "be verbose"

1510 msgstr "冗长输出"

1511

1493 -#: builtin/add.c:322

1512 +#: builtin/add.c:280

1513 msgid "interactive picking"

1514 msgstr "交互式拣选"

1515

1497 -#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:258

1516 +#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258

1517 msgid "select hunks interactively"

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

1519

1501 -#: builtin/add.c:324

1520 +#: builtin/add.c:282

1521 msgid "edit current diff and apply"

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

1523

1505 -#: builtin/add.c:325

1524 +#: builtin/add.c:283

1525 msgid "allow adding otherwise ignored files"

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

1527

1509 -#: builtin/add.c:326

1528 +#: builtin/add.c:284

1529 msgid "update tracked files"

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

1531

1513 -#: builtin/add.c:327

1532 +#: builtin/add.c:285

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

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

1535

1517 -#: builtin/add.c:328

1536 +#: builtin/add.c:286

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

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

1539

1521 -#: builtin/add.c:329

1540 +#: builtin/add.c:287

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

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

1543

1525 -#: builtin/add.c:330

1544 +#: builtin/add.c:288

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

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

1547

1529 -#: builtin/add.c:331

1548 +#: builtin/add.c:289

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

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

1551

1533 -#: builtin/add.c:353

1552 +#: builtin/add.c:311

1553 #, c-format

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

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

1556

1538 -#: builtin/add.c:354

1557 +#: builtin/add.c:312

1558 msgid "no files added"

1559 msgstr "没有文件被添加"

1560

1542 -#: builtin/add.c:360

1561 +#: builtin/add.c:318

1562 msgid "adding files failed"

1563 msgstr "添加文件失败"

1564

1546 -#: builtin/add.c:392

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

1566 +#.

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

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

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

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

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

1572 +#. * keep the old behavior. Later, this warning can be

1573 +#. * turned into a die(...), and eventually we may

1574 +#. * reallow the command with a new behavior.

1575 +#.

1576 +#: builtin/add.c:335

1577 +#, c-format

1578 +msgid ""

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

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

1581 +"anymore.\n"

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

1583 +"\n"

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

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

1586 +"\n"

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

1588 +"\n"

1589 +" git add %s .\n"

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

1591 +"\n"

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

1593 +"directory."

1594 +msgstr ""

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

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

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

1598 +"\n"

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

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

1601 +"\n"

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

1603 +"\n"

1604 +" git add %s .\n"

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

1606 +"\n"

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

1608 +

1609 +#: builtin/add.c:381

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

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

1612

1550 -#: builtin/add.c:394

1613 +#: builtin/add.c:383

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

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

1616

@@ -1561,12 +1624,12 @@ msgstr "没有指定文件，也没有文件被添加。\n"

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

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

1626

1564 -#: builtin/add.c:421 builtin/clean.c:203 builtin/commit.c:291 builtin/mv.c:82

1565 -#: builtin/rm.c:235

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

1628 +#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235

1629 msgid "index file corrupt"

1630 msgstr "索引文件损坏"

1631

1569 -#: builtin/add.c:481 builtin/apply.c:4461 builtin/mv.c:229 builtin/rm.c:370

1632 +#: builtin/add.c:481 builtin/apply.c:4465 builtin/mv.c:229 builtin/rm.c:370

1633 msgid "Unable to write new index file"

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

1635

@@ -1619,17 +1682,17 @@ msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"

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

1683 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"

1684

1622 -#: builtin/apply.c:1420

1685 +#: builtin/apply.c:1422

1686 #, c-format

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

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

1689

1627 -#: builtin/apply.c:1477

1690 +#: builtin/apply.c:1479

1691 #, c-format

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

1693 msgstr "第 %d 行的补丁片段没有头信息：%.*s"

1694

1632 -#: builtin/apply.c:1494

1695 +#: builtin/apply.c:1496

1696 #, c-format

1697 msgid ""

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

@@ -1640,78 +1703,78 @@ msgid_plural ""

1703 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"

1704 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"

1705

1643 -#: builtin/apply.c:1654

1706 +#: builtin/apply.c:1656

1707 msgid "new file depends on old contents"

1708 msgstr "新文件依赖旧内容"

1709

1647 -#: builtin/apply.c:1656

1710 +#: builtin/apply.c:1658

1711 msgid "deleted file still has contents"

1712 msgstr "删除的文件仍有内容"

1713

1651 -#: builtin/apply.c:1682

1714 +#: builtin/apply.c:1684

1715 #, c-format

1716 msgid "corrupt patch at line %d"

1717 msgstr "补丁在第 %d 行损坏"

1718

1656 -#: builtin/apply.c:1718

1719 +#: builtin/apply.c:1720

1720 #, c-format

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

1722 msgstr "新文件 %s 依赖旧内容"

1723

1661 -#: builtin/apply.c:1720

1724 +#: builtin/apply.c:1722

1725 #, c-format

1726 msgid "deleted file %s still has contents"

1727 msgstr "删除的文件 %s 仍有内容"

1728

1666 -#: builtin/apply.c:1723

1729 +#: builtin/apply.c:1725

1730 #, c-format

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

1732 msgstr "** 警告：文件 %s 成为空文件但并未删除"

1733

1671 -#: builtin/apply.c:1869

1734 +#: builtin/apply.c:1871

1735 #, c-format

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

1737 msgstr "二进制补丁在第 %d 行损坏：%.*s"

1738

1739 #. there has to be one hunk (forward hunk)

1677 -#: builtin/apply.c:1898

1740 +#: builtin/apply.c:1900

1741 #, c-format

1742 msgid "unrecognized binary patch at line %d"

1743 msgstr "未能识别的二进制补丁位于第 %d 行"

1744

1682 -#: builtin/apply.c:1984

1745 +#: builtin/apply.c:1986

1746 #, c-format

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

1748 msgstr "补丁文件的第 %d 行只有垃圾数据"

1749

1687 -#: builtin/apply.c:2074

1750 +#: builtin/apply.c:2076

1751 #, c-format

1752 msgid "unable to read symlink %s"

1753 msgstr "无法读取符号链接 %s"

1754

1692 -#: builtin/apply.c:2078

1755 +#: builtin/apply.c:2080

1756 #, c-format

1757 msgid "unable to open or read %s"

1758 msgstr "不能打开或读取 %s"

1759

1697 -#: builtin/apply.c:2682

1760 +#: builtin/apply.c:2684

1761 #, c-format

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

1763 msgstr "无效的行首字符：'%c'"

1764

1702 -#: builtin/apply.c:2800

1765 +#: builtin/apply.c:2802

1766 #, c-format

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

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

1769 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"

1770 msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）"

1771

1709 -#: builtin/apply.c:2812

1772 +#: builtin/apply.c:2814

1773 #, c-format

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

1775 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"

1776

1714 -#: builtin/apply.c:2818

1777 +#: builtin/apply.c:2820

1778 #, c-format

1779 msgid ""

1780 "while searching for:\n"

@@ -1720,318 +1783,318 @@ msgstr ""

1783 "当查询：\n"

1784 "%.*s"

1785

1723 -#: builtin/apply.c:2837

1786 +#: builtin/apply.c:2839

1787 #, c-format

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

1789 msgstr "缺失 '%s' 的二进制补丁数据"

1790

1728 -#: builtin/apply.c:2940

1791 +#: builtin/apply.c:2942

1792 #, c-format

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

1794 msgstr "二进制补丁未应用到 '%s'"

1795

1733 -#: builtin/apply.c:2946

1796 +#: builtin/apply.c:2948

1797 #, c-format

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

1799 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"

1800

1738 -#: builtin/apply.c:2967

1801 +#: builtin/apply.c:2969

1802 #, c-format

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

1804 msgstr "打补丁失败：%s:%ld"

1805

1743 -#: builtin/apply.c:3089

1806 +#: builtin/apply.c:3091

1807 #, c-format

1808 msgid "cannot checkout %s"

1809 msgstr "不能检出 %s"

1810

1748 -#: builtin/apply.c:3134 builtin/apply.c:3143 builtin/apply.c:3187

1811 +#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189

1812 #, c-format

1813 msgid "read of %s failed"

1814 msgstr "读取 %s 失败"

1815

1753 -#: builtin/apply.c:3167 builtin/apply.c:3389

1816 +#: builtin/apply.c:3169 builtin/apply.c:3391

1817 #, c-format

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

1819 msgstr "路径 %s 已经被重命名/删除"

1820

1758 -#: builtin/apply.c:3248 builtin/apply.c:3403

1821 +#: builtin/apply.c:3250 builtin/apply.c:3405

1822 #, c-format

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

1824 msgstr "%s：不存在于索引中"

1825

1763 -#: builtin/apply.c:3252 builtin/apply.c:3395 builtin/apply.c:3417

1826 +#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419

1827 #, c-format

1828 msgid "%s: %s"

1829 msgstr "%s：%s"

1830

1768 -#: builtin/apply.c:3257 builtin/apply.c:3411

1831 +#: builtin/apply.c:3259 builtin/apply.c:3413

1832 #, c-format

1833 msgid "%s: does not match index"

1834 msgstr "%s：和索引不匹配"

1835

1773 -#: builtin/apply.c:3359

1836 +#: builtin/apply.c:3361

1837 msgid "removal patch leaves file contents"

1838 msgstr "移除补丁仍留下了文件内容"

1839

1777 -#: builtin/apply.c:3428

1840 +#: builtin/apply.c:3430

1841 #, c-format

1842 msgid "%s: wrong type"

1843 msgstr "%s：错误类型"

1844

1782 -#: builtin/apply.c:3430

1845 +#: builtin/apply.c:3432

1846 #, c-format

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

1848 msgstr "%s 的类型是 %o，应为 %o"

1849

1787 -#: builtin/apply.c:3531

1850 +#: builtin/apply.c:3533

1851 #, c-format

1852 msgid "%s: already exists in index"

1853 msgstr "%s：已经存在于索引中"

1854

1792 -#: builtin/apply.c:3534

1855 +#: builtin/apply.c:3536

1856 #, c-format

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

1858 msgstr "%s：已经存在于工作区中"

1859

1797 -#: builtin/apply.c:3554

1860 +#: builtin/apply.c:3556

1861 #, c-format

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

1863 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"

1864

1802 -#: builtin/apply.c:3559

1865 +#: builtin/apply.c:3561

1866 #, c-format

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

1868 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"

1869

1807 -#: builtin/apply.c:3567

1870 +#: builtin/apply.c:3569

1871 #, c-format

1872 msgid "%s: patch does not apply"

1873 msgstr "%s：补丁未应用"

1874

1812 -#: builtin/apply.c:3580

1875 +#: builtin/apply.c:3582

1876 #, c-format

1877 msgid "Checking patch %s..."

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

1879

1817 -#: builtin/apply.c:3635 builtin/checkout.c:215 builtin/reset.c:124

1880 +#: builtin/apply.c:3639 builtin/checkout.c:215 builtin/reset.c:124

1881 #, c-format

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

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

1884

1822 -#: builtin/apply.c:3778

1885 +#: builtin/apply.c:3782

1886 #, c-format

1887 msgid "unable to remove %s from index"

1888 msgstr "不能从索引中移除 %s"

1889

1827 -#: builtin/apply.c:3806

1890 +#: builtin/apply.c:3810

1891 #, c-format

1892 msgid "corrupt patch for subproject %s"

1893 msgstr "子项目 %s 损坏的补丁"

1894

1832 -#: builtin/apply.c:3810

1895 +#: builtin/apply.c:3814

1896 #, c-format

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

1898 msgstr "不能枚举新建文件 '%s' 的状态"

1899

1837 -#: builtin/apply.c:3815

1900 +#: builtin/apply.c:3819

1901 #, c-format

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

1903 msgstr "不能为新建文件 %s 创建后端存储"

1904

1842 -#: builtin/apply.c:3818 builtin/apply.c:3926

1905 +#: builtin/apply.c:3822 builtin/apply.c:3930

1906 #, c-format

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

1908 msgstr "无法为 %s 添加缓存条目"

1909

1847 -#: builtin/apply.c:3851

1910 +#: builtin/apply.c:3855

1911 #, c-format

1912 msgid "closing file '%s'"

1913 msgstr "关闭文件 '%s'"

1914

1852 -#: builtin/apply.c:3900

1915 +#: builtin/apply.c:3904

1916 #, c-format

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

1918 msgstr "不能写文件 '%s' 权限 %o"

1919

1857 -#: builtin/apply.c:3987

1920 +#: builtin/apply.c:3991

1921 #, c-format

1922 msgid "Applied patch %s cleanly."

1923 msgstr "成功应用补丁 %s。"

1924

1862 -#: builtin/apply.c:3995

1925 +#: builtin/apply.c:3999

1926 msgid "internal error"

1927 msgstr "内部错误"

1928

1929 #. Say this even without --verbose

1867 -#: builtin/apply.c:3998

1930 +#: builtin/apply.c:4002

1931 #, c-format

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

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

1934 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."

1935 msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."

1936

1874 -#: builtin/apply.c:4008

1937 +#: builtin/apply.c:4012

1938 #, c-format

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

1940 msgstr "截短 .rej 文件名为 %.*s.rej"

1941

1879 -#: builtin/apply.c:4029

1942 +#: builtin/apply.c:4033

1943 #, c-format

1944 msgid "Hunk #%d applied cleanly."

1945 msgstr "第 #%d 个片段成功应用。"

1946

1884 -#: builtin/apply.c:4032

1947 +#: builtin/apply.c:4036

1948 #, c-format

1949 msgid "Rejected hunk #%d."

1950 msgstr "拒绝第 #%d 个片段。"

1951

1889 -#: builtin/apply.c:4182

1952 +#: builtin/apply.c:4186

1953 msgid "unrecognized input"

1954 msgstr "未能识别的输入"

1955

1893 -#: builtin/apply.c:4193

1956 +#: builtin/apply.c:4197

1957 msgid "unable to read index file"

1958 msgstr "无法读取索引文件"

1959

1897 -#: builtin/apply.c:4312 builtin/apply.c:4315 builtin/clone.c:91

1960 +#: builtin/apply.c:4316 builtin/apply.c:4319 builtin/clone.c:91

1961 #: builtin/fetch.c:63

1962 msgid "path"

1963 msgstr "路径"

1964

1902 -#: builtin/apply.c:4313

1965 +#: builtin/apply.c:4317

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

1967 msgstr "不要应用与给出路径向匹配的变更"

1968

1906 -#: builtin/apply.c:4316

1969 +#: builtin/apply.c:4320

1970 msgid "apply changes matching the given path"

1971 msgstr "应用与给出路径向匹配的变更"

1972

1910 -#: builtin/apply.c:4318

1973 +#: builtin/apply.c:4322

1974 msgid "num"

1975 msgstr "数字"

1976

1914 -#: builtin/apply.c:4319

1977 +#: builtin/apply.c:4323

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

1979 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"

1980

1918 -#: builtin/apply.c:4322

1981 +#: builtin/apply.c:4326

1982 msgid "ignore additions made by the patch"

1983 msgstr "忽略补丁中的添加的文件"

1984

1922 -#: builtin/apply.c:4324

1985 +#: builtin/apply.c:4328

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

1987 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"

1988

1926 -#: builtin/apply.c:4328

1989 +#: builtin/apply.c:4332

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

1991 msgstr "以十进制数显示添加和删除的行数"

1992

1930 -#: builtin/apply.c:4330

1993 +#: builtin/apply.c:4334

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

1995 msgstr "不应用补丁，而是显示输入的概要"

1996

1934 -#: builtin/apply.c:4332

1997 +#: builtin/apply.c:4336

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

1999 msgstr "不应用补丁，而是查看补丁是否可应用"

2000

1938 -#: builtin/apply.c:4334

2001 +#: builtin/apply.c:4338

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

2003 msgstr "确认补丁可以应用到当前索引"

2004

1942 -#: builtin/apply.c:4336

2005 +#: builtin/apply.c:4340

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

2007 msgstr "应用补丁而不修改工作区"

2008

1946 -#: builtin/apply.c:4338

2009 +#: builtin/apply.c:4342

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

2011 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"

2012

1950 -#: builtin/apply.c:4340

2013 +#: builtin/apply.c:4344

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

2015 msgstr "如果一个补丁不能应用则尝试三路合并"

2016

1954 -#: builtin/apply.c:4342

2017 +#: builtin/apply.c:4346

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

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

2020

1958 -#: builtin/apply.c:4344 builtin/checkout-index.c:197 builtin/ls-files.c:460

2021 +#: builtin/apply.c:4348 builtin/checkout-index.c:197 builtin/ls-files.c:463

2022 msgid "paths are separated with NUL character"

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

2024

1962 -#: builtin/apply.c:4347

2025 +#: builtin/apply.c:4351

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

2027 msgstr "确保至少匹配 <n> 行上下文"

2028

1966 -#: builtin/apply.c:4348

2029 +#: builtin/apply.c:4352

2030 msgid "action"

2031 msgstr "动作"

2032

1970 -#: builtin/apply.c:4349

2033 +#: builtin/apply.c:4353

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

2035 msgstr "检查新增和修改的行中间的空白字符滥用"

2036

1974 -#: builtin/apply.c:4352 builtin/apply.c:4355

2037 +#: builtin/apply.c:4356 builtin/apply.c:4359

2038 msgid "ignore changes in whitespace when finding context"

2039 msgstr "查找上下文时忽略空白字符的变更"

2040

1978 -#: builtin/apply.c:4358

2041 +#: builtin/apply.c:4362

2042 msgid "apply the patch in reverse"

2043 msgstr "反向应用补丁"

2044

1982 -#: builtin/apply.c:4360

2045 +#: builtin/apply.c:4364

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

2047 msgstr "无需至少一行上下文"

2048

1986 -#: builtin/apply.c:4362

2049 +#: builtin/apply.c:4366

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

2051 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"

2052

1990 -#: builtin/apply.c:4364

2053 +#: builtin/apply.c:4368

2054 msgid "allow overlapping hunks"

2055 msgstr "允许重叠的补丁片段"

2056

1994 -#: builtin/apply.c:4367

2057 +#: builtin/apply.c:4371

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

2059 msgstr "允许不正确的文件末尾换行符"

2060

1998 -#: builtin/apply.c:4370

2061 +#: builtin/apply.c:4374

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

2063 msgstr "不信任补丁片段的头信息中的行号"

2064

2002 -#: builtin/apply.c:4372

2065 +#: builtin/apply.c:4376

2066 msgid "root"

2067 msgstr "根目录"

2068

2006 -#: builtin/apply.c:4373

2069 +#: builtin/apply.c:4377

2070 msgid "prepend <root> to all filenames"

2071 msgstr "为所有文件名前添加 <根目录>"

2072

2010 -#: builtin/apply.c:4395

2073 +#: builtin/apply.c:4399

2074 msgid "--3way outside a repository"

2075 msgstr "--3way 在一个版本库之外"

2076

2014 -#: builtin/apply.c:4403

2077 +#: builtin/apply.c:4407

2078 msgid "--index outside a repository"

2079 msgstr "--index 在一个版本库之外"

2080

2018 -#: builtin/apply.c:4406

2081 +#: builtin/apply.c:4410

2082 msgid "--cached outside a repository"

2083 msgstr "--cached 在一个版本库之外"

2084

2022 -#: builtin/apply.c:4422

2085 +#: builtin/apply.c:4426

2086 #, c-format

2087 msgid "can't open patch '%s'"

2088 msgstr "不能打开补丁 '%s'"

2089

2027 -#: builtin/apply.c:4436

2090 +#: builtin/apply.c:4440

2091 #, c-format

2092 msgid "squelched %d whitespace error"

2093 msgid_plural "squelched %d whitespace errors"

2094 msgstr[0] "抑制下仍有 %d 个空白字符误用"

2095 msgstr[1] "抑制下仍有 %d 个空白字符误用"

2096

2034 -#: builtin/apply.c:4442 builtin/apply.c:4452

2097 +#: builtin/apply.c:4446 builtin/apply.c:4456

2098 #, c-format

2099 msgid "%d line adds whitespace errors."

2100 msgid_plural "%d lines add whitespace errors."

@@ -2093,95 +2156,95 @@ msgstr "git blame [选项] [版本选项] [版本] [--] 文件"

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

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

2158

2096 -#: builtin/blame.c:2364

2159 +#: builtin/blame.c:2350

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

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

2162

2100 -#: builtin/blame.c:2365

2163 +#: builtin/blame.c:2351

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

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

2166

2104 -#: builtin/blame.c:2366

2167 +#: builtin/blame.c:2352

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

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

2170

2108 -#: builtin/blame.c:2367

2171 +#: builtin/blame.c:2353

2172 msgid "Show work cost statistics"

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

2174

2112 -#: builtin/blame.c:2368

2175 +#: builtin/blame.c:2354

2176 msgid "Show output score for blame entries"

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

2178

2116 -#: builtin/blame.c:2369

2179 +#: builtin/blame.c:2355

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

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

2182

2120 -#: builtin/blame.c:2370

2183 +#: builtin/blame.c:2356

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

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

2186

2124 -#: builtin/blame.c:2371

2187 +#: builtin/blame.c:2357

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

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

2190

2128 -#: builtin/blame.c:2372

2191 +#: builtin/blame.c:2358

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

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

2194

2132 -#: builtin/blame.c:2373

2195 +#: builtin/blame.c:2359

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

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

2198

2136 -#: builtin/blame.c:2374

2199 +#: builtin/blame.c:2360

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

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

2202

2140 -#: builtin/blame.c:2375

2203 +#: builtin/blame.c:2361

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

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

2206

2144 -#: builtin/blame.c:2376

2207 +#: builtin/blame.c:2362

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

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

2210

2148 -#: builtin/blame.c:2377

2211 +#: builtin/blame.c:2363

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

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

2214

2152 -#: builtin/blame.c:2378

2215 +#: builtin/blame.c:2364

2216 msgid "Ignore whitespace differences"

2217 msgstr "忽略空白差异"

2218

2156 -#: builtin/blame.c:2379

2219 +#: builtin/blame.c:2365

2220 msgid "Spend extra cycles to find better match"

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

2222

2160 -#: builtin/blame.c:2380

2223 +#: builtin/blame.c:2366

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

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

2226

2164 -#: builtin/blame.c:2381

2227 +#: builtin/blame.c:2367

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

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

2230

2168 -#: builtin/blame.c:2382 builtin/blame.c:2383

2231 +#: builtin/blame.c:2368 builtin/blame.c:2369

2232 msgid "score"

2233 msgstr "得分"

2234

2172 -#: builtin/blame.c:2382

2235 +#: builtin/blame.c:2368

2236 msgid "Find line copies within and across files"

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

2238

2176 -#: builtin/blame.c:2383

2239 +#: builtin/blame.c:2369

2240 msgid "Find line movements within and across files"

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

2242

2180 -#: builtin/blame.c:2384

2243 +#: builtin/blame.c:2370

2244 msgid "n,m"

2245 msgstr "n,m"

2246

2184 -#: builtin/blame.c:2384

2247 +#: builtin/blame.c:2370

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

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

2250

@@ -2317,10 +2380,19 @@ msgstr "[%s：领先 %d，落后 %d]"

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

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

2382

2383 +#: builtin/branch.c:469

2384 +msgid " **** invalid ref ****"

2385 +msgstr " **** 无效引用 ****"

2386 +

2387 #: builtin/branch.c:560

2388 msgid "(no branch)"

2389 msgstr "（非分支）"

2390

2391 +#: builtin/branch.c:593

2392 +#, c-format

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

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

2395 +

2396 #: builtin/branch.c:625

2397 msgid "some refs could not be read"

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

@@ -2391,8 +2463,8 @@ msgid "act on remote-tracking branches"

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

2464

2465 #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788

2394 -#: builtin/branch.c:794 builtin/commit.c:1378 builtin/commit.c:1379

2395 -#: builtin/commit.c:1380 builtin/commit.c:1381 builtin/tag.c:470

2466 +#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367

2467 +#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468

2468 msgid "commit"

2469 msgstr "提交"

2470

@@ -2460,25 +2532,51 @@ msgstr "无法将 HEAD 解析为有效引用。"

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

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

2534

2463 -#: builtin/branch.c:836

2535 +#: builtin/branch.c:839

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

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

2538

2467 -#: builtin/branch.c:887

2539 +#: builtin/branch.c:845

2540 +msgid "branch name required"

2541 +msgstr "必须提供分支名"

2542 +

2543 +#: builtin/branch.c:860

2544 +msgid "Cannot give description to detached HEAD"

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

2546 +

2547 +#: builtin/branch.c:865

2548 +msgid "cannot edit description of more than one branch"

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

2550 +

2551 +#: builtin/branch.c:872

2552 +#, c-format

2553 +msgid "No commit on branch '%s' yet."

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

2555 +

2556 +#: builtin/branch.c:875

2557 +#, c-format

2558 +msgid "No branch named '%s'."

2559 +msgstr "没有分支 '%s'。"

2560 +

2561 +#: builtin/branch.c:888

2562 +msgid "too many branches for a rename operation"

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

2564 +

2565 +#: builtin/branch.c:893

2566 #, c-format

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

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

2569

2472 -#: builtin/branch.c:899

2570 +#: builtin/branch.c:905

2571 #, c-format

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

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

2574

2477 -#: builtin/branch.c:914

2575 +#: builtin/branch.c:920

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

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

2578

2481 -#: builtin/branch.c:917

2579 +#: builtin/branch.c:923

2580 #, c-format

2581 msgid ""

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

@@ -2486,7 +2584,7 @@ msgid ""

2584 msgstr ""

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

2586

2489 -#: builtin/branch.c:934

2587 +#: builtin/branch.c:940

2588 #, c-format

2589 msgid ""

2590 "\n"

@@ -2497,12 +2595,12 @@ msgstr ""

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

2596 "\n"

2597

2500 -#: builtin/branch.c:935

2598 +#: builtin/branch.c:941

2599 #, c-format

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

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

2602

2505 -#: builtin/branch.c:936

2603 +#: builtin/branch.c:942

2604 #, c-format

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

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

@@ -2576,14 +2674,38 @@ msgstr "报告设置在文件上的所有属性"

2674 msgid "use .gitattributes only from the index"

2675 msgstr "只使用索引中的 .gitattributes"

2676

2579 -#: builtin/check-attr.c:21 builtin/hash-object.c:75

2677 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75

2678 msgid "read file names from stdin"

2679 msgstr "从标准输入读出文件名"

2680

2583 -#: builtin/check-attr.c:23

2681 +#: builtin/check-attr.c:23 builtin/check-ignore.c:24

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

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

2684

2685 +#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177

2686 +msgid "suppress progress reporting"

2687 +msgstr "不显示进度报告"

2688 +

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

2690 +msgid "cannot specify pathnames with --stdin"

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

2692 +

2693 +#: builtin/check-ignore.c:154

2694 +msgid "-z only makes sense with --stdin"

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

2696 +

2697 +#: builtin/check-ignore.c:156

2698 +msgid "no path specified"

2699 +msgstr "未指定路径"

2700 +

2701 +#: builtin/check-ignore.c:160

2702 +msgid "--quiet is only valid with a single pathname"

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

2704 +

2705 +#: builtin/check-ignore.c:162

2706 +msgid "cannot have both --quiet and --verbose"

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

2708 +

2709 #: builtin/checkout-index.c:126

2710 msgid "git checkout-index [options] [--] [<file>...]"

2711 msgstr "git checkout-index [选项] [--] [<文件>...]"

@@ -2816,10 +2938,6 @@ msgstr "'%s' 不能和 '%s' 同时使用"

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

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

2940

2819 -#: builtin/checkout.c:1012 builtin/gc.c:177

2820 -msgid "suppress progress reporting"

2821 -msgstr "不显示进度报告"

2822 -

2941 #: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89

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

2943 msgid "branch"

@@ -2951,46 +3069,46 @@ msgstr "将忽略版本库 %s\n"

3069 msgid "failed to remove %s"

3070 msgstr "无法删除 %s"

3071

2954 -#: builtin/clean.c:159

3072 +#: builtin/clean.c:160

3073 msgid "do not print names of files removed"

3074 msgstr "不打印删除文件的名称"

3075

2958 -#: builtin/clean.c:161

3076 +#: builtin/clean.c:162

3077 msgid "force"

3078 msgstr "强制"

3079

2962 -#: builtin/clean.c:163

3080 +#: builtin/clean.c:164

3081 msgid "remove whole directories"

3082 msgstr "删除整个目录"

3083

2966 -#: builtin/clean.c:164 builtin/describe.c:413 builtin/grep.c:717

2967 -#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182

3084 +#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717

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

3086 msgid "pattern"

3087 msgstr "模式"

3088

2971 -#: builtin/clean.c:165

3089 +#: builtin/clean.c:166

3090 msgid "add <pattern> to ignore rules"

3091 msgstr "添加<模式>到忽略规则"

3092

2975 -#: builtin/clean.c:166

3093 +#: builtin/clean.c:167

3094 msgid "remove ignored files, too"

3095 msgstr "也删除忽略的文件"

3096

2979 -#: builtin/clean.c:168

3097 +#: builtin/clean.c:169

3098 msgid "remove only ignored files"

3099 msgstr "只删除忽略的文件"

3100

2983 -#: builtin/clean.c:186

3101 +#: builtin/clean.c:187

3102 msgid "-x and -X cannot be used together"

3103 msgstr "-x 和 -X 不能同时使用"

3104

2987 -#: builtin/clean.c:190

3105 +#: builtin/clean.c:191

3106 msgid ""

3107 "clean.requireForce set to true and neither -n nor -f given; refusing to clean"

3108 msgstr ""

3109 "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作"

3110

2993 -#: builtin/clean.c:193

3111 +#: builtin/clean.c:194

3112 msgid ""

3113 "clean.requireForce defaults to true and neither -n nor -f given; refusing to "

3114 "clean"

@@ -3002,7 +3120,7 @@ msgid "git clone [options] [--] <repo> [<dir>]"

3120 msgstr "git clone [选项] [--] <版本库> [<路径>]"

3121

3122 #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212

3005 -#: builtin/push.c:407

3123 +#: builtin/push.c:436

3124 msgid "force progress reporting"

3125 msgstr "强制显示进度报告"

3126

@@ -3115,11 +3233,6 @@ msgstr "%s 存在且不是一个目录"

3233 msgid "failed to stat %s\n"

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

3235

3118 -#: builtin/clone.c:341

3119 -#, c-format

3120 -msgid "failed to unlink '%s'"

3121 -msgstr "无法删除 '%s'"

3122 -

3236 #: builtin/clone.c:346

3237 #, c-format

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

@@ -3180,7 +3293,7 @@ msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"

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

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

3295

3183 -#: builtin/clone.c:759 builtin/clone.c:773

3296 +#: builtin/clone.c:759 builtin/clone.c:771

3297 #, c-format

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

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

@@ -3190,27 +3303,27 @@ msgstr "不能为 '%s' 创建先导目录"

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

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

3305

3193 -#: builtin/clone.c:783

3306 +#: builtin/clone.c:781

3307 #, c-format

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

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

3310

3198 -#: builtin/clone.c:785

3311 +#: builtin/clone.c:783

3312 #, c-format

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

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

3315

3203 -#: builtin/clone.c:827

3316 +#: builtin/clone.c:818

3317 #, c-format

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

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

3320

3208 -#: builtin/clone.c:876

3321 +#: builtin/clone.c:867

3322 #, c-format

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

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

3325

3213 -#: builtin/clone.c:883

3326 +#: builtin/clone.c:874

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

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

3329

@@ -3247,12 +3360,12 @@ msgid "--command must be the first argument"

3360 msgstr "--command 必须是第一个参数"

3361

3362 #: builtin/commit.c:34

3250 -msgid "git commit [options] [--] <filepattern>..."

3251 -msgstr "git commit [选项] [--] <文件模式>..."

3363 +msgid "git commit [options] [--] <pathspec>..."

3364 +msgstr "git commit [选项] [--] <路径匹配>..."

3365

3366 #: builtin/commit.c:39

3254 -msgid "git status [options] [--] <filepattern>..."

3255 -msgstr "git status [选项] [--] <文件模式>..."

3367 +msgid "git status [options] [--] <pathspec>..."

3368 +msgstr "git status [选项] [--] <路径匹配>..."

3369

3370 #: builtin/commit.c:44

3371 msgid ""

@@ -3417,21 +3530,23 @@ msgstr ""

3530 "然后重试。\n"

3531

3532 #: builtin/commit.c:735

3533 +#, c-format

3534 msgid ""

3535 "Please enter the commit message for your changes. Lines starting\n"

3422 -"with '#' will be ignored, and an empty message aborts the commit.\n"

3536 +"with '%c' will be ignored, and an empty message aborts the commit.\n"

3537 msgstr ""

3424 -"请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交\n"

3538 +"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"

3539 "说明将会终止提交。\n"

3540

3541 #: builtin/commit.c:740

3542 +#, c-format

3543 msgid ""

3544 "Please enter the commit message for your changes. Lines starting\n"

3430 -"with '#' will be kept; you may remove them yourself if you want to.\n"

3545 +"with '%c' will be kept; you may remove them yourself if you want to.\n"

3546 "An empty message aborts the commit.\n"

3547 msgstr ""

3433 -"请为您的变更输入提交说明。以 '#' 开始的行将被保留，您可以删除它们\n"

3434 -"如果您想这样做的话。而一个空的提交说明将会终止提交。\n"

3548 +"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您原意\n"

3549 +"也可以删除它们。一个空的提交说明将会终止提交。\n"

3550

3551 # 译者：为保证在输出中对齐，注意调整句中空格！

3552 #: builtin/commit.c:753

@@ -3453,7 +3568,7 @@ msgstr "无法读取索引"

3568 msgid "Error building trees"

3569 msgstr "无法创建树对象"

3570

3456 -#: builtin/commit.c:832 builtin/tag.c:361

3571 +#: builtin/commit.c:832 builtin/tag.c:359

3572 #, c-format

3573 msgid "Please supply the message using either -m or -F option.\n"

3574 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"

@@ -3463,326 +3578,326 @@ msgstr "请使用 -m 或 -F 选项提供提交说明。\n"

3578 msgid "No existing author found with '%s'"

3579 msgstr "没有找到匹配 '%s' 的作者"

3580

3466 -#: builtin/commit.c:944 builtin/commit.c:1148

3581 +#: builtin/commit.c:944 builtin/commit.c:1138

3582 #, c-format

3583 msgid "Invalid untracked files mode '%s'"

3584 msgstr "无效的未追踪文件参数 '%s'"

3585

3471 -#: builtin/commit.c:984

3586 +#: builtin/commit.c:974

3587 msgid "Using both --reset-author and --author does not make sense"

3588 msgstr "同时使用 --reset-author 和 --author 没有意义"

3589

3475 -#: builtin/commit.c:995

3590 +#: builtin/commit.c:985

3591 msgid "You have nothing to amend."

3592 msgstr "您没有可修补的提交。"

3593

3479 -#: builtin/commit.c:998

3594 +#: builtin/commit.c:988

3595 msgid "You are in the middle of a merge -- cannot amend."

3596 msgstr "您正处于一个合并过程中 -- 无法修补提交。"

3597

3483 -#: builtin/commit.c:1000

3598 +#: builtin/commit.c:990

3599 msgid "You are in the middle of a cherry-pick -- cannot amend."

3600 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"

3601

3487 -#: builtin/commit.c:1003

3602 +#: builtin/commit.c:993

3603 msgid "Options --squash and --fixup cannot be used together"

3604 msgstr "选项 --squash 和 --fixup 不能同时使用"

3605

3491 -#: builtin/commit.c:1013

3606 +#: builtin/commit.c:1003

3607 msgid "Only one of -c/-C/-F/--fixup can be used."

3608 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"

3609

3495 -#: builtin/commit.c:1015

3610 +#: builtin/commit.c:1005

3611 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

3612 msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"

3613

3499 -#: builtin/commit.c:1023

3614 +#: builtin/commit.c:1013

3615 msgid "--reset-author can be used only with -C, -c or --amend."

3616 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"

3617

3503 -#: builtin/commit.c:1040

3618 +#: builtin/commit.c:1030

3619 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

3620 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"

3621

3507 -#: builtin/commit.c:1042

3622 +#: builtin/commit.c:1032

3623 msgid "No paths with --include/--only does not make sense."

3624 msgstr "参数 --include/--only 不跟路径没有意义。"

3625

3511 -#: builtin/commit.c:1044

3626 +#: builtin/commit.c:1034

3627 msgid "Clever... amending the last one with dirty index."

3628 msgstr "聪明... 在索引不干净下修补最后的提交。"

3629

3515 -#: builtin/commit.c:1046

3630 +#: builtin/commit.c:1036

3631 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

3632 msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..."

3633

3519 -#: builtin/commit.c:1056 builtin/tag.c:577

3634 +#: builtin/commit.c:1046 builtin/tag.c:575

3635 #, c-format

3636 msgid "Invalid cleanup mode %s"

3637 msgstr "无效的清理模式 %s"

3638

3524 -#: builtin/commit.c:1061

3639 +#: builtin/commit.c:1051

3640 msgid "Paths with -a does not make sense."

3641 msgstr "路径和 -a 选项同时使用没有意义。"

3642

3528 -#: builtin/commit.c:1067 builtin/commit.c:1202

3643 +#: builtin/commit.c:1057 builtin/commit.c:1192

3644 msgid "--long and -z are incompatible"

3645 msgstr "--long 和 -z 选项不兼容"

3646

3532 -#: builtin/commit.c:1162 builtin/commit.c:1400

3647 +#: builtin/commit.c:1152 builtin/commit.c:1388

3648 msgid "show status concisely"

3649 msgstr "以简洁的格式显示状态"

3650

3536 -#: builtin/commit.c:1164 builtin/commit.c:1402

3651 +#: builtin/commit.c:1154 builtin/commit.c:1390

3652 msgid "show branch information"

3653 msgstr "显示分支信息"

3654

3540 -#: builtin/commit.c:1166 builtin/commit.c:1404 builtin/push.c:397

3655 +#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426

3656 msgid "machine-readable output"

3657 msgstr "机器可读的输出"

3658

3544 -#: builtin/commit.c:1169 builtin/commit.c:1406

3659 +#: builtin/commit.c:1159 builtin/commit.c:1394

3660 msgid "show status in long format (default)"

3661 msgstr "以长格式显示状态（默认）"

3662

3548 -#: builtin/commit.c:1172 builtin/commit.c:1409

3663 +#: builtin/commit.c:1162 builtin/commit.c:1397

3664 msgid "terminate entries with NUL"

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

3666

3552 -#: builtin/commit.c:1174 builtin/commit.c:1412 builtin/fast-export.c:647

3553 -#: builtin/fast-export.c:650 builtin/tag.c:461

3667 +#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647

3668 +#: builtin/fast-export.c:650 builtin/tag.c:459

3669 msgid "mode"

3670 msgstr "模式"

3671

3557 -#: builtin/commit.c:1175 builtin/commit.c:1412

3672 +#: builtin/commit.c:1165 builtin/commit.c:1400

3673 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

3674 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"

3675

3561 -#: builtin/commit.c:1178

3676 +#: builtin/commit.c:1168

3677 msgid "show ignored files"

3678 msgstr "显示忽略的文件"

3679

3565 -#: builtin/commit.c:1179 parse-options.h:151

3680 +#: builtin/commit.c:1169 parse-options.h:151

3681 msgid "when"

3682 msgstr "何时"

3683

3569 -#: builtin/commit.c:1180

3684 +#: builtin/commit.c:1170

3685 msgid ""

3686 "ignore changes to submodules, optional when: all, dirty, untracked. "

3687 "(Default: all)"

3688 msgstr ""

3689 "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"

3690

3576 -#: builtin/commit.c:1182

3691 +#: builtin/commit.c:1172

3692 msgid "list untracked files in columns"

3693 msgstr "以列的方式显示未跟踪的文件"

3694

3580 -#: builtin/commit.c:1256

3695 +#: builtin/commit.c:1246

3696 msgid "couldn't look up newly created commit"

3697 msgstr "无法找到新创建的提交"

3698

3584 -#: builtin/commit.c:1258

3699 +#: builtin/commit.c:1248

3700 msgid "could not parse newly created commit"

3701 msgstr "不能解析新创建的提交"

3702

3588 -#: builtin/commit.c:1299

3703 +#: builtin/commit.c:1289

3704 msgid "detached HEAD"

3705 msgstr "分离头指针"

3706

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

3593 -#: builtin/commit.c:1301

3708 +#: builtin/commit.c:1291

3709 msgid " (root-commit)"

3710 msgstr "（根提交）"

3711

3597 -#: builtin/commit.c:1370

3712 +#: builtin/commit.c:1358

3713 msgid "suppress summary after successful commit"

3714 msgstr "提交成功后不显示概述信息"

3715

3601 -#: builtin/commit.c:1371

3716 +#: builtin/commit.c:1359

3717 msgid "show diff in commit message template"

3718 msgstr "在提交说明模板里显示差异"

3719

3605 -#: builtin/commit.c:1373

3720 +#: builtin/commit.c:1361

3721 msgid "Commit message options"

3722 msgstr "提交说明选项"

3723

3609 -#: builtin/commit.c:1374 builtin/tag.c:459

3724 +#: builtin/commit.c:1362 builtin/tag.c:457

3725 msgid "read message from file"

3726 msgstr "从文件中读取提交说明"

3727

3613 -#: builtin/commit.c:1375

3728 +#: builtin/commit.c:1363

3729 msgid "author"

3730 msgstr "作者"

3731

3617 -#: builtin/commit.c:1375

3732 +#: builtin/commit.c:1363

3733 msgid "override author for commit"

3734 msgstr "提交时覆盖作者"

3735

3621 -#: builtin/commit.c:1376 builtin/gc.c:178

3736 +#: builtin/commit.c:1364 builtin/gc.c:178

3737 msgid "date"

3738 msgstr "日期"

3739

3625 -#: builtin/commit.c:1376

3740 +#: builtin/commit.c:1364

3741 msgid "override date for commit"

3742 msgstr "提交时覆盖日期"

3743

3629 -#: builtin/commit.c:1377 builtin/merge.c:206 builtin/notes.c:537

3630 -#: builtin/notes.c:694 builtin/tag.c:457

3744 +#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533

3745 +#: builtin/notes.c:690 builtin/tag.c:455

3746 msgid "message"

3747 msgstr "说明"

3748

3634 -#: builtin/commit.c:1377

3749 +#: builtin/commit.c:1365

3750 msgid "commit message"

3751 msgstr "提交说明"

3752

3638 -#: builtin/commit.c:1378

3753 +#: builtin/commit.c:1366

3754 msgid "reuse and edit message from specified commit"

3755 msgstr "重用并编辑指定提交的提交说明"

3756

3642 -#: builtin/commit.c:1379

3757 +#: builtin/commit.c:1367

3758 msgid "reuse message from specified commit"

3759 msgstr "重用指定提交的提交说明"

3760

3646 -#: builtin/commit.c:1380

3761 +#: builtin/commit.c:1368

3762 msgid "use autosquash formatted message to fixup specified commit"

3763 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"

3764

3650 -#: builtin/commit.c:1381

3765 +#: builtin/commit.c:1369

3766 msgid "use autosquash formatted message to squash specified commit"

3767 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"

3768

3654 -#: builtin/commit.c:1382

3769 +#: builtin/commit.c:1370

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

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

3772

3658 -#: builtin/commit.c:1383 builtin/log.c:1102 builtin/revert.c:109

3773 +#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109

3774 msgid "add Signed-off-by:"

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

3776

3662 -#: builtin/commit.c:1384

3777 +#: builtin/commit.c:1372

3778 msgid "use specified template file"

3779 msgstr "使用指定的模板文件"

3780

3666 -#: builtin/commit.c:1385

3781 +#: builtin/commit.c:1373

3782 msgid "force edit of commit"

3783 msgstr "强制编辑提交"

3784

3785 # 译者：可选值，不能翻译（或是原文中笔误，应为 mode）

3671 -#: builtin/commit.c:1386

3786 +#: builtin/commit.c:1374

3787 msgid "default"

3788 msgstr "default"

3789

3675 -#: builtin/commit.c:1386 builtin/tag.c:462

3790 +#: builtin/commit.c:1374 builtin/tag.c:460

3791 msgid "how to strip spaces and #comments from message"

3792 msgstr "设置如何删除提交说明里的空格和#注释"

3793

3679 -#: builtin/commit.c:1387

3794 +#: builtin/commit.c:1375

3795 msgid "include status in commit message template"

3796 msgstr "在提交说明模板里包含状态信息"

3797

3683 -#: builtin/commit.c:1388 builtin/merge.c:213 builtin/tag.c:463

3798 +#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461

3799 msgid "key id"

3800 msgstr "key id"

3801

3687 -#: builtin/commit.c:1389 builtin/merge.c:214

3802 +#: builtin/commit.c:1377 builtin/merge.c:214

3803 msgid "GPG sign commit"

3804 msgstr "GPG 提交签名"

3805

3806 #. end commit message options

3692 -#: builtin/commit.c:1392

3807 +#: builtin/commit.c:1380

3808 msgid "Commit contents options"

3809 msgstr "提交内容选项"

3810

3696 -#: builtin/commit.c:1393

3811 +#: builtin/commit.c:1381

3812 msgid "commit all changed files"

3813 msgstr "提交所有改动的文件"

3814

3700 -#: builtin/commit.c:1394

3815 +#: builtin/commit.c:1382

3816 msgid "add specified files to index for commit"

3817 msgstr "添加指定的文件到索引区等待提交"

3818

3704 -#: builtin/commit.c:1395

3819 +#: builtin/commit.c:1383

3820 msgid "interactively add files"

3821 msgstr "交互式添加文件"

3822

3708 -#: builtin/commit.c:1396

3823 +#: builtin/commit.c:1384

3824 msgid "interactively add changes"

3825 msgstr "交互式添加变更"

3826

3712 -#: builtin/commit.c:1397

3827 +#: builtin/commit.c:1385

3828 msgid "commit only specified files"

3829 msgstr "只提交指定的文件"

3830

3716 -#: builtin/commit.c:1398

3831 +#: builtin/commit.c:1386

3832 msgid "bypass pre-commit hook"

3833 msgstr "绕过 pre-commit 钩子"

3834

3720 -#: builtin/commit.c:1399

3835 +#: builtin/commit.c:1387

3836 msgid "show what would be committed"

3837 msgstr "显示将要提交的内容"

3838

3724 -#: builtin/commit.c:1410

3839 +#: builtin/commit.c:1398

3840 msgid "amend previous commit"

3841 msgstr "修改先前的提交"

3842

3728 -#: builtin/commit.c:1411

3843 +#: builtin/commit.c:1399

3844 msgid "bypass post-rewrite hook"

3845 msgstr "绕过 post-rewrite 钩子"

3846

3732 -#: builtin/commit.c:1416

3847 +#: builtin/commit.c:1404

3848 msgid "ok to record an empty change"

3849 msgstr "允许一个空提交"

3850

3736 -#: builtin/commit.c:1419

3851 +#: builtin/commit.c:1407

3852 msgid "ok to record a change with an empty message"

3853 msgstr "允许空的提交说明"

3854

3740 -#: builtin/commit.c:1451

3855 +#: builtin/commit.c:1439

3856 msgid "could not parse HEAD commit"

3857 msgstr "不能解析 HEAD 提交"

3858

3744 -#: builtin/commit.c:1489 builtin/merge.c:508

3859 +#: builtin/commit.c:1477 builtin/merge.c:508

3860 #, c-format

3861 msgid "could not open '%s' for reading"

3862 msgstr "不能为读入打开 '%s'"

3863

3749 -#: builtin/commit.c:1496

3864 +#: builtin/commit.c:1484

3865 #, c-format

3866 msgid "Corrupt MERGE_HEAD file (%s)"

3867 msgstr "损坏的 MERGE_HEAD 文件（%s）"

3868

3754 -#: builtin/commit.c:1503

3869 +#: builtin/commit.c:1491

3870 msgid "could not read MERGE_MODE"

3871 msgstr "不能读取 MERGE_MODE"

3872

3758 -#: builtin/commit.c:1522

3873 +#: builtin/commit.c:1510

3874 #, c-format

3875 msgid "could not read commit message: %s"

3876 msgstr "不能读取提交说明：%s"

3877

3763 -#: builtin/commit.c:1536

3878 +#: builtin/commit.c:1524

3879 #, c-format

3880 msgid "Aborting commit; you did not edit the message.\n"

3881 msgstr "终止提交；您未更改来自模版的提交说明。\n"

3882

3768 -#: builtin/commit.c:1541

3883 +#: builtin/commit.c:1529

3884 #, c-format

3885 msgid "Aborting commit due to empty commit message.\n"

3886 msgstr "终止提交因为提交说明为空。\n"

3887

3773 -#: builtin/commit.c:1556 builtin/merge.c:833 builtin/merge.c:858

3888 +#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857

3889 msgid "failed to write commit object"

3890 msgstr "无法写提交对象"

3891

3777 -#: builtin/commit.c:1577

3892 +#: builtin/commit.c:1565

3893 msgid "cannot lock HEAD ref"

3894 msgstr "无法锁定 HEAD 引用"

3895

3781 -#: builtin/commit.c:1581

3896 +#: builtin/commit.c:1569

3897 msgid "cannot update HEAD ref"

3898 msgstr "无法更新 HEAD 引用"

3899

3785 -#: builtin/commit.c:1592

3900 +#: builtin/commit.c:1580

3901 msgid ""

3902 "Repository has been updated, but unable to write\n"

3903 "new_index file. Check that disk is not full or quota is\n"

@@ -4190,89 +4305,93 @@ msgstr "允许更新 HEAD 引用"

4305 msgid "deepen history of shallow clone"

4306 msgstr "深化浅克隆的历史"

4307

4193 -#: builtin/fetch.c:85 builtin/log.c:1119

4308 +#: builtin/fetch.c:86

4309 +msgid "convert to a complete repository"

4310 +msgstr "转换为一个完整的版本库"

4311 +

4312 +#: builtin/fetch.c:88 builtin/log.c:1119

4313 msgid "dir"

4314 msgstr "目录"

4315

4197 -#: builtin/fetch.c:86

4316 +#: builtin/fetch.c:89

4317 msgid "prepend this to submodule path output"

4318 msgstr "在子模组路径输出的前面加上此目录"

4319

4201 -#: builtin/fetch.c:89

4320 +#: builtin/fetch.c:92

4321 msgid "default mode for recursion"

4322 msgstr "递归的默认模式"

4323

4205 -#: builtin/fetch.c:201

4324 +#: builtin/fetch.c:204

4325 msgid "Couldn't find remote ref HEAD"

4326 msgstr "无法发现远程 HEAD 引用"

4327

4209 -#: builtin/fetch.c:254

4328 +#: builtin/fetch.c:257

4329 #, c-format

4330 msgid "object %s not found"

4331 msgstr "对象 %s 未发现"

4332

4214 -#: builtin/fetch.c:259

4333 +#: builtin/fetch.c:262

4334 msgid "[up to date]"

4335 msgstr "[最新]"

4336

4218 -#: builtin/fetch.c:273

4337 +#: builtin/fetch.c:276

4338 #, c-format

4339 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

4340 msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）"

4341

4223 -#: builtin/fetch.c:274 builtin/fetch.c:360

4342 +#: builtin/fetch.c:277 builtin/fetch.c:363

4343 msgid "[rejected]"

4344 msgstr "[已拒绝]"

4345

4227 -#: builtin/fetch.c:285

4346 +#: builtin/fetch.c:288

4347 msgid "[tag update]"

4348 msgstr "[tag更新]"

4349

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

4232 -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340

4351 +#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343

4352 msgid " (unable to update local ref)"

4353 msgstr " （不能更新本地引用）"

4354

4236 -#: builtin/fetch.c:305

4355 +#: builtin/fetch.c:308

4356 msgid "[new tag]"

4357 msgstr "[新tag]"

4358

4240 -#: builtin/fetch.c:308

4359 +#: builtin/fetch.c:311

4360 msgid "[new branch]"

4361 msgstr "[新分支]"

4362

4244 -#: builtin/fetch.c:311

4363 +#: builtin/fetch.c:314

4364 msgid "[new ref]"

4365 msgstr "[新引用]"

4366

4248 -#: builtin/fetch.c:356

4367 +#: builtin/fetch.c:359

4368 msgid "unable to update local ref"

4369 msgstr "不能更新本地引用"

4370

4252 -#: builtin/fetch.c:356

4371 +#: builtin/fetch.c:359

4372 msgid "forced update"

4373 msgstr "强制更新"

4374

4256 -#: builtin/fetch.c:362

4375 +#: builtin/fetch.c:365

4376 msgid "(non-fast-forward)"

4377 msgstr "（非快进式）"

4378

4260 -#: builtin/fetch.c:393 builtin/fetch.c:685

4379 +#: builtin/fetch.c:396 builtin/fetch.c:688

4380 #, c-format

4381 msgid "cannot open %s: %s\n"

4382 msgstr "无法打开 %s：%s\n"

4383

4265 -#: builtin/fetch.c:402

4384 +#: builtin/fetch.c:405

4385 #, c-format

4386 msgid "%s did not send all necessary objects\n"

4387 msgstr "%s 未发送所有必须的对象\n"

4388

4270 -#: builtin/fetch.c:488

4389 +#: builtin/fetch.c:491

4390 #, c-format

4391 msgid "From %.*s\n"

4392 msgstr "来自 %.*s\n"

4393

4275 -#: builtin/fetch.c:499

4394 +#: builtin/fetch.c:502

4395 #, c-format

4396 msgid ""

4397 "some local refs could not be updated; try running\n"

@@ -4282,79 +4401,87 @@ msgstr ""

4401 " 'git remote prune %s' 来删除旧的、有冲突的分支"

4402

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

4285 -#: builtin/fetch.c:549

4404 +#: builtin/fetch.c:552

4405 #, c-format

4406 msgid " (%s will become dangling)"

4407 msgstr " （%s 将成为摇摆状态）"

4408

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

4291 -#: builtin/fetch.c:550

4410 +#: builtin/fetch.c:553

4411 #, c-format

4412 msgid " (%s has become dangling)"

4413 msgstr " （%s 已成为摇摆状态）"

4414

4296 -#: builtin/fetch.c:557

4415 +#: builtin/fetch.c:560

4416 msgid "[deleted]"

4417 msgstr "[已删除]"

4418

4300 -#: builtin/fetch.c:558 builtin/remote.c:1055

4419 +#: builtin/fetch.c:561 builtin/remote.c:1055

4420 msgid "(none)"

4421 msgstr "（无）"

4422

4304 -#: builtin/fetch.c:675

4423 +#: builtin/fetch.c:678

4424 #, c-format

4425 msgid "Refusing to fetch into current branch %s of non-bare repository"

4426 msgstr "拒绝获取到非裸版本库的当前分支 %s"

4427

4309 -#: builtin/fetch.c:709

4428 +#: builtin/fetch.c:712

4429 #, c-format

4430 msgid "Don't know how to fetch from %s"

4431 msgstr "不知道如何从 %s 获取"

4432

4314 -#: builtin/fetch.c:786

4433 +#: builtin/fetch.c:789

4434 #, c-format

4435 msgid "Option \"%s\" value \"%s\" is not valid for %s"

4436 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"

4437

4319 -#: builtin/fetch.c:789

4438 +#: builtin/fetch.c:792

4439 #, c-format

4440 msgid "Option \"%s\" is ignored for %s\n"

4441 msgstr "选项 \"%s\" 为 %s 所忽略\n"

4442

4324 -#: builtin/fetch.c:891

4443 +#: builtin/fetch.c:894

4444 #, c-format

4445 msgid "Fetching %s\n"

4446 msgstr "正在获取 %s\n"

4447

4329 -#: builtin/fetch.c:893 builtin/remote.c:100

4448 +#: builtin/fetch.c:896 builtin/remote.c:100

4449 #, c-format

4450 msgid "Could not fetch %s"

4451 msgstr "不能获取 %s"

4452

4334 -#: builtin/fetch.c:912

4453 +#: builtin/fetch.c:915

4454 msgid ""

4455 "No remote repository specified. Please, specify either a URL or a\n"

4456 "remote name from which new revisions should be fetched."

4457 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"

4458

4340 -#: builtin/fetch.c:932

4459 +#: builtin/fetch.c:935

4460 msgid "You need to specify a tag name."

4461 msgstr "您需要指定一个 tag 名称。"

4462

4344 -#: builtin/fetch.c:984

4463 +#: builtin/fetch.c:981

4464 +msgid "--depth and --unshallow cannot be used together"

4465 +msgstr "--depth 和 --unshallow 不能同时使用"

4466 +

4467 +#: builtin/fetch.c:983

4468 +msgid "--unshallow on a complete repository does not make sense"

4469 +msgstr "对于一个完整的版本库，参数 --unshallow 没有意义"

4470 +

4471 +#: builtin/fetch.c:1002

4472 msgid "fetch --all does not take a repository argument"

4473 msgstr "fetch --all 不能带一个版本库参数"

4474

4348 -#: builtin/fetch.c:986

4475 +#: builtin/fetch.c:1004

4476 msgid "fetch --all does not make sense with refspecs"

4477 msgstr "fetch --all 带引用表达式没有任何意义"

4478

4352 -#: builtin/fetch.c:997

4479 +#: builtin/fetch.c:1015

4480 #, c-format

4481 msgid "No such remote or remote group: %s"

4482 msgstr "没有这样的远程或远程组：%s"

4483

4357 -#: builtin/fetch.c:1005

4484 +#: builtin/fetch.c:1023

4485 msgid "Fetching a group and specifying refspecs does not make sense"

4486 msgstr "获取组并指定引用表达式没有意义"

4487

@@ -4365,7 +4492,7 @@ msgstr ""

4492

4493 #: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701

4494 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175

4368 -#: builtin/tag.c:448 parse-options.h:133 parse-options.h:239

4495 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239

4496 msgid "n"

4497 msgstr "n"

4498

@@ -4725,23 +4852,23 @@ msgstr "未提供模式匹配。"

4852 msgid "bad object %s"

4853 msgstr "坏对象 %s"

4854

4728 -#: builtin/grep.c:866

4855 +#: builtin/grep.c:868

4856 msgid "--open-files-in-pager only works on the worktree"

4857 msgstr "--open-files-in-pager 仅用于工作区"

4858

4732 -#: builtin/grep.c:889

4859 +#: builtin/grep.c:891

4860 msgid "--cached or --untracked cannot be used with --no-index."

4861 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"

4862

4736 -#: builtin/grep.c:894

4863 +#: builtin/grep.c:896

4864 msgid "--no-index or --untracked cannot be used with revs."

4865 msgstr "--no-index 或 --untracked 不能和版本同时使用。"

4866

4740 -#: builtin/grep.c:897

4867 +#: builtin/grep.c:899

4868 msgid "--[no-]exclude-standard cannot be used for tracked contents."

4869 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"

4870

4744 -#: builtin/grep.c:905

4871 +#: builtin/grep.c:907

4872 msgid "both --cached and trees are given."

4873 msgstr "同时给出了 --cached 和树对象。"

4874

@@ -4781,50 +4908,50 @@ msgstr "原样存储文件不使用过滤器"

4908 msgid "process file as it were from this path"

4909 msgstr "处理文件并假设其来自于此路径"

4910

4784 -#: builtin/help.c:43

4911 +#: builtin/help.c:42

4912 msgid "print all available commands"

4913 msgstr "打印所有可用的命令"

4914

4788 -#: builtin/help.c:44

4915 +#: builtin/help.c:43

4916 msgid "show man page"

4917 msgstr "显示 man 手册"

4918

4792 -#: builtin/help.c:45

4919 +#: builtin/help.c:44

4920 msgid "show manual in web browser"

4921 msgstr "在 web 浏览器中显示手册"

4922

4796 -#: builtin/help.c:47

4923 +#: builtin/help.c:46

4924 msgid "show info page"

4925 msgstr "显示 info 手册"

4926

4800 -#: builtin/help.c:53

4927 +#: builtin/help.c:52

4928 msgid "git help [--all] [--man|--web|--info] [command]"

4929 msgstr "git help [--all] [--man|--web|--info] [命令]"

4930

4804 -#: builtin/help.c:65

4931 +#: builtin/help.c:64

4932 #, c-format

4933 msgid "unrecognized help format '%s'"

4934 msgstr "未能识别的帮助格式 '%s'"

4935

4809 -#: builtin/help.c:93

4936 +#: builtin/help.c:92

4937 msgid "Failed to start emacsclient."

4938 msgstr "无法启动 emacsclient。"

4939

4813 -#: builtin/help.c:106

4940 +#: builtin/help.c:105

4941 msgid "Failed to parse emacsclient version."

4942 msgstr "无法解析 emacsclient 版本。"

4943

4817 -#: builtin/help.c:114

4944 +#: builtin/help.c:113

4945 #, c-format

4946 msgid "emacsclient version '%d' too old (< 22)."

4947 msgstr "emacsclient 版本 '%d' 太老（< 22）。"

4948

4822 -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177

4949 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176

4950 #, c-format

4951 msgid "failed to exec '%s': %s"

4952 msgstr "无法执行 '%s'：%s"

4953

4827 -#: builtin/help.c:217

4954 +#: builtin/help.c:216

4955 #, c-format

4956 msgid ""

4957 "'%s': path for unsupported man viewer.\n"

@@ -4833,7 +4960,7 @@ msgstr ""

4960 "'%s'：不支持的 man 手册查看器的路径。\n"

4961 "请使用 'man.<tool>.cmd'。"

4962

4836 -#: builtin/help.c:229

4963 +#: builtin/help.c:228

4964 #, c-format

4965 msgid ""

4966 "'%s': cmd for supported man viewer.\n"

@@ -4842,29 +4969,25 @@ msgstr ""

4969 "'%s': 支持的 man 手册查看器命令。\n"

4970 "请使用 'man.<tool>.path'。"

4971

4845 -#: builtin/help.c:299

4846 -msgid "The most commonly used git commands are:"

4847 -msgstr "最常用的 git 命令有："

4848 -

4849 -#: builtin/help.c:367

4972 +#: builtin/help.c:349

4973 #, c-format

4974 msgid "'%s': unknown man viewer."

4975 msgstr "'%s'：未知的 man 查看器。"

4976

4854 -#: builtin/help.c:384

4977 +#: builtin/help.c:366

4978 msgid "no man viewer handled the request"

4979 msgstr "没有 man 查看器处理此请求"

4980

4858 -#: builtin/help.c:392

4981 +#: builtin/help.c:374

4982 msgid "no info viewer handled the request"

4983 msgstr "没有 info 查看器处理此请求"

4984

4862 -#: builtin/help.c:447 builtin/help.c:454

4985 +#: builtin/help.c:429 builtin/help.c:436

4986 #, c-format

4987 msgid "usage: %s%s"

4988 msgstr "用法：%s%s"

4989

4867 -#: builtin/help.c:470

4990 +#: builtin/help.c:452

4991 #, c-format

4992 msgid "`git %s' is aliased to `%s'"

4993 msgstr "`git %s' 是 `%s' 的别名"

@@ -5265,8 +5388,8 @@ msgstr "无法获知当前路径"

5388

5389 #: builtin/init-db.c:467

5390 msgid ""

5268 -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"

5269 -"[=<permissions>]] [directory]"

5391 +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

5392 +"shared[=<permissions>]] [directory]"

5393 msgstr ""

5394 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "

5395 "[目录]"

@@ -5561,95 +5684,95 @@ msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"

5684 msgid "Unknown commit %s"

5685 msgstr "未知提交 %s"

5686

5564 -#: builtin/ls-files.c:408

5687 +#: builtin/ls-files.c:409

5688 msgid "git ls-files [options] [<file>...]"

5689 msgstr "git ls-files [选项] [<文件>...]"

5690

5568 -#: builtin/ls-files.c:463

5691 +#: builtin/ls-files.c:466

5692 msgid "identify the file status with tags"

5693 msgstr "用标签标识文件的状态"

5694

5572 -#: builtin/ls-files.c:465

5695 +#: builtin/ls-files.c:468

5696 msgid "use lowercase letters for 'assume unchanged' files"

5697 msgstr "使用小写字母表示 '假设未改变的' 文件"

5698

5576 -#: builtin/ls-files.c:467

5699 +#: builtin/ls-files.c:470

5700 msgid "show cached files in the output (default)"

5701 msgstr "显示缓存的文件（默认）"

5702

5580 -#: builtin/ls-files.c:469

5703 +#: builtin/ls-files.c:472

5704 msgid "show deleted files in the output"

5705 msgstr "显示已删除的文件"

5706

5584 -#: builtin/ls-files.c:471

5707 +#: builtin/ls-files.c:474

5708 msgid "show modified files in the output"

5709 msgstr "显示已修改的文件"

5710

5588 -#: builtin/ls-files.c:473

5711 +#: builtin/ls-files.c:476

5712 msgid "show other files in the output"

5713 msgstr "显示其它文件"

5714

5592 -#: builtin/ls-files.c:475

5715 +#: builtin/ls-files.c:478

5716 msgid "show ignored files in the output"

5717 msgstr "显示忽略的文件"

5718

5596 -#: builtin/ls-files.c:478

5719 +#: builtin/ls-files.c:481

5720 msgid "show staged contents' object name in the output"

5721 msgstr "显示暂存区内容的对象名称"

5722

5600 -#: builtin/ls-files.c:480

5723 +#: builtin/ls-files.c:483

5724 msgid "show files on the filesystem that need to be removed"

5725 msgstr "显示文件系统需要删除的文件"

5726

5604 -#: builtin/ls-files.c:482

5727 +#: builtin/ls-files.c:485

5728 msgid "show 'other' directories' name only"

5729 msgstr "只显示“其他”目录的名称"

5730

5608 -#: builtin/ls-files.c:485

5731 +#: builtin/ls-files.c:488

5732 msgid "don't show empty directories"

5733 msgstr "不显示空目录"

5734

5612 -#: builtin/ls-files.c:488

5735 +#: builtin/ls-files.c:491

5736 msgid "show unmerged files in the output"

5737 msgstr "显示未合并的文件"

5738

5616 -#: builtin/ls-files.c:490

5739 +#: builtin/ls-files.c:493

5740 msgid "show resolve-undo information"

5741 msgstr "显示 resolve-undo 信息"

5742

5620 -#: builtin/ls-files.c:492

5743 +#: builtin/ls-files.c:495

5744 msgid "skip files matching pattern"

5745 msgstr "匹配排除文件的模式"

5746

5624 -#: builtin/ls-files.c:495

5747 +#: builtin/ls-files.c:498

5748 msgid "exclude patterns are read from <file>"

5749 msgstr "从 <文件> 中读取排除模式"

5750

5628 -#: builtin/ls-files.c:498

5751 +#: builtin/ls-files.c:501

5752 msgid "read additional per-directory exclude patterns in <file>"

5753 msgstr "从 <文件> 读取额外的每个目录的排除模式"

5754

5632 -#: builtin/ls-files.c:500

5755 +#: builtin/ls-files.c:503

5756 msgid "add the standard git exclusions"

5757 msgstr "添加标准的 git 排除"

5758

5636 -#: builtin/ls-files.c:503

5759 +#: builtin/ls-files.c:506

5760 msgid "make the output relative to the project top directory"

5761 msgstr "显示相对于顶级目录的文件名"

5762

5640 -#: builtin/ls-files.c:506

5763 +#: builtin/ls-files.c:509

5764 msgid "if any <file> is not in the index, treat this as an error"

5765 msgstr "如果任何 <文件> 都不在索引区，视为错误"

5766

5644 -#: builtin/ls-files.c:507

5767 +#: builtin/ls-files.c:510

5768 msgid "tree-ish"

5769 msgstr "树或提交"

5770

5648 -#: builtin/ls-files.c:508

5771 +#: builtin/ls-files.c:511

5772 msgid "pretend that paths removed since <tree-ish> are still present"

5773 msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"

5774

5652 -#: builtin/ls-files.c:510

5775 +#: builtin/ls-files.c:513

5776 msgid "show debugging data"

5777 msgstr "显示调试数据"

5778

@@ -5756,7 +5879,7 @@ msgstr "允许快进（默认）"

5879 msgid "abort if fast-forward is not possible"

5880 msgstr "如果不能快进就放弃合并"

5881

5759 -#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112

5882 +#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112

5883 msgid "strategy"

5884 msgstr "策略"

5885

@@ -5859,64 +5982,65 @@ msgid "Not committing merge; use 'git commit' to complete the merge.\n"

5982 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"

5983

5984 #: builtin/merge.c:788

5985 +#, c-format

5986 msgid ""

5987 "Please enter a commit message to explain why this merge is necessary,\n"

5988 "especially if it merges an updated upstream into a topic branch.\n"

5989 "\n"

5866 -"Lines starting with '#' will be ignored, and an empty message aborts\n"

5990 +"Lines starting with '%c' will be ignored, and an empty message aborts\n"

5991 "the commit.\n"

5992 msgstr ""

5993 "请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n"

5994 "合并到主题分支。\n"

5995 "\n"

5872 -"以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n"

5996 +"以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"

5997

5874 -#: builtin/merge.c:813

5998 +#: builtin/merge.c:812

5999 msgid "Empty commit message."

6000 msgstr "空提交信息。"

6001

5878 -#: builtin/merge.c:825

6002 +#: builtin/merge.c:824

6003 #, c-format

6004 msgid "Wonderful.\n"

6005 msgstr "太棒了。\n"

6006

5883 -#: builtin/merge.c:890

6007 +#: builtin/merge.c:889

6008 #, c-format

6009 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

6010 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"

6011

5888 -#: builtin/merge.c:906

6012 +#: builtin/merge.c:905

6013 #, c-format

6014 msgid "'%s' is not a commit"

6015 msgstr "'%s' 不是一个提交"

6016

5893 -#: builtin/merge.c:947

6017 +#: builtin/merge.c:946

6018 msgid "No current branch."

6019 msgstr "没有当前分支。"

6020

5897 -#: builtin/merge.c:949

6021 +#: builtin/merge.c:948

6022 msgid "No remote for the current branch."

6023 msgstr "当前分支没有对应的远程版本库。"

6024

5901 -#: builtin/merge.c:951

6025 +#: builtin/merge.c:950

6026 msgid "No default upstream defined for the current branch."

6027 msgstr "当前分支没有定义默认的上游分支。"

6028

5905 -#: builtin/merge.c:956

6029 +#: builtin/merge.c:955

6030 #, c-format

6031 msgid "No remote tracking branch for %s from %s"

6032 msgstr "%s 没有来自 %s 的远程跟踪分支"

6033

5910 -#: builtin/merge.c:1043 builtin/merge.c:1200

6034 +#: builtin/merge.c:1042 builtin/merge.c:1199

6035 #, c-format

6036 msgid "%s - not something we can merge"

6037 msgstr "%s - 不能被合并"

6038

5915 -#: builtin/merge.c:1111

6039 +#: builtin/merge.c:1110

6040 msgid "There is no merge to abort (MERGE_HEAD missing)."

6041 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"

6042

5919 -#: builtin/merge.c:1127 git-pull.sh:31

6043 +#: builtin/merge.c:1126 git-pull.sh:31

6044 msgid ""

6045 "You have not concluded your merge (MERGE_HEAD exists).\n"

6046 "Please, commit your changes before you can merge."

@@ -5924,11 +6048,11 @@ msgstr ""

6048 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"

6049 "请在合并前先提交您的修改。"

6050

5927 -#: builtin/merge.c:1130 git-pull.sh:34

6051 +#: builtin/merge.c:1129 git-pull.sh:34

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

6053 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"

6054

5931 -#: builtin/merge.c:1134

6055 +#: builtin/merge.c:1133

6056 msgid ""

6057 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

6058 "Please, commit your changes before you can merge."

@@ -5936,79 +6060,79 @@ msgstr ""

6060 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"

6061 "请在合并前先提交您的修改。"

6062

5939 -#: builtin/merge.c:1137

6063 +#: builtin/merge.c:1136

6064 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

6065 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"

6066

5943 -#: builtin/merge.c:1146

6067 +#: builtin/merge.c:1145

6068 msgid "You cannot combine --squash with --no-ff."

6069 msgstr "您不能将 --squash 与 --no-ff 同时使用。"

6070

5947 -#: builtin/merge.c:1151

6071 +#: builtin/merge.c:1150

6072 msgid "You cannot combine --no-ff with --ff-only."

6073 msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"

6074

5951 -#: builtin/merge.c:1158

6075 +#: builtin/merge.c:1157

6076 msgid "No commit specified and merge.defaultToUpstream not set."

6077 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"

6078

5955 -#: builtin/merge.c:1190

6079 +#: builtin/merge.c:1189

6080 msgid "Can merge only exactly one commit into empty head"

6081 msgstr "只能将一个提交合并到空分支上"

6082

5959 -#: builtin/merge.c:1193

6083 +#: builtin/merge.c:1192

6084 msgid "Squash commit into empty head not supported yet"

6085 msgstr "尚不支持到空分支的压缩提交"

6086

5963 -#: builtin/merge.c:1195

6087 +#: builtin/merge.c:1194

6088 msgid "Non-fast-forward commit does not make sense into an empty head"

6089 msgstr "到空分支的非快进式提交没有意义"

6090

5967 -#: builtin/merge.c:1311

6091 +#: builtin/merge.c:1310

6092 #, c-format

6093 msgid "Updating %s..%s\n"

6094 msgstr "更新 %s..%s\n"

6095

5972 -#: builtin/merge.c:1350

6096 +#: builtin/merge.c:1349

6097 #, c-format

6098 msgid "Trying really trivial in-index merge...\n"

6099 msgstr "尝试非常小的索引内合并...\n"

6100

5977 -#: builtin/merge.c:1357

6101 +#: builtin/merge.c:1356

6102 #, c-format

6103 msgid "Nope.\n"

6104 msgstr "无。\n"

6105

5982 -#: builtin/merge.c:1389

6106 +#: builtin/merge.c:1388

6107 msgid "Not possible to fast-forward, aborting."

6108 msgstr "无法快进，终止。"

6109

5986 -#: builtin/merge.c:1412 builtin/merge.c:1491

6110 +#: builtin/merge.c:1411 builtin/merge.c:1490

6111 #, c-format

6112 msgid "Rewinding the tree to pristine...\n"

6113 msgstr "将树回滚至原始状态...\n"

6114

5991 -#: builtin/merge.c:1416

6115 +#: builtin/merge.c:1415

6116 #, c-format

6117 msgid "Trying merge strategy %s...\n"

6118 msgstr "尝试合并策略 %s...\n"

6119

5996 -#: builtin/merge.c:1482

6120 +#: builtin/merge.c:1481

6121 #, c-format

6122 msgid "No merge strategy handled the merge.\n"

6123 msgstr "没有合并策略处理此合并。\n"

6124

6001 -#: builtin/merge.c:1484

6125 +#: builtin/merge.c:1483

6126 #, c-format

6127 msgid "Merge with strategy %s failed.\n"

6128 msgstr "使用策略 %s 合并失败。\n"

6129

6006 -#: builtin/merge.c:1493

6130 +#: builtin/merge.c:1492

6131 #, c-format

6132 msgid "Using the %s to prepare resolving by hand.\n"

6133 msgstr "使用 %s 以准备手工解决。\n"

6134

6011 -#: builtin/merge.c:1505

6135 +#: builtin/merge.c:1504

6136 #, c-format

6137 msgid "Automatic merge went well; stopped before committing as requested\n"

6138 msgstr "自动合并进展顺利，按要求在提交前停止\n"

@@ -6319,175 +6443,170 @@ msgstr "git notes prune [<选项>]"

6443 msgid "git notes get-ref"

6444 msgstr "git notes get-ref"

6445

6322 -#: builtin/notes.c:142

6446 +#: builtin/notes.c:139

6447 #, c-format

6448 msgid "unable to start 'show' for object '%s'"

6449 msgstr "不能为对象 '%s' 开始 'show'"

6450

6327 -#: builtin/notes.c:148

6328 -msgid "can't fdopen 'show' output fd"

6329 -msgstr "不能打开 'show' 输出文件句柄"

6451 +#: builtin/notes.c:143

6452 +msgid "could not read 'show' output"

6453 +msgstr "不能读取 'show' 的输出"

6454

6331 -#: builtin/notes.c:158

6332 -#, c-format

6333 -msgid "failed to close pipe to 'show' for object '%s'"

6334 -msgstr "无法为对象 '%s' 的 'show' 关闭管道"

6335 -

6336 -#: builtin/notes.c:161

6455 +#: builtin/notes.c:151

6456 #, c-format

6457 msgid "failed to finish 'show' for object '%s'"

6458 msgstr "无法为对象 '%s' 完成 'show'"

6459

6341 -#: builtin/notes.c:178 builtin/tag.c:347

6460 +#: builtin/notes.c:169 builtin/tag.c:341

6461 #, c-format

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

6463 msgstr "不能创建文件 '%s'"

6464

6346 -#: builtin/notes.c:192

6465 +#: builtin/notes.c:188

6466 msgid "Please supply the note contents using either -m or -F option"

6467 msgstr "请通过 -m 或 -F 选项为注解提供内容"

6468

6350 -#: builtin/notes.c:213 builtin/notes.c:976

6469 +#: builtin/notes.c:209 builtin/notes.c:972

6470 #, c-format

6471 msgid "Removing note for object %s\n"

6472 msgstr "删除对象 %s 的注解\n"

6473

6355 -#: builtin/notes.c:218

6474 +#: builtin/notes.c:214

6475 msgid "unable to write note object"

6476 msgstr "不能写注解对象"

6477

6359 -#: builtin/notes.c:220

6478 +#: builtin/notes.c:216

6479 #, c-format

6480 msgid "The note contents has been left in %s"

6481 msgstr "注解内容被留在文件 %s 中"

6482

6364 -#: builtin/notes.c:254 builtin/tag.c:542

6483 +#: builtin/notes.c:250 builtin/tag.c:540

6484 #, c-format

6485 msgid "cannot read '%s'"

6486 msgstr "不能读取 '%s'"

6487

6369 -#: builtin/notes.c:256 builtin/tag.c:545

6488 +#: builtin/notes.c:252 builtin/tag.c:543

6489 #, c-format

6490 msgid "could not open or read '%s'"

6491 msgstr "不能打开或读取 '%s'"

6492

6374 -#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450

6375 -#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647

6376 -#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769

6377 -#: builtin/notes.c:971 builtin/tag.c:558

6493 +#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446

6494 +#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643

6495 +#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765

6496 +#: builtin/notes.c:967 builtin/tag.c:556

6497 #, c-format

6498 msgid "Failed to resolve '%s' as a valid ref."

6499 msgstr "无法解析 '%s' 为一个有效引用。"

6500

6382 -#: builtin/notes.c:278

6501 +#: builtin/notes.c:274

6502 #, c-format

6503 msgid "Failed to read object '%s'."

6504 msgstr "无法读取对象 '%s'。"

6505

6387 -#: builtin/notes.c:302

6506 +#: builtin/notes.c:298

6507 msgid "Cannot commit uninitialized/unreferenced notes tree"

6508 msgstr "不能提交未初始化/未引用的注解树"

6509

6391 -#: builtin/notes.c:343

6510 +#: builtin/notes.c:339

6511 #, c-format

6512 msgid "Bad notes.rewriteMode value: '%s'"

6513 msgstr "坏的 notes.rewriteMode 值：'%s'"

6514

6396 -#: builtin/notes.c:353

6515 +#: builtin/notes.c:349

6516 #, c-format

6517 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

6518 msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解"

6519

6520 #. TRANSLATORS: The first %s is the name of the

6521 #. environment variable, the second %s is its value

6403 -#: builtin/notes.c:380

6522 +#: builtin/notes.c:376

6523 #, c-format

6524 msgid "Bad %s value: '%s'"

6525 msgstr "坏的 %s 值：'%s'"

6526

6408 -#: builtin/notes.c:444

6527 +#: builtin/notes.c:440

6528 #, c-format

6529 msgid "Malformed input line: '%s'."

6530 msgstr "非法的输入行：'%s'。"

6531

6413 -#: builtin/notes.c:459

6532 +#: builtin/notes.c:455

6533 #, c-format

6534 msgid "Failed to copy notes from '%s' to '%s'"

6535 msgstr "无法从 '%s' 到 '%s' 拷贝注解"

6536

6418 -#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630

6419 -#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762

6420 -#: builtin/notes.c:1036

6537 +#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626

6538 +#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758

6539 +#: builtin/notes.c:1032

6540 msgid "too many parameters"

6541 msgstr "参数太多"

6542

6424 -#: builtin/notes.c:516 builtin/notes.c:775

6543 +#: builtin/notes.c:512 builtin/notes.c:771

6544 #, c-format

6545 msgid "No note found for object %s."

6546 msgstr "未发现对象 %s 的注解。"

6547

6429 -#: builtin/notes.c:538 builtin/notes.c:695

6548 +#: builtin/notes.c:534 builtin/notes.c:691

6549 msgid "note contents as a string"

6550 msgstr "注解内容作为一个字符串"

6551

6433 -#: builtin/notes.c:541 builtin/notes.c:698

6552 +#: builtin/notes.c:537 builtin/notes.c:694

6553 msgid "note contents in a file"

6554 msgstr "注解内容到一个文件中"

6555

6437 -#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700

6438 -#: builtin/notes.c:703 builtin/tag.c:476

6556 +#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696

6557 +#: builtin/notes.c:699 builtin/tag.c:474

6558 msgid "object"

6559 msgstr "对象"

6560

6442 -#: builtin/notes.c:544 builtin/notes.c:701

6561 +#: builtin/notes.c:540 builtin/notes.c:697

6562 msgid "reuse and edit specified note object"

6563 msgstr "重用和编辑指定的注解对象"

6564

6446 -#: builtin/notes.c:547 builtin/notes.c:704

6565 +#: builtin/notes.c:543 builtin/notes.c:700

6566 msgid "reuse specified note object"

6567 msgstr "重用指定的注解对象"

6568

6450 -#: builtin/notes.c:549 builtin/notes.c:617

6569 +#: builtin/notes.c:545 builtin/notes.c:613

6570 msgid "replace existing notes"

6571 msgstr "替换已存在的注解"

6572

6454 -#: builtin/notes.c:583

6573 +#: builtin/notes.c:579

6574 #, c-format

6575 msgid ""

6576 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "

6577 "existing notes"

6578 msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

6579

6461 -#: builtin/notes.c:588 builtin/notes.c:665

6580 +#: builtin/notes.c:584 builtin/notes.c:661

6581 #, c-format

6582 msgid "Overwriting existing notes for object %s\n"

6583 msgstr "覆盖对象 %s 现存注解\n"

6584

6466 -#: builtin/notes.c:618

6585 +#: builtin/notes.c:614

6586 msgid "read objects from stdin"

6587 msgstr "从标准输入读取对象"

6588

6470 -#: builtin/notes.c:620

6589 +#: builtin/notes.c:616

6590 msgid "load rewriting config for <command> (implies --stdin)"

6591 msgstr "重新加载 <命令> 的配置（隐含 --stdin）"

6592

6474 -#: builtin/notes.c:638

6593 +#: builtin/notes.c:634

6594 msgid "too few parameters"

6595 msgstr "参数太少"

6596

6478 -#: builtin/notes.c:659

6597 +#: builtin/notes.c:655

6598 #, c-format

6599 msgid ""

6600 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "

6601 "existing notes"

6602 msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"

6603

6485 -#: builtin/notes.c:671

6604 +#: builtin/notes.c:667

6605 #, c-format

6606 msgid "Missing notes on source object %s. Cannot copy."

6607 msgstr "源对象 %s 缺少注解。不能拷贝。"

6608

6490 -#: builtin/notes.c:720

6609 +#: builtin/notes.c:716

6610 #, c-format

6611 msgid ""

6612 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

@@ -6496,58 +6615,58 @@ msgstr ""

6615 "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"

6616 "请换用 'git notes add -f -m/-F/-c/-C'。\n"

6617

6499 -#: builtin/notes.c:867

6618 +#: builtin/notes.c:863

6619 msgid "General options"

6620 msgstr "通用选项"

6621

6503 -#: builtin/notes.c:869

6622 +#: builtin/notes.c:865

6623 msgid "Merge options"

6624 msgstr "合并选项"

6625

6507 -#: builtin/notes.c:871

6626 +#: builtin/notes.c:867

6627 msgid ""

6628 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"

6629 "cat_sort_uniq)"

6630 msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"

6631

6513 -#: builtin/notes.c:873

6632 +#: builtin/notes.c:869

6633 msgid "Committing unmerged notes"

6634 msgstr "提交未合并的注解"

6635

6517 -#: builtin/notes.c:875

6636 +#: builtin/notes.c:871

6637 msgid "finalize notes merge by committing unmerged notes"

6638 msgstr "通过提交未合并的注解来完成注解合并"

6639

6521 -#: builtin/notes.c:877

6640 +#: builtin/notes.c:873

6641 msgid "Aborting notes merge resolution"

6642 msgstr "中止注解合并的方案"

6643

6525 -#: builtin/notes.c:879

6644 +#: builtin/notes.c:875

6645 msgid "abort notes merge"

6646 msgstr "中止注解合并"

6647

6529 -#: builtin/notes.c:974

6648 +#: builtin/notes.c:970

6649 #, c-format

6650 msgid "Object %s has no note\n"

6651 msgstr "对象 %s 没有注解\n"

6652

6534 -#: builtin/notes.c:986

6653 +#: builtin/notes.c:982

6654 msgid "attempt to remove non-existent note is not an error"

6655 msgstr "尝试删除不存在的注解不是一个错误"

6656

6538 -#: builtin/notes.c:989

6657 +#: builtin/notes.c:985

6658 msgid "read object names from the standard input"

6659 msgstr "从标准输入读取对象名称"

6660

6542 -#: builtin/notes.c:1070

6661 +#: builtin/notes.c:1066

6662 msgid "notes_ref"

6663 msgstr "注解引用"

6664

6546 -#: builtin/notes.c:1071

6665 +#: builtin/notes.c:1067

6666 msgid "use notes from <notes_ref>"

6667 msgstr "从 <注解引用> 使用注解"

6668

6550 -#: builtin/notes.c:1106 builtin/remote.c:1598

6669 +#: builtin/notes.c:1102 builtin/remote.c:1598

6670 #, c-format

6671 msgid "Unknown subcommand: %s"

6672 msgstr "未知子命令：%s"

@@ -6896,26 +7015,46 @@ msgstr ""

7015

7016 #: builtin/push.c:224

7017 msgid ""

6899 -"Updates were rejected because the destination reference already exists\n"

6900 -"in the remote."

6901 -msgstr "更新被拒绝因为目标引用在远程已经存在。"

7018 +"Updates were rejected because the remote contains work that you do\n"

7019 +"not have locally. This is usually caused by another repository pushing\n"

7020 +"to the same ref. You may want to first merge the remote changes (e.g.,\n"

7021 +"'git pull') before pushing again.\n"

7022 +"See the 'Note about fast-forwards' in 'git push --help' for details."

7023 +msgstr ""

7024 +"更新被拒绝，因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n"

7025 +"一个版本库已推送了相同的引用。再次推送前，您可能需要先合并远程变更\n"

7026 +"（如 'git pull'）。\n"

7027 +"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"

7028 +

7029 +#: builtin/push.c:231

7030 +msgid "Updates were rejected because the tag already exists in the remote."

7031 +msgstr "更新被拒绝因为 tag 在远程已经存在。"

7032 +

7033 +#: builtin/push.c:234

7034 +msgid ""

7035 +"You cannot update a remote ref that points at a non-commit object,\n"

7036 +"or update a remote ref to make it point at a non-commit object,\n"

7037 +"without using the '--force' option.\n"

7038 +msgstr ""

7039 +"如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"

7040 +"也不能更新远程引用让其指向一个非提交对象。\n"

7041

6903 -#: builtin/push.c:269

7042 +#: builtin/push.c:294

7043 #, c-format

7044 msgid "Pushing to %s\n"

7045 msgstr "推送到 %s\n"

7046

6908 -#: builtin/push.c:273

7047 +#: builtin/push.c:298

7048 #, c-format

7049 msgid "failed to push some refs to '%s'"

7050 msgstr "无法推送一些引用到 '%s'"

7051

6913 -#: builtin/push.c:302

7052 +#: builtin/push.c:331

7053 #, c-format

7054 msgid "bad repository '%s'"

7055 msgstr "坏的版本库 '%s'"

7056

6918 -#: builtin/push.c:303

7057 +#: builtin/push.c:332

7058 msgid ""

7059 "No configured push destination.\n"

7060 "Either specify the URL from the command-line or configure a remote "

@@ -6936,79 +7075,83 @@ msgstr ""

7075 "\n"

7076 " git push <name>\n"

7077

6939 -#: builtin/push.c:318

7078 +#: builtin/push.c:347

7079 msgid "--all and --tags are incompatible"

7080 msgstr "--all 和 --tags 不兼容"

7081

6943 -#: builtin/push.c:319

7082 +#: builtin/push.c:348

7083 msgid "--all can't be combined with refspecs"

7084 msgstr "--all 不能和引用表达式同时使用"

7085

6947 -#: builtin/push.c:324

7086 +#: builtin/push.c:353

7087 msgid "--mirror and --tags are incompatible"

7088 msgstr "--mirror 和 --tags 不兼容"

7089

6951 -#: builtin/push.c:325

7090 +#: builtin/push.c:354

7091 msgid "--mirror can't be combined with refspecs"

7092 msgstr "--mirror 不能和引用表达式同时使用"

7093

6955 -#: builtin/push.c:330

7094 +#: builtin/push.c:359

7095 msgid "--all and --mirror are incompatible"

7096 msgstr "--all 和 --mirror 不兼容"

7097

6959 -#: builtin/push.c:390

7098 +#: builtin/push.c:419

7099 msgid "repository"

7100 msgstr "版本库"

7101

6963 -#: builtin/push.c:391

7102 +#: builtin/push.c:420

7103 msgid "push all refs"

7104 msgstr "推送所有引用"

7105

6967 -#: builtin/push.c:392

7106 +#: builtin/push.c:421

7107 msgid "mirror all refs"

7108 msgstr "镜像所有引用"

7109

6971 -#: builtin/push.c:394

7110 +#: builtin/push.c:423

7111 msgid "delete refs"

7112 msgstr "删除引用"

7113

6975 -#: builtin/push.c:395

7114 +#: builtin/push.c:424

7115 msgid "push tags (can't be used with --all or --mirror)"

7116 msgstr "推送 tags（不能使用 --all or --mirror）"

7117

6979 -#: builtin/push.c:398

7118 +#: builtin/push.c:427

7119 msgid "force updates"

7120 msgstr "强制更新"

7121

6983 -#: builtin/push.c:399

7122 +#: builtin/push.c:428

7123 msgid "check"

7124 msgstr "检查"

7125

6987 -#: builtin/push.c:400

7126 +#: builtin/push.c:429

7127 msgid "control recursive pushing of submodules"

7128 msgstr "控制子模组的递归推送"

7129

6991 -#: builtin/push.c:402

7130 +#: builtin/push.c:431

7131 msgid "use thin pack"

7132 msgstr "使用精简打包"

7133

6995 -#: builtin/push.c:403 builtin/push.c:404

7134 +#: builtin/push.c:432 builtin/push.c:433

7135 msgid "receive pack program"

7136 msgstr "接收包程序"

7137

6999 -#: builtin/push.c:405

7138 +#: builtin/push.c:434

7139 msgid "set upstream for git pull/status"

7140 msgstr "设置 git pull/status 的上游"

7141

7003 -#: builtin/push.c:408

7142 +#: builtin/push.c:437

7143 msgid "prune locally removed refs"

7144 msgstr "清除本地删除的引用"

7145

7007 -#: builtin/push.c:418

7146 +#: builtin/push.c:439

7147 +msgid "bypass pre-push hook"

7148 +msgstr "绕过 pre-push 钩子"

7149 +

7150 +#: builtin/push.c:448

7151 msgid "--delete is incompatible with --all, --mirror and --tags"

7152 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"

7153

7011 -#: builtin/push.c:420

7154 +#: builtin/push.c:450

7155 msgid "--delete doesn't make sense without any refs"

7156 msgstr "--delete 未接任何引用没有意义"

7157

@@ -8031,11 +8174,11 @@ msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"

8174

8175 #: builtin/show-ref.c:10

8176 msgid ""

8034 -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"

8035 -"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "

8177 +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"

8178 +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "

8179 msgstr ""

8037 -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"

8038 -"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "

8180 +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"

8181 +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "

8182

8183 #: builtin/show-ref.c:11

8184 msgid "git show-ref --exclude-existing[=pattern] < ref-list"

@@ -8104,8 +8247,7 @@ msgstr "更新的原因"

8247 #: builtin/tag.c:22

8248 msgid ""

8249 "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"

8107 -msgstr ""

8108 -"git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"

8250 +msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]"

8251

8252 #: builtin/tag.c:23

8253 msgid "git tag -d <tagname>..."

@@ -8149,169 +8291,163 @@ msgid "could not verify the tag '%s'"

8291 msgstr "不能校验 tag '%s'"

8292

8293 #: builtin/tag.c:249

8294 +#, c-format

8295 msgid ""

8296 "\n"

8154 -"#\n"

8155 -"# Write a tag message\n"

8156 -"# Lines starting with '#' will be ignored.\n"

8157 -"#\n"

8297 +"Write a tag message\n"

8298 +"Lines starting with '%c' will be ignored.\n"

8299 msgstr ""

8300 "\n"

8160 -"#\n"

8161 -"# 输入一个 tag 说明\n"

8162 -"# 以 '#' 开头的行将被忽略。\n"

8163 -"#\n"

8301 +"输入一个 tag 说明\n"

8302 +"以 '%c' 开头的行将被忽略。\n"

8303

8165 -#: builtin/tag.c:256

8304 +#: builtin/tag.c:253

8305 +#, c-format

8306 msgid ""

8307 "\n"

8168 -"#\n"

8169 -"# Write a tag message\n"

8170 -"# Lines starting with '#' will be kept; you may remove them yourself if you "

8308 +"Write a tag message\n"

8309 +"Lines starting with '%c' will be kept; you may remove them yourself if you "

8310 "want to.\n"

8172 -"#\n"

8311 msgstr ""

8312 "\n"

8175 -"#\n"

8176 -"# 输入一个 tag 说明\n"

8177 -"# 以 '#' 开头的行将被忽略，您可以删除它们如果您想这样做。\n"

8178 -"#\n"

8313 +"输入一个 tag 说明\n"

8314 +"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"

8315

8180 -#: builtin/tag.c:298

8316 +#: builtin/tag.c:292

8317 msgid "unable to sign the tag"

8318 msgstr "无法签署 tag"

8319

8184 -#: builtin/tag.c:300

8320 +#: builtin/tag.c:294

8321 msgid "unable to write tag file"

8322 msgstr "无法写 tag 文件"

8323

8188 -#: builtin/tag.c:325

8324 +#: builtin/tag.c:319

8325 msgid "bad object type."

8326 msgstr "坏的对象类型。"

8327

8192 -#: builtin/tag.c:338

8328 +#: builtin/tag.c:332

8329 msgid "tag header too big."

8330 msgstr "tag 头信息太大。"

8331

8196 -#: builtin/tag.c:370

8332 +#: builtin/tag.c:368

8333 msgid "no tag message?"

8334 msgstr "无 tag 说明？"

8335

8200 -#: builtin/tag.c:376

8336 +#: builtin/tag.c:374

8337 #, c-format

8338 msgid "The tag message has been left in %s\n"

8339 msgstr "tag 说明被保留在 %s\n"

8340

8205 -#: builtin/tag.c:425

8341 +#: builtin/tag.c:423

8342 msgid "switch 'points-at' requires an object"

8343 msgstr "开关 'points-at' 需要一个对象"

8344

8209 -#: builtin/tag.c:427

8345 +#: builtin/tag.c:425

8346 #, c-format

8347 msgid "malformed object name '%s'"

8348 msgstr "非法的对象名 '%s'"

8349

8214 -#: builtin/tag.c:447

8350 +#: builtin/tag.c:445

8351 msgid "list tag names"

8352 msgstr "列出tag名称"

8353

8218 -#: builtin/tag.c:449

8354 +#: builtin/tag.c:447

8355 msgid "print <n> lines of each tag message"

8356 msgstr "每个 tag 信息打印 <n> 行"

8357

8222 -#: builtin/tag.c:451

8358 +#: builtin/tag.c:449

8359 msgid "delete tags"

8360 msgstr "删除 tags"

8361

8226 -#: builtin/tag.c:452

8362 +#: builtin/tag.c:450

8363 msgid "verify tags"

8364 msgstr "验证 tags"

8365

8230 -#: builtin/tag.c:454

8366 +#: builtin/tag.c:452

8367 msgid "Tag creation options"

8368 msgstr "Tag 创建选项"

8369

8234 -#: builtin/tag.c:456

8370 +#: builtin/tag.c:454

8371 msgid "annotated tag, needs a message"

8372 msgstr "注解 tag，需要一个说明"

8373

8238 -#: builtin/tag.c:458

8374 +#: builtin/tag.c:456

8375 msgid "tag message"

8376 msgstr "tag 说明"

8377

8242 -#: builtin/tag.c:460

8378 +#: builtin/tag.c:458

8379 msgid "annotated and GPG-signed tag"

8380 msgstr "注解并 GPG 签名的 tag"

8381

8246 -#: builtin/tag.c:464

8382 +#: builtin/tag.c:462

8383 msgid "use another key to sign the tag"

8384 msgstr "使用另外的私钥签名 tag"

8385

8250 -#: builtin/tag.c:465

8386 +#: builtin/tag.c:463

8387 msgid "replace the tag if exists"

8388 msgstr "如果存在，替换现有的 tag"

8389

8254 -#: builtin/tag.c:466

8390 +#: builtin/tag.c:464

8391 msgid "show tag list in columns"

8392 msgstr "以列的方式显示 tag"

8393

8258 -#: builtin/tag.c:468

8394 +#: builtin/tag.c:466

8395 msgid "Tag listing options"

8396 msgstr "Tag 列表选项"

8397

8262 -#: builtin/tag.c:471

8398 +#: builtin/tag.c:469

8399 msgid "print only tags that contain the commit"

8400 msgstr "只打印包含提交的tags"

8401

8266 -#: builtin/tag.c:477

8402 +#: builtin/tag.c:475

8403 msgid "print only tags of the object"

8404 msgstr "只打印tags对象"

8405

8270 -#: builtin/tag.c:506

8406 +#: builtin/tag.c:504

8407 msgid "--column and -n are incompatible"

8408 msgstr "--column 和 -n 不兼容"

8409

8274 -#: builtin/tag.c:523

8410 +#: builtin/tag.c:521

8411 msgid "-n option is only allowed with -l."

8412 msgstr "-n 选项只允许和 -l 同时使用。"

8413

8278 -#: builtin/tag.c:525

8414 +#: builtin/tag.c:523

8415 msgid "--contains option is only allowed with -l."

8416 msgstr "--contains 选项只允许和 -l 同时使用。"

8417

8282 -#: builtin/tag.c:527

8418 +#: builtin/tag.c:525

8419 msgid "--points-at option is only allowed with -l."

8420 msgstr "--points-at 选项只允许和 -l 同时使用。"

8421

8286 -#: builtin/tag.c:535

8422 +#: builtin/tag.c:533

8423 msgid "only one -F or -m option is allowed."

8424 msgstr "只允许一个 -F 或 -m 选项。"

8425

8290 -#: builtin/tag.c:555

8426 +#: builtin/tag.c:553

8427 msgid "too many params"

8428 msgstr "太多参数"

8429

8294 -#: builtin/tag.c:561

8430 +#: builtin/tag.c:559

8431 #, c-format

8432 msgid "'%s' is not a valid tag name."

8433 msgstr "'%s' 不是一个有效的tag名称。"

8434

8299 -#: builtin/tag.c:566

8435 +#: builtin/tag.c:564

8436 #, c-format

8437 msgid "tag '%s' already exists"

8438 msgstr "tag '%s' 已存在"

8439

8304 -#: builtin/tag.c:584

8440 +#: builtin/tag.c:582

8441 #, c-format

8442 msgid "%s: cannot lock the ref"

8443 msgstr "%s：不能锁定引用"

8444

8309 -#: builtin/tag.c:586

8445 +#: builtin/tag.c:584

8446 #, c-format

8447 msgid "%s: cannot update the ref"

8448 msgstr "%s：不能更新引用"

8449

8314 -#: builtin/tag.c:588

8450 +#: builtin/tag.c:586

8451 #, c-format

8452 msgid "Updated tag '%s' (was %s)\n"

8453 msgstr "已更新tag '%s'（曾为 %s）\n"

@@ -8545,8 +8681,8 @@ msgid "Print lines matching a pattern"

8681 msgstr "输出和模式匹配的行"

8682

8683 #: common-cmds.h:17

8548 -msgid "Create an empty git repository or reinitialize an existing one"

8549 -msgstr "创建一个空的 git 版本库或重新初始化一个"

8684 +msgid "Create an empty Git repository or reinitialize an existing one"

8685 +msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库"

8686

8687 #: common-cmds.h:18

8688 msgid "Show commit logs"

@@ -9413,11 +9549,11 @@ msgid "blob"

9549 msgstr "数据对象"

9550

9551 #: git-submodule.sh:979

9416 -msgid "# Submodules changed but not updated:"

9417 -msgstr "# 子模组已修改但尚未更新："

9552 +msgid "Submodules changed but not updated:"

9553 +msgstr "子模组已修改但尚未更新："

9554

9555 #: git-submodule.sh:981

9420 -msgid "# Submodule changes to be committed:"

9556 +msgid "Submodule changes to be committed:"

9557 msgstr "要提交的子模组变更："

9558

9559 #: git-submodule.sh:1129

@@ -9425,6 +9561,12 @@ msgstr "要提交的子模组变更："

9561 msgid "Synchronizing submodule url for '$prefix$sm_path'"

9562 msgstr "为 '$prefix$sm_path' 同步子模组 url"

9563

9564 +#~ msgid "can't fdopen 'show' output fd"

9565 +#~ msgstr "不能打开 'show' 输出文件句柄"

9566 +

9567 +#~ msgid "failed to close pipe to 'show' for object '%s'"

9568 +#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道"

9569 +

9570 #~ msgid "-NUM"

9571 #~ msgstr "-数字"

9572

l10n: zh_CN.po: translate 35 new messages