94550ed38c · matheusbsbs/matheus-bagliano

@@ -87,6 +87,7 @@

87 # pickaxe | 挖掘

88 # plumbing | 管件（Git 底层核心命令的别称）

89 # porcelain | 瓷件（Git 上层封装命令的别称）

90 +# precious-objects repo | 珍品仓库

91 # prune | 清除

92 # pull | 拉，拉取

93 # push | 推，推送

@@ -134,8 +135,8 @@ msgid ""

135 msgstr ""

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

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

137 -"POT-Creation-Date: 2015-09-15 06:45+0800\n"

138 -"PO-Revision-Date: 2015-09-15 21:49+0800\n"

138 +"POT-Creation-Date: 2015-12-11 23:36+0800\n"

139 +"PO-Revision-Date: 2015-12-14 22:12+0800\n"

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

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

142 "Language: zh_CN\n"

@@ -157,12 +158,12 @@ msgstr ""

158 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"

159 "解决方案并提交。"

160

160 -#: advice.c:101 builtin/merge.c:1227

161 +#: advice.c:101 builtin/merge.c:1225

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

163 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"

164

165 #: advice.c:103

165 -msgid "Please, commit your changes before you can merge."

166 +msgid "Please, commit your changes before merging."

167 msgstr "请在合并前先提交您的修改。"

168

169 #: advice.c:104

@@ -187,76 +188,76 @@ msgstr ""

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

189 msgstr "git archive --remote <仓库> [--exec <命令>] --list"

190

190 -#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327

191 +#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327

192 #, c-format

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

194 msgstr "路径规格 '%s' 未匹配任何文件"

195

195 -#: archive.c:428

196 +#: archive.c:429

197 msgid "fmt"

198 msgstr "格式"

199

199 -#: archive.c:428

200 +#: archive.c:429

201 msgid "archive format"

202 msgstr "归档格式"

203

203 -#: archive.c:429 builtin/log.c:1229

204 +#: archive.c:430 builtin/log.c:1228

205 msgid "prefix"

206 msgstr "前缀"

207

207 -#: archive.c:430

208 +#: archive.c:431

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

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

211

211 -#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516

212 -#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987

213 -#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99

212 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535

213 +#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987

214 +#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99

215 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395

216 #: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153

217 msgid "file"

218 msgstr "文件"

219

219 -#: archive.c:432 builtin/archive.c:89

220 +#: archive.c:433 builtin/archive.c:89

221 msgid "write the archive to this file"

222 msgstr "归档写入此文件"

223

223 -#: archive.c:434

224 +#: archive.c:435

225 msgid "read .gitattributes in working directory"

226 msgstr "读取工作区中的 .gitattributes"

227

227 -#: archive.c:435

228 +#: archive.c:436

229 msgid "report archived files on stderr"

230 msgstr "在标准错误上报告归档文件"

231

231 -#: archive.c:436

232 +#: archive.c:437

233 msgid "store only"

234 msgstr "只存储"

235

235 -#: archive.c:437

236 +#: archive.c:438

237 msgid "compress faster"

238 msgstr "压缩速度更快"

239

239 -#: archive.c:445

240 +#: archive.c:446

241 msgid "compress better"

242 msgstr "压缩效果更好"

243

243 -#: archive.c:448

244 +#: archive.c:449

245 msgid "list supported archive formats"

246 msgstr "列出支持的归档格式"

247

247 -#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77

248 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77

249 msgid "repo"

250 msgstr "仓库"

251

251 -#: archive.c:451 builtin/archive.c:91

252 +#: archive.c:452 builtin/archive.c:91

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

254 msgstr "从远程仓库（<仓库>）提取归档文件"

255

255 -#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479

256 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479

257 msgid "command"

258 msgstr "命令"

259

259 -#: archive.c:453 builtin/archive.c:93

260 +#: archive.c:454 builtin/archive.c:93

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

262 msgstr "远程 git-upload-archive 命令的路径"

263

@@ -268,81 +269,81 @@ msgstr ""

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

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

271

271 -#: branch.c:60

272 +#: branch.c:61

273 #, c-format

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

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

276

276 -#: branch.c:83

277 +#: branch.c:84

278 #, c-format

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

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

281

281 -#: branch.c:84

282 +#: branch.c:85

283 #, c-format

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

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

286

286 -#: branch.c:88

287 +#: branch.c:89

288 #, c-format

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

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

291

291 -#: branch.c:89

292 +#: branch.c:90

293 #, c-format

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

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

296

296 -#: branch.c:94

297 +#: branch.c:95

298 #, c-format

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

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

301

301 -#: branch.c:95

302 +#: branch.c:96

303 #, c-format

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

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

306

306 -#: branch.c:99

307 +#: branch.c:100

308 #, c-format

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

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

311

311 -#: branch.c:100

312 +#: branch.c:101

313 #, c-format

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

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

316

316 -#: branch.c:133

317 +#: branch.c:134

318 #, c-format

319 msgid "Not tracking: ambiguous information for ref %s"

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

321

321 -#: branch.c:162

322 +#: branch.c:163

323 #, c-format

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

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

326

326 -#: branch.c:167

327 +#: branch.c:168

328 #, c-format

329 msgid "A branch named '%s' already exists."

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

331

331 -#: branch.c:175

332 +#: branch.c:176

333 msgid "Cannot force update the current branch."

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

335

335 -#: branch.c:195

336 +#: branch.c:196

337 #, c-format

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

339 msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"

340

340 -#: branch.c:197

341 +#: branch.c:198

342 #, c-format

343 msgid "the requested upstream branch '%s' does not exist"

344 msgstr "请求的上游分支 '%s' 不存在"

345

345 -#: branch.c:199

346 +#: branch.c:200

347 msgid ""

348 "\n"

349 "If you are planning on basing your work on an upstream\n"

@@ -360,22 +361,22 @@ msgstr ""

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

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

363

363 -#: branch.c:243

364 +#: branch.c:244

365 #, c-format

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

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

368

368 -#: branch.c:263

369 +#: branch.c:264

370 #, c-format

371 msgid "Ambiguous object name: '%s'."

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

373

373 -#: branch.c:268

374 +#: branch.c:269

375 #, c-format

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

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

378

378 -#: branch.c:399

379 +#: branch.c:322

380 #, c-format

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

382 msgstr "'%s' 已经检出到 '%s'"

@@ -390,7 +391,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件"

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

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

393

393 -#: bundle.c:87 builtin/commit.c:765

394 +#: bundle.c:87 builtin/commit.c:766

395 #, c-format

396 msgid "could not open '%s'"

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

@@ -399,9 +400,9 @@ msgstr "不能打开 '%s'"

400 msgid "Repository lacks these prerequisite commits:"

401 msgstr "仓库中缺少这些必备的提交："

402

402 -#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708

403 -#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334

404 -#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358

403 +#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083

404 +#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334

405 +#: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358

406 #: builtin/shortlog.c:158

407 msgid "revision walk setup failed"

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

@@ -441,7 +442,7 @@ msgstr "rev-list 终止"

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

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

444

444 -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261

445 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261

446 #, c-format

447 msgid "unrecognized argument: %s"

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

@@ -459,13 +460,13 @@ msgstr "不能创建 '%s'"

460 msgid "index-pack died"

461 msgstr "index-pack 终止"

462

462 -#: color.c:260

463 +#: color.c:275

464 #, c-format

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

466 msgstr "无效的颜色值：%.*s"

467

467 -#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516

468 -#: builtin/am.c:2128

468 +#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520

469 +#: builtin/am.c:2149

470 #, c-format

471 msgid "could not parse %s"

472 msgstr "不能解析 %s"

@@ -624,23 +625,23 @@ msgid "Performing inexact rename detection"

625 msgstr "正在进行非精确的重命名检测"

626

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

627 -#: diff.c:116

628 +#: diff.c:115

629 #, c-format

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

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

632

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

633 -#: diff.c:121

634 +#: diff.c:120

635 #, c-format

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

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

638

638 -#: diff.c:216

639 +#: diff.c:215

640 #, c-format

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

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

643

643 -#: diff.c:268

644 +#: diff.c:267

645 #, c-format

646 msgid ""

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

@@ -649,16 +650,16 @@ msgstr ""

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

651 "%s"

652

652 -#: diff.c:2998

653 +#: diff.c:3000

654 #, c-format

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

656 msgstr "外部 diff 退出，停止在 %s"

657

657 -#: diff.c:3394

658 +#: diff.c:3396

659 msgid "--follow requires exactly one pathspec"

660 msgstr "--follow 参数后只跟一个 pathspec"

661

661 -#: diff.c:3557

662 +#: diff.c:3559

663 #, c-format

664 msgid ""

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

@@ -667,16 +668,16 @@ msgstr ""

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

669 "%s"

670

670 -#: diff.c:3571

671 +#: diff.c:3573

672 #, c-format

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

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

675

675 -#: dir.c:1853

676 +#: dir.c:1915

677 msgid "failed to get kernel name and information"

678 msgstr "无法获得内核名称和信息"

679

679 -#: dir.c:1936

680 +#: dir.c:1998

681 msgid "Untracked cache is disabled on this system."

682 msgstr "缓存未跟踪文件在本系统被禁用"

683

@@ -785,8 +786,8 @@ msgstr "%s：%s - %s"

786 msgid "failed to read the cache"

787 msgstr "无法读取缓存"

788

788 -#: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375

789 -#: builtin/checkout.c:586 builtin/clone.c:715

789 +#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376

790 +#: builtin/checkout.c:587 builtin/clone.c:722

791 msgid "unable to write new index file"

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

793

@@ -804,64 +805,64 @@ msgstr "为路径 '%s' addinfo_cache 失败"

805 msgid "error building trees"

806 msgstr "无法创建树"

807

807 -#: merge-recursive.c:687

808 +#: merge-recursive.c:686

809 #, c-format

810 msgid "failed to create path '%s'%s"

811 msgstr "无法创建路径 '%s'%s"

812

812 -#: merge-recursive.c:698

813 +#: merge-recursive.c:697

814 #, c-format

815 msgid "Removing %s to make room for subdirectory\n"

816 msgstr "删除 %s 以便为子目录留出空间\n"

817

817 -#: merge-recursive.c:712 merge-recursive.c:733

818 +#: merge-recursive.c:711 merge-recursive.c:732

819 msgid ": perhaps a D/F conflict?"

820 msgstr "：可能是一个目录/文件冲突？"

821

821 -#: merge-recursive.c:723

822 +#: merge-recursive.c:722

823 #, c-format

824 msgid "refusing to lose untracked file at '%s'"

825 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"

826

826 -#: merge-recursive.c:763

827 +#: merge-recursive.c:762

828 #, c-format

829 msgid "cannot read object %s '%s'"

830 msgstr "不能读取对象 %s '%s'"

831

831 -#: merge-recursive.c:765

832 +#: merge-recursive.c:764

833 #, c-format

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

835 msgstr "%s '%s' 应为数据对象"

836

836 -#: merge-recursive.c:788 builtin/clone.c:364

837 +#: merge-recursive.c:787 builtin/clone.c:369

838 #, c-format

839 msgid "failed to open '%s'"

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

841

841 -#: merge-recursive.c:796

842 +#: merge-recursive.c:795

843 #, c-format

844 msgid "failed to symlink '%s'"

845 msgstr "无法创建符号链接 '%s'"

846

846 -#: merge-recursive.c:799

847 +#: merge-recursive.c:798

848 #, c-format

849 msgid "do not know what to do with %06o %s '%s'"

850 msgstr "不知道如何处理 %06o %s '%s'"

851

851 -#: merge-recursive.c:937

852 +#: merge-recursive.c:936

853 msgid "Failed to execute internal merge"

854 msgstr "无法执行内部合并"

855

855 -#: merge-recursive.c:941

856 +#: merge-recursive.c:940

857 #, c-format

858 msgid "Unable to add %s to database"

859 msgstr "不能添加 %s 至对象库"

860

860 -#: merge-recursive.c:957

861 +#: merge-recursive.c:956

862 msgid "unsupported object type in the tree"

863 msgstr "在树中有不支持的对象类型"

864

864 -#: merge-recursive.c:1032 merge-recursive.c:1046

865 +#: merge-recursive.c:1031 merge-recursive.c:1045

866 #, c-format

867 msgid ""

868 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -870,7 +871,7 @@ msgstr ""

871 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

872 "的版本被保留。"

873

873 -#: merge-recursive.c:1038 merge-recursive.c:1051

874 +#: merge-recursive.c:1037 merge-recursive.c:1050

875 #, c-format

876 msgid ""

877 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -879,20 +880,20 @@ msgstr ""

880 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"

881 "的版本保留于 %8$s 中。"

882

882 -#: merge-recursive.c:1092

883 +#: merge-recursive.c:1091

884 msgid "rename"

885 msgstr "重命名"

886

886 -#: merge-recursive.c:1092

887 +#: merge-recursive.c:1091

888 msgid "renamed"

889 msgstr "重命名"

890

890 -#: merge-recursive.c:1148

891 +#: merge-recursive.c:1147

892 #, c-format

893 msgid "%s is a directory in %s adding as %s instead"

894 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"

895

895 -#: merge-recursive.c:1170

896 +#: merge-recursive.c:1169

897 #, c-format

898 msgid ""

899 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -901,144 +902,144 @@ msgstr ""

902 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "

903 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"

904

904 -#: merge-recursive.c:1175

905 +#: merge-recursive.c:1174

906 msgid " (left unresolved)"

907 msgstr "（留下未解决）"

908

908 -#: merge-recursive.c:1229

909 +#: merge-recursive.c:1228

910 #, c-format

911 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

912 msgstr ""

913 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"

914 "%5$s"

915

915 -#: merge-recursive.c:1259

916 +#: merge-recursive.c:1258

917 #, c-format

918 msgid "Renaming %s to %s and %s to %s instead"

919 msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"

920

920 -#: merge-recursive.c:1458

921 +#: merge-recursive.c:1457

922 #, c-format

923 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

924 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"

925

925 -#: merge-recursive.c:1468

926 +#: merge-recursive.c:1467

927 #, c-format

928 msgid "Adding merged %s"

929 msgstr "添加合并后的 %s"

930

930 -#: merge-recursive.c:1473 merge-recursive.c:1671

931 +#: merge-recursive.c:1472 merge-recursive.c:1674

932 #, c-format

933 msgid "Adding as %s instead"

934 msgstr "而是以 %s 为名添加"

935

935 -#: merge-recursive.c:1524

936 +#: merge-recursive.c:1523

937 #, c-format

938 msgid "cannot read object %s"

939 msgstr "不能读取对象 %s"

940

940 -#: merge-recursive.c:1527

941 +#: merge-recursive.c:1526

942 #, c-format

943 msgid "object %s is not a blob"

944 msgstr "对象 %s 不是一个数据对象"

945

945 -#: merge-recursive.c:1575

946 +#: merge-recursive.c:1578

947 msgid "modify"

948 msgstr "修改"

949

949 -#: merge-recursive.c:1575

950 +#: merge-recursive.c:1578

951 msgid "modified"

952 msgstr "修改"

953

953 -#: merge-recursive.c:1585

954 +#: merge-recursive.c:1588

955 msgid "content"

956 msgstr "内容"

957

957 -#: merge-recursive.c:1592

958 +#: merge-recursive.c:1595

959 msgid "add/add"

960 msgstr "添加/添加"

961

961 -#: merge-recursive.c:1626

962 +#: merge-recursive.c:1629

963 #, c-format

964 msgid "Skipped %s (merged same as existing)"

965 msgstr "略过 %s（已经做过相同合并）"

966

966 -#: merge-recursive.c:1640

967 +#: merge-recursive.c:1643

968 #, c-format

969 msgid "Auto-merging %s"

970 msgstr "自动合并 %s"

971

971 -#: merge-recursive.c:1644 git-submodule.sh:1150

972 +#: merge-recursive.c:1647 git-submodule.sh:1025

973 msgid "submodule"

974 msgstr "子模组"

975

975 -#: merge-recursive.c:1645

976 +#: merge-recursive.c:1648

977 #, c-format

978 msgid "CONFLICT (%s): Merge conflict in %s"

979 msgstr "冲突（%s）：合并冲突于 %s"

980

980 -#: merge-recursive.c:1731

981 +#: merge-recursive.c:1734

982 #, c-format

983 msgid "Removing %s"

984 msgstr "删除 %s"

985

985 -#: merge-recursive.c:1756

986 +#: merge-recursive.c:1759

987 msgid "file/directory"

988 msgstr "文件/目录"

989

989 -#: merge-recursive.c:1762

990 +#: merge-recursive.c:1765

991 msgid "directory/file"

992 msgstr "目录/文件"

993

993 -#: merge-recursive.c:1767

994 +#: merge-recursive.c:1770

995 #, c-format

996 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

997 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"

998

998 -#: merge-recursive.c:1777

999 +#: merge-recursive.c:1780

1000 #, c-format

1001 msgid "Adding %s"

1002 msgstr "添加 %s"

1003

1003 -#: merge-recursive.c:1794

1004 +#: merge-recursive.c:1797

1005 msgid "Fatal merge failure, shouldn't happen."

1006 msgstr "严重的合并错误，不应发生。"

1007

1007 -#: merge-recursive.c:1813

1008 +#: merge-recursive.c:1816

1009 msgid "Already up-to-date!"

1010 msgstr "已经是最新的！"

1011

1011 -#: merge-recursive.c:1822

1012 +#: merge-recursive.c:1825

1013 #, c-format

1014 msgid "merging of trees %s and %s failed"

1015 msgstr "无法合并树 %s 和 %s"

1016

1016 -#: merge-recursive.c:1852

1017 +#: merge-recursive.c:1855

1018 #, c-format

1019 msgid "Unprocessed path??? %s"

1020 msgstr "未处理的路径??? %s"

1021

1021 -#: merge-recursive.c:1900

1022 +#: merge-recursive.c:1903

1023 msgid "Merging:"

1024 msgstr "合并："

1025

1025 -#: merge-recursive.c:1913

1026 +#: merge-recursive.c:1916

1027 #, c-format

1028 msgid "found %u common ancestor:"

1029 msgid_plural "found %u common ancestors:"

1030 msgstr[0] "发现 %u 个共同祖先："

1031 msgstr[1] "发现 %u 个共同祖先："

1032

1032 -#: merge-recursive.c:1950

1033 +#: merge-recursive.c:1953

1034 msgid "merge returned no commit"

1035 msgstr "合并未返回提交"

1036

1036 -#: merge-recursive.c:2007

1037 +#: merge-recursive.c:2010

1038 #, c-format

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

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

1041

1041 -#: merge-recursive.c:2018 builtin/merge.c:645

1042 +#: merge-recursive.c:2021 builtin/merge.c:645

1043 msgid "Unable to write index."

1044 msgstr "不能写入索引。"

1045

@@ -1068,32 +1069,42 @@ msgstr "坏的 %s 值：'%s'"

1069 msgid "unable to parse object: %s"

1070 msgstr "不能解析对象：%s"

1071

1071 -#: parse-options.c:563

1072 +#: parse-options.c:570

1073 msgid "..."

1074 msgstr "..."

1075

1075 -#: parse-options.c:581

1076 +#: parse-options.c:588

1077 #, c-format

1078 msgid "usage: %s"

