cfff71a961 · 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-11-02 08:06+0800\n"

16 -"PO-Revision-Date: 2013-11-02 08:14+0800\n"

15 +"POT-Creation-Date: 2014-01-18 07:42+0800\n"

16 +"PO-Revision-Date: 2014-01-18 10:54+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"

@@ -60,7 +60,7 @@ msgstr ""

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

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

62

63 -#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328

63 +#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328

64 #, c-format

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

66 msgstr "路径规则 '%s' 未匹配任何文件"

@@ -81,8 +81,8 @@ msgstr "前缀"

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

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

83

84 -#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264

85 -#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680

84 +#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265

85 +#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680

86 #: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77

87 #: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408

88 #: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154

@@ -261,64 +261,64 @@ msgstr "无法为更新锁定引用"

261 msgid "Failed to write ref"

262 msgstr "不能写引用"

263

264 -#: bundle.c:36

264 +#: bundle.c:37

265 #, c-format

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

267 msgstr "'%s' 不像是一个 v2 版本的包文件"

268

269 -#: bundle.c:63

269 +#: bundle.c:64

270 #, c-format

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

272 msgstr "未能识别的包头：%s%s (%d)"

273

274 -#: bundle.c:89 builtin/commit.c:706

274 +#: bundle.c:90 builtin/commit.c:706

275 #, c-format

276 msgid "could not open '%s'"

277 msgstr "不能打开 '%s'"

278

279 -#: bundle.c:140

279 +#: bundle.c:141

280 msgid "Repository lacks these prerequisite commits:"

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

282

283 -#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332

284 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364

283 +#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332

284 +#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357

285 #: builtin/shortlog.c:158

286 msgid "revision walk setup failed"

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

288

289 -#: bundle.c:186

289 +#: bundle.c:187

290 #, c-format

291 msgid "The bundle contains this ref:"

292 msgid_plural "The bundle contains these %d refs:"

293 msgstr[0] "这个包中含有这个引用："

294 msgstr[1] "这个包中含有 %d 个引用："

295

296 -#: bundle.c:193

296 +#: bundle.c:194

297 msgid "The bundle records a complete history."

298 msgstr "这个包记录一个完整历史。"

299

300 -#: bundle.c:195

300 +#: bundle.c:196

301 #, c-format

302 msgid "The bundle requires this ref:"

303 msgid_plural "The bundle requires these %d refs:"

304 msgstr[0] "这个包需要这个引用："

305 msgstr[1] "这个包需要 %d 个引用："

306

307 -#: bundle.c:294

307 +#: bundle.c:296

308 msgid "rev-list died"

309 msgstr "rev-list 终止"

310

311 -#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261

311 +#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261

312 #, c-format

313 msgid "unrecognized argument: %s"

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

315

316 -#: bundle.c:335

316 +#: bundle.c:337

317 #, c-format

318 msgid "ref '%s' is excluded by the rev-list options"

319 msgstr "引用 '%s' 被 rev-list 选项排除"

320

321 -#: bundle.c:380

321 +#: bundle.c:382

322 msgid "Refusing to create empty bundle."

323 msgstr "不能创建空包。"

324

@@ -353,16 +353,16 @@ msgstr "%s %s 不是一个提交!"

353 msgid "memory exhausted"

354 msgstr "内存耗尽"

355

356 -#: connected.c:60

356 +#: connected.c:70

357 msgid "Could not run 'git rev-list'"

358 msgstr "不能执行 'git rev-list'"

359

360 -#: connected.c:80

360 +#: connected.c:90

361 #, c-format

362 msgid "failed write to rev-list: %s"

363 msgstr "无法写入 rev-list：%s"

364

365 -#: connected.c:88

365 +#: connected.c:98

366 #, c-format

367 msgid "failed to close rev-list's stdin: %s"

368 msgstr "无法关闭 rev-list 的标准输入：%s"

@@ -434,24 +434,29 @@ msgid_plural "%lu years ago"

434 msgstr[0] "%lu 年前"

435 msgstr[1] "%lu 年前"

436

437 +#: diffcore-order.c:24

438 +#, c-format

439 +msgid "failed to read orderfile '%s'"

440 +msgstr "无法读取排序文件 '%s'"

441 +

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

438 -#: diff.c:112

443 +#: diff.c:113

444 #, c-format

445 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

446 msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"

447

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

444 -#: diff.c:117

449 +#: diff.c:118

450 #, c-format

451 msgid " Unknown dirstat parameter '%s'\n"

452 msgstr " 未知的 dirstat 参数 '%s'\n"

453

449 -#: diff.c:210

454 +#: diff.c:213

455 #, c-format

456 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

457 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"

458

454 -#: diff.c:260

459 +#: diff.c:263

460 #, c-format

461 msgid ""

462 "Found errors in 'diff.dirstat' config variable:\n"

@@ -460,7 +465,7 @@ msgstr ""

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

466 "%s"

467

463 -#: diff.c:3490

468 +#: diff.c:3509

469 #, c-format

470 msgid ""

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

@@ -469,7 +474,7 @@ msgstr ""

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

475 "%s"

476

472 -#: diff.c:3504

477 +#: diff.c:3523

478 #, c-format

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

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

@@ -580,7 +585,7 @@ msgid "failed to read the cache"

585 msgstr "无法读取缓存"

586

587 #: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559

583 -#: builtin/clone.c:655

588 +#: builtin/clone.c:661

589 msgid "unable to write new index file"

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

591

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

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

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

636

632 -#: merge-recursive.c:774 builtin/clone.c:311

637 +#: merge-recursive.c:774 builtin/clone.c:317

638 #, c-format

639 msgid "failed to open '%s'"

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

@@ -679,7 +684,7 @@ msgstr ""

684 msgid "rename"

685 msgstr "重命名"

686

682 -#: merge-recursive.c:1082

687 +#: merge-recursive.c:1082 wt-status.c:283

688 msgid "renamed"

689 msgstr "重命名"

690

@@ -742,7 +747,7 @@ msgstr "对象 %s 不是一个数据（blob）对象"

747 msgid "modify"

748 msgstr "修改"

749

745 -#: merge-recursive.c:1565

750 +#: merge-recursive.c:1565 wt-status.c:281

751 msgid "modified"

752 msgstr "修改"

753

@@ -764,7 +769,7 @@ msgstr "略过 %s（已经做过相同合并）"

769 msgid "Auto-merging %s"

770 msgstr "自动合并 %s"

771

767 -#: merge-recursive.c:1634 git-submodule.sh:1125

772 +#: merge-recursive.c:1634 git-submodule.sh:1148

773 msgid "submodule"

774 msgstr "子模组"

775

@@ -834,7 +839,7 @@ msgstr "合并未返回提交"

839 msgid "Could not parse object '%s'"

840 msgstr "不能解析对象 '%s'"

841

837 -#: merge-recursive.c:2010 builtin/merge.c:672

842 +#: merge-recursive.c:2010 builtin/merge.c:665

843 msgid "Unable to write index."

844 msgstr "不能写入索引。"

845

@@ -890,46 +895,46 @@ msgstr " %s"

895 msgid "-NUM"

896 msgstr "-数字"

897

893 -#: pathspec.c:118

898 +#: pathspec.c:133

899 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

900 msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"

901

897 -#: pathspec.c:128

902 +#: pathspec.c:143

903 msgid ""

904 "global 'literal' pathspec setting is incompatible with all other global "

905 "pathspec settings"

906 msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"

907

903 -#: pathspec.c:158

908 +#: pathspec.c:177

909 msgid "invalid parameter for pathspec magic 'prefix'"

910 msgstr "路径规则包含无效的神奇前缀"

911

907 -#: pathspec.c:164

912 +#: pathspec.c:183

913 #, c-format

914 msgid "Invalid pathspec magic '%.*s' in '%s'"

915 msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"

916

912 -#: pathspec.c:168

917 +#: pathspec.c:187

918 #, c-format

919 msgid "Missing ')' at the end of pathspec magic in '%s'"

920 msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"

921

917 -#: pathspec.c:186

922 +#: pathspec.c:205

923 #, c-format

924 msgid "Unimplemented pathspec magic '%c' in '%s'"

925 msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"

926

922 -#: pathspec.c:211

927 +#: pathspec.c:230

928 #, c-format

929 msgid "%s: 'literal' and 'glob' are incompatible"

930 msgstr "%s：'literal' 和 'glob' 不兼容"

931

927 -#: pathspec.c:222

932 +#: pathspec.c:241

933 #, c-format

934 msgid "%s: '%s' is outside repository"

935 msgstr "%s：'%s' 在版本库之外"

936

932 -#: pathspec.c:278

937 +#: pathspec.c:291

938 #, c-format

939 msgid "Pathspec '%s' is in submodule '%.*s'"

940 msgstr "路径规则 '%s' 在子模组 '%.*s' 中"

@@ -939,42 +944,74 @@ msgstr "路径规则 '%s' 在子模组 '%.*s' 中"

944 #. * name. E.g. when add--interactive dies when running

945 #. * "checkout -p"

946 #.

942 -#: pathspec.c:340

947 +#: pathspec.c:353

948 #, c-format

949 msgid "%s: pathspec magic not supported by this command: %s"

950 msgstr "%s：路径规则神奇前缀不被此命令支持：%s"

951

947 -#: pathspec.c:415

952 +#: pathspec.c:433

953 #, c-format

954 msgid "pathspec '%s' is beyond a symbolic link"

955 msgstr "路径规则 '%s' 位于符号链接中"

956

952 -#: remote.c:1833

957 +#: pathspec.c:442

958 +msgid ""

959 +"There is nothing to exclude from by :(exclude) patterns.\n"

960 +"Perhaps you forgot to add either ':/' or '.' ?"

961 +msgstr ""

962 +"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"

963 +"添加 ':/' 或 '.' ？"

964 +

965 +#: remote.c:753

966 +#, c-format

967 +msgid "Cannot fetch both %s and %s to %s"

968 +msgstr "不能同时获取 %s 和 %s 至 %s"

969 +

970 +#: remote.c:757

971 +#, c-format

972 +msgid "%s usually tracks %s, not %s"

973 +msgstr "%s 通常跟踪 %s，而非 %s"

974 +

975 +#: remote.c:761

976 +#, c-format

977 +msgid "%s tracks both %s and %s"

978 +msgstr "%s 同时跟踪 %s 和 %s"

979 +

980 +#.

981 +#. * This last possibility doesn't occur because

982 +#. * FETCH_HEAD_IGNORE entries always appear at

983 +#. * the end of the list.

984 +#.

985 +#: remote.c:769

986 +msgid "Internal error"

987 +msgstr "内部错误"

988 +

989 +#: remote.c:1871

990 #, c-format

991 msgid "Your branch is based on '%s', but the upstream is gone.\n"

992 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"

993

957 -#: remote.c:1837

994 +#: remote.c:1875

995 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

996 msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"

997

961 -#: remote.c:1840

998 +#: remote.c:1878

999 #, c-format

1000 msgid "Your branch is up-to-date with '%s'.\n"

1001 msgstr "您的分支与上游分支 '%s' 一致。\n"

1002

966 -#: remote.c:1844

1003 +#: remote.c:1882

1004 #, c-format

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

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

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

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

1009

973 -#: remote.c:1850

1010 +#: remote.c:1888

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

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

1013

977 -#: remote.c:1853

1014 +#: remote.c:1891

1015 #, c-format

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

1017 msgid_plural ""

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

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

1021

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

986 -#: remote.c:1861

1023 +#: remote.c:1899

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

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

1026

990 -#: remote.c:1864

1027 +#: remote.c:1902

1028 #, c-format

1029 msgid ""

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

@@ -1003,7 +1040,7 @@ msgstr[1] ""

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

1041

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

1006 -#: remote.c:1874

1043 +#: remote.c:1912

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

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

1046

@@ -1016,14 +1053,14 @@ msgstr "不能打开 /dev/null"

1053 msgid "dup2(%d,%d) failed"

1054 msgstr "不能调用 dup2(%d,%d)"

1055

1019 -#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903

1020 -#: builtin/merge.c:1013 builtin/merge.c:1023

1056 +#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896

1057 +#: builtin/merge.c:1006 builtin/merge.c:1016

1058 #, c-format

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

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

1061

1025 -#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793

1026 -#: builtin/merge.c:1015 builtin/merge.c:1028

1062 +#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786

1063 +#: builtin/merge.c:1008 builtin/merge.c:1021

1064 #, c-format

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

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

@@ -1262,7 +1299,7 @@ msgstr "不能作为初始提交还原"

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

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

1301

1265 -#: sha1_name.c:440

1302 +#: sha1_name.c:439

1303 msgid ""

1304 "Git normally never creates a ref that ends with 40 hex characters\n"

1305 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -1283,21 +1320,21 @@ msgstr ""

1320 "可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"

1321 "命令关闭本消息通知。"

1322

1286 -#: sha1_name.c:1112

1323 +#: sha1_name.c:1109

1324 msgid "HEAD does not point to a branch"

1325 msgstr "HEAD 没有指向一个分支"

1326

1290 -#: sha1_name.c:1115

1327 +#: sha1_name.c:1112

1328 #, c-format

1329 msgid "No such branch: '%s'"

1330 msgstr "没有此分支：'%s'"

1331

1295 -#: sha1_name.c:1117

1332 +#: sha1_name.c:1114

1333 #, c-format

1334 msgid "No upstream configured for branch '%s'"

1335 msgstr "尚未给分支 '%s' 设置上游"

1336

1300 -#: sha1_name.c:1121

1337 +#: sha1_name.c:1118

1338 #, c-format

1339 msgid "Upstream branch '%s' not stored as a remote-tracking branch"

1340 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"

@@ -1405,371 +1442,358 @@ msgstr "无法在口令文件中查询到当前用户：%s"

1442 msgid "no such user"

1443 msgstr "无此用户"

1444

1408 -#: wt-status.c:146

1445 +#: wt-status.c:150

1446 msgid "Unmerged paths:"

1447 msgstr "未合并的路径："

1448

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

1413 -#: wt-status.c:173 wt-status.c:200

1450 +#: wt-status.c:177 wt-status.c:204

1451 #, c-format

1452 msgid " (use \"git reset %s <file>...\" to unstage)"

1453 msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）"

1454

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

1419 -#: wt-status.c:175 wt-status.c:202

1456 +#: wt-status.c:179 wt-status.c:206

1457 msgid " (use \"git rm --cached <file>...\" to unstage)"

1458 msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）"

1459

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

1424 -#: wt-status.c:179

1461 +#: wt-status.c:183

1462 msgid " (use \"git add <file>...\" to mark resolution)"

1463 msgstr " （使用 \"git add <file>...\" 标记解决方案）"

1464

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

1429 -#: wt-status.c:181 wt-status.c:185

1466 +#: wt-status.c:185 wt-status.c:189

1467 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

1468 msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）"

1469

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

1434 -#: wt-status.c:183

1471 +#: wt-status.c:187

1472 msgid " (use \"git rm <file>...\" to mark resolution)"

1473 msgstr " （使用 \"git rm <file>...\" 标记解决方案）"

1474

1438 -#: wt-status.c:194

1475 +#: wt-status.c:198

1476 msgid "Changes to be committed:"

1477 msgstr "要提交的变更："

1478

1442 -#: wt-status.c:212

1479 +#: wt-status.c:216

1480 msgid "Changes not staged for commit:"

1481 msgstr "尚未暂存以备提交的变更："

1482

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

1447 -#: wt-status.c:216

1484 +#: wt-status.c:220

1485 msgid " (use \"git add <file>...\" to update what will be committed)"

1486 msgstr " （使用 \"git add <file>...\" 更新要提交的内容）"

1487

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

1452 -#: wt-status.c:218

1489 +#: wt-status.c:222

1490 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

1491 msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）"

1492

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

1457 -#: wt-status.c:219

1494 +#: wt-status.c:223

1495 msgid ""

1496 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

1497 msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）"

1498

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

1463 -#: wt-status.c:221

1500 +#: wt-status.c:225

1501 msgid " (commit or discard the untracked or modified content in submodules)"

1502 msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"

1503

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

1468 -#: wt-status.c:233

1505 +#: wt-status.c:237

1506 #, c-format

1507 msgid " (use \"git %s <file>...\" to include in what will be committed)"

1508 msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）"

1509

1473 -#: wt-status.c:250

1510 +#: wt-status.c:254

1511 msgid "bug"

1512 msgstr "bug"

1513

1477 -#: wt-status.c:255

1514 +#: wt-status.c:259

1515 msgid "both deleted:"

1516 msgstr "双方删除："

1517

1481 -#: wt-status.c:256

1518 +#: wt-status.c:260

1519 msgid "added by us:"

1520 msgstr "由我们添加："

1521

1485 -#: wt-status.c:257

1522 +#: wt-status.c:261

1523 msgid "deleted by them:"

1524 msgstr "由他们删除："

1525

1489 -#: wt-status.c:258

1526 +#: wt-status.c:262

1527 msgid "added by them:"

1528 msgstr "由他们添加："

1529

1493 -#: wt-status.c:259

1530 +#: wt-status.c:263

1531 msgid "deleted by us:"

1532 msgstr "由我们删除："

1533

1497 -#: wt-status.c:260

1534 +#: wt-status.c:264

1535 msgid "both added:"

1536 msgstr "双方添加："

1537

1501 -#: wt-status.c:261

1538 +#: wt-status.c:265

1539 msgid "both modified:"

1540 msgstr "双方修改："

1541

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

1543 +#: wt-status.c:275

1544 +msgid "new file"

1545 +msgstr "新文件"

1546 +

1547 +#: wt-status.c:277

1548 +msgid "copied"

1549 +msgstr "拷贝"

1550 +

1551 +#: wt-status.c:279

1552 +msgid "deleted"

1553 +msgstr "删除"

1554 +

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

1556 +#: wt-status.c:285

1557 +msgid "typechange"

1558 +msgstr "类型变更"

1559 +

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

1561 +#: wt-status.c:287

1562 +msgid "unknown"

1563 +msgstr "未知"

1564 +

1565 +#: wt-status.c:289

1566 +msgid "unmerged"

1567 +msgstr "未合并"

1568 +

1569 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

1506 -#: wt-status.c:291

1570 +#: wt-status.c:336

1571 msgid "new commits, "

1572 msgstr "新提交, "

1573

1574 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

1511 -#: wt-status.c:293

1575 +#: wt-status.c:338

1576 msgid "modified content, "

1577 msgstr "修改的内容, "

1578

1579 # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字

1516 -#: wt-status.c:295

1580 +#: wt-status.c:340

1581 msgid "untracked content, "

1582 msgstr "未跟踪的内容, "

1583

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

1521 -#: wt-status.c:312

1522 -#, c-format

1523 -msgid "new file: %s"

1524 -msgstr "新文件： %s"

1525 -

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

1527 -#: wt-status.c:315

1528 -#, c-format

1529 -msgid "copied: %s -> %s"

1530 -msgstr "拷贝： %s -> %s"

1531 -

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

1533 -#: wt-status.c:318

1534 -#, c-format

1535 -msgid "deleted: %s"

1536 -msgstr "删除： %s"

1537 -

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

1539 -#: wt-status.c:321

1540 -#, c-format

1541 -msgid "modified: %s"

1542 -msgstr "修改： %s"

1543 -

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

1545 -#: wt-status.c:324

1546 -#, c-format

1547 -msgid "renamed: %s -> %s"

1548 -msgstr "重命名： %s -> %s"

1549 -

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

1551 -#: wt-status.c:327

1552 -#, c-format

1553 -msgid "typechange: %s"

1554 -msgstr "类型变更： %s"

1555 -

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

1557 -#: wt-status.c:330

1558 -#, c-format

1559 -msgid "unknown: %s"

1560 -msgstr "未知： %s"

1561 -

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

1563 -#: wt-status.c:333

1564 -#, c-format

1565 -msgid "unmerged: %s"

1566 -msgstr "未合并： %s"

1567 -

1568 -#: wt-status.c:336

1584 +#: wt-status.c:357

1585 #, c-format

1586 msgid "bug: unhandled diff status %c"

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

1588

1573 -#: wt-status.c:703

1589 +#: wt-status.c:732

1590 msgid "Submodules changed but not updated:"

1591 msgstr "子模组已修改但尚未更新："

1592

1577 -#: wt-status.c:705

1593 +#: wt-status.c:734

1594 msgid "Submodule changes to be committed:"

1595 msgstr "要提交的子模组变更："

1596

1581 -#: wt-status.c:848

1597 +#: wt-status.c:836

1598 +msgid ""

1599 +"Do not touch the line above.\n"

1600 +"Everything below will be removed."

1601 +msgstr ""

1602 +"不要改动上面的一行。\n"

1603 +"下面的所有内容均将被删除。"

1604 +

1605 +#: wt-status.c:899

1606 msgid "You have unmerged paths."

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

1608

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

1586 -#: wt-status.c:851

1610 +#: wt-status.c:902

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

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

1613

1590 -#: wt-status.c:854

1614 +#: wt-status.c:905

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

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

1617

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

1595 -#: wt-status.c:857

1619 +#: wt-status.c:908

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

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

1622

1599 -#: wt-status.c:867

1623 +#: wt-status.c:918

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

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

1626

1603 -#: wt-status.c:870

1627 +#: wt-status.c:921

1628 msgid "The current patch is empty."

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

1630

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

1608 -#: wt-status.c:874

1632 +#: wt-status.c:925

1633 msgid " (fix conflicts and then run \"git am --continue\")"

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

1635

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

1613 -#: wt-status.c:876

1637 +#: wt-status.c:927

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

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

1640

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

1618 -#: wt-status.c:878

1642 +#: wt-status.c:929

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

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

1645

1622 -#: wt-status.c:938 wt-status.c:955

1646 +#: wt-status.c:989 wt-status.c:1006

1647 #, c-format

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

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

1650

1627 -#: wt-status.c:943 wt-status.c:960

1651 +#: wt-status.c:994 wt-status.c:1011

1652 msgid "You are currently rebasing."

1653 msgstr "您正在变基。"

1654

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

1632 -#: wt-status.c:946

1656 +#: wt-status.c:997

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

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

1659

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

1637 -#: wt-status.c:948

1661 +#: wt-status.c:999

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

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

1664

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

1642 -#: wt-status.c:950

1666 +#: wt-status.c:1001

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

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

1669

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

1647 -#: wt-status.c:963

1671 +#: wt-status.c:1014

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

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

1674

1651 -#: wt-status.c:967

1675 +#: wt-status.c:1018

1676 #, c-format

1677 msgid ""

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

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

1680

1657 -#: wt-status.c:972

1681 +#: wt-status.c:1023

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

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

1684

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

1662 -#: wt-status.c:975

1686 +#: wt-status.c:1026

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

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

1689

1666 -#: wt-status.c:979

1690 +#: wt-status.c:1030

1691 #, c-format

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

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

1694

1671 -#: wt-status.c:984

1695 +#: wt-status.c:1035

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

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

1698

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

1676 -#: wt-status.c:987

1700 +#: wt-status.c:1038

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

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

1703

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

1681 -#: wt-status.c:989

1705 +#: wt-status.c:1040

1706 msgid ""

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

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

1709

1686 -#: wt-status.c:999

1710 +#: wt-status.c:1050

1711 #, c-format

1712 msgid "You are currently cherry-picking commit %s."

1713 msgstr "您正在做拣选提交 %s。"

1714

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

1692 -#: wt-status.c:1004

1716 +#: wt-status.c:1055

1717 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

1718 msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"

1719

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

1697 -#: wt-status.c:1007

1721 +#: wt-status.c:1058

1722 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

1723 msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"

1724

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

1702 -#: wt-status.c:1009

1726 +#: wt-status.c:1060

1727 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

1728 msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"

1729

1706 -#: wt-status.c:1018

1730 +#: wt-status.c:1069

1731 #, c-format

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

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

1734

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

1712 -#: wt-status.c:1023

1736 +#: wt-status.c:1074

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

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

1739

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

1717 -#: wt-status.c:1026

1741 +#: wt-status.c:1077

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

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

1744

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

1722 -#: wt-status.c:1028

1746 +#: wt-status.c:1079

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

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

1749

1726 -#: wt-status.c:1039

1750 +#: wt-status.c:1090

1751 #, c-format

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

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

1754

1731 -#: wt-status.c:1043

1755 +#: wt-status.c:1094

1756 msgid "You are currently bisecting."

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

1758

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

1736 -#: wt-status.c:1046

1760 +#: wt-status.c:1097

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

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

1763

1740 -#: wt-status.c:1221

1764 +#: wt-status.c:1272

1765 msgid "On branch "

1766 msgstr "位于分支 "

1767

1744 -#: wt-status.c:1228

1768 +#: wt-status.c:1279

1769 msgid "rebase in progress; onto "

1770 msgstr "变基正在进行中；至 "

1771

1748 -#: wt-status.c:1235

1772 +#: wt-status.c:1286

1773 msgid "HEAD detached at "

1774 msgstr "头指针分离于 "

1775

1752 -#: wt-status.c:1237

1776 +#: wt-status.c:1288

1777 msgid "HEAD detached from "

1778 msgstr "头指针分离自 "

1779

1756 -#: wt-status.c:1240

1780 +#: wt-status.c:1291

1781 msgid "Not currently on any branch."

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

1783

1760 -#: wt-status.c:1257

1784 +#: wt-status.c:1308

1785 msgid "Initial commit"

1786 msgstr "初始提交"

1787

1764 -#: wt-status.c:1271

1788 +#: wt-status.c:1322

1789 msgid "Untracked files"

1790 msgstr "未跟踪的文件"

1791

1768 -#: wt-status.c:1273

1792 +#: wt-status.c:1324

1793 msgid "Ignored files"

1794 msgstr "忽略的文件"

1795

1772 -#: wt-status.c:1277

1796 +#: wt-status.c:1328

1797 #, c-format

1798 msgid ""

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

@@ -1779,94 +1803,94 @@ msgstr ""

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

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

1805

1782 -#: wt-status.c:1283

1806 +#: wt-status.c:1334

1807 #, c-format

1808 msgid "Untracked files not listed%s"

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

1810

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

1788 -#: wt-status.c:1285

1812 +#: wt-status.c:1336

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

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

1815

1792 -#: wt-status.c:1291

1816 +#: wt-status.c:1342

1817 msgid "No changes"

1818 msgstr "没有修改"

1819

1796 -#: wt-status.c:1296

1820 +#: wt-status.c:1347

1821 #, c-format

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

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

1824

1801 -#: wt-status.c:1299

1825 +#: wt-status.c:1350

1826 #, c-format

1827 msgid "no changes added to commit\n"

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

1829

1806 -#: wt-status.c:1302

1830 +#: wt-status.c:1353

1831 #, c-format

1832 msgid ""

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

1834 "track)\n"

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

1836

1813 -#: wt-status.c:1305

1837 +#: wt-status.c:1356

1838 #, c-format

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

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

1841

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

1819 -#: wt-status.c:1308

1843 +#: wt-status.c:1359

1844 #, c-format

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

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

1847

1824 -#: wt-status.c:1311 wt-status.c:1316

1848 +#: wt-status.c:1362 wt-status.c:1367

1849 #, c-format

1850 msgid "nothing to commit\n"

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

1852

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

1830 -#: wt-status.c:1314

1854 +#: wt-status.c:1365

1855 #, c-format

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

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

1858

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

1836 -#: wt-status.c:1318

1860 +#: wt-status.c:1369

1861 #, c-format

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

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

1864

1841 -#: wt-status.c:1427

1865 +#: wt-status.c:1478

1866 msgid "HEAD (no branch)"

1867 msgstr "HEAD（非分支）"

1868

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

1846 -#: wt-status.c:1433

1870 +#: wt-status.c:1484

1871 msgid "Initial commit on "

1872 msgstr "初始提交于 "

1873

1850 -#: wt-status.c:1463

1874 +#: wt-status.c:1514

1875 msgid "gone"

1876 msgstr "丢失"

1877

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

1855 -#: wt-status.c:1465

1879 +#: wt-status.c:1516

1880 msgid "behind "

1881 msgstr "落后 "

1882

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

1860 -#: wt-status.c:1468 wt-status.c:1471

1884 +#: wt-status.c:1519 wt-status.c:1522

1885 msgid "ahead "

1886 msgstr "领先 "

1887

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

1865 -#: wt-status.c:1473

1889 +#: wt-status.c:1524

1890 msgid ", behind "

1891 msgstr "，落后 "

1892

1869 -#: compat/precompose_utf8.c:55 builtin/clone.c:350

1893 +#: compat/precompose_utf8.c:55 builtin/clone.c:356

1894 #, c-format

1895 msgid "failed to unlink '%s'"

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

@@ -1995,15 +2019,15 @@ msgstr "不能应用 '%s'"

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

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

2021

1998 -#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:92 builtin/mv.c:66

1999 -#: builtin/prune-packed.c:73 builtin/push.c:459 builtin/remote.c:1253

2022 +#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70

2023 +#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344

2024 #: builtin/rm.c:269

2025 msgid "dry run"

2026 msgstr "演习"

2027

2028 #: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19

2029 #: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612

2006 -#: builtin/log.c:1592 builtin/mv.c:65 builtin/read-tree.c:113

2030 +#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113

2031 msgid "be verbose"

2032 msgstr "冗长输出"

2033

@@ -2084,11 +2108,11 @@ msgid "Maybe you wanted to say 'git add .'?\n"

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

2109

2110 #: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919

2087 -#: builtin/commit.c:320 builtin/mv.c:86 builtin/reset.c:224 builtin/rm.c:299

2111 +#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299

2112 msgid "index file corrupt"

2113 msgstr "索引文件损坏"

2114

2091 -#: builtin/add.c:589 builtin/apply.c:4506 builtin/mv.c:259 builtin/rm.c:432

2115 +#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432

2116 msgid "Unable to write new index file"

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

2118

@@ -2417,7 +2441,7 @@ msgid "unable to read index file"

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

2442

2443 #: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90

2420 -#: builtin/fetch.c:77

2444 +#: builtin/fetch.c:78

2445 msgid "path"

2446 msgstr "路径"

2447

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

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

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

2641

2618 -#: builtin/blame.c:2248

2642 +#: builtin/blame.c:2249

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

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

2645

2622 -#: builtin/blame.c:2249

2646 +#: builtin/blame.c:2250

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

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

2649

2626 -#: builtin/blame.c:2250

2650 +#: builtin/blame.c:2251

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

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

2653

2630 -#: builtin/blame.c:2251

2654 +#: builtin/blame.c:2252

2655 msgid "Show work cost statistics"

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

2657

2634 -#: builtin/blame.c:2252

2658 +#: builtin/blame.c:2253

2659 msgid "Show output score for blame entries"

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

2661

2638 -#: builtin/blame.c:2253

2662 +#: builtin/blame.c:2254

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

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

2665

2642 -#: builtin/blame.c:2254

2666 +#: builtin/blame.c:2255

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

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

2669

2646 -#: builtin/blame.c:2255

2670 +#: builtin/blame.c:2256

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

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

2673

2650 -#: builtin/blame.c:2256

2674 +#: builtin/blame.c:2257

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

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

2677

2654 -#: builtin/blame.c:2257

2678 +#: builtin/blame.c:2258

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

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

2681

2658 -#: builtin/blame.c:2258

2682 +#: builtin/blame.c:2259

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

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

2685

2662 -#: builtin/blame.c:2259

2686 +#: builtin/blame.c:2260

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

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

2689

2666 -#: builtin/blame.c:2260

2690 +#: builtin/blame.c:2261

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

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

2693

2670 -#: builtin/blame.c:2261

2694 +#: builtin/blame.c:2262

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

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

2697

2674 -#: builtin/blame.c:2262

2698 +#: builtin/blame.c:2263

2699 msgid "Ignore whitespace differences"

2700 msgstr "忽略空白差异"

2701

2678 -#: builtin/blame.c:2263

2702 +#: builtin/blame.c:2264

2703 msgid "Spend extra cycles to find better match"

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

2705

2682 -#: builtin/blame.c:2264

2706 +#: builtin/blame.c:2265

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

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

2709

2686 -#: builtin/blame.c:2265

2710 +#: builtin/blame.c:2266

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

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

2713

2690 -#: builtin/blame.c:2266 builtin/blame.c:2267

2714 +#: builtin/blame.c:2267 builtin/blame.c:2268

2715 msgid "score"

2716 msgstr "得分"

2717

2694 -#: builtin/blame.c:2266

2718 +#: builtin/blame.c:2267

2719 msgid "Find line copies within and across files"

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

2721

2698 -#: builtin/blame.c:2267

2722 +#: builtin/blame.c:2268

2723 msgid "Find line movements within and across files"

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

2725

2702 -#: builtin/blame.c:2268

2726 +#: builtin/blame.c:2269

2727 msgid "n,m"

2728 msgstr "n,m"

2729

2706 -#: builtin/blame.c:2268

2730 +#: builtin/blame.c:2269

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

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

2733

@@ -2809,285 +2833,285 @@ msgstr "已删除分支 %s（曾为 %s）。\n"

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

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

2835

2812 -#: builtin/branch.c:453

2836 +#: builtin/branch.c:454

2837 #, c-format

2838 msgid "[%s: gone]"

2839 msgstr "[%s: 丢失]"

2840

2817 -#: builtin/branch.c:456

2841 +#: builtin/branch.c:459

2842 #, c-format

2843 msgid "[%s]"

2844 msgstr "[%s]"

2845

2822 -#: builtin/branch.c:459

2846 +#: builtin/branch.c:464

2847 #, c-format

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

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

2850

2827 -#: builtin/branch.c:461

2851 +#: builtin/branch.c:466

2852 #, c-format

2853 msgid "[behind %d]"

2854 msgstr "[落后 %d]"

2855

2832 -#: builtin/branch.c:465

2856 +#: builtin/branch.c:470

2857 #, c-format

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

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

2860

2837 -#: builtin/branch.c:467

2861 +#: builtin/branch.c:472

2862 #, c-format

2863 msgid "[ahead %d]"

2864 msgstr "[领先 %d]"

2865

2842 -#: builtin/branch.c:470

2866 +#: builtin/branch.c:475

2867 #, c-format

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

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

2870

2847 -#: builtin/branch.c:473

2871 +#: builtin/branch.c:478

2872 #, c-format

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

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

2875

2852 -#: builtin/branch.c:496

2876 +#: builtin/branch.c:502

2877 msgid " **** invalid ref ****"

2878 msgstr " **** 无效引用 ****"

2879

2856 -#: builtin/branch.c:588

2880 +#: builtin/branch.c:594

2881 #, c-format

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

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

2884

2861 -#: builtin/branch.c:591

2885 +#: builtin/branch.c:597

2886 #, c-format

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

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

2889

2866 -#: builtin/branch.c:594

2890 +#: builtin/branch.c:600

2891 #, c-format

2892 msgid "(detached from %s)"

2893 msgstr "（分离自 %s）"

2894

2871 -#: builtin/branch.c:597

2895 +#: builtin/branch.c:603

2896 msgid "(no branch)"

2897 msgstr "（非分支）"

2898

2875 -#: builtin/branch.c:643

2899 +#: builtin/branch.c:649

2900 #, c-format

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

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

2903

2880 -#: builtin/branch.c:675

2904 +#: builtin/branch.c:681

2905 msgid "some refs could not be read"

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

2907

2884 -#: builtin/branch.c:688

2908 +#: builtin/branch.c:694

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

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

2911

2888 -#: builtin/branch.c:698

2912 +#: builtin/branch.c:704

2913 #, c-format

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

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

2916

2893 -#: builtin/branch.c:713

2917 +#: builtin/branch.c:719

2918 msgid "Branch rename failed"

2919 msgstr "分支重命名失败"

2920

2897 -#: builtin/branch.c:717

2921 +#: builtin/branch.c:723

2922 #, c-format

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

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

2925

2902 -#: builtin/branch.c:721

2926 +#: builtin/branch.c:727

2927 #, c-format

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

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

2930

2907 -#: builtin/branch.c:728

2931 +#: builtin/branch.c:734

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

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

2934

2911 -#: builtin/branch.c:743

2935 +#: builtin/branch.c:749

2936 #, c-format

2937 msgid "malformed object name %s"

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

2939

2916 -#: builtin/branch.c:767

2940 +#: builtin/branch.c:773

2941 #, c-format

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

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

2944

2921 -#: builtin/branch.c:797

2945 +#: builtin/branch.c:803

2946 msgid "Generic options"

2947 msgstr "通用选项"

2948

2925 -#: builtin/branch.c:799

2949 +#: builtin/branch.c:805

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

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

2952

2929 -#: builtin/branch.c:800

2953 +#: builtin/branch.c:806

2954 msgid "suppress informational messages"

2955 msgstr "不显示信息"

2956

2933 -#: builtin/branch.c:801

2957 +#: builtin/branch.c:807

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

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

2960

2937 -#: builtin/branch.c:803

2961 +#: builtin/branch.c:809

2962 msgid "change upstream info"

2963 msgstr "改变上游信息"

2964

2941 -#: builtin/branch.c:807

2965 +#: builtin/branch.c:813

2966 msgid "use colored output"

2967 msgstr "使用彩色输出"

2968

2945 -#: builtin/branch.c:808

2969 +#: builtin/branch.c:814

2970 msgid "act on remote-tracking branches"

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

2972

2949 -#: builtin/branch.c:811 builtin/branch.c:817 builtin/branch.c:838

2950 -#: builtin/branch.c:844 builtin/commit.c:1460 builtin/commit.c:1461

2973 +#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

2974 +#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461

2975 #: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468

2976 msgid "commit"

2977 msgstr "提交"

2978

2955 -#: builtin/branch.c:812 builtin/branch.c:818

2979 +#: builtin/branch.c:818 builtin/branch.c:824

2980 msgid "print only branches that contain the commit"

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

2982

2959 -#: builtin/branch.c:824

2983 +#: builtin/branch.c:830

2984 msgid "Specific git-branch actions:"

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

2986

2963 -#: builtin/branch.c:825

2987 +#: builtin/branch.c:831

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

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

2990

2967 -#: builtin/branch.c:827

2991 +#: builtin/branch.c:833

2992 msgid "delete fully merged branch"

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

2994

2971 -#: builtin/branch.c:828

2995 +#: builtin/branch.c:834

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

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

2998

2975 -#: builtin/branch.c:829

2999 +#: builtin/branch.c:835

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

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

3002

2979 -#: builtin/branch.c:830

3003 +#: builtin/branch.c:836

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

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

3006

2983 -#: builtin/branch.c:831

3007 +#: builtin/branch.c:837

3008 msgid "list branch names"

3009 msgstr "列出分支名"

3010

2987 -#: builtin/branch.c:832

3011 +#: builtin/branch.c:838

3012 msgid "create the branch's reflog"

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

3014

2991 -#: builtin/branch.c:834

3015 +#: builtin/branch.c:840

3016 msgid "edit the description for the branch"

3017 msgstr "标记分支的描述"

3018

2995 -#: builtin/branch.c:835

3019 +#: builtin/branch.c:841

3020 msgid "force creation (when already exists)"

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

3022

2999 -#: builtin/branch.c:838

3023 +#: builtin/branch.c:844

3024 msgid "print only not merged branches"

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

3026

3003 -#: builtin/branch.c:844

3027 +#: builtin/branch.c:850

3028 msgid "print only merged branches"

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

3030

3007 -#: builtin/branch.c:848

3031 +#: builtin/branch.c:854

3032 msgid "list branches in columns"

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

3034

3011 -#: builtin/branch.c:861

3035 +#: builtin/branch.c:867

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

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

3038

3015 -#: builtin/branch.c:866 builtin/clone.c:629

3039 +#: builtin/branch.c:872 builtin/clone.c:635

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

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

3042

3019 -#: builtin/branch.c:890

3043 +#: builtin/branch.c:896

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

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

3046

3023 -#: builtin/branch.c:896 builtin/branch.c:935

3047 +#: builtin/branch.c:902 builtin/branch.c:941

3048 msgid "branch name required"

3049 msgstr "必须提供分支名"

3050

3027 -#: builtin/branch.c:911

3051 +#: builtin/branch.c:917

3052 msgid "Cannot give description to detached HEAD"

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

3054

3031 -#: builtin/branch.c:916

3055 +#: builtin/branch.c:922

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

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

3058

3035 -#: builtin/branch.c:923

3059 +#: builtin/branch.c:929

3060 #, c-format

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

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

3063

3040 -#: builtin/branch.c:926

3064 +#: builtin/branch.c:932

3065 #, c-format

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

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

3068

3045 -#: builtin/branch.c:941

3069 +#: builtin/branch.c:947

3070 msgid "too many branches for a rename operation"

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

3072

3049 -#: builtin/branch.c:946

3073 +#: builtin/branch.c:952

3074 msgid "too many branches to set new upstream"

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

3076

3053 -#: builtin/branch.c:950

3077 +#: builtin/branch.c:956

3078 #, c-format

3079 msgid ""

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

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

3082

3059 -#: builtin/branch.c:953 builtin/branch.c:975 builtin/branch.c:997