1079 msgstr "用法：%s"

1080

1081 #. TRANSLATORS: the colon here should align with the

1082 #. one in "usage: %s" translation

1082 -#: parse-options.c:585

1083 +#: parse-options.c:592

1084 #, c-format

1085 msgid " or: %s"

1086 msgstr " 或：%s"

1087

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

1088 -#: parse-options.c:588

1089 +#: parse-options.c:595

1090 #, c-format

1091 msgid " %s"

1092 msgstr " %s"

1093

1093 -#: parse-options.c:622

1094 +#: parse-options.c:629

1095 msgid "-NUM"

1096 msgstr "-数字"

1097

1098 +#: parse-options-cb.c:108

1099 +#, c-format

1100 +msgid "malformed object name '%s'"

1101 +msgstr "非法的对象名 '%s'"

1102 +

1103 +#: path.c:752

1104 +#, c-format

1105 +msgid "Could not make %s writable by group"

1106 +msgstr "不能设置 %s 为组可写"

1107 +

1108 #: pathspec.c:133

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

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

@@ -1160,11 +1171,11 @@ msgstr ""

1171 msgid "unable to parse --pretty format"

1172 msgstr "不能解析 --pretty 格式"

1173

1163 -#: progress.c:236

1174 +#: progress.c:235

1175 msgid "done"

1176 msgstr "完成"

1177

1167 -#: read-cache.c:1296

1178 +#: read-cache.c:1281

1179 #, c-format

1180 msgid ""

1181 "index.version set, but the value is invalid.\n"

@@ -1173,7 +1184,7 @@ msgstr ""

1184 "设置了 index.version，但是取值无效。\n"

1185 "使用版本 %i"

1186

1176 -#: read-cache.c:1306

1187 +#: read-cache.c:1291

1188 #, c-format

1189 msgid ""

1190 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -1182,118 +1193,163 @@ msgstr ""

1193 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"

1194 "使用版本 %i"

1195

1185 -#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1196 +#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1197 #: builtin/merge.c:983

1198 #, c-format

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

1200 msgstr "无法打开 '%s' 进行写入"

1201

1191 -#: refs.c:3001

1202 +#: refs/files-backend.c:2359

1203 #, c-format

1204 msgid "could not delete reference %s: %s"

1205 msgstr "无法删除引用 %s：%s"

1206

1196 -#: refs.c:3004

1207 +#: refs/files-backend.c:2362

1208 #, c-format

1209 msgid "could not delete references: %s"

1210 msgstr "无法删除引用：%s"

1211

1201 -#: refs.c:3013

1212 +#: refs/files-backend.c:2371

1213 #, c-format

1214 msgid "could not remove reference %s"

1215 msgstr "无法删除引用 %s"

1216

1206 -#: ref-filter.c:660

1217 +#: ref-filter.c:245

1218 +#, c-format

1219 +msgid "format: %%(end) atom used without corresponding atom"

1220 +msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"

1221 +

1222 +#: ref-filter.c:704

1223 +#, c-format

1224 +msgid "positive value expected contents:lines=%s"

1225 +msgstr "要为 contents:lines=%s 提供一个正数"

1226 +

1227 +#: ref-filter.c:833

1228 +#, c-format

1229 +msgid "expected format: %%(color:<color>)"

1230 +msgstr "期望的格式：%%(color:<color>)"

1231 +

1232 +#: ref-filter.c:835

1233 msgid "unable to parse format"

1234 msgstr "不能解析格式"

1235

1210 -#: remote.c:792

1236 +#: ref-filter.c:870

1237 +#, c-format

1238 +msgid "expected format: %%(align:<width>,<position>)"

1239 +msgstr "期望的格式：%%(align:<width>,<position>)"

1240 +

1241 +#: ref-filter.c:893

1242 +#, c-format

1243 +msgid "improper format entered align:%s"

1244 +msgstr "输入了不正确的格式 align:%s"

1245 +

1246 +#: ref-filter.c:898

1247 +#, c-format

1248 +msgid "positive width expected with the %%(align) atom"

1249 +msgstr "元素 %%(align) 需要一个正数的宽度"

1250 +

1251 +#: ref-filter.c:1219

1252 +#, c-format

1253 +msgid "malformed object at '%s'"

1254 +msgstr "非法的对象于 '%s'"

1255 +

1256 +#: ref-filter.c:1561

1257 +#, c-format

1258 +msgid "format: %%(end) atom missing"

1259 +msgstr "格式：缺少 %%(end) 元素"

1260 +

1261 +#: ref-filter.c:1615

1262 +#, c-format

1263 +msgid "malformed object name %s"

1264 +msgstr "非法的对象名 %s"

1265 +

1266 +#: remote.c:756

1267 #, c-format

1268 msgid "Cannot fetch both %s and %s to %s"

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

1270

1215 -#: remote.c:796

1271 +#: remote.c:760

1272 #, c-format

1273 msgid "%s usually tracks %s, not %s"

1274 msgstr "%s 通常跟踪 %s，而非 %s"

1275

1220 -#: remote.c:800

1276 +#: remote.c:764

1277 #, c-format

1278 msgid "%s tracks both %s and %s"

1279 msgstr "%s 同时跟踪 %s 和 %s"

1280

1225 -#: remote.c:808

1281 +#: remote.c:772

1282 msgid "Internal error"

1283 msgstr "内部错误"

1284

1229 -#: remote.c:1723 remote.c:1766

1285 +#: remote.c:1687 remote.c:1730

1286 msgid "HEAD does not point to a branch"

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

1288

1233 -#: remote.c:1732

1289 +#: remote.c:1696

1290 #, c-format

1291 msgid "no such branch: '%s'"

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

1293

1238 -#: remote.c:1735

1294 +#: remote.c:1699

1295 #, c-format

1296 msgid "no upstream configured for branch '%s'"

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

1298

1243 -#: remote.c:1741

1299 +#: remote.c:1705

1300 #, c-format

1301 msgid "upstream branch '%s' not stored as a remote-tracking branch"

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

1303

1248 -#: remote.c:1756

1304 +#: remote.c:1720

1305 #, c-format

1306 msgid "push destination '%s' on remote '%s' has no local tracking branch"

1307 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"

1308

1253 -#: remote.c:1771

1309 +#: remote.c:1735

1310 #, c-format

1311 msgid "branch '%s' has no remote for pushing"

1312 msgstr "分支 '%s' 没有设置要推送的远程服务器"

1313

1258 -#: remote.c:1782

1314 +#: remote.c:1746

1315 #, c-format

1316 msgid "push refspecs for '%s' do not include '%s'"

1317 msgstr "向 '%s' 推送引用规格未包含 '%s'"

1318

1263 -#: remote.c:1795

1319 +#: remote.c:1759

1320 msgid "push has no destination (push.default is 'nothing')"

1321 msgstr "推送无目标（push.default 是 'nothing'）"

1322

1267 -#: remote.c:1817

1323 +#: remote.c:1781

1324 msgid "cannot resolve 'simple' push to a single destination"

1325 msgstr "无法解析 'simple' 推送至一个单独的目标"

1326

1271 -#: remote.c:2124

1327 +#: remote.c:2083

1328 #, c-format

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

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

1331

1276 -#: remote.c:2128

1332 +#: remote.c:2087

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

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

1335

1280 -#: remote.c:2131

1336 +#: remote.c:2090

1337 #, c-format

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

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

1340

1285 -#: remote.c:2135

1341 +#: remote.c:2094

1342 #, c-format

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

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

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

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

1347

1292 -#: remote.c:2141

1348 +#: remote.c:2100

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

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

1351

1296 -#: remote.c:2144

1352 +#: remote.c:2103

1353 #, c-format

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

1355 msgid_plural ""

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

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

1359

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

1305 -#: remote.c:2152

1361 +#: remote.c:2111

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

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

1364

1309 -#: remote.c:2155

1365 +#: remote.c:2114

1366 #, c-format

1367 msgid ""

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

@@ -1322,28 +1378,28 @@ msgstr[1] ""

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

1379

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

1325 -#: remote.c:2165

1381 +#: remote.c:2124

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

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

1384

1329 -#: revision.c:2198

1385 +#: revision.c:2191

1386 msgid "your current branch appears to be broken"

1387 msgstr "您的当前分支好像被损坏"

1388

1333 -#: revision.c:2201

1389 +#: revision.c:2194

1390 #, c-format

1391 msgid "your current branch '%s' does not have any commits yet"

1392 msgstr "您的当前分支 '%s' 尚无任何提交"

1393

1338 -#: revision.c:2395

1394 +#: revision.c:2388

1395 msgid "--first-parent is incompatible with --bisect"

1396 msgstr "--first-parent 与 --bisect 不兼容"

1397

1342 -#: run-command.c:83

1398 +#: run-command.c:90

1399 msgid "open /dev/null failed"

1400 msgstr "不能打开 /dev/null"

1401

1346 -#: run-command.c:85

1402 +#: run-command.c:92

1403 #, c-format

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

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

@@ -1558,7 +1614,7 @@ msgstr "不能解析 HEAD"

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

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

1616

1561 -#: sequencer.c:887 builtin/apply.c:4291

1617 +#: sequencer.c:887 builtin/apply.c:4287

1618 #, c-format

1619 msgid "cannot open %s: %s"

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

@@ -1600,12 +1656,12 @@ msgstr "不能作为初始提交还原"

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

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

1658

1603 -#: setup.c:243

1659 +#: setup.c:248

1660 #, c-format

1661 msgid "failed to read %s"

1662 msgstr "无法读取 %s"

1663

1608 -#: sha1_name.c:453

1664 +#: sha1_name.c:463

1665 msgid ""

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

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

@@ -1649,7 +1705,7 @@ msgstr "无法移除 %s 的 .gitmodules 条目"

1705 msgid "staging updated .gitmodules failed"

1706 msgstr "将更新后 .gitmodules 添加暂存区失败"

1707

1652 -#: submodule.c:1045

1708 +#: submodule.c:1040

1709 #, c-format

1710 msgid "Could not set core.worktree in %s"

1711 msgstr "不能在 %s 中设置 core.worktree"

@@ -1660,7 +1716,7 @@ msgstr "不能在 %s 中设置 core.worktree"

1716 msgid "unknown value '%s' for key '%s'"

1717 msgstr "键 '%2$s' 的未知取值 '%1$s'"

1718

1663 -#: trailer.c:543 trailer.c:548 builtin/remote.c:290

1719 +#: trailer.c:543 trailer.c:548 builtin/remote.c:296

1720 #, c-format

1721 msgid "more than one %s"

1722 msgstr "多于一个 %s"

@@ -1727,8 +1783,8 @@ msgstr "无法打开 '%s' 进行读写"

1783 msgid "could not open '%s' for writing"

1784 msgstr "无法打开 '%s' 进行写入"

1785

1730 -#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688

1731 -#: builtin/merge.c:1076 builtin/pull.c:380

1786 +#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691

1787 +#: builtin/merge.c:1074 builtin/pull.c:380

1788 #, c-format

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

1790 msgstr "无法打开 '%s' 进行读取"

@@ -1756,17 +1812,17 @@ msgstr "无此用户"

1812 msgid "unable to get current working directory"

1813 msgstr "不能获取当前工作目录"

1814

1759 -#: wrapper.c:631

1815 +#: wrapper.c:647

1816 #, c-format

1817 msgid "could not open %s for writing"

1818 msgstr "不能写入 %s"

1819

1764 -#: wrapper.c:642 builtin/am.c:424

1820 +#: wrapper.c:658 builtin/am.c:425

1821 #, c-format

1822 msgid "could not write to %s"

1823 msgstr "不能写入 %s"

1824

1769 -#: wrapper.c:648

1825 +#: wrapper.c:664

1826 #, c-format

1827 msgid "could not close %s"

1828 msgstr "不能关闭 %s"

@@ -2128,27 +2184,27 @@ msgstr "您在执行二分查找操作。"

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

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

2186

2131 -#: wt-status.c:1437

2187 +#: wt-status.c:1438

2188 msgid "On branch "

2189 msgstr "位于分支 "

2190

2135 -#: wt-status.c:1445

2191 +#: wt-status.c:1444

2192 msgid "interactive rebase in progress; onto "

2193 msgstr "交互式变基操作正在进行中；至 "

2194

2139 -#: wt-status.c:1447

2195 +#: wt-status.c:1446

2196 msgid "rebase in progress; onto "

2197 msgstr "变基操作正在进行中；至 "

2198

2143 -#: wt-status.c:1452

2199 +#: wt-status.c:1451

2200 msgid "HEAD detached at "

2201 msgstr "头指针分离于 "

2202

2147 -#: wt-status.c:1454

2203 +#: wt-status.c:1453

2204 msgid "HEAD detached from "

2205 msgstr "头指针分离自 "

2206

2151 -#: wt-status.c:1457

2207 +#: wt-status.c:1456

2208 msgid "Not currently on any branch."

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

2210

@@ -2233,25 +2289,25 @@ msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"

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

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

2291

2236 -#: wt-status.c:1644

2237 -msgid "HEAD (no branch)"

2238 -msgstr "HEAD（非分支）"

2239 -

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

2241 -#: wt-status.c:1650

2293 +#: wt-status.c:1642

2294 msgid "Initial commit on "

2295 msgstr "初始提交于 "

2296

2245 -#: wt-status.c:1677

2297 +#: wt-status.c:1646

2298 +msgid "HEAD (no branch)"

2299 +msgstr "HEAD（非分支）"

2300 +

2301 +#: wt-status.c:1675

2302 msgid "gone"

2303 msgstr "丢失"

2304

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

2250 -#: wt-status.c:1679 wt-status.c:1687

2306 +#: wt-status.c:1677 wt-status.c:1685

2307 msgid "behind "

2308 msgstr "落后 "

2309

2254 -#: compat/precompose_utf8.c:55 builtin/clone.c:403

2310 +#: compat/precompose_utf8.c:56 builtin/clone.c:408

2311 #, c-format

2312 msgid "failed to unlink '%s'"

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

@@ -2265,7 +2321,7 @@ msgstr "git add [<选项>] [--] <路径规格>..."

2321 msgid "unexpected diff status %c"

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

2323

2268 -#: builtin/add.c:70 builtin/commit.c:277

2324 +#: builtin/add.c:70 builtin/commit.c:278

2325 msgid "updating files failed"

2326 msgstr "更新文件失败"

2327

@@ -2278,7 +2334,7 @@ msgstr "删除 '%s'\n"

2334 msgid "Unstaged changes after refreshing the index:"

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

2336

2281 -#: builtin/add.c:194 builtin/rev-parse.c:799

2337 +#: builtin/add.c:194 builtin/rev-parse.c:796

2338 msgid "Could not read the index"

2339 msgstr "不能读取索引"

2340

@@ -2313,15 +2369,15 @@ msgstr "不能应用 '%s'"

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

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

2371

2316 -#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110

2372 +#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110

2373 #: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545

2318 -#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162

2374 +#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162

2375 msgid "dry run"

2376 msgstr "演习"

2377

2322 -#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19

2323 -#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636

2324 -#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114

2378 +#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19

2379 +#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558

2380 +#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114

2381 msgid "be verbose"

2382 msgstr "冗长输出"

2383

@@ -2329,7 +2385,7 @@ msgstr "冗长输出"

2385 msgid "interactive picking"

2386 msgstr "交互式拣选"

2387

2332 -#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286

2388 +#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286

2389 msgid "select hunks interactively"

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

2391

@@ -2386,145 +2442,145 @@ msgstr "-A 和 -u 选项互斥"

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

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

2444

2389 -#: builtin/add.c:358

2445 +#: builtin/add.c:352

2446 #, c-format

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

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

2449

2394 -#: builtin/add.c:359

2450 +#: builtin/add.c:353

2451 #, c-format

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

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

2454

2399 -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940

2400 -#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2455 +#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938

2456 +#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2457 +#: builtin/submodule--helper.c:40

2458 msgid "index file corrupt"

2459 msgstr "索引文件损坏"

2460

2404 -#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2461 +#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430

2462 msgid "Unable to write new index file"

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

2464

2408 -#: builtin/am.c:41

2465 +#: builtin/am.c:42

2466 #, c-format

2467 msgid "could not stat %s"

2468 msgstr "不能获取 %s 的文件状态"

2469

2413 -#: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737

2414 -#: builtin/merge.c:1079

2470 +#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077

2471 #, c-format

2472 msgid "could not read '%s'"

2473 msgstr "不能读取 '%s'"

2474

2419 -#: builtin/am.c:444

2475 +#: builtin/am.c:445

2476 msgid "could not parse author script"

2477 msgstr "不能解析作者脚本"

2478

2423 -#: builtin/am.c:521

2479 +#: builtin/am.c:522

2480 #, c-format

2481 msgid "'%s' was deleted by the applypatch-msg hook"

2482 msgstr "'%s' 被 applypatch-msg 钩子删除"

2483

2428 -#: builtin/am.c:562 builtin/notes.c:300

2484 +#: builtin/am.c:563 builtin/notes.c:300

2485 #, c-format

2486 msgid "Malformed input line: '%s'."

2487 msgstr "非法的输入行：'%s'。"

2488

2433 -#: builtin/am.c:599 builtin/notes.c:315

2489 +#: builtin/am.c:600 builtin/notes.c:315

2490 #, c-format

2491 msgid "Failed to copy notes from '%s' to '%s'"

2492 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"

2493

2438 -#: builtin/am.c:625

2494 +#: builtin/am.c:626

2495 msgid "fseek failed"

2496 msgstr "fseek 失败"

2497

2442 -#: builtin/am.c:786 builtin/am.c:874

2498 +#: builtin/am.c:787 builtin/am.c:875

2499 #, c-format

2500 msgid "could not open '%s' for reading: %s"

2501 msgstr "无法打开 '%s' 进行读取：%s"

2502

2447 -#: builtin/am.c:793

2503 +#: builtin/am.c:794

2504 #, c-format

2505 msgid "could not open '%s' for writing: %s"

2506 msgstr "无法打开 '%s' 进行写入：%s"

2507

2452 -#: builtin/am.c:802

2508 +#: builtin/am.c:803

2509 #, c-format

2510 msgid "could not parse patch '%s'"

2511 msgstr "无法解析补丁 '%s'"

2512

2457 -#: builtin/am.c:867

2513 +#: builtin/am.c:868

2514 msgid "Only one StGIT patch series can be applied at once"

2515 msgstr "一次只能有一个 StGIT 补丁队列被应用"

2516

2461 -#: builtin/am.c:915

2517 +#: builtin/am.c:916

2518 msgid "invalid timestamp"

2519 msgstr "无效的时间戳"

2520

2465 -#: builtin/am.c:918 builtin/am.c:926

2521 +#: builtin/am.c:919 builtin/am.c:927

2522 msgid "invalid Date line"

2523 msgstr "无效的日期行"

2524

2469 -#: builtin/am.c:923

2525 +#: builtin/am.c:924

2526 msgid "invalid timezone offset"

2527 msgstr "无效的时区偏移值"

2528

2473 -#: builtin/am.c:1010

2529 +#: builtin/am.c:1011

2530 msgid "Patch format detection failed."

2531 msgstr "补丁格式检测失败。"

2532

2477 -#: builtin/am.c:1015 builtin/clone.c:368