3083 +#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002

3084 #, c-format

3085 msgid "no such branch '%s'"

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

3087

3064 -#: builtin/branch.c:957

3088 +#: builtin/branch.c:963

3089 #, c-format

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

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

3092

3069 -#: builtin/branch.c:969

3093 +#: builtin/branch.c:975

3094 msgid "too many branches to unset upstream"

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

3096

3073 -#: builtin/branch.c:973

3097 +#: builtin/branch.c:979

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

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

3100

3077 -#: builtin/branch.c:979

3101 +#: builtin/branch.c:985

3102 #, c-format

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

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

3105

3082 -#: builtin/branch.c:994

3106 +#: builtin/branch.c:999

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

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

3109

3086 -#: builtin/branch.c:1000

3110 +#: builtin/branch.c:1005

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

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

3113

3090 -#: builtin/branch.c:1003

3114 +#: builtin/branch.c:1008

3115 #, c-format

3116 msgid ""

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

@@ -3095,7 +3119,7 @@ msgid ""

3119 msgstr ""

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

3121

3098 -#: builtin/branch.c:1020

3122 +#: builtin/branch.c:1025

3123 #, c-format

3124 msgid ""

3125 "\n"

@@ -3106,12 +3130,12 @@ msgstr ""

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

3131 "\n"

3132

3109 -#: builtin/branch.c:1021

3133 +#: builtin/branch.c:1026

3134 #, c-format

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

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

3137

3114 -#: builtin/branch.c:1022

3138 +#: builtin/branch.c:1027

3139 #, c-format

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

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

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

3153 msgid "Need a repository to unbundle."

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

3155

3132 -#: builtin/cat-file.c:312

3156 +#: builtin/cat-file.c:328

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

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

3159

3136 -#: builtin/cat-file.c:313

3160 +#: builtin/cat-file.c:329

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

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

3163

3140 -#: builtin/cat-file.c:350

3164 +#: builtin/cat-file.c:366

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

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

3167

3144 -#: builtin/cat-file.c:351

3168 +#: builtin/cat-file.c:367

3169 msgid "show object type"

3170 msgstr "显示对象类型"

3171

3148 -#: builtin/cat-file.c:352

3172 +#: builtin/cat-file.c:368

3173 msgid "show object size"

3174 msgstr "显示对象大小"

3175

3152 -#: builtin/cat-file.c:354

3176 +#: builtin/cat-file.c:370

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

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

3179

3156 -#: builtin/cat-file.c:355

3180 +#: builtin/cat-file.c:371

3181 msgid "pretty-print object's content"

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

3183

3160 -#: builtin/cat-file.c:357

3184 +#: builtin/cat-file.c:373

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

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

3187

3164 -#: builtin/cat-file.c:359

3188 +#: builtin/cat-file.c:375

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

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

3191

3168 -#: builtin/cat-file.c:362

3192 +#: builtin/cat-file.c:378

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

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

3195

@@ -3193,7 +3217,7 @@ msgstr "从标准输入读出文件名"

3217 msgid "terminate input and output records by a NUL character"

3218 msgstr "输入和输出的记录使用 NUL 字符终结"

3219

3196 -#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:259

3220 +#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260

3221 msgid "suppress progress reporting"

3222 msgstr "不显示进度报告"

3223

@@ -3483,7 +3507,7 @@ msgid "Cannot switch branch to a non-commit '%s'"

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

3508

3509 #: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88

3486 -#: builtin/remote.c:169 builtin/remote.c:171

3510 +#: builtin/remote.c:159 builtin/remote.c:161

3511 msgid "branch"

3512 msgstr "分支"

3513

@@ -3531,11 +3555,11 @@ msgstr "强制检出（丢弃本地修改）"

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

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

3557

3534 -#: builtin/checkout.c:1106 builtin/merge.c:232

3558 +#: builtin/checkout.c:1106 builtin/merge.c:225

3559 msgid "update ignored files (default)"

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

3561

3538 -#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:251

3562 +#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248

3563 msgid "style"

3564 msgstr "风格"

3565

@@ -3732,7 +3756,7 @@ msgid "remove whole directories"

3756 msgstr "删除整个目录"

3757

3758 #: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718

3735 -#: builtin/ls-files.c:483 builtin/name-rev.c:315 builtin/show-ref.c:185

3759 +#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185

3760 msgid "pattern"

3761 msgstr "模式"

3762

@@ -3770,8 +3794,8 @@ msgstr ""

3794 msgid "git clone [options] [--] <repo> [<dir>]"

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

3796

3773 -#: builtin/clone.c:64 builtin/fetch.c:96 builtin/merge.c:229

3774 -#: builtin/push.c:474

3797 +#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222

3798 +#: builtin/push.c:521

3799 msgid "force progress reporting"

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

3801

@@ -3813,7 +3837,7 @@ msgstr "模板目录将被使用"

3837

3838 #: builtin/clone.c:85

3839 msgid "reference repository"

3816 -msgstr "引用版本库"

3840 +msgstr "参考版本库"

3841

3842 #: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44

3843 msgid "name"

@@ -3831,7 +3855,7 @@ msgstr "检出<分支>而不是远程HEAD"

3855 msgid "path to git-upload-pack on the remote"

3856 msgstr "远程 git-upload-pack 路径"

3857

3834 -#: builtin/clone.c:92 builtin/fetch.c:97 builtin/grep.c:663

3858 +#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663

3859 msgid "depth"

3860 msgstr "深度"

3861

@@ -3862,44 +3886,54 @@ msgstr "在新版本库中设置配置信息"

3886 #: builtin/clone.c:252

3887 #, c-format

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

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

3889 +msgstr "参考版本库 '%s' 不是一个本地版本库。"

3890

3867 -#: builtin/clone.c:315

3891 +#: builtin/clone.c:256

3892 +#, c-format

3893 +msgid "reference repository '%s' is shallow"

3894 +msgstr "参考版本库 '%s' 是一个浅克隆"

3895 +

3896 +#: builtin/clone.c:259

3897 +#, c-format

3898 +msgid "reference repository '%s' is grafted"

3899 +msgstr "参考版本库 '%s' 已被嫁接"

3900 +

3901 +#: builtin/clone.c:321

3902 #, c-format

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

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

3905

3872 -#: builtin/clone.c:317 builtin/diff.c:77

3906 +#: builtin/clone.c:323 builtin/diff.c:83

3907 #, c-format

3908 msgid "failed to stat '%s'"

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

3910

3877 -#: builtin/clone.c:319

3911 +#: builtin/clone.c:325

3912 #, c-format

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

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

3915

3882 -#: builtin/clone.c:333

3916 +#: builtin/clone.c:339

3917 #, c-format

3918 msgid "failed to stat %s\n"

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

3920

3887 -#: builtin/clone.c:355

3921 +#: builtin/clone.c:361

3922 #, c-format

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

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

3925

3892 -#: builtin/clone.c:359

3926 +#: builtin/clone.c:365

3927 #, c-format

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

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

3930

3897 -#: builtin/clone.c:382 builtin/clone.c:559

3931 +#: builtin/clone.c:388 builtin/clone.c:565

3932 #, c-format

3933 msgid "done.\n"

3934 msgstr "完成。\n"

3935

3902 -#: builtin/clone.c:395

3936 +#: builtin/clone.c:401

3937 msgid ""

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

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

@@ -3909,99 +3943,108 @@ msgstr ""

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

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

3945

3912 -#: builtin/clone.c:474

3946 +#: builtin/clone.c:480

3947 #, c-format

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

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

3950

3917 -#: builtin/clone.c:554

3951 +#: builtin/clone.c:560

3952 #, c-format

3953 msgid "Checking connectivity... "

3954 msgstr "检查连接... "

3955

3922 -#: builtin/clone.c:557

3956 +#: builtin/clone.c:563

3957 msgid "remote did not send all necessary objects"

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

3959

3926 -#: builtin/clone.c:620

3960 +#: builtin/clone.c:626

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

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

3963

3930 -#: builtin/clone.c:651

3964 +#: builtin/clone.c:657

3965 msgid "unable to checkout working tree"

3966 msgstr "不能检出工作区"

3967

3934 -#: builtin/clone.c:759

3968 +#: builtin/clone.c:765

3969 msgid "Too many arguments."

3970 msgstr "太多参数。"

3971

3938 -#: builtin/clone.c:763

3972 +#: builtin/clone.c:769

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

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

3975

3942 -#: builtin/clone.c:774

3976 +#: builtin/clone.c:780

3977 #, c-format

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

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

3980

3947 -#: builtin/clone.c:777

3981 +#: builtin/clone.c:783

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

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

3984

3951 -#: builtin/clone.c:790

3985 +#: builtin/clone.c:796

3986 #, c-format

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

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

3989

3956 -#: builtin/clone.c:795

3990 +#: builtin/clone.c:802

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

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

3993

3960 -#: builtin/clone.c:797

3994 +#: builtin/clone.c:805

3995 +msgid "source repository is shallow, ignoring --local"

3996 +msgstr "源版本库是浅克隆，忽略 --local"

3997 +

3998 +#: builtin/clone.c:810

3999 msgid "--local is ignored"

4000 msgstr "--local 被忽略"

4001

3964 -#: builtin/clone.c:807

4002 +#: builtin/clone.c:814 builtin/fetch.c:1119

4003 +#, c-format

4004 +msgid "depth %s is not a positive number"

4005 +msgstr "深度 %s 不是一个正数"

4006 +

4007 +#: builtin/clone.c:824

4008 #, c-format

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

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

4011

3969 -#: builtin/clone.c:817

4012 +#: builtin/clone.c:834

4013 #, c-format

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

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

4016

3974 -#: builtin/clone.c:830 builtin/clone.c:842

4017 +#: builtin/clone.c:847 builtin/clone.c:859

4018 #, c-format

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

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

4021

3979 -#: builtin/clone.c:833

4022 +#: builtin/clone.c:850

4023 #, c-format

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

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

4026

3984 -#: builtin/clone.c:852

4027 +#: builtin/clone.c:869

4028 #, c-format

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

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

4031

3989 -#: builtin/clone.c:854

4032 +#: builtin/clone.c:871

4033 #, c-format

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

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

4036

3994 -#: builtin/clone.c:888

4037 +#: builtin/clone.c:906

4038 #, c-format

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

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

4041

3999 -#: builtin/clone.c:939 builtin/clone.c:947

4042 +#: builtin/clone.c:957 builtin/clone.c:965

4043 #, c-format

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

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

4046

4004 -#: builtin/clone.c:950

4047 +#: builtin/clone.c:968

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

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

4050

@@ -4348,7 +4391,7 @@ msgstr "以简洁的格式显示状态"

4391 msgid "show branch information"

4392 msgstr "显示分支信息"

4393

4351 -#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:460

4394 +#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507

4395 msgid "machine-readable output"

4396 msgstr "机器可读的输出"

4397

@@ -4429,7 +4472,7 @@ msgstr "作者"

4472 msgid "override author for commit"

4473 msgstr "提交时覆盖作者"

4474

4432 -#: builtin/commit.c:1458 builtin/gc.c:260

4475 +#: builtin/commit.c:1458 builtin/gc.c:261

4476 msgid "date"

4477 msgstr "日期"

4478

@@ -4437,7 +4480,7 @@ msgstr "日期"

4480 msgid "override date for commit"

4481 msgstr "提交时覆盖日期"

4482

4440 -#: builtin/commit.c:1459 builtin/merge.c:223 builtin/notes.c:405

4483 +#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405

4484 #: builtin/notes.c:562 builtin/tag.c:455

4485 msgid "message"

4486 msgstr "说明"

@@ -4491,11 +4534,11 @@ msgstr "设置如何删除提交说明里的空格和#注释"

4534 msgid "include status in commit message template"

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

4536

4494 -#: builtin/commit.c:1470 builtin/merge.c:230 builtin/tag.c:461

4537 +#: builtin/commit.c:1470 builtin/merge.c:223 builtin/tag.c:461

4538 msgid "key id"

4539 msgstr "key id"

4540

4498 -#: builtin/commit.c:1471 builtin/merge.c:231

4541 +#: builtin/commit.c:1471 builtin/merge.c:224

4542 msgid "GPG sign commit"

4543 msgstr "GPG 提交签名"

4544

@@ -4552,7 +4595,7 @@ msgstr "允许空的提交说明"

4595 msgid "could not parse HEAD commit"

4596 msgstr "不能解析 HEAD 提交"

4597

4555 -#: builtin/commit.c:1567 builtin/merge.c:525

4598 +#: builtin/commit.c:1567 builtin/merge.c:518

4599 #, c-format

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

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

@@ -4571,29 +4614,29 @@ msgstr "不能读取 MERGE_MODE"

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

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

4616

4574 -#: builtin/commit.c:1614

4617 +#: builtin/commit.c:1611

4618 #, c-format

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

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

4621

4579 -#: builtin/commit.c:1619

4622 +#: builtin/commit.c:1616

4623 #, c-format

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

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

4626

4584 -#: builtin/commit.c:1634 builtin/merge.c:861 builtin/merge.c:886

4627 +#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879

4628 msgid "failed to write commit object"

4629 msgstr "无法写提交对象"

4630

4588 -#: builtin/commit.c:1655

4631 +#: builtin/commit.c:1652

4632 msgid "cannot lock HEAD ref"

4633 msgstr "无法锁定 HEAD 引用"

4634

4592 -#: builtin/commit.c:1659

4635 +#: builtin/commit.c:1656

4636 msgid "cannot update HEAD ref"

4637 msgstr "无法更新 HEAD 引用"

4638

4596 -#: builtin/commit.c:1670

4639 +#: builtin/commit.c:1667

4640 msgid ""

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

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

@@ -4854,7 +4897,7 @@ msgstr "考虑最近 <n> 个 tags（默认：10）"

4897 msgid "only consider tags matching <pattern>"

4898 msgstr "只考虑匹配 <模式> 的 tags"

4899

4857 -#: builtin/describe.c:423 builtin/name-rev.c:322

4900 +#: builtin/describe.c:423 builtin/name-rev.c:321

4901 msgid "show abbreviated commit object as fallback"

4902 msgstr "显示简写的提交号作为后备"

4903

@@ -4878,31 +4921,31 @@ msgstr "没有发现名称，无法描述任何东西。"

4921 msgid "--dirty is incompatible with commit-ishes"

4922 msgstr "--dirty 不能与提交同时使用"

4923

4881 -#: builtin/diff.c:79

4924 +#: builtin/diff.c:85

4925 #, c-format

4926 msgid "'%s': not a regular file or symlink"

4927 msgstr "'%s'：不是一个正规文件或符号链接"

4928

4886 -#: builtin/diff.c:230

4929 +#: builtin/diff.c:236

4930 #, c-format

4931 msgid "invalid option: %s"

4932 msgstr "无效选项：%s"

4933

4891 -#: builtin/diff.c:307

4934 +#: builtin/diff.c:357

4935 msgid "Not a git repository"

4936 msgstr "不是一个 git 版本库"

4937

4895 -#: builtin/diff.c:350

4938 +#: builtin/diff.c:400

4939 #, c-format

4940 msgid "invalid object '%s' given."

4941 msgstr "提供了无效对象 '%s'。"

4942

4900 -#: builtin/diff.c:359

4943 +#: builtin/diff.c:409

4944 #, c-format

4945 msgid "more than two blobs given: '%s'"

4946 msgstr "提供了超过两个数据（blob）对象：'%s'"

4947

4905 -#: builtin/diff.c:366

4948 +#: builtin/diff.c:416

4949 #, c-format

4950 msgid "unhandled object '%s' given."

4951 msgstr "提供了无法处理的对象 '%s'。"

@@ -4963,146 +5006,155 @@ msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]"

5006 msgid "git fetch --all [<options>]"

5007 msgstr "git fetch --all [<选项>]"

5008

4966 -#: builtin/fetch.c:74

5009 +#: builtin/fetch.c:75

5010 msgid "fetch from all remotes"

5011 msgstr "从所有的远程抓取"

5012

4970 -#: builtin/fetch.c:76

5013 +#: builtin/fetch.c:77

5014 msgid "append to .git/FETCH_HEAD instead of overwriting"

5015 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"

5016

4974 -#: builtin/fetch.c:78

5017 +#: builtin/fetch.c:79

5018 msgid "path to upload pack on remote end"

5019 msgstr "上传包到远程的路径"

5020

4978 -#: builtin/fetch.c:79

5021 +#: builtin/fetch.c:80

5022 msgid "force overwrite of local branch"

5023 msgstr "强制覆盖本地分支"

5024

4982 -#: builtin/fetch.c:81

5025 +#: builtin/fetch.c:82

5026 msgid "fetch from multiple remotes"

5027 msgstr "从多个远程抓取"

5028

4986 -#: builtin/fetch.c:83

5029 +#: builtin/fetch.c:84

5030 msgid "fetch all tags and associated objects"

5031 msgstr "抓取所有的 tags 和关联对象"

5032

4990 -#: builtin/fetch.c:85

5033 +#: builtin/fetch.c:86

5034 msgid "do not fetch all tags (--no-tags)"

5035 msgstr "不抓取任何 tags (--no-tags)"

5036

4994 -#: builtin/fetch.c:87

5037 +#: builtin/fetch.c:88

5038 msgid "prune remote-tracking branches no longer on remote"

5039 msgstr "清除远程已经不存在的分支的跟踪分支"

5040

5041 # 译者：可选值，不能翻译

4999 -#: builtin/fetch.c:88

5042 +#: builtin/fetch.c:89

5043 msgid "on-demand"

5044 msgstr "on-demand"

5045

5003 -#: builtin/fetch.c:89

5046 +#: builtin/fetch.c:90

5047 msgid "control recursive fetching of submodules"

5048 msgstr "控制子模组的递归抓取"

5049

5007 -#: builtin/fetch.c:93

5050 +#: builtin/fetch.c:94

5051 msgid "keep downloaded pack"

5052 msgstr "保持下载包"

5053

5011 -#: builtin/fetch.c:95

5054 +#: builtin/fetch.c:96

5055 msgid "allow updating of HEAD ref"

5056 msgstr "允许更新 HEAD 引用"

5057

5015 -#: builtin/fetch.c:98

5058 +#: builtin/fetch.c:99

5059 msgid "deepen history of shallow clone"

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

5061

5019 -#: builtin/fetch.c:100

5062 +#: builtin/fetch.c:101

5063 msgid "convert to a complete repository"

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

5065

5023 -#: builtin/fetch.c:102 builtin/log.c:1197

5066 +#: builtin/fetch.c:103 builtin/log.c:1197

5067 msgid "dir"

5068 msgstr "目录"

5069

5027 -#: builtin/fetch.c:103

5070 +#: builtin/fetch.c:104

5071 msgid "prepend this to submodule path output"

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

5073

5031 -#: builtin/fetch.c:106

5074 +#: builtin/fetch.c:107

5075 msgid "default mode for recursion"

5076 msgstr "递归的默认模式"

5077

5035 -#: builtin/fetch.c:236

5078 +#: builtin/fetch.c:109

5079 +msgid "accept refs that update .git/shallow"

5080 +msgstr "接受更新 .git/shallow 的引用"

5081 +

5082 +#: builtin/fetch.c:347

5083 msgid "Couldn't find remote ref HEAD"

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

5085

5039 -#: builtin/fetch.c:290

5086 +#: builtin/fetch.c:411

5087 #, c-format

5088 msgid "object %s not found"

5089 msgstr "对象 %s 未发现"

5090

5044 -#: builtin/fetch.c:295

5091 +#: builtin/fetch.c:416

5092 msgid "[up to date]"

5093 msgstr "[最新]"

5094

5048 -#: builtin/fetch.c:309

5095 +#: builtin/fetch.c:430

5096 #, c-format

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

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

5099

5053 -#: builtin/fetch.c:310 builtin/fetch.c:396

5100 +#: builtin/fetch.c:431 builtin/fetch.c:517

5101 msgid "[rejected]"

5102 msgstr "[已拒绝]"

5103

5057 -#: builtin/fetch.c:321

5104 +#: builtin/fetch.c:442

5105 msgid "[tag update]"

5106 msgstr "[tag更新]"

5107

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

5062 -#: builtin/fetch.c:323 builtin/fetch.c:358 builtin/fetch.c:376

5109 +#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497

5110 msgid " (unable to update local ref)"

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

5112

5066 -#: builtin/fetch.c:341

5113 +#: builtin/fetch.c:462

5114 msgid "[new tag]"

5115 msgstr "[新tag]"

5116

5070 -#: builtin/fetch.c:344

5117 +#: builtin/fetch.c:465

5118 msgid "[new branch]"

5119 msgstr "[新分支]"

5120

5074 -#: builtin/fetch.c:347

5121 +#: builtin/fetch.c:468

5122 msgid "[new ref]"

5123 msgstr "[新引用]"

5124

5078 -#: builtin/fetch.c:392

5125 +#: builtin/fetch.c:513

5126 msgid "unable to update local ref"

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

5128

5082 -#: builtin/fetch.c:392

5129 +#: builtin/fetch.c:513

5130 msgid "forced update"

5131 msgstr "强制更新"

5132

5086 -#: builtin/fetch.c:398

5133 +#: builtin/fetch.c:519

5134 msgid "(non-fast-forward)"

5135 msgstr "（非快进式）"

5136

5090 -#: builtin/fetch.c:429 builtin/fetch.c:735

5137 +#: builtin/fetch.c:552 builtin/fetch.c:785

5138 #, c-format

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

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

5141

5095 -#: builtin/fetch.c:438

5142 +#: builtin/fetch.c:561

5143 #, c-format

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

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

5146

5100 -#: builtin/fetch.c:537

5147 +#: builtin/fetch.c:579

5148 +#, c-format

5149 +msgid "reject %s because shallow roots are not allowed to be updated"

5150 +msgstr "拒绝 %s 因为浅克隆不允许被更新"

5151 +

5152 +#: builtin/fetch.c:667 builtin/fetch.c:750

5153 #, c-format

5154 msgid "From %.*s\n"

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

5156

5105 -#: builtin/fetch.c:548

5157 +#: builtin/fetch.c:678

5158 #, c-format

5159 msgid ""

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

@@ -5112,87 +5164,87 @@ msgstr ""

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

5165

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

5115 -#: builtin/fetch.c:598

5167 +#: builtin/fetch.c:730

5168 #, c-format

5169 msgid " (%s will become dangling)"

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

5171

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

5121 -#: builtin/fetch.c:599

5173 +#: builtin/fetch.c:731

5174 #, c-format

5175 msgid " (%s has become dangling)"

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

5177

5126 -#: builtin/fetch.c:606

5178 +#: builtin/fetch.c:755

5179 msgid "[deleted]"

5180 msgstr "[已删除]"

5181

5130 -#: builtin/fetch.c:607 builtin/remote.c:1055

5182 +#: builtin/fetch.c:756 builtin/remote.c:1050

5183 msgid "(none)"

5184 msgstr "（无）"

5185

5134 -#: builtin/fetch.c:725

5186 +#: builtin/fetch.c:775

5187 #, c-format

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

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

5190

5139 -#: builtin/fetch.c:744

5191 +#: builtin/fetch.c:794

5192 #, c-format

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

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

5195

5144 -#: builtin/fetch.c:747

5196 +#: builtin/fetch.c:797

5197 #, c-format

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

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

5200

5149 -#: builtin/fetch.c:801

5201 +#: builtin/fetch.c:853

5202 #, c-format

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

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

5205

5154 -#: builtin/fetch.c:976

5206 +#: builtin/fetch.c:1015

5207 #, c-format

5208 msgid "Fetching %s\n"

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

5210

5159 -#: builtin/fetch.c:978 builtin/remote.c:100

5211 +#: builtin/fetch.c:1017 builtin/remote.c:90

5212 #, c-format

5213 msgid "Could not fetch %s"

5214 msgstr "不能获取 %s"

5215

5164 -#: builtin/fetch.c:997

5216 +#: builtin/fetch.c:1036

5217 msgid ""

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

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

5220 msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。"

5221

5170 -#: builtin/fetch.c:1020

5222 +#: builtin/fetch.c:1059

5223 msgid "You need to specify a tag name."

5224 msgstr "您需要指定一个 tag 名称。"

5225

5174 -#: builtin/fetch.c:1068

5226 +#: builtin/fetch.c:1107

5227 msgid "--depth and --unshallow cannot be used together"

5228 msgstr "--depth 和 --unshallow 不能同时使用"

5229

5178 -#: builtin/fetch.c:1070

5230 +#: builtin/fetch.c:1109

5231 msgid "--unshallow on a complete repository does not make sense"

5232 msgstr "对于一个完整的版本库，参数 --unshallow 没有意义"

5233

5182 -#: builtin/fetch.c:1089

5234 +#: builtin/fetch.c:1132

5235 msgid "fetch --all does not take a repository argument"

5236 msgstr "fetch --all 不能带一个版本库参数"

5237

5186 -#: builtin/fetch.c:1091

5238 +#: builtin/fetch.c:1134

5239 msgid "fetch --all does not make sense with refspecs"

5240 msgstr "fetch --all 带引用规则没有任何意义"

5241

5190 -#: builtin/fetch.c:1102

5242 +#: builtin/fetch.c:1145

5243 #, c-format

5244 msgid "No such remote or remote group: %s"

5245 msgstr "没有这样的远程或远程组：%s"

5246

5195 -#: builtin/fetch.c:1110

5247 +#: builtin/fetch.c:1153

5248 msgid "Fetching a group and specifying refspecs does not make sense"

5249 msgstr "获取组并指定引用规则没有意义"

5250

@@ -5202,8 +5254,8 @@ msgstr ""

5254 "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5255

5256 #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702

5205 -#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:178

5206 -#: builtin/tag.c:446 parse-options.h:135 parse-options.h:245

5257 +#: builtin/merge.c:196 builtin/show-branch.c:654 builtin/show-ref.c:178

5258 +#: builtin/tag.c:446 parse-options.h:135 parse-options.h:242

5259 msgid "n"

5260 msgstr "n"

5261

@@ -5227,43 +5279,43 @@ msgstr "使用 <文本> 作为提交说明的开始"

5279 msgid "file to read from"

5280 msgstr "从文件中读取"

5281

5230 -#: builtin/for-each-ref.c:995

5282 +#: builtin/for-each-ref.c:1063

5283 msgid "git for-each-ref [options] [<pattern>]"

5284 msgstr "git for-each-ref [选项] [<模式>]"

5285

5234 -#: builtin/for-each-ref.c:1010

5286 +#: builtin/for-each-ref.c:1078

5287 msgid "quote placeholders suitably for shells"

5288 msgstr "引用占位符适用于 shells"

5289

5238 -#: builtin/for-each-ref.c:1012

5290 +#: builtin/for-each-ref.c:1080

5291 msgid "quote placeholders suitably for perl"

5292 msgstr "引用占位符适用于 perl"

5293

5242 -#: builtin/for-each-ref.c:1014

5294 +#: builtin/for-each-ref.c:1082

5295 msgid "quote placeholders suitably for python"

5296 msgstr "引用占位符适用于 python"

5297

5246 -#: builtin/for-each-ref.c:1016

5298 +#: builtin/for-each-ref.c:1084

5299 msgid "quote placeholders suitably for tcl"

5300 msgstr "引用占位符适用于 tcl"

5301

5250 -#: builtin/for-each-ref.c:1019

5302 +#: builtin/for-each-ref.c:1087

5303 msgid "show only <n> matched refs"

5304 msgstr "只显示 <n> 个匹配的引用"

5305

5254 -#: builtin/for-each-ref.c:1020

5306 +#: builtin/for-each-ref.c:1088 builtin/replace.c:177

5307 msgid "format"

5308 msgstr "格式"

5309

5258 -#: builtin/for-each-ref.c:1020

5310 +#: builtin/for-each-ref.c:1088

5311 msgid "format to use for the output"

5312 msgstr "输出格式"

5313

5262 -#: builtin/for-each-ref.c:1021

5314 +#: builtin/for-each-ref.c:1089

5315 msgid "key"

5316 msgstr "key"

5317

5266 -#: builtin/for-each-ref.c:1022

5318 +#: builtin/for-each-ref.c:1090

5319 msgid "field name to sort on"

5320 msgstr "排序的字段名"

5321

@@ -5307,41 +5359,41 @@ msgstr "启用更严格的检查"

5359 msgid "write dangling objects in .git/lost-found"

5360 msgstr "将摇摆对象写入 .git/lost-found 中"

5361

5310 -#: builtin/fsck.c:623 builtin/prune.c:134

5362 +#: builtin/fsck.c:623 builtin/prune.c:144

5363 msgid "show progress"

5364 msgstr "显示进度"

5365

5314 -#: builtin/gc.c:23

5366 +#: builtin/gc.c:24

5367 msgid "git gc [options]"

5368 msgstr "git gc [选项]"

5369

5318 -#: builtin/gc.c:79

5370 +#: builtin/gc.c:80

5371 #, c-format

5372 msgid "Invalid %s: '%s'"

5373 msgstr "无效的 %s：'%s'"

5374

5323 -#: builtin/gc.c:106

5375 +#: builtin/gc.c:107

5376 #, c-format

5377 msgid "insanely long object directory %.*s"

5378 msgstr "不正常的长对象目录 %.*s"

5379

5328 -#: builtin/gc.c:261

5380 +#: builtin/gc.c:262

5381 msgid "prune unreferenced objects"

5382 msgstr "清除未引用的对象"

5383

5332 -#: builtin/gc.c:263

5384 +#: builtin/gc.c:264

5385 msgid "be more thorough (increased runtime)"

5386 msgstr "更彻底（增加运行时间）"

5387

5336 -#: builtin/gc.c:264

5388 +#: builtin/gc.c:265

5389 msgid "enable auto-gc mode"

5390 msgstr "启用自动垃圾回收模式"

5391

5340 -#: builtin/gc.c:265

5392 +#: builtin/gc.c:266

5393 msgid "force running gc even if there may be another gc running"

5394 msgstr "强制执行 gc 即使另外一个 gc 正在执行"

5395

5344 -#: builtin/gc.c:305

5396 +#: builtin/gc.c:306

5397 #, c-format

5398 msgid ""

5399 "Auto packing the repository for optimum performance. You may also\n"

@@ -5351,14 +5403,14 @@ msgstr ""

5403 "参见 \"git help gc\" 以获取更多信息。\n"

5404

5405 #. be quiet on --auto

5354 -#: builtin/gc.c:315

5406 +#: builtin/gc.c:316

5407 #, c-format

5408 msgid ""

5409 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

5410 msgstr ""

5411 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）"

5412

5361 -#: builtin/gc.c:340

5413 +#: builtin/gc.c:341

5414 msgid ""

5415 "There are too many unreachable loose objects; run 'git prune' to remove them."

5416 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"

@@ -5695,57 +5747,57 @@ msgstr ""

5747 "'%s': 支持的 man 手册查看器命令。\n"

5748 "请使用 'man.<tool>.path'。"

5749

5698 -#: builtin/help.c:349

5750 +#: builtin/help.c:353

5751 #, c-format

5752 msgid "'%s': unknown man viewer."

5753 msgstr "'%s'：未知的 man 查看器。"

5754

5703 -#: builtin/help.c:366

5755 +#: builtin/help.c:370

5756 msgid "no man viewer handled the request"

5757 msgstr "没有 man 查看器处理此请求"

5758

5707 -#: builtin/help.c:374

5759 +#: builtin/help.c:378

5760 msgid "no info viewer handled the request"

5761 msgstr "没有 info 查看器处理此请求"

5762

5711 -#: builtin/help.c:420

5763 +#: builtin/help.c:424

5764 msgid "Defining attributes per path"

5765 msgstr "定义路径的属性"

5766

5715 -#: builtin/help.c:421

5767 +#: builtin/help.c:425

5768 msgid "A Git glossary"

5769 msgstr "Git 词汇表"

5770

5719 -#: builtin/help.c:422

5771 +#: builtin/help.c:426

5772 msgid "Specifies intentionally untracked files to ignore"

5773 msgstr "忽略指定的未跟踪文件"

5774

5723 -#: builtin/help.c:423

5775 +#: builtin/help.c:427

5776 msgid "Defining submodule properties"

5777 msgstr "定义子模组属性"

5778

5727 -#: builtin/help.c:424

5779 +#: builtin/help.c:428

5780 msgid "Specifying revisions and ranges for Git"

5781 msgstr "指定 Git 的版本和版本范围"

5782

5731 -#: builtin/help.c:425

5783 +#: builtin/help.c:429

5784 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

5785 msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"

5786

5735 -#: builtin/help.c:426

5787 +#: builtin/help.c:430

5788 msgid "An overview of recommended workflows with Git"

5789 msgstr "Git 推荐的工作流概览"

5790

5739 -#: builtin/help.c:438

5791 +#: builtin/help.c:442

5792 msgid "The common Git guides are:\n"

5793 msgstr "最常用的 Git 向导有：\n"

5794

5743 -#: builtin/help.c:460 builtin/help.c:476

5795 +#: builtin/help.c:463 builtin/help.c:480

5796 #, c-format

5797 msgid "usage: %s%s"

5798 msgstr "用法：%s%s"

5799

5748 -#: builtin/help.c:492

5800 +#: builtin/help.c:496

5801 #, c-format

5802 msgid "`git %s' is aliased to `%s'"

5803 msgstr "`git %s' 是 `%s' 的别名"

@@ -6155,7 +6207,7 @@ msgstr "权限"

6207 msgid "specify that the git repository is to be shared amongst several users"

6208 msgstr "指定 git 版本库是多个用户之间共享的"

6209

6158 -#: builtin/init-db.c:493 builtin/prune-packed.c:75 builtin/repack.c:155

6210 +#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155

6211 msgid "be quiet"

6212 msgstr "保持安静"

6213

@@ -6604,149 +6656,149 @@ msgstr "可用的策略有："

6656 msgid "Available custom strategies are:"

6657 msgstr "可用的自定义策略有："

6658

6607 -#: builtin/merge.c:198

6659 +#: builtin/merge.c:191

6660 msgid "do not show a diffstat at the end of the merge"

6661 msgstr "在合并的最后不显示差异统计"

6662

6611 -#: builtin/merge.c:201

6663 +#: builtin/merge.c:194

6664 msgid "show a diffstat at the end of the merge"

6665 msgstr "在合并的最后显示差异统计"

6666

6615 -#: builtin/merge.c:202

6667 +#: builtin/merge.c:195

6668 msgid "(synonym to --stat)"

6669 msgstr "（和 --stat 同义）"

6670

6619 -#: builtin/merge.c:204

6671 +#: builtin/merge.c:197

6672 msgid "add (at most <n>) entries from shortlog to merge commit message"

6673 msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"

6674

6623 -#: builtin/merge.c:207

6675 +#: builtin/merge.c:200

6676 msgid "create a single commit instead of doing a merge"

6677 msgstr "创建一个单独的提交而不是做一次合并"

6678

6627 -#: builtin/merge.c:209

6679 +#: builtin/merge.c:202

6680 msgid "perform a commit if the merge succeeds (default)"

6681 msgstr "如果合并成功，执行一次提交（默认）"

6682

6631 -#: builtin/merge.c:211

6683 +#: builtin/merge.c:204

6684 msgid "edit message before committing"

6685 msgstr "在提交前编辑提交说明"

6686

6635 -#: builtin/merge.c:212

6687 +#: builtin/merge.c:205

6688 msgid "allow fast-forward (default)"

6689 msgstr "允许快进（默认）"

6690

6639 -#: builtin/merge.c:214

6691 +#: builtin/merge.c:207

6692 msgid "abort if fast-forward is not possible"

6693 msgstr "如果不能快进就放弃合并"

6694

6643 -#: builtin/merge.c:218

6695 +#: builtin/merge.c:211

6696 msgid "Verify that the named commit has a valid GPG signature"

6697 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"

6698

6647 -#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:89

6699 +#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89

6700 msgid "strategy"

6701 msgstr "策略"

6702

6651 -#: builtin/merge.c:220

6703 +#: builtin/merge.c:213

6704 msgid "merge strategy to use"

6705 msgstr "要使用的合并策略"

6706

6655 -#: builtin/merge.c:221

6707 +#: builtin/merge.c:214

6708 msgid "option=value"

6709 msgstr "option=value"

6710

6659 -#: builtin/merge.c:222

6711 +#: builtin/merge.c:215

6712 msgid "option for selected merge strategy"

6713 msgstr "所选的合并策略的选项"

6714

6663 -#: builtin/merge.c:224

6715 +#: builtin/merge.c:217

6716 msgid "merge commit message (for a non-fast-forward merge)"

6717 msgstr "合并的提交说明（针对非快进式合并）"

6718

6667 -#: builtin/merge.c:228

6719 +#: builtin/merge.c:221

6720 msgid "abort the current in-progress merge"

6721 msgstr "放弃当前正在进行的合并"

6722

6671 -#: builtin/merge.c:257

6723 +#: builtin/merge.c:250

6724 msgid "could not run stash."

6725 msgstr "不能进行进度保存。"

6726

6675 -#: builtin/merge.c:262

6727 +#: builtin/merge.c:255

6728 msgid "stash failed"

6729 msgstr "进度保存失败"

6730

6679 -#: builtin/merge.c:267

6731 +#: builtin/merge.c:260

6732 #, c-format

6733 msgid "not a valid object: %s"

6734 msgstr "不是一个有效对象：%s"

6735

6684 -#: builtin/merge.c:286 builtin/merge.c:303

6736 +#: builtin/merge.c:279 builtin/merge.c:296

6737 msgid "read-tree failed"

6738 msgstr "读取树失败"

6739

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

6689 -#: builtin/merge.c:333

6741 +#: builtin/merge.c:326

6742 msgid " (nothing to squash)"

6743 msgstr " （无可压缩）"

6744

6693 -#: builtin/merge.c:346

6745 +#: builtin/merge.c:339

6746 #, c-format

6747 msgid "Squash commit -- not updating HEAD\n"

6748 msgstr "压缩提交 -- 未更新 HEAD\n"

6749

6698 -#: builtin/merge.c:378

6750 +#: builtin/merge.c:371

6751 msgid "Writing SQUASH_MSG"

6752 msgstr "写入 SQUASH_MSG"

6753

6702 -#: builtin/merge.c:380

6754 +#: builtin/merge.c:373

6755 msgid "Finishing SQUASH_MSG"

6756 msgstr "完成 SQUASH_MSG"

6757

6706 -#: builtin/merge.c:403

6758 +#: builtin/merge.c:396

6759 #, c-format

6760 msgid "No merge message -- not updating HEAD\n"

6761 msgstr "无合并信息 -- 未更新 HEAD\n"

6762

6711 -#: builtin/merge.c:453

6763 +#: builtin/merge.c:446

6764 #, c-format

6765 msgid "'%s' does not point to a commit"

6766 msgstr "'%s' 没有指向一个提交"

6767

6716 -#: builtin/merge.c:565

6768 +#: builtin/merge.c:558

6769 #, c-format

6770 msgid "Bad branch.%s.mergeoptions string: %s"

6771 msgstr "坏的 branch.%s.mergeoptions 字符串：%s"

6772

6721 -#: builtin/merge.c:657

6773 +#: builtin/merge.c:650

6774 msgid "git write-tree failed to write a tree"

6775 msgstr "git write-tree 无法写入一树对象"

6776

6725 -#: builtin/merge.c:685

6777 +#: builtin/merge.c:678

6778 msgid "Not handling anything other than two heads merge."

6779 msgstr "不能处理两个头合并之外的任何操作。"

6780

6729 -#: builtin/merge.c:699

6781 +#: builtin/merge.c:692

6782 #, c-format

6783 msgid "Unknown option for merge-recursive: -X%s"

6784 msgstr "merge-recursive 的未知选项：-X%s"

6785

6734 -#: builtin/merge.c:713

6786 +#: builtin/merge.c:706

6787 #, c-format

6788 msgid "unable to write %s"

6789 msgstr "不能写 %s"

6790

6739 -#: builtin/merge.c:802

6791 +#: builtin/merge.c:795

6792 #, c-format

6793 msgid "Could not read from '%s'"

6794 msgstr "不能从 '%s' 读取"

6795

6744 -#: builtin/merge.c:811

6796 +#: builtin/merge.c:804

6797 #, c-format

6798 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

6799 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"

6800

6749 -#: builtin/merge.c:817

6801 +#: builtin/merge.c:810

6802 #, c-format

6803 msgid ""

6804 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -6760,47 +6812,47 @@ msgstr ""

6812 "\n"

6813 "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"

6814

6763 -#: builtin/merge.c:841

6815 +#: builtin/merge.c:834

6816 msgid "Empty commit message."

6817 msgstr "空提交信息。"

6818

6767 -#: builtin/merge.c:853

6819 +#: builtin/merge.c:846

6820 #, c-format

6821 msgid "Wonderful.\n"

6822 msgstr "太棒了。\n"

6823

6772 -#: builtin/merge.c:918

6824 +#: builtin/merge.c:911

6825 #, c-format

6826 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

6827 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"

6828