2533 +#: builtin/am.c:1016 builtin/clone.c:373

2534 #, c-format

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

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

2537

2482 -#: builtin/am.c:1019

2538 +#: builtin/am.c:1020

2539 msgid "Failed to split patches."

2540 msgstr "无法拆分补丁。"

2541

2486 -#: builtin/am.c:1151 builtin/commit.c:362

2542 +#: builtin/am.c:1152 builtin/commit.c:363

2543 msgid "unable to write index file"

2544 msgstr "无法写入索引文件"

2545

2490 -#: builtin/am.c:1202

2546 +#: builtin/am.c:1203

2547 #, c-format

2548 msgid "When you have resolved this problem, run \"%s --continue\"."

2549 msgstr "当您解决这一问题，执行 \"%s --continue\"。"

2550

2495 -#: builtin/am.c:1203

2551 +#: builtin/am.c:1204

2552 #, c-format

2553 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

2554 msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"

2555

2500 -#: builtin/am.c:1204

2556 +#: builtin/am.c:1205

2557 #, c-format

2558 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

2559 msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"

2560

2505 -#: builtin/am.c:1339

2561 +#: builtin/am.c:1343

2562 msgid "Patch is empty. Was it split wrong?"

2563 msgstr "补丁为空。是不是切分错误？"

2564

2509 -#: builtin/am.c:1413 builtin/log.c:1345

2565 +#: builtin/am.c:1417 builtin/log.c:1344

2566 #, c-format

2567 msgid "invalid ident line: %s"

2568 msgstr "包含无效的身份标识：%s"

2569

2514 -#: builtin/am.c:1440

2570 +#: builtin/am.c:1444

2571 #, c-format

2572 msgid "unable to parse commit %s"

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

2574

2519 -#: builtin/am.c:1614

2575 +#: builtin/am.c:1646

2576 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

2577 msgstr "仓库缺乏必要的数据对象以进行三方合并。"

2578

2523 -#: builtin/am.c:1616

2579 +#: builtin/am.c:1648

2580 msgid "Using index info to reconstruct a base tree..."

2581 msgstr "使用索引来重建一个（三方合并的）基础目录树..."

2582

2527 -#: builtin/am.c:1635

2583 +#: builtin/am.c:1667

2584 msgid ""

2585 "Did you hand edit your patch?\n"

2586 "It does not apply to blobs recorded in its index."

@@ -2532,37 +2588,37 @@ msgstr ""

2588 "您是否曾手动编辑过您的补丁？\n"

2589 "无法应用补丁到索引中的数据对象上。"

2590

2535 -#: builtin/am.c:1641

2591 +#: builtin/am.c:1673

2592 msgid "Falling back to patching base and 3-way merge..."

2593 msgstr "回落到基础版本上打补丁及进行三方合并..."

2594

2539 -#: builtin/am.c:1666

2595 +#: builtin/am.c:1688

2596 msgid "Failed to merge in the changes."

2597 msgstr "无法合并变更。"

2598

2543 -#: builtin/am.c:1691 builtin/merge.c:632

2599 +#: builtin/am.c:1712 builtin/merge.c:632

2600 msgid "git write-tree failed to write a tree"

2601 msgstr "git write-tree 无法写入一树对象"

2602

2547 -#: builtin/am.c:1698

2603 +#: builtin/am.c:1719

2604 msgid "applying to an empty history"

2605 msgstr "正应用到一个空历史上"

2606

2551 -#: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829

2607 +#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829

2608 #: builtin/merge.c:854

2609 msgid "failed to write commit object"

2610 msgstr "无法写提交对象"

2611

2556 -#: builtin/am.c:1743 builtin/am.c:1747

2612 +#: builtin/am.c:1764 builtin/am.c:1768

2613 #, c-format

2614 msgid "cannot resume: %s does not exist."

2615 msgstr "无法继续：%s 不存在。"

2616

2561 -#: builtin/am.c:1763

2617 +#: builtin/am.c:1784

2618 msgid "cannot be interactive without stdin connected to a terminal."

2619 msgstr "标准输入没有和终端关联，不能进行交互式操作。"

2620

2565 -#: builtin/am.c:1768

2621 +#: builtin/am.c:1789

2622 msgid "Commit Body is:"

2623 msgstr "提交内容为："

2624

@@ -2571,35 +2627,35 @@ msgstr "提交内容为："

2627 #. in your translation. The program will only accept English

2628 #. input at this point.

2629 #.

2574 -#: builtin/am.c:1778

2630 +#: builtin/am.c:1799

2631 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

2632 msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："

2633

2578 -#: builtin/am.c:1828

2634 +#: builtin/am.c:1849

2635 #, c-format

2636 msgid "Dirty index: cannot apply patches (dirty: %s)"

2637 msgstr "脏索引：不能应用补丁（脏文件：%s）"

2638

2583 -#: builtin/am.c:1863 builtin/am.c:1934

2639 +#: builtin/am.c:1884 builtin/am.c:1955

2640 #, c-format

2641 msgid "Applying: %.*s"

2642 msgstr "应用：%.*s"

2643

2588 -#: builtin/am.c:1879

2644 +#: builtin/am.c:1900

2645 msgid "No changes -- Patch already applied."

2646 msgstr "没有变更 —— 补丁已经应用过。"

2647

2592 -#: builtin/am.c:1887

2648 +#: builtin/am.c:1908

2649 #, c-format

2650 msgid "Patch failed at %s %.*s"

2651 msgstr "打补丁失败于 %s %.*s"

2652

2597 -#: builtin/am.c:1893

2653 +#: builtin/am.c:1914

2654 #, c-format

2655 msgid "The copy of the patch that failed is found in: %s"

2656 msgstr "失败的补丁文件副本位于：%s"

2657

2602 -#: builtin/am.c:1937

2658 +#: builtin/am.c:1958

2659 msgid ""

2660 "No changes - did you forget to use 'git add'?\n"

2661 "If there is nothing left to stage, chances are that something else\n"

@@ -2609,7 +2665,7 @@ msgstr ""

2665 "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"

2666 "您也许想要跳过这个补丁。"

2667

2612 -#: builtin/am.c:1944

2668 +#: builtin/am.c:1965

2669 msgid ""

2670 "You still have unmerged paths in your index.\n"

2671 "Did you forget to use 'git add'?"

@@ -2617,166 +2673,168 @@ msgstr ""

2673 "您的索引中仍有未合并的路径。\n"

2674 "您是否忘了执行 'git add'？"

2675

2620 -#: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308

2676 +#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308

2677 #: builtin/reset.c:316

2678 #, c-format

2679 msgid "Could not parse object '%s'."

2680 msgstr "不能解析对象 '%s'。"

2681

2626 -#: builtin/am.c:2104

2682 +#: builtin/am.c:2125

2683 msgid "failed to clean index"

2684 msgstr "无法清空索引"

2685

2630 -#: builtin/am.c:2138

2686 +#: builtin/am.c:2159

2687 msgid ""

2688 "You seem to have moved HEAD since the last 'am' failure.\n"

2689 "Not rewinding to ORIG_HEAD"

2690 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"

2691

2636 -#: builtin/am.c:2199

2692 +#: builtin/am.c:2220

2693 #, c-format

2694 msgid "Invalid value for --patch-format: %s"

2695 msgstr "无效的 --patch-format 值：%s"

2696

2641 -#: builtin/am.c:2221

2642 -msgid "git am [options] [(<mbox>|<Maildir>)...]"

2643 -msgstr "git am [选项] [(<mbox>|<Maildir>)...]"

2697 +#: builtin/am.c:2253

2698 +msgid "git am [<options>] [(<mbox>|<Maildir>)...]"

2699 +msgstr "git am [<选项>] [(<mbox>|<Maildir>)...]"

2700

2645 -#: builtin/am.c:2222

2646 -msgid "git am [options] (--continue | --skip | --abort)"

2647 -msgstr "git am [选项] (--continue | --skip | --abort)"

2701 +#: builtin/am.c:2254

2702 +msgid "git am [<options>] (--continue | --skip | --abort)"

2703 +msgstr "git am [<选项>] (--continue | --skip | --abort)"

2704

2649 -#: builtin/am.c:2228

2705 +#: builtin/am.c:2260

2706 msgid "run interactively"

2707 msgstr "以交互式方式运行"

2708

2653 -#: builtin/am.c:2230

2709 +#: builtin/am.c:2262

2710 msgid "historical option -- no-op"

2711 msgstr "老的参数 —— 无作用"

2712

2657 -#: builtin/am.c:2232

2713 +#: builtin/am.c:2264

2714 msgid "allow fall back on 3way merging if needed"

2715 msgstr "如果必要，允许使用三方合并。"

2716

2661 -#: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57

2717 +#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57

2718 #: builtin/repack.c:171

2719 msgid "be quiet"

2720 msgstr "静默模式"

2721

2666 -#: builtin/am.c:2235

2722 +#: builtin/am.c:2267

2723 msgid "add a Signed-off-by line to the commit message"

2724 msgstr "在提交说明中添加一个 Signed-off-by 签名"

2725

2670 -#: builtin/am.c:2238

2726 +#: builtin/am.c:2270

2727 msgid "recode into utf8 (default)"

2728 msgstr "使用 utf8 字符集（默认）"

2729

2674 -#: builtin/am.c:2240

2730 +#: builtin/am.c:2272

2731 msgid "pass -k flag to git-mailinfo"

2732 msgstr "向 git-mailinfo 传递 -k 参数"

2733

2678 -#: builtin/am.c:2242

2734 +#: builtin/am.c:2274

2735 msgid "pass -b flag to git-mailinfo"

2736 msgstr "向 git-mailinfo 传递 -b 参数"

2737

2682 -#: builtin/am.c:2244

2738 +#: builtin/am.c:2276

2739 msgid "pass -m flag to git-mailinfo"

2740 msgstr "向 git-mailinfo 传递 -m 参数"

2741

2686 -#: builtin/am.c:2246

2742 +#: builtin/am.c:2278

2743 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

2744 msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"

2745

2690 -#: builtin/am.c:2249

2746 +#: builtin/am.c:2281

2747 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

2748 msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"

2749

2694 -#: builtin/am.c:2252

2750 +#: builtin/am.c:2284

2751 msgid "strip everything before a scissors line"

2752 msgstr "丢弃裁切线前的所有内容"

2753

2698 -#: builtin/am.c:2253 builtin/apply.c:4563

2754 +#: builtin/am.c:2285 builtin/apply.c:4554

2755 msgid "action"

2756 msgstr "动作"

2757

2702 -#: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263

2703 -#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275

2704 -#: builtin/am.c:2281

2758 +#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295

2759 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307

2760 +#: builtin/am.c:2313

2761 msgid "pass it through git-apply"

2762 msgstr "传递给 git-apply"

2763

2708 -#: builtin/am.c:2262 builtin/apply.c:4587

2764 +#: builtin/am.c:2294 builtin/apply.c:4578

2765 msgid "root"

2766 msgstr "根目录"

2767

2712 -#: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525

2713 -#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93

2714 -#: builtin/pull.c:167

2768 +#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516

2769 +#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93

2770 +#: builtin/pull.c:167 builtin/submodule--helper.c:78

2771 +#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

2772 msgid "path"

2773 msgstr "路径"

2774

2718 -#: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672

2719 -#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127

2720 -#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664

2721 -#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132

2722 -#: parse-options.h:134 parse-options.h:243

2775 +#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2776 +#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127

2777 +#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645

2778 +#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132

2779 +#: parse-options.h:134 parse-options.h:244

2780 msgid "n"

2781 msgstr "n"

2782

2726 -#: builtin/am.c:2274 builtin/apply.c:4531

2783 +#: builtin/am.c:2306 builtin/apply.c:4522

2784 msgid "num"

2785 msgstr "数字"

2786

2730 -#: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438

2787 +#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438

2788 +#: builtin/tag.c:372

2789 msgid "format"

2790 msgstr "格式"

2791

2734 -#: builtin/am.c:2278

2792 +#: builtin/am.c:2310

2793 msgid "format the patch(es) are in"

2794 msgstr "补丁的格式"

2795

2738 -#: builtin/am.c:2284

2796 +#: builtin/am.c:2316

2797 msgid "override error message when patch failure occurs"

2798 msgstr "打补丁失败时显示的错误信息"

2799

2742 -#: builtin/am.c:2286

2800 +#: builtin/am.c:2318

2801 msgid "continue applying patches after resolving a conflict"

2802 msgstr "冲突解决后继续应用补丁"

2803

2746 -#: builtin/am.c:2289

2804 +#: builtin/am.c:2321

2805 msgid "synonyms for --continue"

2806 msgstr "和 --continue 同义"

2807

2750 -#: builtin/am.c:2292

2808 +#: builtin/am.c:2324

2809 msgid "skip the current patch"

2810 msgstr "跳过当前补丁"

2811

2754 -#: builtin/am.c:2295

2812 +#: builtin/am.c:2327

2813 msgid "restore the original branch and abort the patching operation."

2814 msgstr "恢复原始分支并终止打补丁操作。"

2815

2758 -#: builtin/am.c:2299

2816 +#: builtin/am.c:2331

2817 msgid "lie about committer date"

2818 msgstr "将作者日期作为提交日期"

2819

2762 -#: builtin/am.c:2301

2820 +#: builtin/am.c:2333

2821 msgid "use current timestamp for author date"

2822 msgstr "用当前时间作为作者日期"

2823

2766 -#: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225

2767 -#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606

2824 +#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225

2825 +#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355

2826 msgid "key-id"

2827 msgstr "key-id"

2828

2771 -#: builtin/am.c:2304

2829 +#: builtin/am.c:2336

2830 msgid "GPG-sign commits"

2831 msgstr "使用 GPG 签名提交"

2832

2775 -#: builtin/am.c:2307

2833 +#: builtin/am.c:2339

2834 msgid "(internal use for git-rebase)"

2835 msgstr "（内部使用，用于 git-rebase）"

2836

2779 -#: builtin/am.c:2322

2837 +#: builtin/am.c:2354

2838 msgid ""

2839 "The -b/--binary option has been a no-op for long time, and\n"

2840 "it will be removed. Please do not use it anymore."

@@ -2784,16 +2842,16 @@ msgstr ""

2842 "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"

2843 "请不要再使用它了。"

2844

2787 -#: builtin/am.c:2329

2845 +#: builtin/am.c:2361

2846 msgid "failed to read the index"

2847 msgstr "无法读取索引"

2848

2791 -#: builtin/am.c:2344

2849 +#: builtin/am.c:2376

2850 #, c-format

2851 msgid "previous rebase directory %s still exists but mbox given."

2852 msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"

2853

2796 -#: builtin/am.c:2368

2854 +#: builtin/am.c:2400

2855 #, c-format

2856 msgid ""

2857 "Stray %s directory found.\n"

@@ -2802,7 +2860,7 @@ msgstr ""

2860 "发现了错误的 %s 目录。\n"

2861 "使用 \"git am --abort\" 删除它。"

2862

2805 -#: builtin/am.c:2374

2863 +#: builtin/am.c:2406

2864 msgid "Resolve operation not in progress, we are not resuming."

2865 msgstr "解决操作未进行，我们不会继续。"

2866

@@ -2810,62 +2868,62 @@ msgstr "解决操作未进行，我们不会继续。"

2868 msgid "git apply [<options>] [<patch>...]"

2869 msgstr "git apply [<选项>] [<补丁>...]"

2870

2813 -#: builtin/apply.c:112

2871 +#: builtin/apply.c:111

2872 #, c-format

2873 msgid "unrecognized whitespace option '%s'"

2874 msgstr "未能识别的空白字符选项 '%s'"

2875

2818 -#: builtin/apply.c:127

2876 +#: builtin/apply.c:126

2877 #, c-format

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

2879 msgstr "未能识别的空白字符忽略选项 '%s'"

2880

2823 -#: builtin/apply.c:822

2881 +#: builtin/apply.c:818

2882 #, c-format

2883 msgid "Cannot prepare timestamp regexp %s"

2884 msgstr "无法准备时间戳正则表达式 %s"

2885

2828 -#: builtin/apply.c:831

2886 +#: builtin/apply.c:827

2887 #, c-format

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

2889 msgstr "regexec 返回 %d，输入为：%s"

2890

2833 -#: builtin/apply.c:912

2891 +#: builtin/apply.c:908

2892 #, c-format

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

2894 msgstr "不能在补丁的第 %d 行找到文件名"

2895

2838 -#: builtin/apply.c:944

2896 +#: builtin/apply.c:940

2897 #, c-format

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

2899 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"

2900

2843 -#: builtin/apply.c:948

2901 +#: builtin/apply.c:944

2902 #, c-format

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

2904 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"

2905

2848 -#: builtin/apply.c:949

2906 +#: builtin/apply.c:945

2907 #, c-format

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

2909 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"

2910

2853 -#: builtin/apply.c:956

2911 +#: builtin/apply.c:952

2912 #, c-format

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

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

2915

2858 -#: builtin/apply.c:1419

2916 +#: builtin/apply.c:1415

2917 #, c-format

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

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

2920

2863 -#: builtin/apply.c:1476

2921 +#: builtin/apply.c:1472

2922 #, c-format

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

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

2925

2868 -#: builtin/apply.c:1493

2926 +#: builtin/apply.c:1489

2927 #, c-format

2928 msgid ""

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

@@ -2876,77 +2934,77 @@ msgid_plural ""

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

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

2936

2879 -#: builtin/apply.c:1659

2937 +#: builtin/apply.c:1655

2938 msgid "new file depends on old contents"

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

2940

2883 -#: builtin/apply.c:1661

2941 +#: builtin/apply.c:1657

2942 msgid "deleted file still has contents"

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

2944

2887 -#: builtin/apply.c:1687

2945 +#: builtin/apply.c:1683

2946 #, c-format

2947 msgid "corrupt patch at line %d"

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

2949

2892 -#: builtin/apply.c:1723

2950 +#: builtin/apply.c:1719

2951 #, c-format

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

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

2954

2897 -#: builtin/apply.c:1725

2955 +#: builtin/apply.c:1721

2956 #, c-format

2957 msgid "deleted file %s still has contents"

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

2959

2902 -#: builtin/apply.c:1728

2960 +#: builtin/apply.c:1724

2961 #, c-format

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

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

2964

2907 -#: builtin/apply.c:1874

2965 +#: builtin/apply.c:1870

2966 #, c-format

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

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

2969

2912 -#: builtin/apply.c:1903

2970 +#: builtin/apply.c:1899

2971 #, c-format

2972 msgid "unrecognized binary patch at line %d"

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

2974

2917 -#: builtin/apply.c:2054

2975 +#: builtin/apply.c:2050

2976 #, c-format

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

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

2979

2922 -#: builtin/apply.c:2144

2980 +#: builtin/apply.c:2140

2981 #, c-format

2982 msgid "unable to read symlink %s"

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

2984

2927 -#: builtin/apply.c:2148

2985 +#: builtin/apply.c:2144

2986 #, c-format

2987 msgid "unable to open or read %s"

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

2989

2932 -#: builtin/apply.c:2781

2990 +#: builtin/apply.c:2777

2991 #, c-format

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

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

2994

2937 -#: builtin/apply.c:2900

2995 +#: builtin/apply.c:2896