6777 -#: builtin/merge.c:934

6829 +#: builtin/merge.c:927

6830 #, c-format

6831 msgid "'%s' is not a commit"

6832 msgstr "'%s' 不是一个提交"

6833

6782 -#: builtin/merge.c:975

6834 +#: builtin/merge.c:968

6835 msgid "No current branch."

6836 msgstr "没有当前分支。"

6837

6786 -#: builtin/merge.c:977

6838 +#: builtin/merge.c:970

6839 msgid "No remote for the current branch."

6840 msgstr "当前分支没有对应的远程版本库。"

6841

6790 -#: builtin/merge.c:979

6842 +#: builtin/merge.c:972

6843 msgid "No default upstream defined for the current branch."

6844 msgstr "当前分支没有定义默认的上游分支。"

6845

6794 -#: builtin/merge.c:984

6846 +#: builtin/merge.c:977

6847 #, c-format

6848 msgid "No remote-tracking branch for %s from %s"

6849 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"

6850

6799 -#: builtin/merge.c:1140

6851 +#: builtin/merge.c:1133

6852 msgid "There is no merge to abort (MERGE_HEAD missing)."

6853 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"

6854

6803 -#: builtin/merge.c:1156 git-pull.sh:31

6855 +#: builtin/merge.c:1149 git-pull.sh:31

6856 msgid ""

6857 "You have not concluded your merge (MERGE_HEAD exists).\n"

6858 "Please, commit your changes before you can merge."

@@ -6808,11 +6860,11 @@ msgstr ""

6860 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"

6861 "请在合并前先提交您的修改。"

6862

6811 -#: builtin/merge.c:1159 git-pull.sh:34

6863 +#: builtin/merge.c:1152 git-pull.sh:34

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

6865 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"

6866

6815 -#: builtin/merge.c:1163

6867 +#: builtin/merge.c:1156

6868 msgid ""

6869 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

6870 "Please, commit your changes before you can merge."

@@ -6820,137 +6872,145 @@ msgstr ""

6872 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"

6873 "请在合并前先提交您的修改。"

6874

6823 -#: builtin/merge.c:1166

6875 +#: builtin/merge.c:1159

6876 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

6877 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"

6878

6827 -#: builtin/merge.c:1175

6879 +#: builtin/merge.c:1168

6880 msgid "You cannot combine --squash with --no-ff."

6881 msgstr "您不能将 --squash 与 --no-ff 同时使用。"

6882

6831 -#: builtin/merge.c:1184

6883 +#: builtin/merge.c:1177

6884 msgid "No commit specified and merge.defaultToUpstream not set."

6885 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"

6886

6835 -#: builtin/merge.c:1216

6887 +#: builtin/merge.c:1209

6888 msgid "Can merge only exactly one commit into empty head"

6889 msgstr "只能将一个提交合并到空分支上"

6890

6839 -#: builtin/merge.c:1219

6891 +#: builtin/merge.c:1212

6892 msgid "Squash commit into empty head not supported yet"

6893 msgstr "尚不支持到空分支的压缩提交"

6894

6843 -#: builtin/merge.c:1221

6895 +#: builtin/merge.c:1214

6896 msgid "Non-fast-forward commit does not make sense into an empty head"

6897 msgstr "到空分支的非快进式提交没有意义"

6898

6847 -#: builtin/merge.c:1226

6899 +#: builtin/merge.c:1219

6900 #, c-format

6901 msgid "%s - not something we can merge"

6902 msgstr "%s - 不能被合并"

6903

6852 -#: builtin/merge.c:1277

6904 +#: builtin/merge.c:1270

6905 #, c-format

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

6907 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"

6908

6857 -#: builtin/merge.c:1280

6909 +#: builtin/merge.c:1273

6910 #, c-format

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

6912 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"

6913

6914 #. 'N'

6863 -#: builtin/merge.c:1283

6915 +#: builtin/merge.c:1276

6916 #, c-format

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

6918 msgstr "提交 %s 没有一个 GPG 签名。"

6919

6868 -#: builtin/merge.c:1286

6920 +#: builtin/merge.c:1279

6921 #, c-format

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

6923 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"

6924

6873 -#: builtin/merge.c:1370

6925 +#: builtin/merge.c:1363

6926 #, c-format

6927 msgid "Updating %s..%s\n"

6928 msgstr "更新 %s..%s\n"

6929

6878 -#: builtin/merge.c:1409

6930 +#: builtin/merge.c:1402

6931 #, c-format

6932 msgid "Trying really trivial in-index merge...\n"

6933 msgstr "尝试非常小的索引内合并...\n"

6934

6883 -#: builtin/merge.c:1416

6935 +#: builtin/merge.c:1409

6936 #, c-format

6937 msgid "Nope.\n"

6938 msgstr "无。\n"

6939

6888 -#: builtin/merge.c:1448

6940 +#: builtin/merge.c:1441

6941 msgid "Not possible to fast-forward, aborting."

6942 msgstr "无法快进，终止。"

6943

6892 -#: builtin/merge.c:1471 builtin/merge.c:1550

6944 +#: builtin/merge.c:1464 builtin/merge.c:1543

6945 #, c-format

6946 msgid "Rewinding the tree to pristine...\n"

6947 msgstr "将树回滚至原始状态...\n"

6948

6897 -#: builtin/merge.c:1475

6949 +#: builtin/merge.c:1468

6950 #, c-format

6951 msgid "Trying merge strategy %s...\n"

6952 msgstr "尝试合并策略 %s...\n"

6953

6902 -#: builtin/merge.c:1541

6954 +#: builtin/merge.c:1534

6955 #, c-format

6956 msgid "No merge strategy handled the merge.\n"

6957 msgstr "没有合并策略处理此合并。\n"

6958

6907 -#: builtin/merge.c:1543

6959 +#: builtin/merge.c:1536

6960 #, c-format

6961 msgid "Merge with strategy %s failed.\n"

6962 msgstr "使用策略 %s 合并失败。\n"

6963

6912 -#: builtin/merge.c:1552

6964 +#: builtin/merge.c:1545

6965 #, c-format

6966 msgid "Using the %s to prepare resolving by hand.\n"

6967 msgstr "使用 %s 以准备手工解决。\n"

6968

6917 -#: builtin/merge.c:1564

6969 +#: builtin/merge.c:1557

6970 #, c-format

6971 msgid "Automatic merge went well; stopped before committing as requested\n"

6972 msgstr "自动合并进展顺利，按要求在提交前停止\n"

6973

6922 -#: builtin/merge-base.c:26

6974 +#: builtin/merge-base.c:29

6975 msgid "git merge-base [-a|--all] <commit> <commit>..."

6976 msgstr "git merge-base [-a|--all] <提交> <提交>..."

6977

6926 -#: builtin/merge-base.c:27

6978 +#: builtin/merge-base.c:30

6979 msgid "git merge-base [-a|--all] --octopus <commit>..."

6980 msgstr "git merge-base [-a|--all] --octopus <提交>..."

6981

6930 -#: builtin/merge-base.c:28

6982 +#: builtin/merge-base.c:31

6983 msgid "git merge-base --independent <commit>..."

6984 msgstr "git merge-base --independent <提交>..."

6985

6934 -#: builtin/merge-base.c:29

6986 +#: builtin/merge-base.c:32

6987 msgid "git merge-base --is-ancestor <commit> <commit>"

6988 msgstr "git merge-base --is-ancestor <提交> <提交>"

6989

6938 -#: builtin/merge-base.c:98

6990 +#: builtin/merge-base.c:33

6991 +msgid "git merge-base --fork-point <ref> [<commit>]"

6992 +msgstr "git merge-base --fork-point <提交> [<提交>]"

6993 +

6994 +#: builtin/merge-base.c:214

6995 msgid "output all common ancestors"

6996 msgstr "输出所有共同的祖先"

6997

6942 -#: builtin/merge-base.c:99

6998 +#: builtin/merge-base.c:216

6999 msgid "find ancestors for a single n-way merge"

7000 msgstr "查找一个多路合并的祖先提交"

7001

6946 -#: builtin/merge-base.c:100

7002 +#: builtin/merge-base.c:218

7003 msgid "list revs not reachable from others"

7004 msgstr "显示不能被其他访问到的版本"

7005

6950 -#: builtin/merge-base.c:102

7006 +#: builtin/merge-base.c:220

7007 msgid "is the first one ancestor of the other?"

7008 msgstr "第一个是其他的祖先提交么？"

7009

7010 +#: builtin/merge-base.c:222

7011 +msgid "find where <commit> forked from reflog of <ref>"

7012 +msgstr "查找 <commit> 从<引用>日志的何处分支的"

7013 +

7014 #: builtin/merge-file.c:8

7015 msgid ""

7016 "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "

@@ -7010,122 +7070,126 @@ msgstr "允许创建一个以上的树"

7070 msgid "git mv [options] <source>... <destination>"

7071 msgstr "git mv [选项] <源>... <目标>"

7072

7013 -#: builtin/mv.c:67

7073 +#: builtin/mv.c:71

7074 msgid "force move/rename even if target exists"

7075 msgstr "强制移动/重命令，即使目标存在"

7076

7017 -#: builtin/mv.c:68

7077 +#: builtin/mv.c:72

7078 msgid "skip move/rename errors"

7079 msgstr "跳过移动/重命名错误"

7080

7021 -#: builtin/mv.c:113

7081 +#: builtin/mv.c:122

7082 #, c-format

7083 msgid "Checking rename of '%s' to '%s'\n"

7084 msgstr "检查 '%s' 到 '%s' 的重命名\n"

7085

7026 -#: builtin/mv.c:117

7086 +#: builtin/mv.c:126

7087 msgid "bad source"

7088 msgstr "坏的源"

7089

7030 -#: builtin/mv.c:120

7090 +#: builtin/mv.c:129

7091 msgid "can not move directory into itself"

7092 msgstr "不能将目录移动到自身"

7093

7034 -#: builtin/mv.c:123

7094 +#: builtin/mv.c:132

7095 msgid "cannot move directory over file"

7096 msgstr "不能将目录移动到文件"

7097

7038 -#: builtin/mv.c:129

7098 +#: builtin/mv.c:138

7099 #, c-format

7100 msgid "Huh? Directory %s is in index and no submodule?"

7101 msgstr "嗯？目录 %s 在索引中并且不是子模组？"

7102

7043 -#: builtin/mv.c:131 builtin/rm.c:318

7103 +#: builtin/mv.c:140 builtin/rm.c:318

7104 msgid "Please, stage your changes to .gitmodules or stash them to proceed"

7105 msgstr "请将您的修改缓存到 .gitmodules 中或保存进度后再继续"

7106

7047 -#: builtin/mv.c:147

7107 +#: builtin/mv.c:156

7108 #, c-format

7109 msgid "Huh? %.*s is in index?"

7110 msgstr "嗯？%.*s 在索引中？"

7111

7052 -#: builtin/mv.c:159

7112 +#: builtin/mv.c:168

7113 msgid "source directory is empty"

7114 msgstr "源目录为空"

7115

7056 -#: builtin/mv.c:191

7116 +#: builtin/mv.c:200

7117 msgid "not under version control"

7118 msgstr "不在版本控制之下"

7119

7060 -#: builtin/mv.c:193

7120 +#: builtin/mv.c:202

7121 msgid "destination exists"

7122 msgstr "目标已存在"

7123

7064 -#: builtin/mv.c:201

7124 +#: builtin/mv.c:210

7125 #, c-format

7126 msgid "overwriting '%s'"

7127 msgstr "覆盖 '%s'"

7128

7069 -#: builtin/mv.c:204

7129 +#: builtin/mv.c:213

7130 msgid "Cannot overwrite"

7131 msgstr "不能覆盖"

7132

7073 -#: builtin/mv.c:207

7133 +#: builtin/mv.c:216

7134 msgid "multiple sources for the same target"

7135 msgstr "同一目标具有多个源"

7136

7077 -#: builtin/mv.c:222

7137 +#: builtin/mv.c:218

7138 +msgid "destination directory does not exist"

7139 +msgstr "目标目录不存在"

7140 +

7141 +#: builtin/mv.c:233

7142 #, c-format

7143 msgid "%s, source=%s, destination=%s"

7144 msgstr "%s，源=%s，目标=%s"

7145

7082 -#: builtin/mv.c:232

7146 +#: builtin/mv.c:243

7147 #, c-format

7148 msgid "Renaming %s to %s\n"

7149 msgstr "重命名 %s 至 %s\n"

7150

7087 -#: builtin/mv.c:235 builtin/remote.c:731 builtin/repack.c:330

7151 +#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328

7152 #, c-format

7153 msgid "renaming '%s' failed"

7154 msgstr "重命名 '%s' 失败"

7155

7092 -#: builtin/name-rev.c:259

7156 +#: builtin/name-rev.c:258

7157 msgid "git name-rev [options] <commit>..."

7158 msgstr "git name-rev [选项] <提交>..."

7159

7096 -#: builtin/name-rev.c:260

7160 +#: builtin/name-rev.c:259

7161 msgid "git name-rev [options] --all"

7162 msgstr "git name-rev [选项] --all"

7163

7100 -#: builtin/name-rev.c:261

7164 +#: builtin/name-rev.c:260

7165 msgid "git name-rev [options] --stdin"

7166 msgstr "git name-rev [选项] --stdin"

7167

7104 -#: builtin/name-rev.c:313

7168 +#: builtin/name-rev.c:312

7169 msgid "print only names (no SHA-1)"

7170 msgstr "只打印名称（无 SHA-1）"

7171

7108 -#: builtin/name-rev.c:314

7172 +#: builtin/name-rev.c:313

7173 msgid "only use tags to name the commits"

7174 msgstr "只使用 tags 来命名提交"

7175

7112 -#: builtin/name-rev.c:316

7176 +#: builtin/name-rev.c:315

7177 msgid "only use refs matching <pattern>"

7178 msgstr "只使用和 <模式> 相匹配的引用"

7179

7116 -#: builtin/name-rev.c:318

7180 +#: builtin/name-rev.c:317

7181 msgid "list all commits reachable from all refs"

7182 msgstr "列出可以从所有引用访问的提交"

7183

7120 -#: builtin/name-rev.c:319

7184 +#: builtin/name-rev.c:318

7185 msgid "read from stdin"

7186 msgstr "从标准输入读取"

7187

7124 -#: builtin/name-rev.c:320

7188 +#: builtin/name-rev.c:319

7189 msgid "allow to print `undefined` names (default)"

7190 msgstr "允许打印 `未定义` 的名称（默认）"

7191

7128 -#: builtin/name-rev.c:326

7192 +#: builtin/name-rev.c:325

7193 msgid "dereference tags in the input (internal use)"

7194 msgstr "反向解析输入中的 tags（内部使用）"

7195

@@ -7440,7 +7504,7 @@ msgstr "注解引用"

7504 msgid "use notes from <notes_ref>"

7505 msgstr "从 <注解引用> 使用注解"

7506

7443 -#: builtin/notes.c:974 builtin/remote.c:1598

7507 +#: builtin/notes.c:974 builtin/remote.c:1593

7508 #, c-format

7509 msgid "Unknown subcommand: %s"

7510 msgstr "未知子命令：%s"

@@ -7458,145 +7522,145 @@ msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]

7522 msgid "deflate error (%d)"

7523 msgstr "压缩错误 (%d)"

7524

7461 -#: builtin/pack-objects.c:2398

7525 +#: builtin/pack-objects.c:2396

7526 #, c-format

7527 msgid "unsupported index version %s"

7528 msgstr "不支持的索引版本 %s"

7529

7466 -#: builtin/pack-objects.c:2402

7530 +#: builtin/pack-objects.c:2400

7531 #, c-format

7532 msgid "bad index version '%s'"

7533 msgstr "坏的索引版本 '%s'"

7534

7471 -#: builtin/pack-objects.c:2425

7535 +#: builtin/pack-objects.c:2423

7536 #, c-format

7537 msgid "option %s does not accept negative form"

7538 msgstr "选项 %s 不接受否定格式"

7539

7476 -#: builtin/pack-objects.c:2429

7540 +#: builtin/pack-objects.c:2427

7541 #, c-format

7542 msgid "unable to parse value '%s' for option %s"

7543 msgstr "不能解析选项 %1$s 的值 '%2$s'"

7544

7481 -#: builtin/pack-objects.c:2448

7545 +#: builtin/pack-objects.c:2446

7546 msgid "do not show progress meter"

7547 msgstr "不显示进度表"

7548

7485 -#: builtin/pack-objects.c:2450

7549 +#: builtin/pack-objects.c:2448

7550 msgid "show progress meter"

7551 msgstr "显示进度表"

7552

7489 -#: builtin/pack-objects.c:2452

7553 +#: builtin/pack-objects.c:2450

7554 msgid "show progress meter during object writing phase"

7555 msgstr "在对象写入阶段显示进度表"

7556

7493 -#: builtin/pack-objects.c:2455

7557 +#: builtin/pack-objects.c:2453

7558 msgid "similar to --all-progress when progress meter is shown"

7559 msgstr "当进度表显示时类似于 --all-progress"

7560

7497 -#: builtin/pack-objects.c:2456

7561 +#: builtin/pack-objects.c:2454

7562 msgid "version[,offset]"

7563 msgstr "版本[,偏移]"

7564

7501 -#: builtin/pack-objects.c:2457

7565 +#: builtin/pack-objects.c:2455

7566 msgid "write the pack index file in the specified idx format version"

7567 msgstr "用指定的 idx 格式版本来写包索引文件"

7568

7505 -#: builtin/pack-objects.c:2460

7569 +#: builtin/pack-objects.c:2458

7570 msgid "maximum size of each output pack file"

7571 msgstr "每个输出包的最大尺寸"

7572

7509 -#: builtin/pack-objects.c:2462

7573 +#: builtin/pack-objects.c:2460

7574 msgid "ignore borrowed objects from alternate object store"

7575 msgstr "忽略从替代对象存储里借用对象"

7576

7513 -#: builtin/pack-objects.c:2464

7577 +#: builtin/pack-objects.c:2462

7578 msgid "ignore packed objects"

7579 msgstr "忽略包对象"

7580

7517 -#: builtin/pack-objects.c:2466

7581 +#: builtin/pack-objects.c:2464

7582 msgid "limit pack window by objects"

7583 msgstr "限制打包窗口的对象数"

7584

7521 -#: builtin/pack-objects.c:2468

7585 +#: builtin/pack-objects.c:2466

7586 msgid "limit pack window by memory in addition to object limit"

7587 msgstr "除对象数量限制外设置打包窗口的内存限制"

7588

7525 -#: builtin/pack-objects.c:2470

7589 +#: builtin/pack-objects.c:2468

7590 msgid "maximum length of delta chain allowed in the resulting pack"

7591 msgstr "打包允许的 delta 链的最大长度"

7592

7529 -#: builtin/pack-objects.c:2472

7593 +#: builtin/pack-objects.c:2470

7594 msgid "reuse existing deltas"

7595 msgstr "重用已存在的 deltas"

7596

7533 -#: builtin/pack-objects.c:2474

7597 +#: builtin/pack-objects.c:2472

7598 msgid "reuse existing objects"

7599 msgstr "重用已存在的对象"

7600

7537 -#: builtin/pack-objects.c:2476

7601 +#: builtin/pack-objects.c:2474

7602 msgid "use OFS_DELTA objects"

7603 msgstr "使用 OFS_DELTA 对象"

7604

7541 -#: builtin/pack-objects.c:2478

7605 +#: builtin/pack-objects.c:2476

7606 msgid "use threads when searching for best delta matches"

7607 msgstr "使用线程查询最佳 delta 匹配"

7608

7545 -#: builtin/pack-objects.c:2480

7609 +#: builtin/pack-objects.c:2478

7610 msgid "do not create an empty pack output"

7611 msgstr "不创建空的包输出"

7612

7549 -#: builtin/pack-objects.c:2482

7613 +#: builtin/pack-objects.c:2480

7614 msgid "read revision arguments from standard input"

7615 msgstr "从标准输入读取修订号参数"

7616

7553 -#: builtin/pack-objects.c:2484

7617 +#: builtin/pack-objects.c:2482

7618 msgid "limit the objects to those that are not yet packed"

7619 msgstr "限制那些尚未打包的对象"

7620

7557 -#: builtin/pack-objects.c:2487

7621 +#: builtin/pack-objects.c:2485

7622 msgid "include objects reachable from any reference"

7623 msgstr "包括可以从任何引用访问到的对象"

7624

7561 -#: builtin/pack-objects.c:2490

7625 +#: builtin/pack-objects.c:2488

7626 msgid "include objects referred by reflog entries"

7627 msgstr "包括被引用日志引用到的对象"

7628

7565 -#: builtin/pack-objects.c:2493

7629 +#: builtin/pack-objects.c:2491

7630 msgid "output pack to stdout"

7631 msgstr "输出包到标准输出"

7632

7569 -#: builtin/pack-objects.c:2495

7633 +#: builtin/pack-objects.c:2493

7634 msgid "include tag objects that refer to objects to be packed"

7635 msgstr "包括引用了打包对象的 tag"

7636

7573 -#: builtin/pack-objects.c:2497

7637 +#: builtin/pack-objects.c:2495

7638 msgid "keep unreachable objects"

7639 msgstr "维持不可达的对象"

7640

7577 -#: builtin/pack-objects.c:2498 parse-options.h:143

7641 +#: builtin/pack-objects.c:2496 parse-options.h:143

7642 msgid "time"

7643 msgstr "时间"

7644

7581 -#: builtin/pack-objects.c:2499

7645 +#: builtin/pack-objects.c:2497

7646 msgid "unpack unreachable objects newer than <time>"

7647 msgstr "将比给定 <时间> 新的无法访问的对象解包"

7648

7585 -#: builtin/pack-objects.c:2502

7649 +#: builtin/pack-objects.c:2500

7650 msgid "create thin packs"

7651 msgstr "创建精简包"

7652

7589 -#: builtin/pack-objects.c:2504

7653 +#: builtin/pack-objects.c:2502

7654 msgid "ignore packs that have companion .keep file"

7655 msgstr "忽略配有 .keep 文件的包"

7656

7593 -#: builtin/pack-objects.c:2506

7657 +#: builtin/pack-objects.c:2504

7658 msgid "pack compression level"

7659 msgstr "打包压缩级别"

7660

7597 -#: builtin/pack-objects.c:2508

7661 +#: builtin/pack-objects.c:2506

7662 msgid "do not hide commits by grafts"

7599 -msgstr "不隐藏移植覆盖的提交"

7663 +msgstr "显示被嫁接隐藏的提交"

7664

7665 #: builtin/pack-refs.c:6

7666 msgid "git pack-refs [options]"

@@ -7618,15 +7682,15 @@ msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"

7682 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"

7683 msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"

7684

7621 -#: builtin/prune.c:132

7685 +#: builtin/prune.c:142

7686 msgid "do not remove, show only"

7687 msgstr "不删除，只显示"

7688

7625 -#: builtin/prune.c:133

7689 +#: builtin/prune.c:143

7690 msgid "report pruned objects"

7691 msgstr "报告清除的对象"

7692

7629 -#: builtin/prune.c:136

7693 +#: builtin/prune.c:146

7694 msgid "expire objects older than <time>"

7695 msgstr "使早于给定时间的对象过期"

7696

@@ -7634,15 +7698,15 @@ msgstr "使早于给定时间的对象过期"

7698 msgid "git push [<options>] [<repository> [<refspec>...]]"

7699 msgstr "git push [<选项>] [<版本库> [<引用规则>...]]"

7700

7637 -#: builtin/push.c:47

7701 +#: builtin/push.c:86

7702 msgid "tag shorthand without <tag>"

7703 msgstr "tag 简写没有跟 <tag> 参数"

7704

7641 -#: builtin/push.c:66

7705 +#: builtin/push.c:96

7706 msgid "--delete only accepts plain target ref names"

7707 msgstr "--delete 只接受简单的目标引用名"

7708

7645 -#: builtin/push.c:101

7709 +#: builtin/push.c:141

7710 msgid ""

7711 "\n"

7712 "To choose either option permanently, see push.default in 'git help config'."

@@ -7650,7 +7714,7 @@ msgstr ""

7714 "\n"

7715 "为了永久地选择任一选项，参见 'git help config' 中的 push.default。"

7716

7653 -#: builtin/push.c:104

7717 +#: builtin/push.c:144

7718 #, c-format

7719 msgid ""

7720 "The upstream branch of your current branch does not match\n"

@@ -7674,7 +7738,7 @@ msgstr ""

7738 " git push %s %s\n"

7739 "%s"

7740

7677 -#: builtin/push.c:119

7741 +#: builtin/push.c:159

7742 #, c-format

7743 msgid ""

7744 "You are not currently on a branch.\n"

@@ -7688,7 +7752,7 @@ msgstr ""

7752 "\n"

7753 " git push %s HEAD:<name-of-remote-branch>\n"

7754

7691 -#: builtin/push.c:133

7755 +#: builtin/push.c:173

7756 #, c-format

7757 msgid ""

7758 "The current branch %s has no upstream branch.\n"

@@ -7701,12 +7765,12 @@ msgstr ""

7765 "\n"

7766 " git push --set-upstream %s %s\n"

7767

7704 -#: builtin/push.c:141

7768 +#: builtin/push.c:181

7769 #, c-format

7770 msgid "The current branch %s has multiple upstream branches, refusing to push."

7771 msgstr "当前分支 %s 有多个上游分支，拒绝推送。"

7772

7709 -#: builtin/push.c:144

7773 +#: builtin/push.c:184

7774 #, c-format

7775 msgid ""

7776 "You are pushing to remote '%s', which is not the upstream of\n"

@@ -7717,7 +7781,7 @@ msgstr ""

7781 "而没有告诉我要推送什么、更新哪个远程分支。"

7782

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

7720 -#: builtin/push.c:167

7784 +#: builtin/push.c:207

7785 msgid ""

7786 "push.default is unset; its implicit value is changing in\n"

7787 "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"

@@ -7729,13 +7793,20 @@ msgid ""

7793 "\n"

7794 " git config --global push.default simple\n"

7795 "\n"

7796 +"When push.default is set to 'matching', git will push local branches\n"

7797 +"to the remote branches that already exist with the same name.\n"

7798 +"\n"

7799 +"In Git 2.0, Git will default to the more conservative 'simple'\n"

7800 +"behavior, which only pushes the current branch to the corresponding\n"

7801 +"remote branch that 'git pull' uses to update the current branch.\n"

7802 +"\n"

7803 "See 'git help config' and search for 'push.default' for further "

7804 "information.\n"

7805 "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"

7806 "'current' instead of 'simple' if you sometimes use older versions of Git)"

7807 msgstr ""

7737 -"push.default 未设置，它的默认值将在 Git 2.0 由 'matching'\n"

7738 -"改变为 'simple'。若要不再显示本信息并保持传统习惯，进行如下设置：\n"

7808 +"push.default 尚未设置，它的默认值在 Git 2.0 从 'matching'\n"

7809 +"变更为 'simple'。若要不再显示本信息并保持传统习惯，进行如下设置：\n"

7810 "\n"

7811 " git config --global push.default matching\n"

7812 "\n"

@@ -7743,16 +7814,22 @@ msgstr ""

7814 "\n"

7815 " git config --global push.default simple\n"

7816 "\n"

7817 +"当 push.default 设置为 'matching' 后，git 将推送和远程同名的所有\n"

7818 +"本地分支。\n"

7819 +"\n"

7820 +"从 Git 2.0 开始，Git 缺省采用更为保守的 'simple' 模式，只推送当前\n"

7821 +"分支到远程关联的同名分支，即 'git push' 推送当前分支。\n"

7822 +"\n"

7823 "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"

7824 "（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n"

7825 "为保持兼容，请用 'current' 代替 'simple'）"

7826

7750 -#: builtin/push.c:227

7827 +#: builtin/push.c:274

7828 msgid ""

7829 "You didn't specify any refspecs to push, and push.default is \"nothing\"."

7830 msgstr "您没有为推送指定任何引用规则，并且 push.default 为 \"nothing\"。"

7831

7755 -#: builtin/push.c:234

7832 +#: builtin/push.c:281

7833 msgid ""

7834 "Updates were rejected because the tip of your current branch is behind\n"

7835 "its remote counterpart. Integrate the remote changes (e.g.\n"

@@ -7763,7 +7840,7 @@ msgstr ""

7840 "再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"

7841 "'git push --help' 中的 'Note about fast-forwards' 小节。"

7842

7766 -#: builtin/push.c:240

7843 +#: builtin/push.c:287

7844 msgid ""

7845 "Updates were rejected because a pushed branch tip is behind its remote\n"

7846 "counterpart. If you did not intend to push that branch, you may want to\n"

@@ -7775,7 +7852,7 @@ msgstr ""

7852 "配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"

7853 "以便只推送当前分支。"

7854

7778 -#: builtin/push.c:246

7855 +#: builtin/push.c:293

7856 msgid ""

7857 "Updates were rejected because a pushed branch tip is behind its remote\n"

7858 "counterpart. Check out this branch and integrate the remote changes\n"

@@ -7786,7 +7863,7 @@ msgstr ""

7863 "检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"

7864 "'git push --help' 中的 'Note about fast-forwards' 小节。"

7865

7789 -#: builtin/push.c:252

7866 +#: builtin/push.c:299

7867 msgid ""

7868 "Updates were rejected because the remote contains work that you do\n"

7869 "not have locally. This is usually caused by another repository pushing\n"

@@ -7799,11 +7876,11 @@ msgstr ""

7876 "（如 'git pull ...'）。\n"

7877 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"

7878

7802 -#: builtin/push.c:259

7879 +#: builtin/push.c:306

7880 msgid "Updates were rejected because the tag already exists in the remote."

7881 msgstr "更新被拒绝因为 tag 在远程已经存在。"

7882

7806 -#: builtin/push.c:262

7883 +#: builtin/push.c:309

7884 msgid ""

7885 "You cannot update a remote ref that points at a non-commit object,\n"

7886 "or update a remote ref to make it point at a non-commit object,\n"

@@ -7812,22 +7889,22 @@ msgstr ""

7889 "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"

7890 "也不能更新远程引用让其指向一个非提交对象。\n"

7891

7815 -#: builtin/push.c:328

7892 +#: builtin/push.c:375

7893 #, c-format

7894 msgid "Pushing to %s\n"

7895 msgstr "推送到 %s\n"

7896

7820 -#: builtin/push.c:332

7897 +#: builtin/push.c:379

7898 #, c-format

7899 msgid "failed to push some refs to '%s'"

7900 msgstr "无法推送一些引用到 '%s'"

7901

7825 -#: builtin/push.c:365

7902 +#: builtin/push.c:412

7903 #, c-format

7904 msgid "bad repository '%s'"

7905 msgstr "坏的版本库 '%s'"

7906

7830 -#: builtin/push.c:366

7907 +#: builtin/push.c:413

7908 msgid ""

7909 "No configured push destination.\n"

7910 "Either specify the URL from the command-line or configure a remote "

@@ -7848,95 +7925,95 @@ msgstr ""

7925 "\n"

7926 " git push <name>\n"

7927

7851 -#: builtin/push.c:381

7928 +#: builtin/push.c:428

7929 msgid "--all and --tags are incompatible"

7930 msgstr "--all 和 --tags 不兼容"

7931

7855 -#: builtin/push.c:382

7932 +#: builtin/push.c:429

7933 msgid "--all can't be combined with refspecs"

7934 msgstr "--all 不能和引用规则同时使用"

7935

7859 -#: builtin/push.c:387

7936 +#: builtin/push.c:434

7937 msgid "--mirror and --tags are incompatible"

7938 msgstr "--mirror 和 --tags 不兼容"

7939

7863 -#: builtin/push.c:388

7940 +#: builtin/push.c:435

7941 msgid "--mirror can't be combined with refspecs"

7942 msgstr "--mirror 不能和引用规则同时使用"

7943

7867 -#: builtin/push.c:393

7944 +#: builtin/push.c:440

7945 msgid "--all and --mirror are incompatible"

7946 msgstr "--all 和 --mirror 不兼容"

7947

7871 -#: builtin/push.c:453

7948 +#: builtin/push.c:500

7949 msgid "repository"

7950 msgstr "版本库"

7951

7875 -#: builtin/push.c:454

7952 +#: builtin/push.c:501

7953 msgid "push all refs"

7954 msgstr "推送所有引用"

7955

7879 -#: builtin/push.c:455

7956 +#: builtin/push.c:502

7957 msgid "mirror all refs"

7958 msgstr "镜像所有引用"

7959

7883 -#: builtin/push.c:457

7960 +#: builtin/push.c:504

7961 msgid "delete refs"

7962 msgstr "删除引用"

7963

7887 -#: builtin/push.c:458

7964 +#: builtin/push.c:505

7965 msgid "push tags (can't be used with --all or --mirror)"

7966 msgstr "推送 tags（不能使用 --all or --mirror）"

7967

7891 -#: builtin/push.c:461

7968 +#: builtin/push.c:508

7969 msgid "force updates"

7970 msgstr "强制更新"

7971

7895 -#: builtin/push.c:463

7972 +#: builtin/push.c:510

7973 msgid "refname>:<expect"

7974 msgstr "引用名>:<期望值"

7975

7899 -#: builtin/push.c:464

7976 +#: builtin/push.c:511

7977 msgid "require old value of ref to be at this value"

7978 msgstr "要求引用旧的取值为设定值"

7979

7903 -#: builtin/push.c:466

7980 +#: builtin/push.c:513

7981 msgid "check"

7982 msgstr "检查"

7983

7907 -#: builtin/push.c:467

7984 +#: builtin/push.c:514

7985 msgid "control recursive pushing of submodules"

7986 msgstr "控制子模组的递归推送"

7987

7911 -#: builtin/push.c:469

7988 +#: builtin/push.c:516

7989 msgid "use thin pack"

7990 msgstr "使用精简打包"

7991

7915 -#: builtin/push.c:470 builtin/push.c:471

7992 +#: builtin/push.c:517 builtin/push.c:518

7993 msgid "receive pack program"

7994 msgstr "接收包程序"

7995

7919 -#: builtin/push.c:472

7996 +#: builtin/push.c:519

7997 msgid "set upstream for git pull/status"

7998 msgstr "设置 git pull/status 的上游"

7999

7923 -#: builtin/push.c:475

8000 +#: builtin/push.c:522

8001 msgid "prune locally removed refs"

8002 msgstr "清除本地删除的引用"

8003

7927 -#: builtin/push.c:477

8004 +#: builtin/push.c:524

8005 msgid "bypass pre-push hook"

8006 msgstr "绕过 pre-push 钩子"

8007

7931 -#: builtin/push.c:478

8008 +#: builtin/push.c:525

8009 msgid "push missing but relevant tags"

8010 msgstr "推送缺失的有关的 tags"

8011

7935 -#: builtin/push.c:488

8012 +#: builtin/push.c:535

8013 msgid "--delete is incompatible with --all, --mirror and --tags"

8014 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"

8015

7939 -#: builtin/push.c:490

8016 +#: builtin/push.c:537

8017 msgid "--delete doesn't make sense without any refs"

8018 msgstr "--delete 未接任何引用没有意义"

8019

@@ -8024,11 +8101,11 @@ msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"

8101 msgid "'%s' is not a valid timestamp"

8102 msgstr "'%s' 不是一个有效的时间戳"

8103

8027 -#: builtin/remote.c:11

8104 +#: builtin/remote.c:12

8105 msgid "git remote [-v | --verbose]"

8106 msgstr "git remote [-v | --verbose]"

8107

8031 -#: builtin/remote.c:12

8108 +#: builtin/remote.c:13

8109 msgid ""

8110 "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"

8111 "mirror=<fetch|push>] <name> <url>"

@@ -8036,81 +8113,81 @@ msgstr ""

8113 "git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--"

8114 "mirror=<fetch|push>] <名称> <url>"

8115

8039 -#: builtin/remote.c:13 builtin/remote.c:32

8116 +#: builtin/remote.c:14 builtin/remote.c:33

8117 msgid "git remote rename <old> <new>"

8118 msgstr "git remote rename <旧名称> <新名称>"

8119

8043 -#: builtin/remote.c:14 builtin/remote.c:37

8120 +#: builtin/remote.c:15 builtin/remote.c:38

8121 msgid "git remote remove <name>"

8122 msgstr "git remote remove <名称>"

8123

8047 -#: builtin/remote.c:15

8124 +#: builtin/remote.c:16

8125 msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"

8126 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete |<分支>)"

8127

8051 -#: builtin/remote.c:16

8128 +#: builtin/remote.c:17

8129 msgid "git remote [-v | --verbose] show [-n] <name>"

8130 msgstr "git remote [-v | --verbose] show [-n] <名称>"

8131

8055 -#: builtin/remote.c:17

8132 +#: builtin/remote.c:18

8133 msgid "git remote prune [-n | --dry-run] <name>"

8134 msgstr "git remote prune [-n | --dry-run] <名称>"

8135

8059 -#: builtin/remote.c:18

8136 +#: builtin/remote.c:19

8137 msgid ""

8138 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"

8139 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"

8140

8064 -#: builtin/remote.c:19

8141 +#: builtin/remote.c:20

8142 msgid "git remote set-branches [--add] <name> <branch>..."

8143 msgstr "git remote set-branches [--add] <名称> <分支>..."

8144

8068 -#: builtin/remote.c:20 builtin/remote.c:68

8145 +#: builtin/remote.c:21 builtin/remote.c:69

8146 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"

8147 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"

8148

8072 -#: builtin/remote.c:21 builtin/remote.c:69

8149 +#: builtin/remote.c:22 builtin/remote.c:70

8150 msgid "git remote set-url --add <name> <newurl>"

8151 msgstr "git remote set-url --add <名称> <新的地址>"

8152

8076 -#: builtin/remote.c:22 builtin/remote.c:70

8153 +#: builtin/remote.c:23 builtin/remote.c:71

8154 msgid "git remote set-url --delete <name> <url>"

8155 msgstr "git remote set-url --delete <名称> <地址>"

8156

8080 -#: builtin/remote.c:27

8157 +#: builtin/remote.c:28

8158 msgid "git remote add [<options>] <name> <url>"

8159 msgstr "git remote add [<选项>] <名称> <地址>"

8160

8084 -#: builtin/remote.c:42

8161 +#: builtin/remote.c:43

8162 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"

8163 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"

8164

8088 -#: builtin/remote.c:47

8165 +#: builtin/remote.c:48

8166 msgid "git remote set-branches <name> <branch>..."

8167 msgstr "git remote set-branches <名称> <分支>..."

8168

8092 -#: builtin/remote.c:48

8169 +#: builtin/remote.c:49

8170 msgid "git remote set-branches --add <name> <branch>..."

8171 msgstr "git remote set-branches --add <名称> <分支>..."

8172

8096 -#: builtin/remote.c:53

8173 +#: builtin/remote.c:54

8174 msgid "git remote show [<options>] <name>"

8175 msgstr "git remote show [<选项>] <名称>"

8176

8100 -#: builtin/remote.c:58

8177 +#: builtin/remote.c:59

8178 msgid "git remote prune [<options>] <name>"

8179 msgstr "git remote prune [<选项>] <名称>"

8180

8104 -#: builtin/remote.c:63

8181 +#: builtin/remote.c:64

8182 msgid "git remote update [<options>] [<group> | <remote>]..."

8183 msgstr "git remote update [<选项>] [<组> | <远程>]..."

8184

8108 -#: builtin/remote.c:98

8185 +#: builtin/remote.c:88

8186 #, c-format

8187 msgid "Updating %s"

8188 msgstr "更新 %s 中"

8189

8113 -#: builtin/remote.c:130

8190 +#: builtin/remote.c:120

8191 msgid ""

8192 "--mirror is dangerous and deprecated; please\n"

8193 "\t use --mirror=fetch or --mirror=push instead"

@@ -8118,101 +8195,101 @@ msgstr ""

8195 "--mirror 选项危险且过时，请使用 --mirror=fetch\n"

8196 "\t 或 --mirror=push"

8197

8121 -#: builtin/remote.c:147

8198 +#: builtin/remote.c:137

8199 #, c-format

8200 msgid "unknown mirror argument: %s"

8201 msgstr "未知的镜像参数：%s"

8202

8126 -#: builtin/remote.c:163

8203 +#: builtin/remote.c:153

8204 msgid "fetch the remote branches"

8205 msgstr "抓取远程的分支"

8206

8130 -#: builtin/remote.c:165

8207 +#: builtin/remote.c:155

8208 msgid "import all tags and associated objects when fetching"

8209 msgstr "抓取时导入所有的 tags 和关联对象"

8210

8134 -#: builtin/remote.c:168

8211 +#: builtin/remote.c:158

8212 msgid "or do not fetch any tag at all (--no-tags)"

8213 msgstr "或不抓取任何 tag（--no-tags）"

8214

8138 -#: builtin/remote.c:170

8215 +#: builtin/remote.c:160

8216 msgid "branch(es) to track"

8217 msgstr "跟踪的分支"

8218

8142 -#: builtin/remote.c:171