2996 #, c-format

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

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

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

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

3001

2944 -#: builtin/apply.c:2912

3002 +#: builtin/apply.c:2908

3003 #, c-format

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

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

3006

2949 -#: builtin/apply.c:2918

3007 +#: builtin/apply.c:2914

3008 #, c-format

3009 msgid ""

3010 "while searching for:\n"

@@ -2955,319 +3013,319 @@ msgstr ""

3013 "当查询：\n"

3014 "%.*s"

3015

2958 -#: builtin/apply.c:2938

3016 +#: builtin/apply.c:2934

3017 #, c-format

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

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

3020

2963 -#: builtin/apply.c:3039

3021 +#: builtin/apply.c:3035

3022 #, c-format

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

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

3025

2968 -#: builtin/apply.c:3045

3026 +#: builtin/apply.c:3041

3027 #, c-format

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

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

3030

2973 -#: builtin/apply.c:3066

3031 +#: builtin/apply.c:3062

3032 #, c-format

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

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

3035

2978 -#: builtin/apply.c:3190

3036 +#: builtin/apply.c:3186

3037 #, c-format

3038 msgid "cannot checkout %s"

3039 msgstr "不能检出 %s"

3040

2983 -#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291

3041 +#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287

3042 #, c-format

3043 msgid "read of %s failed"

3044 msgstr "读取 %s 失败"

3045

2988 -#: builtin/apply.c:3243

3046 +#: builtin/apply.c:3239

3047 #, c-format

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

3049 msgstr "读取位于符号链接中的 '%s'"

3050

2993 -#: builtin/apply.c:3271 builtin/apply.c:3493

3051 +#: builtin/apply.c:3267 builtin/apply.c:3489

3052 #, c-format

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

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

3055

2998 -#: builtin/apply.c:3352 builtin/apply.c:3507

3056 +#: builtin/apply.c:3348 builtin/apply.c:3503

3057 #, c-format

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

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

3060

3003 -#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521

3061 +#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517

3062 #, c-format

3063 msgid "%s: %s"

3064 msgstr "%s：%s"

3065

3008 -#: builtin/apply.c:3361 builtin/apply.c:3515

3066 +#: builtin/apply.c:3357 builtin/apply.c:3511

3067 #, c-format

3068 msgid "%s: does not match index"

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

3070

3013 -#: builtin/apply.c:3463

3071 +#: builtin/apply.c:3459

3072 msgid "removal patch leaves file contents"

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

3074

3017 -#: builtin/apply.c:3532

3075 +#: builtin/apply.c:3528

3076 #, c-format

3077 msgid "%s: wrong type"

3078 msgstr "%s：错误类型"

3079

3022 -#: builtin/apply.c:3534

3080 +#: builtin/apply.c:3530

3081 #, c-format

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

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

3084

3027 -#: builtin/apply.c:3693 builtin/apply.c:3695

3085 +#: builtin/apply.c:3689 builtin/apply.c:3691

3086 #, c-format

3087 msgid "invalid path '%s'"

3088 msgstr "无效路径 '%s'"

3089

3032 -#: builtin/apply.c:3750

3090 +#: builtin/apply.c:3746

3091 #, c-format

3092 msgid "%s: already exists in index"

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

3094

3037 -#: builtin/apply.c:3753

3095 +#: builtin/apply.c:3749

3096 #, c-format

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

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

3099

3042 -#: builtin/apply.c:3773

3100 +#: builtin/apply.c:3769

3101 #, c-format

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

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

3104

3047 -#: builtin/apply.c:3778

3105 +#: builtin/apply.c:3774

3106 #, c-format

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

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

3109

3052 -#: builtin/apply.c:3798

3110 +#: builtin/apply.c:3794

3111 #, c-format

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

3113 msgstr "受影响的文件 '%s' 位于符号链接中"

3114

3057 -#: builtin/apply.c:3802

3115 +#: builtin/apply.c:3798

3116 #, c-format

3117 msgid "%s: patch does not apply"

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

3119

3062 -#: builtin/apply.c:3816

3120 +#: builtin/apply.c:3812

3121 #, c-format

3122 msgid "Checking patch %s..."

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

3124

3067 -#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135

3125 +#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135

3126 #, c-format

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

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

3129

3072 -#: builtin/apply.c:4052

3130 +#: builtin/apply.c:4048

3131 #, c-format

3132 msgid "unable to remove %s from index"

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

3134

3077 -#: builtin/apply.c:4081

3135 +#: builtin/apply.c:4077

3136 #, c-format

3137 msgid "corrupt patch for submodule %s"

3138 msgstr "子模组 %s 损坏的补丁"

3139

3082 -#: builtin/apply.c:4085

3140 +#: builtin/apply.c:4081

3141 #, c-format

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

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

3144

3087 -#: builtin/apply.c:4090

3145 +#: builtin/apply.c:4086

3146 #, c-format

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

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

3149

3092 -#: builtin/apply.c:4093 builtin/apply.c:4201

3150 +#: builtin/apply.c:4089 builtin/apply.c:4197

3151 #, c-format

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

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

3154

3097 -#: builtin/apply.c:4126

3155 +#: builtin/apply.c:4122

3156 #, c-format

3157 msgid "closing file '%s'"

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

3159

3102 -#: builtin/apply.c:4175

3160 +#: builtin/apply.c:4171

3161 #, c-format

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

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

3164

3107 -#: builtin/apply.c:4262

3165 +#: builtin/apply.c:4258

3166 #, c-format

3167 msgid "Applied patch %s cleanly."

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

3169

3112 -#: builtin/apply.c:4270

3170 +#: builtin/apply.c:4266

3171 msgid "internal error"

3172 msgstr "内部错误"

3173

3116 -#: builtin/apply.c:4273

3174 +#: builtin/apply.c:4269

3175 #, c-format

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

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

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

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

3180

3123 -#: builtin/apply.c:4283

3181 +#: builtin/apply.c:4279

3182 #, c-format

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

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

3185

3128 -#: builtin/apply.c:4304

3186 +#: builtin/apply.c:4300

3187 #, c-format

3188 msgid "Hunk #%d applied cleanly."

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

3190

3133 -#: builtin/apply.c:4307

3191 +#: builtin/apply.c:4303

3192 #, c-format

3193 msgid "Rejected hunk #%d."

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

3195

3138 -#: builtin/apply.c:4397

3196 +#: builtin/apply.c:4393

3197 msgid "unrecognized input"

3198 msgstr "未能识别的输入"

3199

3142 -#: builtin/apply.c:4408

3200 +#: builtin/apply.c:4404

3201 msgid "unable to read index file"

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

3203

3146 -#: builtin/apply.c:4526

3204 +#: builtin/apply.c:4517

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

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

3207

3150 -#: builtin/apply.c:4529

3208 +#: builtin/apply.c:4520

3209 msgid "apply changes matching the given path"

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

3211

3154 -#: builtin/apply.c:4532

3212 +#: builtin/apply.c:4523

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

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

3215

3158 -#: builtin/apply.c:4535

3216 +#: builtin/apply.c:4526

3217 msgid "ignore additions made by the patch"

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

3219

3162 -#: builtin/apply.c:4537

3220 +#: builtin/apply.c:4528

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

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

3223

3166 -#: builtin/apply.c:4541

3224 +#: builtin/apply.c:4532

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

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

3227

3170 -#: builtin/apply.c:4543

3228 +#: builtin/apply.c:4534

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

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

3231

3174 -#: builtin/apply.c:4545

3232 +#: builtin/apply.c:4536

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

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

3235

3178 -#: builtin/apply.c:4547

3236 +#: builtin/apply.c:4538

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

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

3239

3182 -#: builtin/apply.c:4549

3240 +#: builtin/apply.c:4540

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

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

3243

3186 -#: builtin/apply.c:4551

3244 +#: builtin/apply.c:4542

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

3246 msgstr "接受修改工作区之外文件的补丁"

3247

3190 -#: builtin/apply.c:4553

3248 +#: builtin/apply.c:4544

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

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

3251

3194 -#: builtin/apply.c:4555

3252 +#: builtin/apply.c:4546

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

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

3255

3198 -#: builtin/apply.c:4557

3256 +#: builtin/apply.c:4548

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

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

3259

3202 -#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412

3260 +#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412

3261 msgid "paths are separated with NUL character"

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

3263

3206 -#: builtin/apply.c:4562

3264 +#: builtin/apply.c:4553

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

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

3267

3210 -#: builtin/apply.c:4564

3268 +#: builtin/apply.c:4555

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

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

3271

3214 -#: builtin/apply.c:4567 builtin/apply.c:4570

3272 +#: builtin/apply.c:4558 builtin/apply.c:4561

3273 msgid "ignore changes in whitespace when finding context"

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

3275

3218 -#: builtin/apply.c:4573

3276 +#: builtin/apply.c:4564

3277 msgid "apply the patch in reverse"

3278 msgstr "反向应用补丁"

3279

3222 -#: builtin/apply.c:4575

3280 +#: builtin/apply.c:4566

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

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

3283

3226 -#: builtin/apply.c:4577

3284 +#: builtin/apply.c:4568

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

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

3287

3230 -#: builtin/apply.c:4579

3288 +#: builtin/apply.c:4570

3289 msgid "allow overlapping hunks"

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

3291

3234 -#: builtin/apply.c:4582

3292 +#: builtin/apply.c:4573

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

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

3295

3238 -#: builtin/apply.c:4585

3296 +#: builtin/apply.c:4576

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

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

3299

3242 -#: builtin/apply.c:4588

3300 +#: builtin/apply.c:4579

3301 msgid "prepend <root> to all filenames"

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

3303

3246 -#: builtin/apply.c:4610

3304 +#: builtin/apply.c:4601

3305 msgid "--3way outside a repository"

3306 msgstr "--3way 在一个仓库之外"

3307

3250 -#: builtin/apply.c:4618

3308 +#: builtin/apply.c:4609

3309 msgid "--index outside a repository"

3310 msgstr "--index 在一个仓库之外"

3311

3254 -#: builtin/apply.c:4621

3312 +#: builtin/apply.c:4612

3313 msgid "--cached outside a repository"

3314 msgstr "--cached 在一个仓库之外"

3315

3258 -#: builtin/apply.c:4640

3316 +#: builtin/apply.c:4631

3317 #, c-format

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

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

3320

3263 -#: builtin/apply.c:4654

3321 +#: builtin/apply.c:4645

3322 #, c-format

3323 msgid "squelched %d whitespace error"

3324 msgid_plural "squelched %d whitespace errors"

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

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

3327

3270 -#: builtin/apply.c:4660 builtin/apply.c:4670

3328 +#: builtin/apply.c:4651 builtin/apply.c:4661

3329 #, c-format

3330 msgid "%d line adds whitespace errors."

3331 msgid_plural "%d lines add whitespace errors."

@@ -3329,95 +3387,95 @@ msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"

3387 msgid "<rev-opts> are documented in git-rev-list(1)"

3388 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"

3389

3332 -#: builtin/blame.c:2500

3390 +#: builtin/blame.c:2519

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

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

3393

3336 -#: builtin/blame.c:2501

3394 +#: builtin/blame.c:2520

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

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

3397

3340 -#: builtin/blame.c:2502

3398 +#: builtin/blame.c:2521

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

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

3401

3344 -#: builtin/blame.c:2503

3402 +#: builtin/blame.c:2522

3403 msgid "Show work cost statistics"

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

3405

3348 -#: builtin/blame.c:2504

3406 +#: builtin/blame.c:2523

3407 msgid "Show output score for blame entries"

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

3409

3352 -#: builtin/blame.c:2505

3410 +#: builtin/blame.c:2524

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

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

3413

3356 -#: builtin/blame.c:2506

3414 +#: builtin/blame.c:2525

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

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

3417

3360 -#: builtin/blame.c:2507

3418 +#: builtin/blame.c:2526

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

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

3421

3364 -#: builtin/blame.c:2508

3422 +#: builtin/blame.c:2527

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

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

3425

3368 -#: builtin/blame.c:2509

3426 +#: builtin/blame.c:2528

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

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

3429

3372 -#: builtin/blame.c:2510

3430 +#: builtin/blame.c:2529

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

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

3433

3376 -#: builtin/blame.c:2511

3434 +#: builtin/blame.c:2530

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

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

3437

3380 -#: builtin/blame.c:2512

3438 +#: builtin/blame.c:2531

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

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

3441

3384 -#: builtin/blame.c:2513

3442 +#: builtin/blame.c:2532

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

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

3445

3388 -#: builtin/blame.c:2514

3446 +#: builtin/blame.c:2533

3447 msgid "Ignore whitespace differences"

3448 msgstr "忽略空白差异"

3449

3392 -#: builtin/blame.c:2515

3450 +#: builtin/blame.c:2534

3451 msgid "Spend extra cycles to find better match"

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

3453

3396 -#: builtin/blame.c:2516

3454 +#: builtin/blame.c:2535

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

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

3457

3400 -#: builtin/blame.c:2517

3458 +#: builtin/blame.c:2536

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

3460 msgstr "使用 <文件> 的内容作为最终的图片"

3461

3404 -#: builtin/blame.c:2518 builtin/blame.c:2519

3462 +#: builtin/blame.c:2537 builtin/blame.c:2538

3463 msgid "score"

3464 msgstr "得分"

3465

3408 -#: builtin/blame.c:2518

3466 +#: builtin/blame.c:2537

3467 msgid "Find line copies within and across files"

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

3469

3412 -#: builtin/blame.c:2519

3470 +#: builtin/blame.c:2538

3471 msgid "Find line movements within and across files"

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

3473

3416 -#: builtin/blame.c:2520

3474 +#: builtin/blame.c:2539

3475 msgid "n,m"

3476 msgstr "n,m"

3477

3420 -#: builtin/blame.c:2520

3478 +#: builtin/blame.c:2539

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

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

3481

@@ -3427,28 +3485,32 @@ msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"

3485 #. takes 22 places, is the longest among various forms of

3486 #. relative timestamps, but your language may need more or

3487 #. fewer display columns.

3430 -#: builtin/blame.c:2601

3488 +#: builtin/blame.c:2620

3489 msgid "4 years, 11 months ago"

3490 msgstr "4 年 11 个月前"

3491

3434 -#: builtin/branch.c:24

3492 +#: builtin/branch.c:25

3493 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"

3494 msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"

3495

3438 -#: builtin/branch.c:25

3496 +#: builtin/branch.c:26

3497 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"

3498 msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"

3499

3442 -#: builtin/branch.c:26

3500 +#: builtin/branch.c:27

3501 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."

3502 msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."

3503

3446 -#: builtin/branch.c:27

3504 +#: builtin/branch.c:28

3505 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

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

3507

3508 +#: builtin/branch.c:29

3509 +msgid "git branch [<options>] [-r | -a] [--points-at]"

3510 +msgstr "git branch [<选项>] [-r | -a] [--points-at]"

3511 +

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

3451 -#: builtin/branch.c:150

3513 +#: builtin/branch.c:142

3514 #, c-format

3515 msgid ""

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

@@ -3458,7 +3520,7 @@ msgstr ""

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

3521

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

3461 -#: builtin/branch.c:154

3523 +#: builtin/branch.c:146

3524 #, c-format

3525 msgid ""

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

@@ -3467,12 +3529,12 @@ msgstr ""

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

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

3531

3470 -#: builtin/branch.c:168

3532 +#: builtin/branch.c:160

3533 #, c-format

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

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

3536

3475 -#: builtin/branch.c:172

3537 +#: builtin/branch.c:164

3538 #, c-format

3539 msgid ""

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

@@ -3481,343 +3543,335 @@ msgstr ""

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

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

3545

3484 -#: builtin/branch.c:185

3546 +#: builtin/branch.c:177

3547 msgid "Update of config-file failed"

3548 msgstr "无法更新 config 文件"

3549

3488 -#: builtin/branch.c:213

3550 +#: builtin/branch.c:205

3551 msgid "cannot use -a with -d"

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

3553

3492 -#: builtin/branch.c:219

3554 +#: builtin/branch.c:211

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

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

3557

3496 -#: builtin/branch.c:227

3558 +#: builtin/branch.c:219

3559 #, c-format

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

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

3562

3501 -#: builtin/branch.c:243

3563 +#: builtin/branch.c:235

3564 #, c-format

3565 msgid "remote-tracking branch '%s' not found."

3566 msgstr "未能找到远程跟踪分支 '%s'。"

3567

3506 -#: builtin/branch.c:244

3568 +#: builtin/branch.c:236

3569 #, c-format

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

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

3572

3511 -#: builtin/branch.c:259

3573 +#: builtin/branch.c:251

3574 #, c-format

3575 msgid "Error deleting remote-tracking branch '%s'"

3576 msgstr "无法删除远程跟踪分支 '%s'"

3577

3516 -#: builtin/branch.c:260

3578 +#: builtin/branch.c:252

3579 #, c-format

3580 msgid "Error deleting branch '%s'"

3581 msgstr "无法删除分支 '%s'"

3582

3521 -#: builtin/branch.c:267

3583 +#: builtin/branch.c:259

3584 #, c-format

3585 msgid "Deleted remote-tracking branch %s (was %s).\n"

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

3587

3526 -#: builtin/branch.c:268

3588 +#: builtin/branch.c:260

3589 #, c-format

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

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

3592

3531 -#: builtin/branch.c:369

3532 -#, c-format

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

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

3535 -

3536 -#: builtin/branch.c:452

3593 +#: builtin/branch.c:303

3594 #, c-format

3595 msgid "[%s: gone]"

3596 msgstr "[%s: 丢失]"

3597

3541 -#: builtin/branch.c:457

3598 +#: builtin/branch.c:308

3599 #, c-format

3600 msgid "[%s]"

3601 msgstr "[%s]"

3602

3546 -#: builtin/branch.c:462

3603 +#: builtin/branch.c:313

3604 #, c-format

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

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

3607

3551 -#: builtin/branch.c:464

3608 +#: builtin/branch.c:315

3609 #, c-format

3610 msgid "[behind %d]"

3611 msgstr "[落后 %d]"

3612

3556 -#: builtin/branch.c:468

3613 +#: builtin/branch.c:319

3614 #, c-format

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

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

3617

3561 -#: builtin/branch.c:470

3618 +#: builtin/branch.c:321

3619 #, c-format

3620 msgid "[ahead %d]"

3621 msgstr "[领先 %d]"

3622

3566 -#: builtin/branch.c:473

3623 +#: builtin/branch.c:324

3624 #, c-format

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

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

3627

3571 -#: builtin/branch.c:476

3628 +#: builtin/branch.c:327

3629 #, c-format

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

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

3632

3576 -#: builtin/branch.c:489

3633 +#: builtin/branch.c:340

3634 msgid " **** invalid ref ****"

3635 msgstr " **** 无效引用 ****"

3636

3580 -#: builtin/branch.c:580

3637 +#: builtin/branch.c:366

3638 #, c-format

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

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

3641

3585 -#: builtin/branch.c:583

3642 +#: builtin/branch.c:369

3643 #, c-format

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

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

3646

3590 -#: builtin/branch.c:589

3647 +#: builtin/branch.c:375

3648 #, c-format

3649 msgid "(HEAD detached at %s)"

3650 msgstr "（头指针分离于 %s）"

3651