8219 +#: builtin/remote.c:161

8220 msgid "master branch"

8221 msgstr "主线分支"

8222

8146 -#: builtin/remote.c:172

8223 +#: builtin/remote.c:162

8224 msgid "push|fetch"

8225 msgstr "push|fetch"

8226

8150 -#: builtin/remote.c:173

8227 +#: builtin/remote.c:163

8228 msgid "set up remote as a mirror to push to or fetch from"

8229 msgstr "把远程设置为用以推送或抓取的镜像"

8230

8154 -#: builtin/remote.c:185

8231 +#: builtin/remote.c:175

8232 msgid "specifying a master branch makes no sense with --mirror"

8233 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"

8234

8158 -#: builtin/remote.c:187

8235 +#: builtin/remote.c:177

8236 msgid "specifying branches to track makes sense only with fetch mirrors"

8237 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"

8238

8162 -#: builtin/remote.c:195 builtin/remote.c:646

8239 +#: builtin/remote.c:185 builtin/remote.c:641

8240 #, c-format

8241 msgid "remote %s already exists."

8242 msgstr "远程 %s 已经存在。"

8243

8167 -#: builtin/remote.c:199 builtin/remote.c:650

8244 +#: builtin/remote.c:189 builtin/remote.c:645

8245 #, c-format

8246 msgid "'%s' is not a valid remote name"

8247 msgstr "'%s' 不是一个有效的远程名称"

8248

8172 -#: builtin/remote.c:243

8249 +#: builtin/remote.c:233

8250 #, c-format

8251 msgid "Could not setup master '%s'"

8252 msgstr "无法设置 master '%s'"

8253

8177 -#: builtin/remote.c:299

8254 +#: builtin/remote.c:289

8255 #, c-format

8256 msgid "more than one %s"

8257 msgstr "多于一个 %s"

8258

8182 -#: builtin/remote.c:339

8259 +#: builtin/remote.c:334

8260 #, c-format

8261 msgid "Could not get fetch map for refspec %s"

8262 msgstr "无法得到引用规则 %s 的获取列表"

8263

8187 -#: builtin/remote.c:440 builtin/remote.c:448

8264 +#: builtin/remote.c:435 builtin/remote.c:443

8265 msgid "(matching)"

8266 msgstr "（匹配）"

8267

8191 -#: builtin/remote.c:452

8268 +#: builtin/remote.c:447

8269 msgid "(delete)"

8270 msgstr "（删除）"

8271

8195 -#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607

8272 +#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602

8273 #, c-format

8274 msgid "Could not append '%s' to '%s'"

8275 msgstr "不能添加 '%s' 至 '%s'"

8276

8200 -#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890

8277 +#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885

8278 #, c-format

8279 msgid "No such remote: %s"

8280 msgstr "没有这样的远程：%s"

8281

8205 -#: builtin/remote.c:656

8282 +#: builtin/remote.c:651

8283 #, c-format

8284 msgid "Could not rename config section '%s' to '%s'"

8285 msgstr "不能重命名配置小节 '%s' 到 '%s'"

8286

8210 -#: builtin/remote.c:662 builtin/remote.c:799

8287 +#: builtin/remote.c:657 builtin/remote.c:794

8288 #, c-format

8289 msgid "Could not remove config section '%s'"

8290 msgstr "不能移除配置小节 '%s'"

8291

8215 -#: builtin/remote.c:677

8292 +#: builtin/remote.c:672

8293 #, c-format

8294 msgid ""

8295 "Not updating non-default fetch refspec\n"

@@ -8223,32 +8300,32 @@ msgstr ""

8300 "\t%s\n"

8301 "\t如果必要请手动更新配置。"

8302

8226 -#: builtin/remote.c:683

8303 +#: builtin/remote.c:678

8304 #, c-format

8305 msgid "Could not append '%s'"

8306 msgstr "不能追加 '%s'"

8307

8231 -#: builtin/remote.c:694

8308 +#: builtin/remote.c:689

8309 #, c-format

8310 msgid "Could not set '%s'"

8311 msgstr "不能设置 '%s'"

8312

8236 -#: builtin/remote.c:716

8313 +#: builtin/remote.c:711

8314 #, c-format

8315 msgid "deleting '%s' failed"

8316 msgstr "删除 '%s' 失败"

8317

8241 -#: builtin/remote.c:750

8318 +#: builtin/remote.c:745

8319 #, c-format

8320 msgid "creating '%s' failed"

8321 msgstr "创建 '%s' 失败"

8322

8246 -#: builtin/remote.c:764

8323 +#: builtin/remote.c:759

8324 #, c-format

8325 msgid "Could not remove branch %s"

8326 msgstr "无法移除分支 %s"

8327

8251 -#: builtin/remote.c:834

8328 +#: builtin/remote.c:829

8329 msgid ""

8330 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"

8331 "to delete it, use:"

@@ -8258,126 +8335,126 @@ msgid_plural ""

8335 msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："

8336 msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："

8337

8261 -#: builtin/remote.c:943

8338 +#: builtin/remote.c:938

8339 #, c-format

8340 msgid " new (next fetch will store in remotes/%s)"

8341 msgstr " 新的（下一次获取将存储于 remotes/%s）"

8342

8266 -#: builtin/remote.c:946

8343 +#: builtin/remote.c:941

8344 msgid " tracked"

8345 msgstr " 已跟踪"

8346

8270 -#: builtin/remote.c:948

8347 +#: builtin/remote.c:943

8348 msgid " stale (use 'git remote prune' to remove)"

8349 msgstr " 过时（使用 'git remote prune' 来移除）"

8350

8274 -#: builtin/remote.c:950

8351 +#: builtin/remote.c:945

8352 msgid " ???"

8353 msgstr " ???"

8354

8278 -#: builtin/remote.c:991

8355 +#: builtin/remote.c:986

8356 #, c-format

8357 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"

8358 msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"

8359

8283 -#: builtin/remote.c:998

8360 +#: builtin/remote.c:993

8361 #, c-format

8362 msgid "rebases onto remote %s"

8363 msgstr "变基到远程 %s"

8364

8288 -#: builtin/remote.c:1001

8365 +#: builtin/remote.c:996

8366 #, c-format

8367 msgid " merges with remote %s"

8368 msgstr " 与远程 %s 合并"

8369

8293 -#: builtin/remote.c:1002

8370 +#: builtin/remote.c:997

8371 msgid " and with remote"

8372 msgstr " 且有远程"

8373

8297 -#: builtin/remote.c:1004

8374 +#: builtin/remote.c:999

8375 #, c-format

8376 msgid "merges with remote %s"

8377 msgstr "与远程 %s 合并"

8378

8302 -#: builtin/remote.c:1005

8379 +#: builtin/remote.c:1000

8380 msgid " and with remote"

8381 msgstr " 且有远程"

8382

8306 -#: builtin/remote.c:1051

8383 +#: builtin/remote.c:1046

8384 msgid "create"

8385 msgstr "创建"

8386

8310 -#: builtin/remote.c:1054

8387 +#: builtin/remote.c:1049

8388 msgid "delete"

8389 msgstr "删除"

8390

8314 -#: builtin/remote.c:1058

8391 +#: builtin/remote.c:1053

8392 msgid "up to date"

8393 msgstr "最新"

8394

8318 -#: builtin/remote.c:1061

8395 +#: builtin/remote.c:1056

8396 msgid "fast-forwardable"

8397 msgstr "可快进"

8398

8322 -#: builtin/remote.c:1064

8399 +#: builtin/remote.c:1059

8400 msgid "local out of date"

8401 msgstr "本地已过时"

8402

8326 -#: builtin/remote.c:1071

8403 +#: builtin/remote.c:1066

8404 #, c-format

8405 msgid " %-*s forces to %-*s (%s)"

8406 msgstr " %-*s 强制推送至 %-*s (%s)"

8407

8331 -#: builtin/remote.c:1074

8408 +#: builtin/remote.c:1069

8409 #, c-format

8410 msgid " %-*s pushes to %-*s (%s)"

8411 msgstr " %-*s 推送至 %-*s (%s)"

8412

8336 -#: builtin/remote.c:1078

8413 +#: builtin/remote.c:1073

8414 #, c-format

8415 msgid " %-*s forces to %s"

8416 msgstr " %-*s 强制推送至 %s"

8417

8341 -#: builtin/remote.c:1081

8418 +#: builtin/remote.c:1076

8419 #, c-format

8420 msgid " %-*s pushes to %s"

8421 msgstr " %-*s 推送至 %s"

8422

8346 -#: builtin/remote.c:1091

8423 +#: builtin/remote.c:1144

8424 msgid "do not query remotes"

8425 msgstr "不查询远程"

8426

8350 -#: builtin/remote.c:1118

8427 +#: builtin/remote.c:1171

8428 #, c-format

8429 msgid "* remote %s"

8430 msgstr "* 远程 %s"

8431

8355 -#: builtin/remote.c:1119

8432 +#: builtin/remote.c:1172

8433 #, c-format

8434 msgid " Fetch URL: %s"

8435 msgstr " 获取地址：%s"

8436

8360 -#: builtin/remote.c:1120 builtin/remote.c:1285

8437 +#: builtin/remote.c:1173 builtin/remote.c:1318

8438 msgid "(no URL)"

8439 msgstr "(无 URL)"

8440

8364 -#: builtin/remote.c:1129 builtin/remote.c:1131

8441 +#: builtin/remote.c:1182 builtin/remote.c:1184

8442 #, c-format

8443 msgid " Push URL: %s"

8444 msgstr " 推送地址：%s"

8445

8369 -#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137

8446 +#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190

8447 #, c-format

8448 msgid " HEAD branch: %s"

8449 msgstr " HEAD分支：%s"

8450

8374 -#: builtin/remote.c:1139

8451 +#: builtin/remote.c:1192

8452 #, c-format

8453 msgid ""

8454 " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"

8455 msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"

8456

8380 -#: builtin/remote.c:1151

8457 +#: builtin/remote.c:1204

8458 #, c-format

8459 msgid " Remote branch:%s"

8460 msgid_plural " Remote branches:%s"

@@ -8385,138 +8462,138 @@ msgstr[0] " 远程分支：%s"

8462 msgstr[1] " 远程分支：%s"

8463

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

8388 -#: builtin/remote.c:1154 builtin/remote.c:1181

8465 +#: builtin/remote.c:1207 builtin/remote.c:1234

8466 msgid " (status not queried)"

8467 msgstr "（状态未查询）"

8468

8392 -#: builtin/remote.c:1163

8469 +#: builtin/remote.c:1216

8470 msgid " Local branch configured for 'git pull':"

8471 msgid_plural " Local branches configured for 'git pull':"

8472 msgstr[0] " 为 'git pull' 配置的本地分支："

8473 msgstr[1] " 为 'git pull' 配置的本地分支："

8474

8398 -#: builtin/remote.c:1171

8475 +#: builtin/remote.c:1224

8476 msgid " Local refs will be mirrored by 'git push'"

8477 msgstr " 本地引用将在 'git push' 时被镜像"

8478

8402 -#: builtin/remote.c:1178

8479 +#: builtin/remote.c:1231

8480 #, c-format

8481 msgid " Local ref configured for 'git push'%s:"

8482 msgid_plural " Local refs configured for 'git push'%s:"

8483 msgstr[0] " 为 'git push' 配置的本地引用%s："

8484 msgstr[1] " 为 'git push' 配置的本地引用%s："

8485

8409 -#: builtin/remote.c:1199

8486 +#: builtin/remote.c:1252

8487 msgid "set refs/remotes/<name>/HEAD according to remote"

8488 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"

8489

8413 -#: builtin/remote.c:1201

8490 +#: builtin/remote.c:1254

8491 msgid "delete refs/remotes/<name>/HEAD"

8492 msgstr "删除 refs/remotes/<名称>/HEAD"

8493

8417 -#: builtin/remote.c:1216

8494 +#: builtin/remote.c:1269

8495 msgid "Cannot determine remote HEAD"

8496 msgstr "无法确定远程 HEAD"

8497

8421 -#: builtin/remote.c:1218

8498 +#: builtin/remote.c:1271

8499 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"

8500 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："

8501

8425 -#: builtin/remote.c:1228

8502 +#: builtin/remote.c:1281

8503 #, c-format

8504 msgid "Could not delete %s"

8505 msgstr "无法删除 %s"

8506

8430 -#: builtin/remote.c:1236

8507 +#: builtin/remote.c:1289

8508 #, c-format

8509 msgid "Not a valid ref: %s"

8510 msgstr "不是一个有效引用：%s"

8511

8435 -#: builtin/remote.c:1238

8512 +#: builtin/remote.c:1291

8513 #, c-format

8514 msgid "Could not setup %s"

8515 msgstr "不能设置 %s"

8516

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

8441 -#: builtin/remote.c:1274

8518 +#: builtin/remote.c:1307

8519 #, c-format

8520 msgid " %s will become dangling!"

8521 msgstr " %s 将成为摇摆状态！"

8522

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

8447 -#: builtin/remote.c:1275

8524 +#: builtin/remote.c:1308

8525 #, c-format

8526 msgid " %s has become dangling!"

8527 msgstr " %s 已成为摇摆状态！"

8528

8452 -#: builtin/remote.c:1281

8529 +#: builtin/remote.c:1314

8530 #, c-format

8531 msgid "Pruning %s"

8532 msgstr "修剪 %s"

8533

8457 -#: builtin/remote.c:1282

8534 +#: builtin/remote.c:1315

8535 #, c-format

8536 msgid "URL: %s"

8537 msgstr "URL：%s"

8538

8462 -#: builtin/remote.c:1295

8539 +#: builtin/remote.c:1328

8540 #, c-format

8541 msgid " * [would prune] %s"

8542 msgstr " * [将删除] %s"

8543

8467 -#: builtin/remote.c:1298

8544 +#: builtin/remote.c:1331

8545 #, c-format

8546 msgid " * [pruned] %s"

8547 msgstr " * [已删除] %s"

8548

8472 -#: builtin/remote.c:1321

8549 +#: builtin/remote.c:1374

8550 msgid "prune remotes after fetching"

8551 msgstr "抓取后清除远程"

8552

8476 -#: builtin/remote.c:1387 builtin/remote.c:1461

8553 +#: builtin/remote.c:1440 builtin/remote.c:1514

8554 #, c-format

8555 msgid "No such remote '%s'"

8556 msgstr "没有此远程 '%s'"

8557

8481 -#: builtin/remote.c:1407

8558 +#: builtin/remote.c:1460

8559 msgid "add branch"

8560 msgstr "添加分支"

8561

8485 -#: builtin/remote.c:1414

8562 +#: builtin/remote.c:1467

8563 msgid "no remote specified"

8564 msgstr "未指定远程"

8565

8489 -#: builtin/remote.c:1436

8566 +#: builtin/remote.c:1489

8567 msgid "manipulate push URLs"

8568 msgstr "操作推送 URLS"

8569

8493 -#: builtin/remote.c:1438

8570 +#: builtin/remote.c:1491

8571 msgid "add URL"

8572 msgstr "添加 URL"

8573

8497 -#: builtin/remote.c:1440

8574 +#: builtin/remote.c:1493

8575 msgid "delete URLs"

8576 msgstr "删除 URLS"

8577

8501 -#: builtin/remote.c:1447

8578 +#: builtin/remote.c:1500

8579 msgid "--add --delete doesn't make sense"

8580 msgstr "--add --delete 无意义"

8581

8505 -#: builtin/remote.c:1487

8582 +#: builtin/remote.c:1540

8583 #, c-format

8584 msgid "Invalid old URL pattern: %s"

8585 msgstr "无效的旧URL匹配模版：%s"

8586

8510 -#: builtin/remote.c:1495

8587 +#: builtin/remote.c:1548

8588 #, c-format

8589 msgid "No such URL found: %s"

8590 msgstr "未找到此URL：%s"

8591

8515 -#: builtin/remote.c:1497

8592 +#: builtin/remote.c:1550

8593 msgid "Will not delete all non-push URLs"

8594 msgstr "将不会删除所有非推送URL地址"

8595

8519 -#: builtin/remote.c:1569

8596 +#: builtin/remote.c:1564

8597 msgid "be verbose; must be placed before a subcommand"

8598 msgstr "冗长输出；必须置于子命令之前"

8599

@@ -8576,7 +8653,7 @@ msgstr "限制最大增量深度"

8653 msgid "maximum size of each packfile"

8654 msgstr "每个包的最大尺寸"

8655

8579 -#: builtin/repack.c:345

8656 +#: builtin/repack.c:343

8657 #, c-format

8658 msgid "removing '%s' failed"

8659 msgstr "删除 '%s' 失败"

@@ -8590,21 +8667,25 @@ msgid "git replace -d <object>..."

8667 msgstr "git replace -d <对象>..."

8668

8669 #: builtin/replace.c:19

8593 -msgid "git replace -l [<pattern>]"

8594 -msgstr "git replace -l [<模式>]"

8670 +msgid "git replace [--format=<format>] [-l [<pattern>]]"

8671 +msgstr "git replace [--format=<格式>] [-l [<模式>]]"

8672

8596 -#: builtin/replace.c:131

8673 +#: builtin/replace.c:174

8674 msgid "list replace refs"

8675 msgstr "列出替换的引用"

8676

8600 -#: builtin/replace.c:132

8677 +#: builtin/replace.c:175

8678 msgid "delete replace refs"

8679 msgstr "删除替换的引用"

8680

8604 -#: builtin/replace.c:133

8681 +#: builtin/replace.c:176

8682 msgid "replace the ref if it exists"

8683 msgstr "如果存在则替换引用"

8684

8685 +#: builtin/replace.c:177

8686 +msgid "use this format"

8687 +msgstr "使用此格式"

8688 +

8689 #: builtin/rerere.c:12

@@ -8738,19 +8819,23 @@ msgstr "不能重置索引文件至版本 '%s'。"

8819 msgid "Could not write new index file."

8820 msgstr "不能写入新的索引文件。"

8821

8741 -#: builtin/rev-parse.c:345

8822 +#: builtin/rev-parse.c:359

8823 msgid "git rev-parse --parseopt [options] -- [<args>...]"

8824 msgstr "git rev-parse --parseopt [选项] -- [<参数>...]"

8825

8745 -#: builtin/rev-parse.c:350

8826 +#: builtin/rev-parse.c:364

8827 msgid "keep the `--` passed as an arg"

8828 msgstr "保持 `--` 作为一个参数传递"

8829

8749 -#: builtin/rev-parse.c:352

8830 +#: builtin/rev-parse.c:366

8831 msgid "stop parsing after the first non-option argument"

8832 msgstr "遇到第一个非选项参数后停止解析"

8833

8753 -#: builtin/rev-parse.c:470

8834 +#: builtin/rev-parse.c:369

8835 +msgid "output in stuck long form"

8836 +msgstr "以固定长格式输出"

8837 +

8838 +#: builtin/rev-parse.c:486

8839 msgid ""

8840 "git rev-parse --parseopt [options] -- [<args>...]\n"

8841 " or: git rev-parse --sq-quote [<arg>...]\n"

@@ -8988,67 +9073,67 @@ msgstr ""

9073 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"

9074 msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"

9075

8991 -#: builtin/show-branch.c:650

9076 +#: builtin/show-branch.c:649

9077 msgid "show remote-tracking and local branches"

9078 msgstr "显示远程跟踪的和本地的分支"

9079

8995 -#: builtin/show-branch.c:652

9080 +#: builtin/show-branch.c:651

9081 msgid "show remote-tracking branches"

9082 msgstr "显示远程跟踪的分支"

9083

8999 -#: builtin/show-branch.c:654

9084 +#: builtin/show-branch.c:653

9085 msgid "color '*!+-' corresponding to the branch"

9086 msgstr "着色 '*!+-' 到相应的分支"

9087

9003 -#: builtin/show-branch.c:656

9088 +#: builtin/show-branch.c:655

9089 msgid "show <n> more commits after the common ancestor"

9090 msgstr "显示共同祖先后的 <n> 个提交"

9091

9007 -#: builtin/show-branch.c:658

9092 +#: builtin/show-branch.c:657

9093 msgid "synonym to more=-1"

9094 msgstr "和 more=-1 同义"

9095

9011 -#: builtin/show-branch.c:659

9096 +#: builtin/show-branch.c:658

9097 msgid "suppress naming strings"

9098 msgstr "不显示字符串命名"

9099

9015 -#: builtin/show-branch.c:661

9100 +#: builtin/show-branch.c:660

9101 msgid "include the current branch"

9102 msgstr "包括当前分支"

9103

9019 -#: builtin/show-branch.c:663

9104 +#: builtin/show-branch.c:662