3595 -#: builtin/branch.c:592

3652 +#: builtin/branch.c:378

3653 #, c-format

3654 msgid "(HEAD detached from %s)"

3655 msgstr "（头指针分离自 %s）"

3656

3600 -#: builtin/branch.c:596

3657 +#: builtin/branch.c:382

3658 msgid "(no branch)"

3659 msgstr "（非分支）"

3660

3604 -#: builtin/branch.c:643

3605 -#, c-format

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

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

3608 -

3609 -#: builtin/branch.c:691

3610 -msgid "some refs could not be read"

3611 -msgstr "一些引用不能读取"

3612 -

3613 -#: builtin/branch.c:704

3661 +#: builtin/branch.c:524

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

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

3664

3617 -#: builtin/branch.c:714

3665 +#: builtin/branch.c:534

3666 #, c-format

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

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

3669

3622 -#: builtin/branch.c:729

3670 +#: builtin/branch.c:549

3671 msgid "Branch rename failed"

3672 msgstr "分支重命名失败"

3673

3626 -#: builtin/branch.c:733

3674 +#: builtin/branch.c:553

3675 #, c-format

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

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

3678

3631 -#: builtin/branch.c:737

3679 +#: builtin/branch.c:557

3680 #, c-format

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

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

3683

3636 -#: builtin/branch.c:744

3684 +#: builtin/branch.c:564

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

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

3687

3640 -#: builtin/branch.c:759

3641 -#, c-format

3642 -msgid "malformed object name %s"

3643 -msgstr "非法的对象名 %s"

3644 -

3645 -#: builtin/branch.c:781

3688 +#: builtin/branch.c:587

3689 #, c-format

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

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

3692

3650 -#: builtin/branch.c:811

3693 +#: builtin/branch.c:616

3694 msgid "Generic options"

3695 msgstr "通用选项"

3696

3654 -#: builtin/branch.c:813

3697 +#: builtin/branch.c:618

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

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

3700

3658 -#: builtin/branch.c:814

3701 +#: builtin/branch.c:619

3702 msgid "suppress informational messages"

3703 msgstr "不显示信息"

3704

3662 -#: builtin/branch.c:815

3705 +#: builtin/branch.c:620

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

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

3708

3666 -#: builtin/branch.c:817

3709 +#: builtin/branch.c:622

3710 msgid "change upstream info"

3711 msgstr "改变上游信息"

3712

3670 -#: builtin/branch.c:821

3713 +#: builtin/branch.c:626

3714 msgid "use colored output"

3715 msgstr "使用彩色输出"

3716

3674 -#: builtin/branch.c:822

3717 +#: builtin/branch.c:627

3718 msgid "act on remote-tracking branches"

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

3720

3678 -#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852

3679 -#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581

3680 -#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618

3681 -#: builtin/tag.c:624

3682 -msgid "commit"

3683 -msgstr "提交"

3684 -

3685 -#: builtin/branch.c:826 builtin/branch.c:832

3721 +#: builtin/branch.c:629 builtin/branch.c:630

3722 msgid "print only branches that contain the commit"

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

3724

3689 -#: builtin/branch.c:838

3725 +#: builtin/branch.c:633

3726 msgid "Specific git-branch actions:"

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

3728

3693 -#: builtin/branch.c:839

3729 +#: builtin/branch.c:634

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

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

3732

3697 -#: builtin/branch.c:841

3733 +#: builtin/branch.c:636

3734 msgid "delete fully merged branch"

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

3736

3701 -#: builtin/branch.c:842

3737 +#: builtin/branch.c:637

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

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

3740

3705 -#: builtin/branch.c:843

3741 +#: builtin/branch.c:638

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

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

3744

3709 -#: builtin/branch.c:844

3745 +#: builtin/branch.c:639

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

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

3748

3713 -#: builtin/branch.c:845

3749 +#: builtin/branch.c:640

3750 msgid "list branch names"

3751 msgstr "列出分支名"

3752

3717 -#: builtin/branch.c:846

3753 +#: builtin/branch.c:641

3754 msgid "create the branch's reflog"

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

3756

3721 -#: builtin/branch.c:848

3757 +#: builtin/branch.c:643

3758 msgid "edit the description for the branch"

3759 msgstr "标记分支的描述"

3760

3725 -#: builtin/branch.c:849

3761 +#: builtin/branch.c:644

3762 msgid "force creation, move/rename, deletion"

3763 msgstr "强制创建、移动/重命名、删除"

3764

3729 -#: builtin/branch.c:852

3730 -msgid "print only not merged branches"

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

3765 +#: builtin/branch.c:645

3766 +msgid "print only branches that are merged"

3767 +msgstr "只打印已经合并的分支"

3768

3733 -#: builtin/branch.c:858

3734 -msgid "print only merged branches"

3735 -msgstr "只打印合并的分支"

3769 +#: builtin/branch.c:646

3770 +msgid "print only branches that are not merged"

3771 +msgstr "只打印尚未合并的分支"

3772

3737 -#: builtin/branch.c:862

3773 +#: builtin/branch.c:647

3774 msgid "list branches in columns"

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

3776

3741 -#: builtin/branch.c:875

3777 +#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366

3778 +msgid "key"

3779 +msgstr "key"

3780 +

3781 +#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367

3782 +msgid "field name to sort on"

3783 +msgstr "排序的字段名"

3784 +

3785 +#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398

3786 +#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564

3787 +#: builtin/tag.c:369

3788 +msgid "object"

3789 +msgstr "对象"

3790 +

3791 +#: builtin/branch.c:652

3792 +msgid "print only branches of the object"

3793 +msgstr "只打印指向该对象的分支"

3794 +

3795 +#: builtin/branch.c:670

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

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

3798

3745 -#: builtin/branch.c:879 builtin/clone.c:690

3799 +#: builtin/branch.c:674 builtin/clone.c:697

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

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

3802

3749 -#: builtin/branch.c:901

3803 +#: builtin/branch.c:694

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

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

3806

3753 -#: builtin/branch.c:912 builtin/branch.c:951

3807 +#: builtin/branch.c:705 builtin/branch.c:747

3808 msgid "branch name required"

3809 msgstr "必须提供分支名"

3810

3757 -#: builtin/branch.c:927

3811 +#: builtin/branch.c:723

3812 msgid "Cannot give description to detached HEAD"

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

3814

3761 -#: builtin/branch.c:932

3815 +#: builtin/branch.c:728

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

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

3818

3765 -#: builtin/branch.c:939

3819 +#: builtin/branch.c:735

3820 #, c-format

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

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

3823

3770 -#: builtin/branch.c:942

3824 +#: builtin/branch.c:738

3825 #, c-format

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

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

3828

3775 -#: builtin/branch.c:957

3829 +#: builtin/branch.c:753

3830 msgid "too many branches for a rename operation"

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

3832

3779 -#: builtin/branch.c:962

3833 +#: builtin/branch.c:758

3834 msgid "too many branches to set new upstream"

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

3836

3783 -#: builtin/branch.c:966

3837 +#: builtin/branch.c:762

3838 #, c-format

3839 msgid ""

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

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

3842

3789 -#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012

3843 +#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808

3844 #, c-format

3845 msgid "no such branch '%s'"

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

3847

3794 -#: builtin/branch.c:973

3848 +#: builtin/branch.c:769

3849 #, c-format

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

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

3852

3799 -#: builtin/branch.c:985

3853 +#: builtin/branch.c:781

3854 msgid "too many branches to unset upstream"

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

3856

3803 -#: builtin/branch.c:989

3857 +#: builtin/branch.c:785

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

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

3860

3807 -#: builtin/branch.c:995

3861 +#: builtin/branch.c:791

3862 #, c-format

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

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

3865

3812 -#: builtin/branch.c:1009

3866 +#: builtin/branch.c:805

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

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

3869

3816 -#: builtin/branch.c:1015

3870 +#: builtin/branch.c:811

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

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

3873

3820 -#: builtin/branch.c:1018

3874 +#: builtin/branch.c:814

3875 #, c-format

3876 msgid ""

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

@@ -3825,7 +3879,7 @@ msgid ""

3879 msgstr ""

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

3881

3828 -#: builtin/branch.c:1035

3882 +#: builtin/branch.c:831

3883 #, c-format

3884 msgid ""

3885 "\n"

@@ -3836,12 +3890,12 @@ msgstr ""

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

3891 "\n"

3892

3839 -#: builtin/branch.c:1036

3893 +#: builtin/branch.c:832

3894 #, c-format

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

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

3897

3844 -#: builtin/branch.c:1037

3898 +#: builtin/branch.c:833

3899 #, c-format

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

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

@@ -3868,11 +3922,8 @@ msgstr ""

3922 ">|--textconv) <对象>"

3923

3924 #: builtin/cat-file.c:429

3871 -msgid ""

3872 -"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"

3873 -"objects>"

3874 -msgstr ""

3875 -"git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>"

3925 +msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"

3926 +msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"

3927

3928 #: builtin/cat-file.c:466

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

@@ -3927,8 +3978,8 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

3978 msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."

3979

3980 #: builtin/check-attr.c:12

3930 -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"

3931 -msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>"

3981 +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"

3982 +msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"

3983

3984 #: builtin/check-attr.c:19

3985 msgid "report all attributes set on file"

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

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

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

3999

3949 -#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267

4000 +#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325

4001 msgid "suppress progress reporting"

4002 msgstr "不显示进度报告"

4003

@@ -4032,6 +4083,8 @@ msgid "write the content to temporary files"

4083 msgstr "将内容写入临时文件"

4084

4085 #: builtin/checkout-index.c:204 builtin/column.c:30

4086 +#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175

4087 +#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181

4088 msgid "string"

4089 msgstr "字符串"

4090

@@ -4051,106 +4104,106 @@ msgstr "git checkout [<选项>] <分支>"

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

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

4106

4054 -#: builtin/checkout.c:133 builtin/checkout.c:166

4107 +#: builtin/checkout.c:134 builtin/checkout.c:167

4108 #, c-format

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

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

4111

4059 -#: builtin/checkout.c:135 builtin/checkout.c:168

4112 +#: builtin/checkout.c:136 builtin/checkout.c:169

4113 #, c-format

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

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

4116

4064 -#: builtin/checkout.c:151

4117 +#: builtin/checkout.c:152

4118 #, c-format

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

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

4121

4069 -#: builtin/checkout.c:195

4122 +#: builtin/checkout.c:196

4123 #, c-format

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

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

4126

4074 -#: builtin/checkout.c:212

4127 +#: builtin/checkout.c:213

4128 #, c-format

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

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

4131

4079 -#: builtin/checkout.c:229

4132 +#: builtin/checkout.c:230

4133 #, c-format

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

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

4136

4084 -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

4085 -#: builtin/checkout.c:259

4137 +#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

4138 +#: builtin/checkout.c:260

4139 #, c-format

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

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

4142

4090 -#: builtin/checkout.c:262 builtin/checkout.c:265

4143 +#: builtin/checkout.c:263 builtin/checkout.c:266

4144 #, c-format

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

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

4147

4095 -#: builtin/checkout.c:268

4148 +#: builtin/checkout.c:269

4149 #, c-format

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

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

4152

4100 -#: builtin/checkout.c:279 builtin/checkout.c:473

4153 +#: builtin/checkout.c:280 builtin/checkout.c:474

4154 msgid "corrupt index file"

4155 msgstr "损坏的索引文件"

4156

4104 -#: builtin/checkout.c:339 builtin/checkout.c:346

4157 +#: builtin/checkout.c:340 builtin/checkout.c:347

4158 #, c-format

4159 msgid "path '%s' is unmerged"

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

4161

4109 -#: builtin/checkout.c:495

4162 +#: builtin/checkout.c:496

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

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

4165

4113 -#: builtin/checkout.c:622

4166 +#: builtin/checkout.c:623

4167 #, c-format

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

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

4170

4118 -#: builtin/checkout.c:660

4171 +#: builtin/checkout.c:661

4172 msgid "HEAD is now at"

4173 msgstr "HEAD 目前位于"

4174

4122 -#: builtin/checkout.c:667

4175 +#: builtin/checkout.c:668

4176 #, c-format

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

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

4179

4127 -#: builtin/checkout.c:670

4180 +#: builtin/checkout.c:671

4181 #, c-format

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

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

4184

4132 -#: builtin/checkout.c:674

4185 +#: builtin/checkout.c:675

4186 #, c-format

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

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

4189

4137 -#: builtin/checkout.c:676 builtin/checkout.c:1065

4190 +#: builtin/checkout.c:677 builtin/checkout.c:1066

4191 #, c-format

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

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

4194

4142 -#: builtin/checkout.c:678

4195 +#: builtin/checkout.c:679

4196 #, c-format

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

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

4199

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

4148 -#: builtin/checkout.c:730

4201 +#: builtin/checkout.c:731

4202 #, c-format

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

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

4205

4153 -#: builtin/checkout.c:736

4206 +#: builtin/checkout.c:737

4207 #, c-format

4208 msgid ""

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

@@ -4171,7 +4224,7 @@ msgstr[1] ""

4224 "\n"

4225 "%s\n"

4226

4174 -#: builtin/checkout.c:755

4227 +#: builtin/checkout.c:756

4228 #, c-format

4229 msgid ""

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

@@ -4198,144 +4251,150 @@ msgstr[1] ""

4251 " git branch <新分支名> %s\n"

4252 "\n"

4253

4201 -#: builtin/checkout.c:791

4254 +#: builtin/checkout.c:792

4255 msgid "internal error in revision walk"

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

4257

4205 -#: builtin/checkout.c:795

4258 +#: builtin/checkout.c:796

4259 msgid "Previous HEAD position was"

4260 msgstr "之前的 HEAD 位置是"

4261

4209 -#: builtin/checkout.c:822 builtin/checkout.c:1060

4262 +#: builtin/checkout.c:823 builtin/checkout.c:1061

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

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

4265

4213 -#: builtin/checkout.c:967

4266 +#: builtin/checkout.c:968

4267 #, c-format

4268 msgid "only one reference expected, %d given."

4269 msgstr "只要一个引用，却给出了 %d 个"

4270

4218 -#: builtin/checkout.c:1006 builtin/worktree.c:210

4271 +#: builtin/checkout.c:1007 builtin/worktree.c:213

4272 #, c-format

4273 msgid "invalid reference: %s"

4274 msgstr "无效引用：%s"

4275

4223 -#: builtin/checkout.c:1035

4276 +#: builtin/checkout.c:1036

4277 #, c-format

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

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

4280

4228 -#: builtin/checkout.c:1074

4281 +#: builtin/checkout.c:1075

4282 msgid "paths cannot be used with switching branches"

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

4284

4232 -#: builtin/checkout.c:1077 builtin/checkout.c:1081

4285 +#: builtin/checkout.c:1078 builtin/checkout.c:1082

4286 #, c-format

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

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

4289

4237 -#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093

4238 -#: builtin/checkout.c:1096

4290 +#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094

4291 +#: builtin/checkout.c:1097

4292 #, c-format

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

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

4295

4243 -#: builtin/checkout.c:1101

4296 +#: builtin/checkout.c:1102

4297 #, c-format

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

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

4300

4248 -#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83

4249 -#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317

4250 -#: builtin/worktree.c:319

4301 +#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83

4302 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320

4303 +#: builtin/worktree.c:322

4304 msgid "branch"

4305 msgstr "分支"

4306

4254 -#: builtin/checkout.c:1135

4307 +#: builtin/checkout.c:1136

4308 msgid "create and checkout a new branch"

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

4310

4258 -#: builtin/checkout.c:1137

4311 +#: builtin/checkout.c:1138

4312 msgid "create/reset and checkout a branch"

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

4314

4262 -#: builtin/checkout.c:1138

4315 +#: builtin/checkout.c:1139

4316 msgid "create reflog for new branch"

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

4318

4266 -#: builtin/checkout.c:1139

4319 +#: builtin/checkout.c:1140

4320 msgid "detach the HEAD at named commit"

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

4322

4270 -#: builtin/checkout.c:1140

4323 +#: builtin/checkout.c:1141

4324 msgid "set upstream info for new branch"

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

4326

4274 -#: builtin/checkout.c:1142

4327 +#: builtin/checkout.c:1143

4328 msgid "new-branch"

4329 msgstr "新分支"

4330

4278 -#: builtin/checkout.c:1142

4331 +#: builtin/checkout.c:1143

4332 msgid "new unparented branch"

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

4334

4282 -#: builtin/checkout.c:1143

4335 +#: builtin/checkout.c:1144

4336 msgid "checkout our version for unmerged files"

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

4338

4286 -#: builtin/checkout.c:1145

4339 +#: builtin/checkout.c:1146

4340 msgid "checkout their version for unmerged files"

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

4342

4290 -#: builtin/checkout.c:1147

4343 +#: builtin/checkout.c:1148

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

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

4346

4294 -#: builtin/checkout.c:1148

4347 +#: builtin/checkout.c:1149

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

4349 msgstr "和新的分支执行三方合并"

4350

4298 -#: builtin/checkout.c:1149 builtin/merge.c:227

4351 +#: builtin/checkout.c:1150 builtin/merge.c:227

4352 msgid "update ignored files (default)"

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

4354

4302 -#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249

4355 +#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250

4356 msgid "style"

4357 msgstr "风格"

4358

4306 -#: builtin/checkout.c:1151

4359 +#: builtin/checkout.c:1152

4360 msgid "conflict style (merge or diff3)"

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

4362

4310 -#: builtin/checkout.c:1154

4363 +#: builtin/checkout.c:1155

4364 msgid "do not limit pathspecs to sparse entries only"

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

4366

4314 -#: builtin/checkout.c:1156

4367 +#: builtin/checkout.c:1157

4368 msgid "second guess 'git checkout <no-such-branch>'"

4369 msgstr "二次猜测'git checkout <无此分支>'"

4370

4318 -#: builtin/checkout.c:1158

4371 +#: builtin/checkout.c:1159

4372 msgid "do not check if another worktree is holding the given ref"

4373 msgstr "不检查指定的引用是否被其他工作区所占用"

4374

4322 -#: builtin/checkout.c:1181

4375 +#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112

4376 +#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560

4377 +#: builtin/send-pack.c:168

4378 +msgid "force progress reporting"

4379 +msgstr "强制显示进度报告"

4380 +

4381 +#: builtin/checkout.c:1191

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

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

4384

4326 -#: builtin/checkout.c:1198

4385 +#: builtin/checkout.c:1208

4386 msgid "--track needs a branch name"

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

4388

4330 -#: builtin/checkout.c:1203

4389 +#: builtin/checkout.c:1213

4390 msgid "Missing branch name; try -b"

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

4392

4334 -#: builtin/checkout.c:1239

4393 +#: builtin/checkout.c:1249

4394 msgid "invalid path specification"

4395 msgstr "无效的路径规格"

4396

4338 -#: builtin/checkout.c:1246

4397 +#: builtin/checkout.c:1256

4398 #, c-format

4399 msgid ""

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

@@ -4344,12 +4403,12 @@ msgstr ""

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

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

4405

4347 -#: builtin/checkout.c:1251

4406 +#: builtin/checkout.c:1261

4407 #, c-format

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

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

4410

4352 -#: builtin/checkout.c:1255

4411 +#: builtin/checkout.c:1265