9105 msgid "name commits with their object names"

9106 msgstr "以对象名字命名提交"

9107

9023 -#: builtin/show-branch.c:665

9108 +#: builtin/show-branch.c:664

9109 msgid "show possible merge bases"

9110 msgstr "显示可能合并的基线"

9111

9027 -#: builtin/show-branch.c:667

9112 +#: builtin/show-branch.c:666

9113 msgid "show refs unreachable from any other ref"

9114 msgstr "显示没有任何引用的的引用"

9115

9031 -#: builtin/show-branch.c:669

9116 +#: builtin/show-branch.c:668

9117 msgid "show commits in topological order"

9118 msgstr "以拓扑顺序显示提交"

9119

9035 -#: builtin/show-branch.c:672

9120 +#: builtin/show-branch.c:671

9121 msgid "show only commits not on the first branch"

9122 msgstr "只显示不在第一个分支上的提交"

9123

9039 -#: builtin/show-branch.c:674

9124 +#: builtin/show-branch.c:673

9125 msgid "show merges reachable from only one tip"

9126 msgstr "显示仅一个分支可访问的合并提交"

9127

9043 -#: builtin/show-branch.c:676

9128 +#: builtin/show-branch.c:675

9129 msgid "topologically sort, maintaining date order where possible"

9130 msgstr "拓扑方式排序，并尽可能地保持日期顺序"

9131

9047 -#: builtin/show-branch.c:679

9132 +#: builtin/show-branch.c:678

9133 msgid "<n>[,<base>]"

9134 msgstr "<n>[,<base>]"

9135

9051 -#: builtin/show-branch.c:680

9136 +#: builtin/show-branch.c:679

9137 msgid "show <n> most recent ref-log entries starting at base"

9138 msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"

9139

@@ -9533,15 +9618,15 @@ msgstr "逾期日期"

9618 msgid "no-op (backward compatibility)"

9619 msgstr "空操作（向后兼容）"

9620

9536 -#: parse-options.h:238

9621 +#: parse-options.h:235

9622 msgid "be more verbose"

9623 msgstr "更加详细"

9624

9540 -#: parse-options.h:240

9625 +#: parse-options.h:237

9626 msgid "be more quiet"

9627 msgstr "更加安静"

9628

9544 -#: parse-options.h:246

9629 +#: parse-options.h:243

9630 msgid "use <n> digits to display SHA-1s"

9631 msgstr "用 <n> 位数字显示 SHA-1 哈希值"

9632

@@ -9833,8 +9918,8 @@ msgid ""

9918 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"

9919

9920 #: git-bisect.sh:140

9836 -msgid "won't bisect on seeked tree"

9837 -msgstr "不会在已查找过的树上二分查找"

9921 +msgid "won't bisect on cg-seek'ed tree"

9922 +msgstr "不会在做了 cg-seek 的树上做二分查找"

9923

9924 #: git-bisect.sh:144

9925 msgid "Bad HEAD - strange symbolic ref"

@@ -9979,7 +10064,7 @@ msgstr "更新尚未诞生的分支，变更添加至索引"

10064 #. The working tree and the index file is still based on the

10065 #. $orig_head commit, but we are merging into $curr_head.

10066 #. First update the working tree to match $curr_head.

9982 -#: git-pull.sh:255

10067 +#: git-pull.sh:247

10068 #, sh-format

10069 msgid ""

10070 "Warning: fetch updated the current branch head.\n"

@@ -9989,15 +10074,15 @@ msgstr ""

10074 "警告：fetch 更新了当前的分支。您的工作区\n"

10075 "警告：从原提交 $orig_head 快进。"

10076

9992 -#: git-pull.sh:280

10077 +#: git-pull.sh:272

10078 msgid "Cannot merge multiple branches into empty head"

10079 msgstr "无法将多个分支合并到空分支"

10080

9996 -#: git-pull.sh:284

10081 +#: git-pull.sh:276

10082 msgid "Cannot rebase onto multiple branches"

10083 msgstr "无法变基到多个分支"

10084

10000 -#: git-rebase.sh:54

10085 +#: git-rebase.sh:55

10086 msgid ""

10087 "When you have resolved this problem, run \"git rebase --continue\".\n"

10088 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"

@@ -10008,16 +10093,16 @@ msgstr ""

10093 "如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n"

10094 "要恢复原分支并停止变基，执行 \"git rebase --abort\"。"

10095

10011 -#: git-rebase.sh:156

10096 +#: git-rebase.sh:158

10097 msgid "Applied autostash."

10098 msgstr "成功应用 autostash。"

10099

10015 -#: git-rebase.sh:159

10100 +#: git-rebase.sh:161

10101 #, sh-format

10102 msgid "Cannot store $stash_sha1"

10103 msgstr "无法保存 $stash_sha1"

10104

10020 -#: git-rebase.sh:160

10105 +#: git-rebase.sh:162

10106 msgid ""

10107 "Applying autostash resulted in conflicts.\n"

10108 "Your changes are safe in the stash.\n"

@@ -10027,31 +10112,31 @@ msgstr ""

10112 "您的修改安全地保存在 stash 中。\n"

10113 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"

10114

10030 -#: git-rebase.sh:199

10115 +#: git-rebase.sh:201

10116 msgid "The pre-rebase hook refused to rebase."

10117 msgstr "钩子 pre-rebase 拒绝变基。"

10118

10034 -#: git-rebase.sh:204

10119 +#: git-rebase.sh:206

10120 msgid "It looks like git-am is in progress. Cannot rebase."

10121 msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"

10122

10038 -#: git-rebase.sh:338

10123 +#: git-rebase.sh:346

10124 msgid "The --exec option must be used with the --interactive option"

10125 msgstr "选项 --exec 必须和选项 --interactive 同时使用"

10126

10042 -#: git-rebase.sh:343

10127 +#: git-rebase.sh:351

10128 msgid "No rebase in progress?"

10129 msgstr "没有正在进行的变基？"

10130

10046 -#: git-rebase.sh:354

10131 +#: git-rebase.sh:362

10132 msgid "The --edit-todo action can only be used during interactive rebase."

10133 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"

10134

10050 -#: git-rebase.sh:361

10135 +#: git-rebase.sh:369

10136 msgid "Cannot read HEAD"

10137 msgstr "不能读取 HEAD"

10138

10054 -#: git-rebase.sh:364

10139 +#: git-rebase.sh:372

10140 msgid ""

10141 "You must edit all merge conflicts and then\n"

10142 "mark them as resolved using git add"

@@ -10059,12 +10144,12 @@ msgstr ""

10144 "您必须编辑所有的合并冲突，然后通过 git add\n"

10145 "命令将它们标记为已解决"

10146

10062 -#: git-rebase.sh:382

10147 +#: git-rebase.sh:390

10148 #, sh-format

10149 msgid "Could not move back to $head_name"

10150 msgstr "无法移回 $head_name"

10151

10067 -#: git-rebase.sh:401

10152 +#: git-rebase.sh:409

10153 #, sh-format

10154 msgid ""

10155 "It seems that there is already a $state_dir_base directory, and\n"

@@ -10083,65 +10168,65 @@ msgstr ""

10168 "\t$cmd_clear_stale_rebase\n"

10169 "然后再重新执行变基。为避免您丢失重要数据，我已经停止当前操作。"

10170

10086 -#: git-rebase.sh:446

10171 +#: git-rebase.sh:456

10172 #, sh-format

10173 msgid "invalid upstream $upstream_name"

10174 msgstr "无效的上游 $upstream_name"

10175

10091 -#: git-rebase.sh:470

10176 +#: git-rebase.sh:480

10177 #, sh-format

10178 msgid "$onto_name: there are more than one merge bases"

10179 msgstr "$onto_name: 有一个以上的合并基准"

10180

10096 -#: git-rebase.sh:473 git-rebase.sh:477

10181 +#: git-rebase.sh:483 git-rebase.sh:487

10182 #, sh-format

10183 msgid "$onto_name: there is no merge base"

10184 msgstr "$onto_name: 没有合并基准"

10185

10101 -#: git-rebase.sh:482

10186 +#: git-rebase.sh:492

10187 #, sh-format

10188 msgid "Does not point to a valid commit: $onto_name"

10189 msgstr "没有指向一个有效的提交：$onto_name"

10190

10106 -#: git-rebase.sh:505

10191 +#: git-rebase.sh:515

10192 #, sh-format

10193 msgid "fatal: no such branch: $branch_name"

10194 msgstr "严重错误：无此分支：$branch_name"

10195

10111 -#: git-rebase.sh:528

10196 +#: git-rebase.sh:548

10197 msgid "Cannot autostash"

10198 msgstr "无法 autostash"

10199

10115 -#: git-rebase.sh:533

10200 +#: git-rebase.sh:553

10201 #, sh-format

10202 msgid "Created autostash: $stash_abbrev"

10203 msgstr "创建了 autostash: $stash_abbrev"

10204

10120 -#: git-rebase.sh:537

10205 +#: git-rebase.sh:557

10206 msgid "Please commit or stash them."

10207 msgstr "请提交或为它们保存进度。"

10208

10124 -#: git-rebase.sh:557

10209 +#: git-rebase.sh:577

10210 #, sh-format

10211 msgid "Current branch $branch_name is up to date."

10212 msgstr "当前分支 $branch_name 是最新的。"

10213

10129 -#: git-rebase.sh:561

10214 +#: git-rebase.sh:581

10215 #, sh-format

10216 msgid "Current branch $branch_name is up to date, rebase forced."

10217 msgstr "当前分支 $branch_name 是最新的，强制变基。"

10218

10134 -#: git-rebase.sh:572

10219 +#: git-rebase.sh:592

10220 #, sh-format

10221 msgid "Changes from $mb to $onto:"

10222 msgstr "变更从 $mb 到 $onto："

10223

10224 #. Detach HEAD and reset the tree

10140 -#: git-rebase.sh:581

10225 +#: git-rebase.sh:601

10226 msgid "First, rewinding head to replay your work on top of it..."

10227 msgstr "首先，重置头指针以便在上面重放您的工作..."

10228

10144 -#: git-rebase.sh:591

10229 +#: git-rebase.sh:611

10230 #, sh-format

10231 msgid "Fast-forwarded $branch_name to $onto_name."

10232 msgstr "快进 $branch_name 至 $onto_name。"

@@ -10384,75 +10469,75 @@ msgstr "无法注册子模组 '$sm_path'"

10469 msgid "Entering '$prefix$displaypath'"

10470 msgstr "正在进入 '$prefix$displaypath'"

10471

10387 -#: git-submodule.sh:554

10472 +#: git-submodule.sh:559

10473 #, sh-format

10474 msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."

10475 msgstr "停止于 '$prefix$displaypath'，脚本返回非零值。"

10476

10392 -#: git-submodule.sh:600

10477 +#: git-submodule.sh:605

10478 #, sh-format

10479 msgid "No url found for submodule path '$displaypath' in .gitmodules"

10480 msgstr "在 .gitmodules 中未找到子模组路径 '$displaypath' 的 url"

10481

10397 -#: git-submodule.sh:609

10482 +#: git-submodule.sh:614

10483 #, sh-format

10484 msgid "Failed to register url for submodule path '$displaypath'"

10485 msgstr "无法为子模组路径 '$displaypath' 注册 url"

10486

10402 -#: git-submodule.sh:611

10487 +#: git-submodule.sh:616

10488 #, sh-format

10489 msgid "Submodule '$name' ($url) registered for path '$displaypath'"

10490 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"

10491

10407 -#: git-submodule.sh:619

10492 +#: git-submodule.sh:633

10493 #, sh-format

10494 msgid "Failed to register update mode for submodule path '$displaypath'"

10495 msgstr "无法为子模组路径 '$displaypath' 注册更新模式"

10496

10412 -#: git-submodule.sh:656

10497 +#: git-submodule.sh:671

10498 #, sh-format

10499 msgid "Use '.' if you really want to deinitialize all submodules"

10500 msgstr "使用 '.' 如果您真的想要对所有子模组取消初始化"

10501

10417 -#: git-submodule.sh:673

10502 +#: git-submodule.sh:688

10503 #, sh-format

10504 msgid "Submodule work tree '$displaypath' contains a .git directory"

10505 msgstr "子模组工作区 '$displaypath' 包含一个 .git 目录"

10506

10422 -#: git-submodule.sh:674

10507 +#: git-submodule.sh:689

10508 #, sh-format

10509 msgid ""

10510 "(use 'rm -rf' if you really want to remove it including all of its history)"

10511 msgstr "（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）"

10512

10428 -#: git-submodule.sh:680

10513 +#: git-submodule.sh:695

10514 #, sh-format

10515 msgid ""

10516 "Submodule work tree '$displaypath' contains local modifications; use '-f' to "

10517 "discard them"

10518 msgstr "子模组工作区 '$displaypath' 包含本地修改；使用 '-f' 丢弃它们"

10519

10435 -#: git-submodule.sh:683

10520 +#: git-submodule.sh:698

10521 #, sh-format

10522 msgid "Cleared directory '$displaypath'"

10523 msgstr "已清除目录 '$displaypath'"

10524

10440 -#: git-submodule.sh:684

10525 +#: git-submodule.sh:699

10526 #, sh-format

10527 msgid "Could not remove submodule work tree '$displaypath'"

10528 msgstr "无法移除子模组工作区 '$displaypath'"

10529

10445 -#: git-submodule.sh:687

10530 +#: git-submodule.sh:702

10531 #, sh-format

10532 msgid "Could not create empty submodule directory '$displaypath'"

10533 msgstr "不能创建空的子模组目录 '$displaypath'"

10534

10450 -#: git-submodule.sh:696

10535 +#: git-submodule.sh:711

10536 #, sh-format

10537 msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"

10538 msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"

10539

10455 -#: git-submodule.sh:811

10540 +#: git-submodule.sh:834

10541 #, sh-format

10542 msgid ""

10543 "Submodule path '$displaypath' not initialized\n"

@@ -10461,109 +10546,159 @@ msgstr ""

10546 "子模组路径 '$displaypath' 没有初始化\n"

10547 "也许您想用 'update --init'？"

10548

10464 -#: git-submodule.sh:824

10549 +#: git-submodule.sh:847

10550 #, sh-format

10551 msgid "Unable to find current revision in submodule path '$displaypath'"

10552 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"

10553

10469 -#: git-submodule.sh:833

10554 +#: git-submodule.sh:856

10555 #, sh-format

10556 msgid "Unable to fetch in submodule path '$sm_path'"

10557 msgstr "无法在子模组路径 '$sm_path' 中获取"

10558

10474 -#: git-submodule.sh:857

10559 +#: git-submodule.sh:880

10560 #, sh-format

10561 msgid "Unable to fetch in submodule path '$displaypath'"

10562 msgstr "无法在子模组路径 '$displaypath' 中获取"

10563

10479 -#: git-submodule.sh:871

10564 +#: git-submodule.sh:894

10565 #, sh-format

10566 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"

10567 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"

10568

10484 -#: git-submodule.sh:872

10569 +#: git-submodule.sh:895

10570 #, sh-format

10571 msgid "Submodule path '$displaypath': rebased into '$sha1'"

10572 msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"

10573

10489 -#: git-submodule.sh:877

10574 +#: git-submodule.sh:900

10575 #, sh-format

10576 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"

10577 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"

10578

10494 -#: git-submodule.sh:878

10579 +#: git-submodule.sh:901

10580 #, sh-format

10581 msgid "Submodule path '$displaypath': merged in '$sha1'"

10582 msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"

10583

10499 -#: git-submodule.sh:883

10584 +#: git-submodule.sh:906

10585 #, sh-format

10586 msgid ""

10587 "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"

10588 msgstr "在子模组路径 '$prefix$sm_path' 中执行 '$command $sha1' 失败"

10589

10505 -#: git-submodule.sh:884

10590 +#: git-submodule.sh:907

10591 #, sh-format

10592 msgid "Submodule path '$prefix$sm_path': '$command $sha1'"

10593 msgstr "子模组路径 '$prefix$sm_path': '$command $sha1'"

10594

10510 -#: git-submodule.sh:889

10595 +#: git-submodule.sh:912

10596 #, sh-format

10597 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"

10598 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"

10599

10515 -#: git-submodule.sh:890

10600 +#: git-submodule.sh:913

10601 #, sh-format

10602 msgid "Submodule path '$displaypath': checked out '$sha1'"

10603 msgstr "子模组路径 '$displaypath'：检出 '$sha1'"

10604

10520 -#: git-submodule.sh:917

10605 +#: git-submodule.sh:940

10606 #, sh-format

10607 msgid "Failed to recurse into submodule path '$displaypath'"

10608 msgstr "无法递归进子模组路径 '$displaypath'"

10609

10525 -#: git-submodule.sh:1025

10610 +#: git-submodule.sh:1048

10611 msgid "The --cached option cannot be used with the --files option"

10612 msgstr "选项 --cached 不能和选项 --files 同时使用"

10613

10614 #. unexpected type

10530 -#: git-submodule.sh:1073

10615 +#: git-submodule.sh:1096

10616 #, sh-format

10617 msgid "unexpected mode $mod_dst"

10618 msgstr "意外的模式 $mod_dst"

10619

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

10536 -#: git-submodule.sh:1093

10621 +#: git-submodule.sh:1116

10622 #, sh-format

10623 msgid " Warn: $display_name doesn't contain commit $sha1_src"

10624 msgstr " 警告：$display_name 未包含提交 $sha1_src"

10625

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

10542 -#: git-submodule.sh:1096

10627 +#: git-submodule.sh:1119

10628 #, sh-format

10629 msgid " Warn: $display_name doesn't contain commit $sha1_dst"

10630 msgstr " 警告：$display_name 未包含提交 $sha1_dst"

10631

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

10548 -#: git-submodule.sh:1099

10633 +#: git-submodule.sh:1122

10634 #, sh-format

10635 msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"

10636 msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"

10637

10553 -#: git-submodule.sh:1124

10638 +#: git-submodule.sh:1147

10639 msgid "blob"

10640 msgstr "数据对象"

10641

10557 -#: git-submodule.sh:1238

10642 +#: git-submodule.sh:1261

10643 #, sh-format

10644 msgid "Failed to recurse into submodule path '$sm_path'"

10645 msgstr "无法递归进子模组路径 '$sm_path'"

10646

10562 -#: git-submodule.sh:1302

10647 +#: git-submodule.sh:1325

10648 #, sh-format

10649 msgid "Synchronizing submodule url for '$displaypath'"

10650 msgstr "为 '$displaypath' 同步子模组 url"

10651

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

10653 +#~ msgid "copied: %s -> %s"

10654 +#~ msgstr "拷贝： %s -> %s"

10655 +

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

10657 +#~ msgid "deleted: %s"

10658 +#~ msgstr "删除： %s"

10659 +

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

10661 +#~ msgid "modified: %s"

10662 +#~ msgstr "修改： %s"

10663 +

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

10665 +#~ msgid "renamed: %s -> %s"

10666 +#~ msgstr "重命名： %s -> %s"

10667 +

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

10669 +#~ msgid "unmerged: %s"

10670 +#~ msgstr "未合并： %s"

10671 +

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

10673 +#~ msgid ""

10674 +#~ "push.default is unset; its implicit value is changing in\n"

10675 +#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"

10676 +#~ "and maintain the current behavior after the default changes, use:\n"

10677 +#~ "\n"

10678 +#~ " git config --global push.default matching\n"

10679 +#~ "\n"

10680 +#~ "To squelch this message and adopt the new behavior now, use:\n"

10681 +#~ "\n"

10682 +#~ " git config --global push.default simple\n"

10683 +#~ "\n"

10684 +#~ "See 'git help config' and search for 'push.default' for further "

10685 +#~ "information.\n"

10686 +#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"

10687 +#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"

10688 +#~ msgstr ""

10689 +#~ "push.default 未设置，它的默认值将在 Git 2.0 由 'matching'\n"

10690 +#~ "改变为 'simple'。若要不再显示本信息并保持传统习惯，进行如下设置：\n"

10691 +#~ "\n"

10692 +#~ " git config --global push.default matching\n"

10693 +#~ "\n"

10694 +#~ "若要不再显示本信息并从现在开始采用新的使用习惯，设置：\n"

10695 +#~ "\n"

10696 +#~ " git config --global push.default simple\n"

10697 +#~ "\n"

10698 +#~ "参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"

10699 +#~ "（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n"

10700 +#~ "为保持兼容，请用 'current' 代替 'simple'）"

10701 +

10702 #~ msgid "done\n"

10703 #~ msgstr "完成\n"

10704

l10n: zh_CN.po: translate 27 messages (2210t0f0u)