4412 msgid ""

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

4414 "checking out of the index."

@@ -4387,7 +4446,7 @@ msgstr "将忽略仓库 %s\n"

4446 msgid "failed to remove %s"

4447 msgstr "无法删除 %s"

4448

4390 -#: builtin/clean.c:317

4449 +#: builtin/clean.c:315

4450 msgid ""

4451 "Prompt help:\n"

4452 "1 - select a numbered item\n"

@@ -4399,7 +4458,7 @@ msgstr ""

4458 "foo - 通过标题选择一个选项\n"

4459 " - （空）什么也不选择"

4460

4402 -#: builtin/clean.c:321

4461 +#: builtin/clean.c:319

4462 msgid ""

4463 "Prompt help:\n"

4464 "1 - select a single item\n"

@@ -4419,36 +4478,36 @@ msgstr ""

4478 "* - 选择所有选项\n"

4479 " - （空）结束选择"

4480

4422 -#: builtin/clean.c:537

4481 +#: builtin/clean.c:535

4482 #, c-format

4483 msgid "Huh (%s)?"

4484 msgstr "嗯（%s）？"

4485

4427 -#: builtin/clean.c:679

4486 +#: builtin/clean.c:677

4487 #, c-format

4488 msgid "Input ignore patterns>> "

4489 msgstr "输入模版以排除条目>> "

4490

4432 -#: builtin/clean.c:716

4491 +#: builtin/clean.c:714

4492 #, c-format

4493 msgid "WARNING: Cannot find items matched by: %s"

4494 msgstr "警告：无法找到和 %s 匹配的条目"

4495

4437 -#: builtin/clean.c:737

4496 +#: builtin/clean.c:735

4497 msgid "Select items to delete"

4498 msgstr "选择要删除的条目"

4499

4500 #. TRANSLATORS: Make sure to keep [y/N] as is

4442 -#: builtin/clean.c:778

4501 +#: builtin/clean.c:776

4502 #, c-format

4503 msgid "Remove %s [y/N]? "

4504 msgstr "删除 %s [y/N]？"

4505

4447 -#: builtin/clean.c:803

4506 +#: builtin/clean.c:801

4507 msgid "Bye."

4508 msgstr "再见。"

4509

4451 -#: builtin/clean.c:811

4510 +#: builtin/clean.c:809

4511 msgid ""

4512 "clean - start cleaning\n"

4513 "filter by pattern - exclude items from deletion\n"

@@ -4466,69 +4525,69 @@ msgstr ""

4525 "help - 显示本帮助\n"

4526 "? - 显示如何在提示符下选择的帮助"

4527

4469 -#: builtin/clean.c:838

4528 +#: builtin/clean.c:836

4529 msgid "*** Commands ***"

4530 msgstr "*** 命令 ***"

4531

4473 -#: builtin/clean.c:839

4532 +#: builtin/clean.c:837

4533 msgid "What now"

4534 msgstr "请选择"

4535

4477 -#: builtin/clean.c:847

4536 +#: builtin/clean.c:845

4537 msgid "Would remove the following item:"

4538 msgid_plural "Would remove the following items:"

4539 msgstr[0] "将删除如下条目："

4540 msgstr[1] "将删除如下条目："

4541

4483 -#: builtin/clean.c:864

4542 +#: builtin/clean.c:862

4543 msgid "No more files to clean, exiting."

4544 msgstr "没有要清理的文件，退出。"

4545

4487 -#: builtin/clean.c:895

4546 +#: builtin/clean.c:893

4547 msgid "do not print names of files removed"

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

4549

4491 -#: builtin/clean.c:897

4550 +#: builtin/clean.c:895

4551 msgid "force"

4552 msgstr "强制"

4553

4495 -#: builtin/clean.c:898

4554 +#: builtin/clean.c:896

4555 msgid "interactive cleaning"

4556 msgstr "交互式清除"

4557

4499 -#: builtin/clean.c:900

4558 +#: builtin/clean.c:898

4559 msgid "remove whole directories"

4560 msgstr "删除整个目录"

4561

4503 -#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714

4504 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187

4562 +#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709

4563 +#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182

4564 msgid "pattern"

4565 msgstr "模式"

4566

4508 -#: builtin/clean.c:902

4567 +#: builtin/clean.c:900

4568 msgid "add <pattern> to ignore rules"

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

4570

4512 -#: builtin/clean.c:903

4571 +#: builtin/clean.c:901

4572 msgid "remove ignored files, too"

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

4574

4516 -#: builtin/clean.c:905

4575 +#: builtin/clean.c:903

4576 msgid "remove only ignored files"

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

4578

4520 -#: builtin/clean.c:923

4579 +#: builtin/clean.c:921

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

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

4582

4524 -#: builtin/clean.c:927

4583 +#: builtin/clean.c:925

4584 msgid ""

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

4586 "clean"

4587 msgstr ""

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

4589

4531 -#: builtin/clean.c:930

4590 +#: builtin/clean.c:928

4591 msgid ""

4592 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

4593 "refusing to clean"

@@ -4539,16 +4598,11 @@ msgstr ""

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

4599 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"

4600

4542 -#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224

4543 -#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168

4544 -msgid "force progress reporting"

4545 -msgstr "强制显示进度报告"

4546 -

4601 #: builtin/clone.c:59

4602 msgid "don't create a checkout"

4603 msgstr "不创建一个检出"

4604

4551 -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504

4605 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469

4606 msgid "create a bare repository"

4607 msgstr "创建一个纯仓库"

4608

@@ -4572,15 +4626,15 @@ msgstr "设置为共享仓库"

4626 msgid "initialize submodules in the clone"

4627 msgstr "在克隆时初始化子模组"

4628

4575 -#: builtin/clone.c:75 builtin/init-db.c:501

4629 +#: builtin/clone.c:75 builtin/init-db.c:466

4630 msgid "template-directory"

4631 msgstr "模板目录"

4632

4579 -#: builtin/clone.c:76 builtin/init-db.c:502

4633 +#: builtin/clone.c:76 builtin/init-db.c:467

4634 msgid "directory from which templates will be used"

4635 msgstr "模板目录将被使用"

4636

4583 -#: builtin/clone.c:78

4637 +#: builtin/clone.c:78 builtin/submodule--helper.c:179

4638 msgid "reference repository"

4639 msgstr "参考仓库"

4640

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

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

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

4660

4607 -#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659

4661 +#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654

4662 #: builtin/pull.c:186

4663 msgid "depth"

4664 msgstr "深度"

@@ -4617,11 +4671,11 @@ msgstr "创建一个指定深度的浅克隆"

4671 msgid "clone only one branch, HEAD or --branch"

4672 msgstr "只克隆一个分支、HEAD 或 --branch"

4673

4620 -#: builtin/clone.c:91 builtin/init-db.c:510

4674 +#: builtin/clone.c:91 builtin/init-db.c:475

4675 msgid "gitdir"

4676 msgstr "git目录"

4677

4624 -#: builtin/clone.c:92 builtin/init-db.c:511

4678 +#: builtin/clone.c:92 builtin/init-db.c:476

4679 msgid "separate git dir from working tree"

4680 msgstr "git目录和工作区分离"

4681

@@ -4633,52 +4687,57 @@ msgstr "key=value"

4687 msgid "set config inside the new repository"

4688 msgstr "在新仓库中设置配置信息"

4689

4636 -#: builtin/clone.c:298

4690 +#: builtin/clone.c:300

4691 +#, c-format

4692 +msgid "reference repository '%s' as a linked checkout is not supported yet."

4693 +msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"

4694 +

4695 +#: builtin/clone.c:302

4696 #, c-format

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

4698 msgstr "参考仓库 '%s' 不是一个本地仓库。"

4699

4641 -#: builtin/clone.c:302

4700 +#: builtin/clone.c:307

4701 #, c-format

4702 msgid "reference repository '%s' is shallow"

4703 msgstr "参考仓库 '%s' 是一个浅克隆"

4704

4646 -#: builtin/clone.c:305

4705 +#: builtin/clone.c:310

4706 #, c-format

4707 msgid "reference repository '%s' is grafted"

4708 msgstr "参考仓库 '%s' 已被嫁接"

4709

4651 -#: builtin/clone.c:370 builtin/diff.c:84

4710 +#: builtin/clone.c:375 builtin/diff.c:84

4711 #, c-format

4712 msgid "failed to stat '%s'"

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

4714

4656 -#: builtin/clone.c:372

4715 +#: builtin/clone.c:377

4716 #, c-format

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

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

4719

4661 -#: builtin/clone.c:386

4720 +#: builtin/clone.c:391

4721 #, c-format

4722 msgid "failed to stat %s\n"

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

4724

4666 -#: builtin/clone.c:408

4725 +#: builtin/clone.c:413

4726 #, c-format

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

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

4729

4671 -#: builtin/clone.c:412

4730 +#: builtin/clone.c:417

4731 #, c-format

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

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

4734

4676 -#: builtin/clone.c:435 builtin/clone.c:619

4735 +#: builtin/clone.c:442 builtin/clone.c:626

4736 #, c-format

4737 msgid "done.\n"

4738 msgstr "完成。\n"

4739

4681 -#: builtin/clone.c:447

4740 +#: builtin/clone.c:454

4741 msgid ""

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

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

@@ -4688,121 +4747,117 @@ msgstr ""

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

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

4749

4691 -#: builtin/clone.c:524

4750 +#: builtin/clone.c:531

4751 #, c-format

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

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

4754

4696 -#: builtin/clone.c:614

4755 +#: builtin/clone.c:621

4756 #, c-format

4757 msgid "Checking connectivity... "

4758 msgstr "检查连接... "

4759

4701 -#: builtin/clone.c:617

4760 +#: builtin/clone.c:624

4761 msgid "remote did not send all necessary objects"

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

4763

4705 -#: builtin/clone.c:681

4764 +#: builtin/clone.c:688

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

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

4767

4709 -#: builtin/clone.c:712

4768 +#: builtin/clone.c:719

4769 msgid "unable to checkout working tree"

4770 msgstr "不能检出工作区"

4771

4713 -#: builtin/clone.c:799

4772 +#: builtin/clone.c:808

4773 msgid "cannot repack to clean up"

4774 msgstr "无法执行 repack 来清理"

4775

4717 -#: builtin/clone.c:801

4776 +#: builtin/clone.c:810

4777 msgid "cannot unlink temporary alternates file"

4778 msgstr "无法删除临时的 alternates 文件"

4779

4721 -#: builtin/clone.c:831

4780 +#: builtin/clone.c:842

4781 msgid "Too many arguments."

4782 msgstr "太多参数。"

4783

4725 -#: builtin/clone.c:835

4784 +#: builtin/clone.c:846

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

4786 msgstr "您必须指定一个仓库来克隆。"

4787

4729 -#: builtin/clone.c:846

4788 +#: builtin/clone.c:857

4789 #, c-format

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

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

4792

4734 -#: builtin/clone.c:849

4793 +#: builtin/clone.c:860

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

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

4796

4738 -#: builtin/clone.c:862

4797 +#: builtin/clone.c:873

4798 #, c-format

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

4800 msgstr "仓库 '%s' 不存在"

4801

4743 -#: builtin/clone.c:868 builtin/fetch.c:1168

4802 +#: builtin/clone.c:879 builtin/fetch.c:1166

4803 #, c-format

4804 msgid "depth %s is not a positive number"

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

4806

4748 -#: builtin/clone.c:878

4807 +#: builtin/clone.c:889

4808 #, c-format

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

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

4811

4753 -#: builtin/clone.c:888

4812 +#: builtin/clone.c:899

4813 #, c-format

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

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

4816

4758 -#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218

4759 -#: builtin/worktree.c:245

4817 +#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224

4818 +#: builtin/worktree.c:221 builtin/worktree.c:248

4819 #, c-format

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

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

4822

4764 -#: builtin/clone.c:906

4823 +#: builtin/clone.c:917

4824 #, c-format

4825 msgid "could not create work tree dir '%s'"

4826 msgstr "不能创建工作区目录 '%s'"

4827

4769 -#: builtin/clone.c:924

4828 +#: builtin/clone.c:935

4829 #, c-format

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

4831 msgstr "克隆到纯仓库 '%s'...\n"

4832

4774 -#: builtin/clone.c:926

4833 +#: builtin/clone.c:937

4834 #, c-format

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

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

4837

4779 -#: builtin/clone.c:951

4780 -msgid "--dissociate given, but there is no --reference"

4781 -msgstr "提供了参数 --dissociate，但未提供 --reference"

4782 -

4783 -#: builtin/clone.c:968

4838 +#: builtin/clone.c:975

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

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

4841

4787 -#: builtin/clone.c:971

4842 +#: builtin/clone.c:978

4843 msgid "source repository is shallow, ignoring --local"

4844 msgstr "源仓库是浅克隆，忽略 --local"

4845

4791 -#: builtin/clone.c:976

4846 +#: builtin/clone.c:983

4847 msgid "--local is ignored"

4848 msgstr "--local 被忽略"

4849

4795 -#: builtin/clone.c:980

4850 +#: builtin/clone.c:987

4851 #, c-format

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

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

4854

4800 -#: builtin/clone.c:1029 builtin/clone.c:1037

4855 +#: builtin/clone.c:1036 builtin/clone.c:1044

4856 #, c-format

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

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

4859

4805 -#: builtin/clone.c:1040

4860 +#: builtin/clone.c:1047

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

4862 msgstr "您似乎克隆了一个空仓库。"

4863

@@ -4838,15 +4893,15 @@ msgstr "两列之间的填充空间"

4893 msgid "--command must be the first argument"

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

4895

4841 -#: builtin/commit.c:37

4896 +#: builtin/commit.c:38

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

4898 msgstr "git commit [<选项>] [--] <路径规格>..."

4899

4845 -#: builtin/commit.c:42

4900 +#: builtin/commit.c:43

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

4902 msgstr "git status [<选项>] [--] <路径规格>..."

4903

4849 -#: builtin/commit.c:47

4904 +#: builtin/commit.c:48

4905 msgid ""

4906 "Your name and email address were configured automatically based\n"

4907 "on your username and hostname. Please check that they are accurate.\n"

@@ -4870,7 +4925,7 @@ msgstr ""

4925 "\n"

4926 " git commit --amend --reset-author\n"

4927

4873 -#: builtin/commit.c:60

4928 +#: builtin/commit.c:61

4929 msgid ""

4930 "Your name and email address were configured automatically based\n"

4931 "on your username and hostname. Please check that they are accurate.\n"

@@ -4893,7 +4948,7 @@ msgstr ""

4948 "\n"

4949 " git commit --amend --reset-author\n"

4950

4896 -#: builtin/commit.c:72

4951 +#: builtin/commit.c:73

4952 msgid ""

4953 "You asked to amend the most recent commit, but doing so would make\n"

4954 "it empty. You can repeat your command with --allow-empty, or you can\n"

@@ -4902,7 +4957,7 @@ msgstr ""

4957 "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n"

4958 "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"

4959

4905 -#: builtin/commit.c:77

4960 +#: builtin/commit.c:78

4961 msgid ""

4962 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

4963 "If you wish to commit it anyway, use:\n"

@@ -4916,11 +4971,11 @@ msgstr ""

4971 " git commit --allow-empty\n"

4972 "\n"

4973

4919 -#: builtin/commit.c:84

4974 +#: builtin/commit.c:85

4975 msgid "Otherwise, please use 'git reset'\n"

4976 msgstr "否则，请使用命令 'git reset'\n"

4977

4923 -#: builtin/commit.c:87

4978 +#: builtin/commit.c:88

4979 msgid ""

4980 "If you wish to skip this commit, use:\n"

4981 "\n"

@@ -4936,103 +4991,103 @@ msgstr ""

4991 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"

4992 "操作。\n"

4993

4939 -#: builtin/commit.c:304

4994 +#: builtin/commit.c:305

4995 msgid "failed to unpack HEAD tree object"

4996 msgstr "无法解包 HEAD 树对象"

4997

4943 -#: builtin/commit.c:345

4998 +#: builtin/commit.c:346

4999 msgid "unable to create temporary index"

5000 msgstr "不能创建临时索引"

5001

4947 -#: builtin/commit.c:351

5002 +#: builtin/commit.c:352

5003 msgid "interactive add failed"

5004 msgstr "交互式添加失败"

5005

4951 -#: builtin/commit.c:364

5006 +#: builtin/commit.c:365

5007 msgid "unable to update temporary index"

5008 msgstr "无法更新临时索引"

5009

4955 -#: builtin/commit.c:366

5010 +#: builtin/commit.c:367

5011 msgid "Failed to update main cache tree"

5012 msgstr "不能更新树的主缓存"

5013

4959 -#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462

5014 +#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463

5015 msgid "unable to write new_index file"

5016 msgstr "无法写 new_index 文件"

5017

4963 -#: builtin/commit.c:444

5018 +#: builtin/commit.c:445

5019 msgid "cannot do a partial commit during a merge."

5020 msgstr "在合并过程中不能做部分提交。"

5021

4967 -#: builtin/commit.c:446

5022 +#: builtin/commit.c:447

5023 msgid "cannot do a partial commit during a cherry-pick."

5024 msgstr "在拣选过程中不能做部分提交。"

5025

4971 -#: builtin/commit.c:455

5026 +#: builtin/commit.c:456

5027 msgid "cannot read the index"

5028 msgstr "无法读取索引"

5029

4975 -#: builtin/commit.c:474

5030 +#: builtin/commit.c:475

5031 msgid "unable to write temporary index file"

5032 msgstr "无法写临时索引文件"

5033

4979 -#: builtin/commit.c:579

5034 +#: builtin/commit.c:580

5035 #, c-format

5036 msgid "commit '%s' lacks author header"

5037 msgstr "提交 '%s' 缺少作者信息"

5038

4984 -#: builtin/commit.c:581

5039 +#: builtin/commit.c:582

5040 #, c-format

5041 msgid "commit '%s' has malformed author line"

5042 msgstr "提交 '%s' 有非法的作者信息"

5043

4989 -#: builtin/commit.c:600

5044 +#: builtin/commit.c:601

5045 msgid "malformed --author parameter"

5046 msgstr "非法的 --author 参数"

5047

4993 -#: builtin/commit.c:608

5048 +#: builtin/commit.c:609

5049 #, c-format

5050 msgid "invalid date format: %s"

5051 msgstr "无效的日期格式：%s"

5052

4998 -#: builtin/commit.c:652

5053 +#: builtin/commit.c:653

5054 msgid ""

5055 "unable to select a comment character that is not used\n"

5056 "in the current commit message"

5057 msgstr "无法选择一个未被当前提交说明使用的注释字符"

5058

5004 -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079

5059 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080

5060 #, c-format

5061 msgid "could not lookup commit %s"

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

5063

5009 -#: builtin/commit.c:701 builtin/shortlog.c:273

5064 +#: builtin/commit.c:702 builtin/shortlog.c:273

5065 #, c-format

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

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

5068

5014 -#: builtin/commit.c:703

5069 +#: builtin/commit.c:704

5070 msgid "could not read log from standard input"

5071 msgstr "不能从标准输入中读取日志信息"

5072

5018 -#: builtin/commit.c:707

5073 +#: builtin/commit.c:708

5074 #, c-format

5075 msgid "could not read log file '%s'"

5076 msgstr "不能读取日志文件 '%s'"

5077

5023 -#: builtin/commit.c:729

5078 +#: builtin/commit.c:730

5079 msgid "could not read MERGE_MSG"

5080 msgstr "不能读取 MERGE_MSG"

5081

5027 -#: builtin/commit.c:733

5082 +#: builtin/commit.c:734

5083 msgid "could not read SQUASH_MSG"

5084 msgstr "不能读取 SQUASH_MSG"

5085

5031 -#: builtin/commit.c:784

5086 +#: builtin/commit.c:785

5087 msgid "could not write commit template"

5088 msgstr "不能写提交模版"

5089

5035 -#: builtin/commit.c:802

5090 +#: builtin/commit.c:803

5091 #, c-format

5092 msgid ""

5093 "\n"

@@ -5046,7 +5101,7 @@ msgstr ""

5101 "\t%s\n"

5102 "然后重试。\n"

5103

5049 -#: builtin/commit.c:807

5104 +#: builtin/commit.c:808

5105 #, c-format

5106 msgid ""

5107 "\n"

@@ -5060,7 +5115,7 @@ msgstr ""

5115 "\t%s\n"

5116 "然后重试。\n"

5117

5063 -#: builtin/commit.c:820

5118 +#: builtin/commit.c:821

5119 #, c-format

5120 msgid ""

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

@@ -5069,7 +5124,7 @@ msgstr ""

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

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

5126

5072 -#: builtin/commit.c:827

5127 +#: builtin/commit.c:828

5128 #, c-format

5129 msgid ""

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

@@ -5080,340 +5135,346 @@ msgstr ""

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

5136

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

5083 -#: builtin/commit.c:847

5138 +#: builtin/commit.c:848

5139 #, c-format

5140 msgid "%sAuthor: %.*s <%.*s>"

5141 msgstr "%s作者： %.*s <%.*s>"

5142

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

5089 -#: builtin/commit.c:855

5144 +#: builtin/commit.c:856

5145 #, c-format

5146 msgid "%sDate: %s"

5147 msgstr "%s日期： %s"

5148

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

5095 -#: builtin/commit.c:862

5150 +#: builtin/commit.c:863

5151 #, c-format

5152 msgid "%sCommitter: %.*s <%.*s>"

5153 msgstr "%s提交者：%.*s <%.*s>"

5154

5100 -#: builtin/commit.c:880

5155 +#: builtin/commit.c:881

5156 msgid "Cannot read index"

5157 msgstr "无法读取索引"

5158

5104 -#: builtin/commit.c:937

5159 +#: builtin/commit.c:938

5160 msgid "Error building trees"

5161 msgstr "无法创建树对象"

5162

5108 -#: builtin/commit.c:952 builtin/tag.c:495

5163 +#: builtin/commit.c:953 builtin/tag.c:266

5164 #, c-format

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

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

5167

5113 -#: builtin/commit.c:1054

5168 +#: builtin/commit.c:1055

5169 #, c-format

5170 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

5171 msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"

5172

5118 -#: builtin/commit.c:1069 builtin/commit.c:1309

5173 +#: builtin/commit.c:1070 builtin/commit.c:1310

5174 #, c-format

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

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

5177

5123 -#: builtin/commit.c:1106

5178 +#: builtin/commit.c:1107

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

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

5181

5127 -#: builtin/commit.c:1136

5182 +#: builtin/commit.c:1137

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

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

5185

5131 -#: builtin/commit.c:1145

5186 +#: builtin/commit.c:1146

5187 msgid "You have nothing to amend."

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

5189

5135 -#: builtin/commit.c:1148

5190 +#: builtin/commit.c:1149

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

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

5193

5139 -#: builtin/commit.c:1150

5194 +#: builtin/commit.c:1151

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

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

5197

5143 -#: builtin/commit.c:1153

5198 +#: builtin/commit.c:1154

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

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

5201

5147 -#: builtin/commit.c:1163

5202 +#: builtin/commit.c:1164

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

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

5205

5151 -#: builtin/commit.c:1165

5206 +#: builtin/commit.c:1166

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

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

5209

5155 -#: builtin/commit.c:1173

5210 +#: builtin/commit.c:1174

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

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

5213

5159 -#: builtin/commit.c:1190

5214 +#: builtin/commit.c:1191

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

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

5217

5163 -#: builtin/commit.c:1192

5218 +#: builtin/commit.c:1193

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

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

5221

5167 -#: builtin/commit.c:1194

5222 +#: builtin/commit.c:1195

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

5224 msgstr "聪明... 用脏索引修补最后一个提交。"

5225

5171 -#: builtin/commit.c:1196

5226 +#: builtin/commit.c:1197

5227 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

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

5229

5175 -#: builtin/commit.c:1208 builtin/tag.c:730

5230 +#: builtin/commit.c:1209 builtin/tag.c:475

5231 #, c-format

5232 msgid "Invalid cleanup mode %s"

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

5234

5180 -#: builtin/commit.c:1213

5235 +#: builtin/commit.c:1214

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

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

5238

5184 -#: builtin/commit.c:1323 builtin/commit.c:1602

5239 +#: builtin/commit.c:1324 builtin/commit.c:1605

5240 msgid "show status concisely"

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

5242

5188 -#: builtin/commit.c:1325 builtin/commit.c:1604

5243 +#: builtin/commit.c:1326 builtin/commit.c:1607

5244 msgid "show branch information"

5245 msgstr "显示分支信息"

5246

5192 -#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546

5247 +#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546

5248 +#: builtin/worktree.c:423

5249 msgid "machine-readable output"

5250 msgstr "机器可读的输出"

5251

5196 -#: builtin/commit.c:1330 builtin/commit.c:1608

5252 +#: builtin/commit.c:1331 builtin/commit.c:1611

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

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

5255

5200 -#: builtin/commit.c:1333 builtin/commit.c:1611

5256 +#: builtin/commit.c:1334 builtin/commit.c:1614

5257 msgid "terminate entries with NUL"

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

5259

5204 -#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981

5205 -#: builtin/fast-export.c:984 builtin/tag.c:604

5260 +#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981

5261 +#: builtin/fast-export.c:984 builtin/tag.c:353

5262 msgid "mode"

5263 msgstr "模式"

5264

5209 -#: builtin/commit.c:1336 builtin/commit.c:1614

5265 +#: builtin/commit.c:1337 builtin/commit.c:1617

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

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

5268

5213 -#: builtin/commit.c:1339

5269 +#: builtin/commit.c:1340

5270 msgid "show ignored files"

5271 msgstr "显示忽略的文件"

5272

5217 -#: builtin/commit.c:1340 parse-options.h:155

5273 +#: builtin/commit.c:1341 parse-options.h:155

5274 msgid "when"

5275 msgstr "何时"

5276

5221 -#: builtin/commit.c:1341

5277 +#: builtin/commit.c:1342

5278 msgid ""

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

5280 "(Default: all)"

5281 msgstr ""

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

5283

5228 -#: builtin/commit.c:1343

5284 +#: builtin/commit.c:1344

5285 msgid "list untracked files in columns"

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

5287

5232 -#: builtin/commit.c:1429

5288 +#: builtin/commit.c:1430

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

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

5291

5236 -#: builtin/commit.c:1431

5292 +#: builtin/commit.c:1432

5293 msgid "could not parse newly created commit"

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

5295

5240 -#: builtin/commit.c:1476

5296 +#: builtin/commit.c:1477

5297 msgid "detached HEAD"

5298 msgstr "分离头指针"

5299

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

5245 -#: builtin/commit.c:1479

5301 +#: builtin/commit.c:1480

5302 msgid " (root-commit)"

5303 msgstr "（根提交）"

5304

5249 -#: builtin/commit.c:1572

5305 +#: builtin/commit.c:1575

5306 msgid "suppress summary after successful commit"

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

5308

5253 -#: builtin/commit.c:1573

5309 +#: builtin/commit.c:1576

5310 msgid "show diff in commit message template"

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

5312

5257 -#: builtin/commit.c:1575

5313 +#: builtin/commit.c:1578

5314 msgid "Commit message options"

5315 msgstr "提交说明选项"

5316

5261 -#: builtin/commit.c:1576 builtin/tag.c:602

5317 +#: builtin/commit.c:1579 builtin/tag.c:351

5318 msgid "read message from file"

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

5320

5265 -#: builtin/commit.c:1577

5321 +#: builtin/commit.c:1580

5322 msgid "author"

5323 msgstr "作者"

5324

5269 -#: builtin/commit.c:1577

5325 +#: builtin/commit.c:1580

5326 msgid "override author for commit"

5327 msgstr "提交时覆盖作者"

5328

5273 -#: builtin/commit.c:1578 builtin/gc.c:268

5329 +#: builtin/commit.c:1581 builtin/gc.c:326

5330 msgid "date"

5331 msgstr "日期"

5332

5277 -#: builtin/commit.c:1578

5333 +#: builtin/commit.c:1581

5334 msgid "override date for commit"

5335 msgstr "提交时覆盖日期"

5336

5281 -#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392

5282 -#: builtin/notes.c:555 builtin/tag.c:600

5337 +#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392

5338 +#: builtin/notes.c:555 builtin/tag.c:349

5339 msgid "message"

5340 msgstr "说明"

5341

5286 -#: builtin/commit.c:1579

5342 +#: builtin/commit.c:1582

5343 msgid "commit message"

5344 msgstr "提交说明"

5345

5290 -#: builtin/commit.c:1580

5346 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585

5347 +#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79

5348 +msgid "commit"

5349 +msgstr "提交"

5350 +

5351 +#: builtin/commit.c:1583

5352 msgid "reuse and edit message from specified commit"

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

5354

5294 -#: builtin/commit.c:1581

5355 +#: builtin/commit.c:1584

5356 msgid "reuse message from specified commit"

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

5358

5298 -#: builtin/commit.c:1582

5359 +#: builtin/commit.c:1585

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

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

5362

5302 -#: builtin/commit.c:1583

5363 +#: builtin/commit.c:1586

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

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

5366

5306 -#: builtin/commit.c:1584

5367 +#: builtin/commit.c:1587

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

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

5370

5310 -#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86

5371 +#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86

5372 msgid "add Signed-off-by:"

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

5374

5314 -#: builtin/commit.c:1586

5375 +#: builtin/commit.c:1589

5376 msgid "use specified template file"

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

5378

5318 -#: builtin/commit.c:1587

5379 +#: builtin/commit.c:1590

5380 msgid "force edit of commit"

5381 msgstr "强制编辑提交"

5382

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

5323 -#: builtin/commit.c:1588

5384 +#: builtin/commit.c:1591

5385 msgid "default"

5386 msgstr "default"

5387

5327 -#: builtin/commit.c:1588 builtin/tag.c:605

5388 +#: builtin/commit.c:1591 builtin/tag.c:354

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

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

5391

5331 -#: builtin/commit.c:1589

5392 +#: builtin/commit.c:1592

5393 msgid "include status in commit message template"

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

5395

5335 -#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156

5396 +#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156

5397 #: builtin/revert.c:93

5398 msgid "GPG sign commit"

5399 msgstr "GPG 提交签名"

5400

5340 -#: builtin/commit.c:1594

5401 +#: builtin/commit.c:1597

5402 msgid "Commit contents options"

5403 msgstr "提交内容选项"

5404

5344 -#: builtin/commit.c:1595

5405 +#: builtin/commit.c:1598

5406 msgid "commit all changed files"

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

5408

5348 -#: builtin/commit.c:1596

5409 +#: builtin/commit.c:1599

5410 msgid "add specified files to index for commit"

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

5412

5352 -#: builtin/commit.c:1597

5413 +#: builtin/commit.c:1600

5414 msgid "interactively add files"

5415 msgstr "交互式添加文件"

5416

5356 -#: builtin/commit.c:1598

5417 +#: builtin/commit.c:1601

5418 msgid "interactively add changes"

5419 msgstr "交互式添加变更"

5420

5360 -#: builtin/commit.c:1599

5421 +#: builtin/commit.c:1602

5422 msgid "commit only specified files"

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

5424

5364 -#: builtin/commit.c:1600

5425 +#: builtin/commit.c:1603

5426 msgid "bypass pre-commit hook"

5427 msgstr "绕过 pre-commit 钩子"

5428

5368 -#: builtin/commit.c:1601

5429 +#: builtin/commit.c:1604

5430 msgid "show what would be committed"

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

5432

5372 -#: builtin/commit.c:1612

5433 +#: builtin/commit.c:1615

5434 msgid "amend previous commit"

5435 msgstr "修改先前的提交"

5436

5376 -#: builtin/commit.c:1613

5437 +#: builtin/commit.c:1616

5438 msgid "bypass post-rewrite hook"

5439 msgstr "绕过 post-rewrite 钩子"

5440

5380 -#: builtin/commit.c:1618

5441 +#: builtin/commit.c:1621

5442 msgid "ok to record an empty change"

5443 msgstr "允许一个空提交"

5444

5384 -#: builtin/commit.c:1620

5445 +#: builtin/commit.c:1623

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

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

5448

5388 -#: builtin/commit.c:1649

5449 +#: builtin/commit.c:1652

5450 msgid "could not parse HEAD commit"

5451 msgstr "不能解析 HEAD 提交"

5452

5392 -#: builtin/commit.c:1695

5453 +#: builtin/commit.c:1698

5454 #, c-format

5455 msgid "Corrupt MERGE_HEAD file (%s)"

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

5457

5397 -#: builtin/commit.c:1702

5458 +#: builtin/commit.c:1705

5459 msgid "could not read MERGE_MODE"

5460 msgstr "不能读取 MERGE_MODE"

5461

5401 -#: builtin/commit.c:1721

5462 +#: builtin/commit.c:1724

5463 #, c-format

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

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

5466

5406 -#: builtin/commit.c:1732

5467 +#: builtin/commit.c:1735

5468 #, c-format

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

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

5471

5411 -#: builtin/commit.c:1737

5472 +#: builtin/commit.c:1740

5473 #, c-format

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

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

5476

5416 -#: builtin/commit.c:1785

5477 +#: builtin/commit.c:1788

5478 msgid ""

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

5480 "new_index file. Check that disk is not full and quota is\n"

@@ -5550,11 +5611,11 @@ msgstr "只显示变量名"

5611 msgid "respect include directives on lookup"

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

5613

5553 -#: builtin/config.c:311

5614 +#: builtin/config.c:303

5615 msgid "unable to parse default color value"

5616 msgstr "不能解析默认颜色值"

5617

5557 -#: builtin/config.c:449

5618 +#: builtin/config.c:441

5619 #, c-format

5620 msgid ""

5621 "# This is Git's per-user configuration file.\n"

@@ -5569,16 +5630,16 @@ msgstr ""

5630 "#\tname = %s\n"

5631 "#\temail = %s\n"

5632

5572 -#: builtin/config.c:583

5633 +#: builtin/config.c:575

5634 #, c-format

5635 msgid "cannot create configuration file %s"

5636 msgstr "不能创建配置文件 %s"

5637

5577 -#: builtin/count-objects.c:55

5638 +#: builtin/count-objects.c:77

5639 msgid "git count-objects [-v] [-H | --human-readable]"

5640 msgstr "git count-objects [-v] [-H | --human-readable]"

5641

5581 -#: builtin/count-objects.c:65

5642 +#: builtin/count-objects.c:87

5643 msgid "print sizes in human readable format"

5644 msgstr "以用户可读的格式显示大小"

5645

@@ -5698,7 +5759,7 @@ msgstr "考虑最近 <n> 个标签（默认：10）"

5759 msgid "only consider tags matching <pattern>"

5760 msgstr "只考虑匹配 <模式> 的标签"

5761

5701 -#: builtin/describe.c:410 builtin/name-rev.c:318

5762 +#: builtin/describe.c:410 builtin/name-rev.c:314

5763 msgid "show abbreviated commit object as fallback"

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

5765

@@ -5876,7 +5937,7 @@ msgstr "深化浅克隆的历史"

5937 msgid "convert to a complete repository"

5938 msgstr "转换为一个完整的仓库"

5939

5879 -#: builtin/fetch.c:118 builtin/log.c:1233

5940 +#: builtin/fetch.c:118 builtin/log.c:1232

5941 msgid "dir"

5942 msgstr "目录"

5943

@@ -5918,7 +5979,7 @@ msgstr "[最新]"

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

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

5981

5921 -#: builtin/fetch.c:478 builtin/fetch.c:564

5982 +#: builtin/fetch.c:478 builtin/fetch.c:566

5983 msgid "[rejected]"

5984 msgstr "[已拒绝]"

5985

@@ -5943,39 +6004,39 @@ msgstr "[新分支]"

6004 msgid "[new ref]"

6005 msgstr "[新引用]"

6006

5946 -#: builtin/fetch.c:560

6007 +#: builtin/fetch.c:561

6008 msgid "unable to update local ref"

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

6010

5950 -#: builtin/fetch.c:560

6011 +#: builtin/fetch.c:561

6012 msgid "forced update"

6013 msgstr "强制更新"

6014

5954 -#: builtin/fetch.c:566

6015 +#: builtin/fetch.c:568

6016 msgid "(non-fast-forward)"

6017 msgstr "（非快进式）"

6018

5958 -#: builtin/fetch.c:600 builtin/fetch.c:842

6019 +#: builtin/fetch.c:602 builtin/fetch.c:843

6020 #, c-format

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

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

6023

5963 -#: builtin/fetch.c:609

6024 +#: builtin/fetch.c:611

6025 #, c-format

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

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

6028

5968 -#: builtin/fetch.c:627

6029 +#: builtin/fetch.c:629

6030 #, c-format

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

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

6033

5973 -#: builtin/fetch.c:715 builtin/fetch.c:807

6034 +#: builtin/fetch.c:716 builtin/fetch.c:808

6035 #, c-format

6036 msgid "From %.*s\n"

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

6038

5978 -#: builtin/fetch.c:726

6039 +#: builtin/fetch.c:727

6040 #, c-format

6041 msgid ""

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

@@ -5985,87 +6046,87 @@ msgstr ""

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

6047

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

5988 -#: builtin/fetch.c:778

6049 +#: builtin/fetch.c:779

6050 #, c-format

6051 msgid " (%s will become dangling)"

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

6053

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

5994 -#: builtin/fetch.c:779

6055 +#: builtin/fetch.c:780

6056 #, c-format

6057 msgid " (%s has become dangling)"

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

6059

5999 -#: builtin/fetch.c:811

6060 +#: builtin/fetch.c:812

6061 msgid "[deleted]"

6062 msgstr "[已删除]"

6063

6003 -#: builtin/fetch.c:812 builtin/remote.c:1034

6064 +#: builtin/fetch.c:813 builtin/remote.c:1040

6065 msgid "(none)"

6066 msgstr "（无）"

6067

6007 -#: builtin/fetch.c:832

6068 +#: builtin/fetch.c:833

6069 #, c-format

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

6071 msgstr "拒绝获取到非纯仓库的当前分支 %s"

6072

6012 -#: builtin/fetch.c:851

6073 +#: builtin/fetch.c:852

6074 #, c-format

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

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

6077

6017 -#: builtin/fetch.c:854

6078 +#: builtin/fetch.c:855

6079 #, c-format

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

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

6082

6022 -#: builtin/fetch.c:910

6083 +#: builtin/fetch.c:911

6084 #, c-format

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

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

6087

6027 -#: builtin/fetch.c:1071

6088 +#: builtin/fetch.c:1072

6089 #, c-format

6090 msgid "Fetching %s\n"

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

6092

6032 -#: builtin/fetch.c:1073 builtin/remote.c:90

6093 +#: builtin/fetch.c:1074 builtin/remote.c:96

6094 #, c-format

6095 msgid "Could not fetch %s"

6096 msgstr "不能获取 %s"

6097

6037 -#: builtin/fetch.c:1091

6098 +#: builtin/fetch.c:1092

6099 msgid ""

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

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

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

6103

6043 -#: builtin/fetch.c:1114

6104 +#: builtin/fetch.c:1115

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

6106 msgstr "您需要指定一个标签名称。"

6107

6047 -#: builtin/fetch.c:1156

6108 +#: builtin/fetch.c:1157

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

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

6111

6051 -#: builtin/fetch.c:1158

6112 +#: builtin/fetch.c:1159

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

6114 msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"

6115

6055 -#: builtin/fetch.c:1181

6116 +#: builtin/fetch.c:1179

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

6118 msgstr "fetch --all 不能带一个仓库参数"

6119

6059 -#: builtin/fetch.c:1183

6120 +#: builtin/fetch.c:1181

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

6122 msgstr "fetch --all 带引用规格没有任何意义"

6123

6063 -#: builtin/fetch.c:1194

6124 +#: builtin/fetch.c:1192

6125 #, c-format

6126 msgid "No such remote or remote group: %s"

6127 msgstr "没有这样的远程或远程组：%s"

6128

6068 -#: builtin/fetch.c:1202

6129 +#: builtin/fetch.c:1200

6130 msgid "Fetching a group and specifying refspecs does not make sense"

6131 msgstr "获取组并指定引用规格没有意义"

6132

@@ -6074,23 +6135,23 @@ msgid ""

6135 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"

6136 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"

6137

6077 -#: builtin/fmt-merge-msg.c:670

6138 +#: builtin/fmt-merge-msg.c:667

6139 msgid "populate log with at most <n> entries from shortlog"

6140 msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"

6141

6081 -#: builtin/fmt-merge-msg.c:673

6142 +#: builtin/fmt-merge-msg.c:670

6143 msgid "alias for --log (deprecated)"

6144 msgstr "参数 --log 的别名（已弃用）"

6145

6085 -#: builtin/fmt-merge-msg.c:676

6146 +#: builtin/fmt-merge-msg.c:673

6147 msgid "text"

6148 msgstr "文本"

6149

6089 -#: builtin/fmt-merge-msg.c:677

6150 +#: builtin/fmt-merge-msg.c:674

6151 msgid "use <text> as start of message"

6152 msgstr "使用 <文本> 作为提交说明的开始"

6153

6093 -#: builtin/fmt-merge-msg.c:678

6154 +#: builtin/fmt-merge-msg.c:675

6155 msgid "file to read from"

6156 msgstr "从文件中读取"

6157

@@ -6098,95 +6159,115 @@ msgstr "从文件中读取"

6159 msgid "git for-each-ref [<options>] [<pattern>]"

6160 msgstr "git for-each-ref [<选项>] [<模式>]"

6161

6101 -#: builtin/for-each-ref.c:24

6162 +#: builtin/for-each-ref.c:10

6163 +msgid "git for-each-ref [--points-at <object>]"

6164 +msgstr "git for-each-ref [--points-at <对象>]"

6165 +

6166 +#: builtin/for-each-ref.c:11

6167 +msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"

6168 +msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"

6169 +

6170 +#: builtin/for-each-ref.c:12

6171 +msgid "git for-each-ref [--contains [<object>]]"

6172 +msgstr "git for-each-ref [--contains [<对象>]]"

6173 +

6174 +#: builtin/for-each-ref.c:27

6175 msgid "quote placeholders suitably for shells"

6176 msgstr "引用占位符适用于 shells"

6177

6105 -#: builtin/for-each-ref.c:26

6178 +#: builtin/for-each-ref.c:29

6179 msgid "quote placeholders suitably for perl"

6180 msgstr "引用占位符适用于 perl"

6181

6109 -#: builtin/for-each-ref.c:28

6182 +#: builtin/for-each-ref.c:31

6183 msgid "quote placeholders suitably for python"

6184 msgstr "引用占位符适用于 python"

6185

6113 -#: builtin/for-each-ref.c:30

6186 +#: builtin/for-each-ref.c:33

6187 msgid "quote placeholders suitably for Tcl"

6188 msgstr "引用占位符适用于 Tcl"

6189

6117 -#: builtin/for-each-ref.c:33

6190 +#: builtin/for-each-ref.c:36

6191 msgid "show only <n> matched refs"

6192 msgstr "只显示 <n> 个匹配的引用"

6193

6121 -#: builtin/for-each-ref.c:34

6194 +#: builtin/for-each-ref.c:37 builtin/tag.c:372

6195 msgid "format to use for the output"

6196 msgstr "输出格式"

6197

6125 -#: builtin/for-each-ref.c:35

6126 -msgid "key"

6127 -msgstr "key"

6198 +#: builtin/for-each-ref.c:41

6199 +msgid "print only refs which points at the given object"

6200 +msgstr "只打印指向给定对象的引用"

6201

6129 -#: builtin/for-each-ref.c:36

6130 -msgid "field name to sort on"

6131 -msgstr "排序的字段名"

6202 +#: builtin/for-each-ref.c:43

6203 +msgid "print only refs that are merged"

6204 +msgstr "只打印已经合并的引用"

6205 +

6206 +#: builtin/for-each-ref.c:44

6207 +msgid "print only refs that are not merged"

6208 +msgstr "只打印没有合并的引用"

6209

6133 -#: builtin/fsck.c:163 builtin/prune.c:137

6210 +#: builtin/for-each-ref.c:45

6211 +msgid "print only refs which contain the commit"

6212 +msgstr "只打印包含该提交的引用"

6213 +

6214 +#: builtin/fsck.c:156 builtin/prune.c:140

6215 msgid "Checking connectivity"

6216 msgstr "检查连接中"

6217

6137 -#: builtin/fsck.c:568

6218 +#: builtin/fsck.c:486

6219 msgid "Checking object directories"

6220 msgstr "检查对象目录中"

6221

6141 -#: builtin/fsck.c:631

6222 +#: builtin/fsck.c:553

6223 msgid "git fsck [<options>] [<object>...]"

6224 msgstr "git fsck [<选项>] [<对象>...]"

6225

6145 -#: builtin/fsck.c:637

6226 +#: builtin/fsck.c:559

6227 msgid "show unreachable objects"

6228 msgstr "显示不可达的对象"

6229

6149 -#: builtin/fsck.c:638

6230 +#: builtin/fsck.c:560

6231 msgid "show dangling objects"

6232 msgstr "显示摇摆的对象"

6233

6153 -#: builtin/fsck.c:639

6234 +#: builtin/fsck.c:561

6235 msgid "report tags"

6236 msgstr "报告标签"

6237

6157 -#: builtin/fsck.c:640

6238 +#: builtin/fsck.c:562

6239 msgid "report root nodes"

6240 msgstr "报告根节点"

6241

6161 -#: builtin/fsck.c:641

6242 +#: builtin/fsck.c:563

6243 msgid "make index objects head nodes"

6244 msgstr "将索引亦作为检查的头节点"

6245

6165 -#: builtin/fsck.c:642

6246 +#: builtin/fsck.c:564

6247 msgid "make reflogs head nodes (default)"

6248 msgstr "将引用日志作为检查的头节点（默认）"

6249

6169 -#: builtin/fsck.c:643

6250 +#: builtin/fsck.c:565

6251 msgid "also consider packs and alternate objects"

6252 msgstr "也考虑包和备用对象"

6253

6173 -#: builtin/fsck.c:644

6254 +#: builtin/fsck.c:566

6255 msgid "check only connectivity"

6256 msgstr "仅检查连通性"

6257

6177 -#: builtin/fsck.c:645

6258 +#: builtin/fsck.c:567

6259 msgid "enable more strict checking"

6260 msgstr "启用更严格的检查"

6261

6181 -#: builtin/fsck.c:647

6262 +#: builtin/fsck.c:569

6263 msgid "write dangling objects in .git/lost-found"

6264 msgstr "将摇摆对象写入 .git/lost-found 中"

6265

6185 -#: builtin/fsck.c:648 builtin/prune.c:107

6266 +#: builtin/fsck.c:570 builtin/prune.c:107

6267 msgid "show progress"

6268 msgstr "显示进度"

6269

6189 -#: builtin/fsck.c:707

6270 +#: builtin/fsck.c:631

6271 msgid "Checking objects"

6272 msgstr "检查对象中"

6273

@@ -6194,55 +6275,69 @@ msgstr "检查对象中"

6275 msgid "git gc [<options>]"

6276 msgstr "git gc [<选项>]"

6277

6197 -#: builtin/gc.c:55

6278 +#: builtin/gc.c:72

6279 #, c-format

6280 msgid "Invalid %s: '%s'"

6281 msgstr "无效 %s：'%s'"

6282

6202 -#: builtin/gc.c:100

6283 +#: builtin/gc.c:139

6284 #, c-format

6285 msgid "insanely long object directory %.*s"

6286 msgstr "不正常的长对象目录 %.*s"

6287

6207 -#: builtin/gc.c:269

6288 +#: builtin/gc.c:290

6289 +#, c-format

6290 +msgid ""

6291 +"The last gc run reported the following. Please correct the root cause\n"

6292 +"and remove %s.\n"

6293 +"Automatic cleanup will not be performed until the file is removed.\n"

6294 +"\n"

6295 +"%s"

6296 +msgstr ""

6297 +"最后一次 gc 操作报告如下信息。请检查原因并删除 %s。\n"

6298 +"在该文件被删除之前，自动清理将不会执行。\n"

6299 +"\n"

6300 +"%s"

6301 +

6302 +#: builtin/gc.c:327

6303 msgid "prune unreferenced objects"

6304 msgstr "清除未引用的对象"

6305

6211 -#: builtin/gc.c:271

6306 +#: builtin/gc.c:329

6307 msgid "be more thorough (increased runtime)"

6308 msgstr "更彻底（增加运行时间）"

6309

6215 -#: builtin/gc.c:272

6310 +#: builtin/gc.c:330

6311 msgid "enable auto-gc mode"

6312 msgstr "启用自动垃圾回收模式"

6313

6219 -#: builtin/gc.c:273

6314 +#: builtin/gc.c:331

6315 msgid "force running gc even if there may be another gc running"

6316 msgstr "强制执行 gc 即使另外一个 gc 正在执行"

6317

6223 -#: builtin/gc.c:315

6318 +#: builtin/gc.c:373

6319 #, c-format

6320 msgid "Auto packing the repository in background for optimum performance.\n"

6321 msgstr "自动在后台执行仓库打包以求最佳性能。\n"

6322

6228 -#: builtin/gc.c:317

6323 +#: builtin/gc.c:375

6324 #, c-format

6325 msgid "Auto packing the repository for optimum performance.\n"

6326 msgstr "自动打包仓库以求最佳性能。\n"

6327

6233 -#: builtin/gc.c:318

6328 +#: builtin/gc.c:376

6329 #, c-format

6330 msgid "See \"git help gc\" for manual housekeeping.\n"

6331 msgstr "手工维护参见 \"git help gc\"。\n"

6332

6238 -#: builtin/gc.c:336

6333 +#: builtin/gc.c:397

6334 #, c-format

6335 msgid ""

6336 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

6337 msgstr ""

6338 "已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> （如果不是，使用 --force）"

6339

6245 -#: builtin/gc.c:364

6340 +#: builtin/gc.c:441

6341 msgid ""

6342 "There are too many unreachable loose objects; run 'git prune' to remove them."

6343 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"

@@ -6276,200 +6371,196 @@ msgstr "开关 `%c' 期望一个数字值"

6371 msgid "cannot open '%s'"

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

6373

6279 -#: builtin/grep.c:638

6374 +#: builtin/grep.c:633

6375 msgid "search in index instead of in the work tree"

6376 msgstr "在索引区搜索而不是在工作区"

6377

6283 -#: builtin/grep.c:640

6378 +#: builtin/grep.c:635

6379 msgid "find in contents not managed by git"

6380 msgstr "在未被 git 管理的内容中查找"

6381

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

6288 -#: builtin/grep.c:642

6383 +#: builtin/grep.c:637

6384 msgid "search in both tracked and untracked files"

6385 msgstr "在跟踪和未跟踪的文件中搜索"

6386

6292 -#: builtin/grep.c:644

6387 +#: builtin/grep.c:639

6388 msgid "ignore files specified via '.gitignore'"

6389 msgstr "忽略 '.gitignore' 包含的文件"

6390

6296 -#: builtin/grep.c:647

6391 +#: builtin/grep.c:642

6392 msgid "show non-matching lines"

6393 msgstr "显示未匹配的行"

6394

6300 -#: builtin/grep.c:649

6395 +#: builtin/grep.c:644

6396 msgid "case insensitive matching"

6397 msgstr "不区分大小写匹配"

6398

6304 -#: builtin/grep.c:651

6399 +#: builtin/grep.c:646

6400 msgid "match patterns only at word boundaries"

6401 msgstr "只在单词边界匹配模式"

6402

6308 -#: builtin/grep.c:653

6403 +#: builtin/grep.c:648

6404 msgid "process binary files as text"

6405 msgstr "把二进制文件当做文本处理"

6406

6312 -#: builtin/grep.c:655

6407 +#: builtin/grep.c:650

6408 msgid "don't match patterns in binary files"

6409 msgstr "不在二进制文件中匹配模式"

6410

6316 -#: builtin/grep.c:658

6411 +#: builtin/grep.c:653

6412 msgid "process binary files with textconv filters"

6413 msgstr "用 textconv 过滤器处理二进制文件"

6414

6320 -#: builtin/grep.c:660

6415 +#: builtin/grep.c:655

6416 msgid "descend at most <depth> levels"

6417 msgstr "最多以指定的深度向下寻找"

6418

6324 -#: builtin/grep.c:664

6419 +#: builtin/grep.c:659

6420 msgid "use extended POSIX regular expressions"

6421 msgstr "使用扩展的 POSIX 正则表达式"

6422

6328 -#: builtin/grep.c:667

6423 +#: builtin/grep.c:662

6424 msgid "use basic POSIX regular expressions (default)"

6425 msgstr "使用基本的 POSIX 正则表达式（默认）"

6426

6332 -#: builtin/grep.c:670

6427 +#: builtin/grep.c:665

6428 msgid "interpret patterns as fixed strings"

6429 msgstr "把模式解析为固定的字符串"

6430

6336 -#: builtin/grep.c:673

6431 +#: builtin/grep.c:668

6432 msgid "use Perl-compatible regular expressions"

6433 msgstr "使用 Perl 兼容的正则表达式"

6434

6340 -#: builtin/grep.c:676

6435 +#: builtin/grep.c:671

6436 msgid "show line numbers"

6437 msgstr "显示行号"

6438

6344 -#: builtin/grep.c:677

6439 +#: builtin/grep.c:672

6440 msgid "don't show filenames"

6441 msgstr "不显示文件名"

6442

6348 -#: builtin/grep.c:678

6443 +#: builtin/grep.c:673

6444 msgid "show filenames"

6445 msgstr "显示文件名"

6446

6352 -#: builtin/grep.c:680

6447 +#: builtin/grep.c:675

6448 msgid "show filenames relative to top directory"

6449 msgstr "显示相对于顶级目录的文件名"

6450

6356 -#: builtin/grep.c:682

6451 +#: builtin/grep.c:677

6452 msgid "show only filenames instead of matching lines"

6453 msgstr "只显示文件名而不显示匹配的行"

6454

6360 -#: builtin/grep.c:684

6455 +#: builtin/grep.c:679

6456 msgid "synonym for --files-with-matches"

6457 msgstr "和 --files-with-matches 同义"

6458

6364 -#: builtin/grep.c:687

6459 +#: builtin/grep.c:682

6460 msgid "show only the names of files without match"

6461 msgstr "只显示未匹配的文件名"

6462

6368 -#: builtin/grep.c:689

6463 +#: builtin/grep.c:684

6464 msgid "print NUL after filenames"

6465 msgstr "在文件名后输出 NUL 字符"

6466

6372 -#: builtin/grep.c:691

6467 +#: builtin/grep.c:686

6468 msgid "show the number of matches instead of matching lines"

6469 msgstr "显示总匹配行数，而不显示匹配的行"

6470

6376 -#: builtin/grep.c:692

6471 +#: builtin/grep.c:687

6472 msgid "highlight matches"

6473 msgstr "高亮显示匹配项"

6474

6380 -#: builtin/grep.c:694

6475 +#: builtin/grep.c:689

6476 msgid "print empty line between matches from different files"

6477 msgstr "在不同文件的匹配项之间打印空行"

6478

6384 -#: builtin/grep.c:696

6479 +#: builtin/grep.c:691

6480 msgid "show filename only once above matches from same file"

6481 msgstr "只在同一文件的匹配项的上面显示一次文件名"

6482

6388 -#: builtin/grep.c:699

6483 +#: builtin/grep.c:694

6484 msgid "show <n> context lines before and after matches"

6485 msgstr "显示匹配项前后的 <n> 行上下文"

6486

6392 -#: builtin/grep.c:702

6487 +#: builtin/grep.c:697

6488 msgid "show <n> context lines before matches"

6489 msgstr "显示匹配项前 <n> 行上下文"

6490

6396 -#: builtin/grep.c:704

6491 +#: builtin/grep.c:699

6492 msgid "show <n> context lines after matches"

6493 msgstr "显示匹配项后 <n> 行上下文"

6494

6400 -#: builtin/grep.c:705

6495 +#: builtin/grep.c:700

6496 msgid "shortcut for -C NUM"

6497 msgstr "快捷键 -C 数字"

6498

6404 -#: builtin/grep.c:708

6499 +#: builtin/grep.c:703

6500 msgid "show a line with the function name before matches"

6501 msgstr "在匹配的前面显示一行函数名"

6502

6408 -#: builtin/grep.c:710

6503 +#: builtin/grep.c:705

6504 msgid "show the surrounding function"

6505 msgstr "显示所在函数的前后内容"

6506

6412 -#: builtin/grep.c:713

6507 +#: builtin/grep.c:708

6508 msgid "read patterns from file"

6509 msgstr "从文件读取模式"

6510

6416 -#: builtin/grep.c:715

6511 +#: builtin/grep.c:710

6512 msgid "match <pattern>"

6513 msgstr "匹配 <模式>"

6514

6420 -#: builtin/grep.c:717

6515 +#: builtin/grep.c:712

6516 msgid "combine patterns specified with -e"

6517 msgstr "组合用 -e 参数设定的模式"

6518

6424 -#: builtin/grep.c:729

6519 +#: builtin/grep.c:724

6520 msgid "indicate hit with exit status without output"

6521 msgstr "不输出，而用退出码标识命中状态"

6522

6428 -#: builtin/grep.c:731

l10n: zh_CN: for git v2.7.0 l10n round 1