fda7b0924e · matheusbsbs/matheus-bagliano

@@ -8,7 +8,7 @@ msgid ""

8 msgstr ""

9 "Project-Id-Version: PACKAGE VERSION\n"

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

11 -"POT-Creation-Date: 2016-08-27 23:21+0800\n"

11 +"POT-Creation-Date: 2016-11-01 21:35+0800\n"

12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14 "Language-Team: LANGUAGE <LL@li.org>\n"

@@ -86,351 +86,953 @@ msgid ""

86 "\n"

87 msgstr ""

88

89 -#: archive.c:12

90 -msgid "git archive [<options>] <tree-ish> [<path>...]"

89 +#: apply.c:57

90 +#, c-format

91 +msgid "unrecognized whitespace option '%s'"

92 msgstr ""

93

93 -#: archive.c:13

94 -msgid "git archive --list"

94 +#: apply.c:73

95 +#, c-format

96 +msgid "unrecognized whitespace ignore option '%s'"

97 msgstr ""

98

97 -#: archive.c:14

98 -msgid ""

99 -"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"

99 +#: apply.c:125

100 +msgid "--reject and --3way cannot be used together."

101 msgstr ""

102

102 -#: archive.c:15

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

103 +#: apply.c:127

104 +msgid "--cached and --3way cannot be used together."

105 msgstr ""

106

106 -#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327

107 -#, c-format

108 -msgid "pathspec '%s' did not match any files"

107 +#: apply.c:130

108 +msgid "--3way outside a repository"

109 msgstr ""

110

111 -#: archive.c:429

112 -msgid "fmt"

111 +#: apply.c:141

112 +msgid "--index outside a repository"

113 msgstr ""

114

115 -#: archive.c:429

116 -msgid "archive format"

115 +#: apply.c:144

116 +msgid "--cached outside a repository"

117 msgstr ""

118

119 -#: archive.c:430 builtin/log.c:1422

120 -msgid "prefix"

119 +#: apply.c:845

120 +#, c-format

121 +msgid "Cannot prepare timestamp regexp %s"

122 msgstr ""

123

123 -#: archive.c:431

124 -msgid "prepend prefix to each pathname in the archive"

124 +#: apply.c:854

125 +#, c-format

126 +msgid "regexec returned %d for input: %s"

127 msgstr ""

128

127 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553

128 -#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987

129 -#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100

130 -#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399

131 -#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153

132 -msgid "file"

129 +#: apply.c:938

130 +#, c-format

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

132 msgstr ""

133

135 -#: archive.c:433 builtin/archive.c:89

136 -msgid "write the archive to this file"

134 +#: apply.c:977

135 +#, c-format

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

137 msgstr ""

138

139 -#: archive.c:435

140 -msgid "read .gitattributes in working directory"

139 +#: apply.c:983

140 +#, c-format

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

142 msgstr ""

143

143 -#: archive.c:436

144 -msgid "report archived files on stderr"

144 +#: apply.c:984

145 +#, c-format

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

147 msgstr ""

148

147 -#: archive.c:437

148 -msgid "store only"

149 +#: apply.c:990

150 +#, c-format

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

152 msgstr ""

153

151 -#: archive.c:438

152 -msgid "compress faster"

154 +#: apply.c:1488

155 +#, c-format

156 +msgid "recount: unexpected line: %.*s"

157 msgstr ""

158

155 -#: archive.c:446

156 -msgid "compress better"

159 +#: apply.c:1557

160 +#, c-format

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

162 msgstr ""

163

159 -#: archive.c:449

160 -msgid "list supported archive formats"

161 -msgstr ""

164 +#: apply.c:1577

165 +#, c-format

166 +msgid ""

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

168 +"component (line %d)"

169 +msgid_plural ""

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

171 +"components (line %d)"

172 +msgstr[0] ""

173 +msgstr[1] ""

174

163 -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82

164 -#: builtin/submodule--helper.c:832

165 -msgid "repo"

175 +#: apply.c:1589

176 +#, c-format

177 +msgid "git diff header lacks filename information (line %d)"

178 msgstr ""

179

168 -#: archive.c:452 builtin/archive.c:91

169 -msgid "retrieve the archive from remote repository <repo>"

180 +#: apply.c:1759

181 +msgid "new file depends on old contents"

182 msgstr ""

183

172 -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483

173 -msgid "command"

184 +#: apply.c:1761

185 +msgid "deleted file still has contents"

186 msgstr ""

187

176 -#: archive.c:454 builtin/archive.c:93

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

188 +#: apply.c:1795

189 +#, c-format

190 +msgid "corrupt patch at line %d"

191 msgstr ""

192

180 -#: archive.c:461

181 -msgid "Unexpected option --remote"

193 +#: apply.c:1832

194 +#, c-format

195 +msgid "new file %s depends on old contents"

196 msgstr ""

197

184 -#: archive.c:463

185 -msgid "Option --exec can only be used together with --remote"

198 +#: apply.c:1834

199 +#, c-format

200 +msgid "deleted file %s still has contents"

201 msgstr ""

202

188 -#: archive.c:465

189 -msgid "Unexpected option --output"

203 +#: apply.c:1837

204 +#, c-format

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

206 msgstr ""

207

192 -#: archive.c:487

208 +#: apply.c:1984

209 #, c-format

194 -msgid "Unknown archive format '%s'"

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

211 msgstr ""

212

197 -#: archive.c:494

213 +#: apply.c:2021

214 #, c-format

199 -msgid "Argument not supported for format '%s': -%d"

215 +msgid "unrecognized binary patch at line %d"

216 msgstr ""

217

202 -#: attr.c:263

203 -msgid ""

204 -"Negative patterns are ignored in git attributes\n"

205 -"Use '\\!' for literal leading exclamation."

218 +#: apply.c:2182

219 +#, c-format

220 +msgid "patch with only garbage at line %d"

221 msgstr ""

222

208 -#: bisect.c:441

223 +#: apply.c:2274

224 #, c-format

210 -msgid "Could not open file '%s'"

225 +msgid "unable to read symlink %s"

226 msgstr ""

227

213 -#: bisect.c:446

228 +#: apply.c:2278

229 #, c-format

215 -msgid "Badly quoted content in file '%s': %s"

230 +msgid "unable to open or read %s"

231 msgstr ""

232

218 -#: bisect.c:655

233 +#: apply.c:2931

234 #, c-format

220 -msgid "We cannot bisect more!\n"

235 +msgid "invalid start of line: '%c'"

236 msgstr ""

237

223 -#: bisect.c:708

238 +#: apply.c:3050

239 #, c-format

225 -msgid "Not a valid commit name %s"

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

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

242 +msgstr[0] ""

243 +msgstr[1] ""

244 +

245 +#: apply.c:3062

246 +#, c-format

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

248 msgstr ""

249

228 -#: bisect.c:732

250 +#: apply.c:3068

251 #, c-format

252 msgid ""

231 -"The merge base %s is bad.\n"

232 -"This means the bug has been fixed between %s and [%s].\n"

253 +"while searching for:\n"

254 +"%.*s"

255 msgstr ""

256

235 -#: bisect.c:737

257 +#: apply.c:3090

258 #, c-format

237 -msgid ""

238 -"The merge base %s is new.\n"

239 -"The property has changed between %s and [%s].\n"

259 +msgid "missing binary patch data for '%s'"

260 msgstr ""

261

242 -#: bisect.c:742

262 +#: apply.c:3098

263 #, c-format

244 -msgid ""

245 -"The merge base %s is %s.\n"

246 -"This means the first '%s' commit is between %s and [%s].\n"

264 +msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

265 msgstr ""

266

249 -#: bisect.c:750

267 +#: apply.c:3144

268 #, c-format

251 -msgid ""

252 -"Some %s revs are not ancestor of the %s rev.\n"

253 -"git bisect cannot work properly in this case.\n"

254 -"Maybe you mistook %s and %s revs?\n"

269 +msgid "cannot apply binary patch to '%s' without full index line"

270 msgstr ""

271

257 -#: bisect.c:763

272 +#: apply.c:3154

273 #, c-format

274 msgid ""

260 -"the merge base between %s and [%s] must be skipped.\n"

261 -"So we cannot be sure the first %s commit is between %s and %s.\n"

262 -"We continue anyway."

275 +"the patch applies to '%s' (%s), which does not match the current contents."

276 msgstr ""

277

265 -#: bisect.c:798

278 +#: apply.c:3162

279 #, c-format

267 -msgid "Bisecting: a merge base must be tested\n"

280 +msgid "the patch applies to an empty '%s' but it is not empty"

281 msgstr ""

282

270 -#: bisect.c:849

283 +#: apply.c:3180

284 #, c-format

272 -msgid "a %s revision is needed"

285 +msgid "the necessary postimage %s for '%s' cannot be read"

286 msgstr ""

287

275 -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248

288 +#: apply.c:3193

289 #, c-format

277 -msgid "could not create file '%s'"

290 +msgid "binary patch does not apply to '%s'"

291 msgstr ""

292

280 -#: bisect.c:917

293 +#: apply.c:3199

294 #, c-format

282 -msgid "could not read file '%s'"

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

296 msgstr ""

297

285 -#: bisect.c:947

286 -msgid "reading bisect refs failed"

298 +#: apply.c:3220

299 +#, c-format

300 +msgid "patch failed: %s:%ld"

301 msgstr ""

302

289 -#: bisect.c:967

303 +#: apply.c:3342

304 #, c-format

291 -msgid "%s was both %s and %s\n"

305 +msgid "cannot checkout %s"

306 msgstr ""

307

294 -#: bisect.c:975

308 +#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248

309 #, c-format

296 -msgid ""

297 -"No testable commit found.\n"

298 -"Maybe you started with bad path parameters?\n"

310 +msgid "failed to read %s"

311 msgstr ""

312

301 -#: bisect.c:994

313 +#: apply.c:3398

314 #, c-format

303 -msgid "(roughly %d step)"

304 -msgid_plural "(roughly %d steps)"

305 -msgstr[0] ""

306 -msgstr[1] ""

315 +msgid "reading from '%s' beyond a symbolic link"

316 +msgstr ""

317

308 -#. TRANSLATORS: the last %s will be replaced with

309 -#. "(roughly %d steps)" translation

310 -#: bisect.c:998

318 +#: apply.c:3427 apply.c:3667

319 #, c-format

312 -msgid "Bisecting: %d revision left to test after this %s\n"

313 -msgid_plural "Bisecting: %d revisions left to test after this %s\n"

314 -msgstr[0] ""

315 -msgstr[1] ""

320 +msgid "path %s has been renamed/deleted"

321 +msgstr ""

322

317 -#: branch.c:53

323 +#: apply.c:3510 apply.c:3681

324 #, c-format

319 -msgid ""

320 -"\n"

321 -"After fixing the error cause you may try to fix up\n"

322 -"the remote tracking information by invoking\n"

323 -"\"git branch --set-upstream-to=%s%s%s\"."

325 +msgid "%s: does not exist in index"

326 msgstr ""

327

326 -#: branch.c:67

328 +#: apply.c:3519 apply.c:3689

329 #, c-format

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

330 +msgid "%s: does not match index"

331 msgstr ""

332

331 -#: branch.c:93

332 -#, c-format

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

333 +#: apply.c:3554

334 +msgid "repository lacks the necessary blob to fall back on 3-way merge."

335 msgstr ""

336

336 -#: branch.c:94

337 +#: apply.c:3557

338 #, c-format

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

339 +msgid "Falling back to three-way merge...\n"

340 msgstr ""

341

341 -#: branch.c:98

342 +#: apply.c:3573 apply.c:3577

343 #, c-format

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

344 +msgid "cannot read the current contents of '%s'"

345 msgstr ""

346

346 -#: branch.c:99

347 +#: apply.c:3589

348 #, c-format

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

349 +msgid "Failed to fall back on three-way merge...\n"

350 msgstr ""

351

351 -#: branch.c:104

352 +#: apply.c:3603

353 #, c-format

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

354 +msgid "Applied patch to '%s' with conflicts.\n"

355 msgstr ""

356

356 -#: branch.c:105

357 +#: apply.c:3608

358 #, c-format

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

359 +msgid "Applied patch to '%s' cleanly.\n"

360 msgstr ""

361

361 -#: branch.c:109

362 -#, c-format

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

362 +#: apply.c:3634

363 +msgid "removal patch leaves file contents"

364 msgstr ""

365

366 -#: branch.c:110

366 +#: apply.c:3706

367 #, c-format

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

368 +msgid "%s: wrong type"

369 msgstr ""

370

371 -#: branch.c:119

372 -msgid "Unable to write upstream branch configuration"

371 +#: apply.c:3708

372 +#, c-format

373 +msgid "%s has type %o, expected %o"

374 msgstr ""

375

375 -#: branch.c:156

376 +#: apply.c:3859 apply.c:3861

377 #, c-format

377 -msgid "Not tracking: ambiguous information for ref %s"

378 +msgid "invalid path '%s'"

379 msgstr ""

380

380 -#: branch.c:185

381 +#: apply.c:3917

382 #, c-format

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

383 +msgid "%s: already exists in index"

384 msgstr ""

385

385 -#: branch.c:190

386 +#: apply.c:3920

387 #, c-format

387 -msgid "A branch named '%s' already exists."

388 +msgid "%s: already exists in working directory"

389 msgstr ""

390

390 -#: branch.c:198

391 -msgid "Cannot force update the current branch."

391 +#: apply.c:3940

392 +#, c-format

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

394 msgstr ""

395

394 -#: branch.c:218

396 +#: apply.c:3945

397 #, c-format

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

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

399 msgstr ""

400

399 -#: branch.c:220

401 +#: apply.c:3965

402 #, c-format

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

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

404 msgstr ""

405

404 -#: branch.c:222

405 -msgid ""

406 -"\n"

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

408 -"branch that already exists at the remote, you may need to\n"

409 -"run \"git fetch\" to retrieve it.\n"

410 -"\n"

411 -"If you are planning to push out a new local branch that\n"

412 -"will track its remote counterpart, you may want to use\n"

413 -"\"git push -u\" to set the upstream config as you push."

406 +#: apply.c:3969

407 +#, c-format

408 +msgid "%s: patch does not apply"

409 msgstr ""

410

416 -#: branch.c:266

411 +#: apply.c:3984

412 #, c-format

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

413 +msgid "Checking patch %s..."

414 msgstr ""

415

421 -#: branch.c:286

416 +#: apply.c:4075

417 #, c-format

423 -msgid "Ambiguous object name: '%s'."

418 +msgid "sha1 information is lacking or useless for submodule %s"

419 msgstr ""

420

426 -#: branch.c:291

421 +#: apply.c:4082

422 #, c-format

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

423 +msgid "mode change for %s, which is not in current HEAD"

424 msgstr ""

425

431 -#: branch.c:345

426 +#: apply.c:4085

427 #, c-format

433 -msgid "'%s' is already checked out at '%s'"

428 +msgid "sha1 information is lacking or useless (%s)."

429 +msgstr ""

430 +

431 +#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135

432 +#, c-format

433 +msgid "make_cache_entry failed for path '%s'"

434 +msgstr ""

435 +

436 +#: apply.c:4094

437 +#, c-format

438 +msgid "could not add %s to temporary index"

439 +msgstr ""

440 +

441 +#: apply.c:4104

442 +#, c-format

443 +msgid "could not write temporary index to %s"

444 +msgstr ""

445 +

446 +#: apply.c:4242

447 +#, c-format

448 +msgid "unable to remove %s from index"

449 +msgstr ""

450 +

451 +#: apply.c:4277

452 +#, c-format

453 +msgid "corrupt patch for submodule %s"

454 +msgstr ""

455 +

456 +#: apply.c:4283

457 +#, c-format

458 +msgid "unable to stat newly created file '%s'"

459 +msgstr ""

460 +

461 +#: apply.c:4291

462 +#, c-format

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

464 +msgstr ""

465 +

466 +#: apply.c:4297 apply.c:4441

467 +#, c-format

468 +msgid "unable to add cache entry for %s"

469 +msgstr ""

470 +

471 +#: apply.c:4338

472 +#, c-format

473 +msgid "failed to write to '%s'"

474 +msgstr ""

475 +

476 +#: apply.c:4342

477 +#, c-format

478 +msgid "closing file '%s'"

479 +msgstr ""

480 +

481 +#: apply.c:4412

482 +#, c-format

483 +msgid "unable to write file '%s' mode %o"

484 +msgstr ""

485 +

486 +#: apply.c:4510

487 +#, c-format

488 +msgid "Applied patch %s cleanly."

489 +msgstr ""

490 +

491 +#: apply.c:4518

492 +msgid "internal error"

493 +msgstr ""

494 +

495 +#: apply.c:4521

496 +#, c-format

497 +msgid "Applying patch %%s with %d reject..."

498 +msgid_plural "Applying patch %%s with %d rejects..."

499 +msgstr[0] ""

500 +msgstr[1] ""

501 +

502 +#: apply.c:4532

503 +#, c-format

504 +msgid "truncating .rej filename to %.*s.rej"

505 +msgstr ""

506 +

507 +#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989

508 +#, c-format

509 +msgid "cannot open %s"

510 +msgstr ""

511 +

512 +#: apply.c:4554

513 +#, c-format

514 +msgid "Hunk #%d applied cleanly."

515 +msgstr ""

516 +

517 +#: apply.c:4558

518 +#, c-format

519 +msgid "Rejected hunk #%d."

520 +msgstr ""

521 +

522 +#: apply.c:4668

523 +#, c-format

524 +msgid "Skipped patch '%s'."

525 +msgstr ""

526 +

527 +#: apply.c:4676

528 +msgid "unrecognized input"

529 +msgstr ""

530 +

531 +#: apply.c:4695

532 +msgid "unable to read index file"

533 +msgstr ""

534 +

535 +#: apply.c:4833

536 +#, c-format

537 +msgid "can't open patch '%s': %s"

538 +msgstr ""

539 +

540 +#: apply.c:4858

541 +#, c-format

542 +msgid "squelched %d whitespace error"

543 +msgid_plural "squelched %d whitespace errors"

544 +msgstr[0] ""

545 +msgstr[1] ""

546 +

547 +#: apply.c:4864 apply.c:4879

548 +#, c-format

549 +msgid "%d line adds whitespace errors."

550 +msgid_plural "%d lines add whitespace errors."

551 +msgstr[0] ""

552 +msgstr[1] ""

553 +

554 +#: apply.c:4872

555 +#, c-format

556 +msgid "%d line applied after fixing whitespace errors."

557 +msgid_plural "%d lines applied after fixing whitespace errors."

558 +msgstr[0] ""

559 +msgstr[1] ""

560 +

561 +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431

562 +msgid "Unable to write new index file"

563 +msgstr ""

564 +

565 +#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280

566 +#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180

567 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407

568 +#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592

569 +#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947

570 +msgid "path"

571 +msgstr ""

572 +

573 +#: apply.c:4920

574 +msgid "don't apply changes matching the given path"

575 +msgstr ""

576 +

577 +#: apply.c:4923

578 +msgid "apply changes matching the given path"

579 +msgstr ""

580 +

581 +#: apply.c:4925 builtin/am.c:2286

582 +msgid "num"

583 +msgstr ""

584 +

585 +#: apply.c:4926

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

587 +msgstr ""

588 +

589 +#: apply.c:4929

590 +msgid "ignore additions made by the patch"

591 +msgstr ""

592 +

593 +#: apply.c:4931

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

595 +msgstr ""

596 +

597 +#: apply.c:4935

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

599 +msgstr ""

600 +

601 +#: apply.c:4937

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

603 +msgstr ""

604 +

605 +#: apply.c:4939

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

607 +msgstr ""

608 +

609 +#: apply.c:4941

610 +msgid "make sure the patch is applicable to the current index"

611 +msgstr ""

612 +

613 +#: apply.c:4943

614 +msgid "apply a patch without touching the working tree"

615 +msgstr ""

616 +

617 +#: apply.c:4945

618 +msgid "accept a patch that touches outside the working area"

619 +msgstr ""

620 +

621 +#: apply.c:4947

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

623 +msgstr ""

624 +

625 +#: apply.c:4949

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

627 +msgstr ""

628 +

629 +#: apply.c:4951

630 +msgid "build a temporary index based on embedded index information"

631 +msgstr ""

632 +

633 +#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505

634 +msgid "paths are separated with NUL character"

635 +msgstr ""

636 +

637 +#: apply.c:4956

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

639 +msgstr ""

640 +

641 +#: apply.c:4957 builtin/am.c:2265

642 +msgid "action"

643 +msgstr ""

644 +

645 +#: apply.c:4958

646 +msgid "detect new or modified lines that have whitespace errors"

647 +msgstr ""

648 +

649 +#: apply.c:4961 apply.c:4964

650 +msgid "ignore changes in whitespace when finding context"

651 +msgstr ""

652 +

653 +#: apply.c:4967

654 +msgid "apply the patch in reverse"

655 +msgstr ""

656 +

657 +#: apply.c:4969

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

659 +msgstr ""

660 +

661 +#: apply.c:4971

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

663 +msgstr ""

664 +

665 +#: apply.c:4973

666 +msgid "allow overlapping hunks"

667 +msgstr ""

668 +

669 +#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19

670 +#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593

671 +#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114

672 +msgid "be verbose"

673 +msgstr ""

674 +

675 +#: apply.c:4976

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

677 +msgstr ""

678 +

679 +#: apply.c:4979

680 +msgid "do not trust the line counts in the hunk headers"

681 +msgstr ""

682 +

683 +#: apply.c:4981 builtin/am.c:2274

684 +msgid "root"

685 +msgstr ""

686 +

687 +#: apply.c:4982

688 +msgid "prepend <root> to all filenames"

689 +msgstr ""

690 +

691 +#: archive.c:12

692 +msgid "git archive [<options>] <tree-ish> [<path>...]"

693 +msgstr ""

694 +

695 +#: archive.c:13

696 +msgid "git archive --list"

697 +msgstr ""

698 +

699 +#: archive.c:14

700 +msgid ""

701 +"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"

702 +msgstr ""

703 +

704 +#: archive.c:15

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

706 +msgstr ""

707 +

708 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327

709 +#, c-format

710 +msgid "pathspec '%s' did not match any files"

711 +msgstr ""

712 +

713 +#: archive.c:429

714 +msgid "fmt"

715 +msgstr ""

716 +

717 +#: archive.c:429

718 +msgid "archive format"

719 +msgstr ""

720 +

721 +#: archive.c:430 builtin/log.c:1429

722 +msgid "prefix"

723 +msgstr ""

724 +

725 +#: archive.c:431

726 +msgid "prepend prefix to each pathname in the archive"

727 +msgstr ""

728 +

729 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603

730 +#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987

731 +#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101

732 +#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401

733 +#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153

734 +msgid "file"

735 +msgstr ""

736 +

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

738 +msgid "write the archive to this file"

739 +msgstr ""

740 +

741 +#: archive.c:435

742 +msgid "read .gitattributes in working directory"

743 +msgstr ""

744 +

745 +#: archive.c:436

746 +msgid "report archived files on stderr"

747 +msgstr ""

748 +

749 +#: archive.c:437

750 +msgid "store only"

751 +msgstr ""

752 +

753 +#: archive.c:438

754 +msgid "compress faster"

755 +msgstr ""

756 +

757 +#: archive.c:446

758 +msgid "compress better"

759 +msgstr ""

760 +

761 +#: archive.c:449

762 +msgid "list supported archive formats"

763 +msgstr ""

764 +

765 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88

766 +#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953

767 +msgid "repo"

768 +msgstr ""

769 +

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

771 +msgid "retrieve the archive from remote repository <repo>"

772 +msgstr ""

773 +

774 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485

775 +msgid "command"

776 +msgstr ""

777 +

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

779 +msgid "path to the remote git-upload-archive command"

780 +msgstr ""

781 +

782 +#: archive.c:461

783 +msgid "Unexpected option --remote"

784 +msgstr ""

785 +

786 +#: archive.c:463

787 +msgid "Option --exec can only be used together with --remote"

788 +msgstr ""

789 +

790 +#: archive.c:465

791 +msgid "Unexpected option --output"

792 +msgstr ""

793 +

794 +#: archive.c:487

795 +#, c-format

796 +msgid "Unknown archive format '%s'"

797 +msgstr ""

798 +

799 +#: archive.c:494

800 +#, c-format

801 +msgid "Argument not supported for format '%s': -%d"

802 +msgstr ""

803 +

804 +#: attr.c:263

805 +msgid ""

806 +"Negative patterns are ignored in git attributes\n"

807 +"Use '\\!' for literal leading exclamation."

808 +msgstr ""

809 +

810 +#: bisect.c:441

811 +#, c-format

812 +msgid "Could not open file '%s'"

813 +msgstr ""

814 +

815 +#: bisect.c:446

816 +#, c-format

817 +msgid "Badly quoted content in file '%s': %s"

818 +msgstr ""

819 +

820 +#: bisect.c:655

821 +#, c-format

822 +msgid "We cannot bisect more!\n"

823 +msgstr ""

824 +

825 +#: bisect.c:708

826 +#, c-format

827 +msgid "Not a valid commit name %s"

828 +msgstr ""

829 +

830 +#: bisect.c:732

831 +#, c-format

832 +msgid ""

833 +"The merge base %s is bad.\n"

834 +"This means the bug has been fixed between %s and [%s].\n"

835 +msgstr ""

836 +

837 +#: bisect.c:737

838 +#, c-format

839 +msgid ""

840 +"The merge base %s is new.\n"

841 +"The property has changed between %s and [%s].\n"

842 +msgstr ""

843 +

844 +#: bisect.c:742

845 +#, c-format

846 +msgid ""

847 +"The merge base %s is %s.\n"

848 +"This means the first '%s' commit is between %s and [%s].\n"

849 +msgstr ""

850 +

851 +#: bisect.c:750

852 +#, c-format

853 +msgid ""

854 +"Some %s revs are not ancestor of the %s rev.\n"

855 +"git bisect cannot work properly in this case.\n"

856 +"Maybe you mistook %s and %s revs?\n"

857 +msgstr ""

858 +

859 +#: bisect.c:763

860 +#, c-format

861 +msgid ""

862 +"the merge base between %s and [%s] must be skipped.\n"

863 +"So we cannot be sure the first %s commit is between %s and %s.\n"

864 +"We continue anyway."

865 +msgstr ""

866 +

867 +#: bisect.c:798

868 +#, c-format

869 +msgid "Bisecting: a merge base must be tested\n"

870 +msgstr ""

871 +

872 +#: bisect.c:849

873 +#, c-format

874 +msgid "a %s revision is needed"

875 +msgstr ""

876 +

877 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248

878 +#, c-format

879 +msgid "could not create file '%s'"

880 +msgstr ""

881 +

882 +#: bisect.c:917

883 +#, c-format

884 +msgid "could not read file '%s'"

885 +msgstr ""

886 +

887 +#: bisect.c:947

888 +msgid "reading bisect refs failed"

889 +msgstr ""

890 +

891 +#: bisect.c:967

892 +#, c-format

893 +msgid "%s was both %s and %s\n"

894 +msgstr ""

895 +

896 +#: bisect.c:975

897 +#, c-format

898 +msgid ""

899 +"No testable commit found.\n"

900 +"Maybe you started with bad path parameters?\n"

901 +msgstr ""

902 +

903 +#: bisect.c:994

904 +#, c-format

905 +msgid "(roughly %d step)"

906 +msgid_plural "(roughly %d steps)"

907 +msgstr[0] ""

908 +msgstr[1] ""

909 +

910 +#. TRANSLATORS: the last %s will be replaced with

911 +#. "(roughly %d steps)" translation

912 +#: bisect.c:998

913 +#, c-format

914 +msgid "Bisecting: %d revision left to test after this %s\n"

915 +msgid_plural "Bisecting: %d revisions left to test after this %s\n"

916 +msgstr[0] ""

917 +msgstr[1] ""

918 +

919 +#: branch.c:53

920 +#, c-format

921 +msgid ""

922 +"\n"

923 +"After fixing the error cause you may try to fix up\n"

924 +"the remote tracking information by invoking\n"

925 +"\"git branch --set-upstream-to=%s%s%s\"."

926 +msgstr ""

927 +

928 +#: branch.c:67

929 +#, c-format

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

931 +msgstr ""

932 +

933 +#: branch.c:93

934 +#, c-format

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

936 +msgstr ""

937 +

938 +#: branch.c:94

939 +#, c-format

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

941 +msgstr ""

942 +

943 +#: branch.c:98

944 +#, c-format

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

946 +msgstr ""

947 +

948 +#: branch.c:99

949 +#, c-format

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

951 +msgstr ""

952 +

953 +#: branch.c:104

954 +#, c-format

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

956 +msgstr ""

957 +

958 +#: branch.c:105

959 +#, c-format

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

961 +msgstr ""

962 +

963 +#: branch.c:109

964 +#, c-format

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

966 +msgstr ""

967 +

968 +#: branch.c:110

969 +#, c-format

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

971 +msgstr ""

972 +

973 +#: branch.c:119

974 +msgid "Unable to write upstream branch configuration"

975 +msgstr ""

976 +

977 +#: branch.c:156

978 +#, c-format

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

980 +msgstr ""

981 +

982 +#: branch.c:185

983 +#, c-format

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

985 +msgstr ""

986 +

987 +#: branch.c:190

988 +#, c-format

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

990 +msgstr ""

991 +

992 +#: branch.c:198

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

994 +msgstr ""

995 +

996 +#: branch.c:218

997 +#, c-format

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

999 +msgstr ""

1000 +

1001 +#: branch.c:220

1002 +#, c-format

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

1004 +msgstr ""

1005 +

1006 +#: branch.c:222

1007 +msgid ""

1008 +"\n"

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

1010 +"branch that already exists at the remote, you may need to\n"

1011 +"run \"git fetch\" to retrieve it.\n"

1012 +"\n"

1013 +"If you are planning to push out a new local branch that\n"

1014 +"will track its remote counterpart, you may want to use\n"

1015 +"\"git push -u\" to set the upstream config as you push."

1016 +msgstr ""

1017 +

1018 +#: branch.c:266

1019 +#, c-format

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

1021 +msgstr ""

1022 +

1023 +#: branch.c:286

1024 +#, c-format

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

1026 +msgstr ""

1027 +

1028 +#: branch.c:291

1029 +#, c-format

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

1031 +msgstr ""

1032 +

1033 +#: branch.c:345

1034 +#, c-format

1035 +msgid "'%s' is already checked out at '%s'"

1036 msgstr ""

1037

1038 #: branch.c:364

@@ -448,7 +1050,7 @@ msgstr ""

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

1051 msgstr ""

1052

451 -#: bundle.c:87 builtin/commit.c:778

1053 +#: bundle.c:87 sequencer.c:963 builtin/commit.c:777

1054 #, c-format

1055 msgid "could not open '%s'"

1056 msgstr ""

@@ -457,9 +1059,9 @@ msgstr ""

1059 msgid "Repository lacks these prerequisite commits:"

1060 msgstr ""

1061

460 -#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085

461 -#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348

462 -#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901

1062 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374

1063 +#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348

1064 +#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909

1065 #: builtin/merge.c:356 builtin/shortlog.c:170

1066 msgid "revision walk setup failed"

1067 msgstr ""

@@ -499,7 +1101,7 @@ msgstr ""

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

1102 msgstr ""

1103

502 -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273

1104 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273

1105 #, c-format

1106 msgid "unrecognized argument: %s"

1107 msgstr ""

@@ -522,8 +1124,8 @@ msgstr ""

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

1125 msgstr ""

1126

525 -#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505

526 -#: builtin/am.c:2119

1127 +#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493

1128 +#: builtin/am.c:2127

1129 #, c-format

1130 msgid "could not parse %s"

1131 msgstr ""

@@ -533,6 +1135,13 @@ msgstr ""

1135 msgid "%s %s is not a commit!"

1136 msgstr ""

1137

1138 +#: commit.c:1514

1139 +msgid ""

1140 +"Warning: commit message did not conform to UTF-8.\n"

1141 +"You may want to amend it after fixing the message, or set the config\n"

1142 +"variable i18n.commitencoding to the encoding your project uses.\n"

1143 +msgstr ""

1144 +

1145 #: compat/obstack.c:406 compat/obstack.c:408

1146 msgid "memory exhausted"

1147 msgstr ""

@@ -615,7 +1224,7 @@ msgstr ""

1224 msgid "failed to expand user dir in: '%s'"

1225 msgstr ""

1226

618 -#: config.c:849 config.c:860

1227 +#: config.c:852 config.c:863

1228 #, c-format

1229 msgid "bad zlib compression level %d"

1230 msgstr ""

@@ -658,22 +1267,58 @@ msgstr ""

1267 msgid "could not unset '%s'"

1268 msgstr ""

1269

1270 +#: connect.c:49

1271 +msgid "The remote end hung up upon initial contact"

1272 +msgstr ""

1273 +

1274 +#: connect.c:51

1275 +msgid ""

1276 +"Could not read from remote repository.\n"

1277 +"\n"

1278 +"Please make sure you have the correct access rights\n"

1279 +"and the repository exists."

1280 +msgstr ""

1281 +

1282 #: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140

1283 msgid "Checking connectivity"

1284 msgstr ""

1285

665 -#: connected.c:74

1286 +#: connected.c:75

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

1288 msgstr ""

1289

669 -#: connected.c:94

1290 +#: connected.c:95

1291 msgid "failed write to rev-list"

1292 msgstr ""

1293

673 -#: connected.c:101

1294 +#: connected.c:102

1295 msgid "failed to close rev-list's stdin"

1296 msgstr ""

1297

1298 +#: convert.c:201

1299 +#, c-format

1300 +msgid ""

1301 +"CRLF will be replaced by LF in %s.\n"

1302 +"The file will have its original line endings in your working directory."

1303 +msgstr ""

1304 +

1305 +#: convert.c:205

1306 +#, c-format

1307 +msgid "CRLF would be replaced by LF in %s."

1308 +msgstr ""

1309 +

1310 +#: convert.c:211

1311 +#, c-format

1312 +msgid ""

1313 +"LF will be replaced by CRLF in %s.\n"

1314 +"The file will have its original line endings in your working directory."

1315 +msgstr ""

1316 +

1317 +#: convert.c:215

1318 +#, c-format

1319 +msgid "LF would be replaced by CRLF in %s"

1320 +msgstr ""

1321 +

1322 #: date.c:97

1323 msgid "in the future"

1324 msgstr ""

@@ -720,3035 +1365,2835 @@ msgid_plural "%lu months ago"

1365 msgstr[0] ""

1366 msgstr[1] ""

1367

723 -#: date.c:148

724 -#, c-format

725 -msgid "%lu year"

726 -msgid_plural "%lu years"

727 -msgstr[0] ""

728 -msgstr[1] ""

729 -

730 -#. TRANSLATORS: "%s" is "<n> years"

731 -#: date.c:151

732 -#, c-format

733 -msgid "%s, %lu month ago"

734 -msgid_plural "%s, %lu months ago"

735 -msgstr[0] ""

736 -msgstr[1] ""

737 -

738 -#: date.c:156 date.c:161

739 -#, c-format

740 -msgid "%lu year ago"

741 -msgid_plural "%lu years ago"

742 -msgstr[0] ""

743 -msgstr[1] ""

744 -

745 -#: diffcore-order.c:24

746 -#, c-format

747 -msgid "failed to read orderfile '%s'"

748 -msgstr ""

749 -

750 -#: diffcore-rename.c:540

751 -msgid "Performing inexact rename detection"

752 -msgstr ""

753 -

754 -#: diff.c:116

755 -#, c-format

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

757 -msgstr ""

758 -

759 -#: diff.c:121

760 -#, c-format

761 -msgid " Unknown dirstat parameter '%s'\n"

762 -msgstr ""

763 -

764 -#: diff.c:225

765 -#, c-format

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

767 -msgstr ""

768 -

769 -#: diff.c:277

770 -#, c-format

771 -msgid ""

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

773 -"%s"

774 -msgstr ""

775 -

776 -#: diff.c:3017

777 -#, c-format

778 -msgid "external diff died, stopping at %s"

779 -msgstr ""

780 -

781 -#: diff.c:3415

782 -msgid "--follow requires exactly one pathspec"

783 -msgstr ""

784 -

785 -#: diff.c:3578

786 -#, c-format

787 -msgid ""

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

789 -"%s"

790 -msgstr ""

791 -

792 -#: diff.c:3592

793 -#, c-format

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

795 -msgstr ""

796 -

797 -#: dir.c:1823

798 -msgid "failed to get kernel name and information"

799 -msgstr ""

800 -

801 -#: dir.c:1942

802 -msgid "Untracked cache is disabled on this system or location."

803 -msgstr ""

804 -

805 -#: gpg-interface.c:178

806 -msgid "gpg failed to sign the data"

807 -msgstr ""

808 -

809 -#: gpg-interface.c:208

810 -msgid "could not create temporary file"

811 -msgstr ""

812 -

813 -#: gpg-interface.c:210

814 -#, c-format

815 -msgid "failed writing detached signature to '%s'"

816 -msgstr ""

817 -

818 -#: grep.c:1792

819 -#, c-format

820 -msgid "'%s': unable to read %s"

821 -msgstr ""

822 -

823 -#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155

824 -#, c-format

825 -msgid "failed to stat '%s'"

826 -msgstr ""

827 -

828 -#: grep.c:1820

829 -#, c-format

830 -msgid "'%s': short read"

831 -msgstr ""

832 -

833 -#: help.c:205

834 -#, c-format

835 -msgid "available git commands in '%s'"

836 -msgstr ""

837 -

838 -#: help.c:212

839 -msgid "git commands available from elsewhere on your $PATH"

840 -msgstr ""

841 -

842 -#: help.c:244

843 -msgid "These are common Git commands used in various situations:"

844 -msgstr ""

845 -

846 -#: help.c:309

847 -#, c-format

848 -msgid ""

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

850 -"able to execute it. Maybe git-%s is broken?"

851 -msgstr ""

852 -

853 -#: help.c:366

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

855 -msgstr ""

856 -

857 -#: help.c:388

858 -#, c-format

859 -msgid ""

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

861 -"Continuing under the assumption that you meant '%s'"

862 -msgstr ""

863 -

864 -#: help.c:393

865 -#, c-format

866 -msgid "in %0.1f seconds automatically..."

867 -msgstr ""

868 -

869 -#: help.c:400

870 -#, c-format

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

872 -msgstr ""

873 -

874 -#: help.c:404 help.c:470

875 -msgid ""

876 -"\n"

877 -"Did you mean this?"

878 -msgid_plural ""

879 -"\n"

880 -"Did you mean one of these?"

881 -msgstr[0] ""

882 -msgstr[1] ""

883 -

884 -#: help.c:466

885 -#, c-format

886 -msgid "%s: %s - %s"

887 -msgstr ""

888 -

889 -#: lockfile.c:152

890 -#, c-format

891 -msgid ""

892 -"Unable to create '%s.lock': %s.\n"

893 -"\n"

894 -"Another git process seems to be running in this repository, e.g.\n"

895 -"an editor opened by 'git commit'. Please make sure all processes\n"

896 -"are terminated then try again. If it still fails, a git process\n"

897 -"may have crashed in this repository earlier:\n"

898 -"remove the file manually to continue."

899 -msgstr ""

900 -

901 -#: lockfile.c:160

902 -#, c-format

903 -msgid "Unable to create '%s.lock': %s"

904 -msgstr ""

905 -

906 -#: merge.c:41

907 -msgid "failed to read the cache"

908 -msgstr ""

909 -

910 -#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375

911 -#: builtin/checkout.c:589 builtin/clone.c:732

912 -msgid "unable to write new index file"

913 -msgstr ""

914 -

915 -#: merge-recursive.c:209

916 -msgid "(bad commit)\n"

917 -msgstr ""

918 -

919 -#: merge-recursive.c:231

1368 +#: date.c:148

1369 #, c-format

921 -msgid "addinfo_cache failed for path '%s'"

922 -msgstr ""

1370 +msgid "%lu year"

1371 +msgid_plural "%lu years"

1372 +msgstr[0] ""

1373 +msgstr[1] ""

1374

924 -#: merge-recursive.c:301

925 -msgid "error building trees"

926 -msgstr ""

1375 +#. TRANSLATORS: "%s" is "<n> years"

1376 +#: date.c:151

1377 +#, c-format

1378 +msgid "%s, %lu month ago"

1379 +msgid_plural "%s, %lu months ago"

1380 +msgstr[0] ""

1381 +msgstr[1] ""

1382

928 -#: merge-recursive.c:720

1383 +#: date.c:156 date.c:161

1384 #, c-format

930 -msgid "failed to create path '%s'%s"

931 -msgstr ""

1385 +msgid "%lu year ago"

1386 +msgid_plural "%lu years ago"

1387 +msgstr[0] ""

1388 +msgstr[1] ""

1389

933 -#: merge-recursive.c:731

1390 +#: diffcore-order.c:24

1391 #, c-format

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

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

1393 msgstr ""

1394

938 -#: merge-recursive.c:745 merge-recursive.c:764

939 -msgid ": perhaps a D/F conflict?"

1395 +#: diffcore-rename.c:540

1396 +msgid "Performing inexact rename detection"

1397 msgstr ""

1398

942 -#: merge-recursive.c:754

1399 +#: diff.c:62

1400 #, c-format

944 -msgid "refusing to lose untracked file at '%s'"

1401 +msgid "option '%s' requires a value"

1402 msgstr ""

1403

947 -#: merge-recursive.c:796

1404 +#: diff.c:124

1405 #, c-format

949 -msgid "cannot read object %s '%s'"

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

1407 msgstr ""

1408

952 -#: merge-recursive.c:798

1409 +#: diff.c:129

1410 #, c-format

954 -msgid "blob expected for %s '%s'"

1411 +msgid " Unknown dirstat parameter '%s'\n"

1412 msgstr ""

1413

957 -#: merge-recursive.c:822

1414 +#: diff.c:283

1415 #, c-format

959 -msgid "failed to open '%s': %s"

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

1417 msgstr ""

1418

962 -#: merge-recursive.c:833

1419 +#: diff.c:346

1420 #, c-format

964 -msgid "failed to symlink '%s': %s"

1421 +msgid ""

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

1423 +"%s"

1424 msgstr ""

1425

967 -#: merge-recursive.c:838

1426 +#: diff.c:3087

1427 #, c-format

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

1428 +msgid "external diff died, stopping at %s"

1429 msgstr ""

1430

972 -#: merge-recursive.c:978

973 -msgid "Failed to execute internal merge"

1431 +#: diff.c:3412

1432 +msgid "--name-only, --name-status, --check and -s are mutually exclusive"

1433 msgstr ""

1434

976 -#: merge-recursive.c:982

977 -#, c-format

978 -msgid "Unable to add %s to database"

1435 +#: diff.c:3502

1436 +msgid "--follow requires exactly one pathspec"

1437 msgstr ""

1438

981 -#: merge-recursive.c:1081 merge-recursive.c:1095

1439 +#: diff.c:3665

1440 #, c-format

1441 msgid ""

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

985 -"in tree."

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

1443 +"%s"

1444 msgstr ""

1445

988 -#: merge-recursive.c:1087 merge-recursive.c:1100

1446 +#: diff.c:3679

1447 #, c-format

990 -msgid ""

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

992 -"in tree at %s."

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

1449 msgstr ""

1450

995 -#: merge-recursive.c:1143

996 -msgid "rename"

1451 +#: diff.c:4700

1452 +msgid "inexact rename detection was skipped due to too many files."

1453 msgstr ""

1454

999 -#: merge-recursive.c:1143

1000 -msgid "renamed"

1455 +#: diff.c:4703

1456 +msgid "only found copies from modified paths due to too many files."

1457 msgstr ""

1458

1003 -#: merge-recursive.c:1200

1459 +#: diff.c:4706

1460 #, c-format

1005 -msgid "%s is a directory in %s adding as %s instead"

1461 +msgid ""

1462 +"you may want to set your %s variable to at least %d and retry the command."

1463 msgstr ""

1464

1008 -#: merge-recursive.c:1225

1009 -#, c-format

1010 -msgid ""

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

1012 -"\"->\"%s\" in \"%s\"%s"

1465 +#: dir.c:1866

1466 +msgid "failed to get kernel name and information"

1467 msgstr ""

1468

1015 -#: merge-recursive.c:1230

1016 -msgid " (left unresolved)"

1469 +#: dir.c:1985

1470 +msgid "Untracked cache is disabled on this system or location."

1471 msgstr ""

1472

1019 -#: merge-recursive.c:1292

1020 -#, c-format

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

1473 +#: fetch-pack.c:213

1474 +msgid "git fetch-pack: expected shallow list"

1475 msgstr ""

1476

1024 -#: merge-recursive.c:1325

1025 -#, c-format

1026 -msgid "Renaming %s to %s and %s to %s instead"

1477 +#: fetch-pack.c:225

1478 +msgid "git fetch-pack: expected ACK/NAK, got EOF"

1479 msgstr ""

1480

1029 -#: merge-recursive.c:1531

1481 +#: fetch-pack.c:243

1482 #, c-format

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

1483 +msgid "git fetch_pack: expected ACK/NAK, got '%s'"

1484 msgstr ""

1485

1034 -#: merge-recursive.c:1546

1035 -#, c-format

1036 -msgid "Adding merged %s"

1486 +#: fetch-pack.c:295

1487 +msgid "--stateless-rpc requires multi_ack_detailed"

1488 msgstr ""

1489

1039 -#: merge-recursive.c:1553 merge-recursive.c:1766

1490 +#: fetch-pack.c:381

1491 #, c-format

1041 -msgid "Adding as %s instead"

1492 +msgid "invalid shallow line: %s"

1493 msgstr ""

1494

1044 -#: merge-recursive.c:1610

1495 +#: fetch-pack.c:387

1496 #, c-format

1046 -msgid "cannot read object %s"

1497 +msgid "invalid unshallow line: %s"

1498 msgstr ""

1499

1049 -#: merge-recursive.c:1613

1500 +#: fetch-pack.c:389

1501 #, c-format

1051 -msgid "object %s is not a blob"

1502 +msgid "object not found: %s"

1503 msgstr ""

1504

1054 -#: merge-recursive.c:1666

1055 -msgid "modify"

1505 +#: fetch-pack.c:392

1506 +#, c-format

1507 +msgid "error in object: %s"

1508 msgstr ""

1509

1058 -#: merge-recursive.c:1666

1059 -msgid "modified"

1510 +#: fetch-pack.c:394

1511 +#, c-format

1512 +msgid "no shallow found: %s"

1513 msgstr ""

1514

1062 -#: merge-recursive.c:1676

1063 -msgid "content"

1515 +#: fetch-pack.c:397

1516 +#, c-format

1517 +msgid "expected shallow/unshallow, got %s"

1518 msgstr ""

1519

1066 -#: merge-recursive.c:1683

1067 -msgid "add/add"

1520 +#: fetch-pack.c:436

1521 +#, c-format

1522 +msgid "got %s %d %s"

1523 msgstr ""

1524

1070 -#: merge-recursive.c:1718

1525 +#: fetch-pack.c:450

1526 #, c-format

1072 -msgid "Skipped %s (merged same as existing)"

1527 +msgid "invalid commit %s"

1528 msgstr ""

1529

1075 -#: merge-recursive.c:1732

1076 -#, c-format

1077 -msgid "Auto-merging %s"

1530 +#: fetch-pack.c:483

1531 +msgid "giving up"

1532 msgstr ""

1533

1080 -#: merge-recursive.c:1736 git-submodule.sh:919

1081 -msgid "submodule"

1534 +#: fetch-pack.c:493 progress.c:235

1535 +msgid "done"

1536 msgstr ""

1537

1084 -#: merge-recursive.c:1737

1538 +#: fetch-pack.c:505

1539 #, c-format

1086 -msgid "CONFLICT (%s): Merge conflict in %s"

1540 +msgid "got %s (%d) %s"

1541 msgstr ""

1542

1089 -#: merge-recursive.c:1831

1543 +#: fetch-pack.c:551

1544 #, c-format

1091 -msgid "Removing %s"

1545 +msgid "Marking %s as complete"

1546 msgstr ""

1547

1094 -#: merge-recursive.c:1857

1095 -msgid "file/directory"

1548 +#: fetch-pack.c:697

1549 +#, c-format

1550 +msgid "already have %s (%s)"

1551 msgstr ""

1552

1098 -#: merge-recursive.c:1863

1099 -msgid "directory/file"

1553 +#: fetch-pack.c:735

1554 +msgid "fetch-pack: unable to fork off sideband demultiplexer"

1555 msgstr ""

1556

1102 -#: merge-recursive.c:1868

1103 -#, c-format

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

1557 +#: fetch-pack.c:743

1558 +msgid "protocol error: bad pack header"

1559 msgstr ""

1560

1107 -#: merge-recursive.c:1877

1561 +#: fetch-pack.c:799

1562 #, c-format

1109 -msgid "Adding %s"

1110 -msgstr ""

1111 -

1112 -#: merge-recursive.c:1914

1113 -msgid "Already up-to-date!"

1563 +msgid "fetch-pack: unable to fork off %s"

1564 msgstr ""

1565

1116 -#: merge-recursive.c:1923

1566 +#: fetch-pack.c:815

1567 #, c-format

1118 -msgid "merging of trees %s and %s failed"

1568 +msgid "%s failed"

1569 msgstr ""

1570

1121 -#: merge-recursive.c:2006

1122 -msgid "Merging:"

1571 +#: fetch-pack.c:817

1572 +msgid "error in sideband demultiplexer"

1573 msgstr ""

1574

1125 -#: merge-recursive.c:2019

1126 -#, c-format

1127 -msgid "found %u common ancestor:"

1128 -msgid_plural "found %u common ancestors:"

1129 -msgstr[0] ""

1130 -msgstr[1] ""

1131 -

1132 -#: merge-recursive.c:2058

1133 -msgid "merge returned no commit"

1575 +#: fetch-pack.c:844

1576 +msgid "Server does not support shallow clients"

1577 msgstr ""

1578

1136 -#: merge-recursive.c:2121

1137 -#, c-format

1138 -msgid "Could not parse object '%s'"

1579 +#: fetch-pack.c:848

1580 +msgid "Server supports multi_ack_detailed"

1581 msgstr ""

1582

1141 -#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788

1142 -msgid "Unable to write index."

1583 +#: fetch-pack.c:851

1584 +msgid "Server supports no-done"

1585 msgstr ""

1586

1145 -#: notes-utils.c:41

1146 -msgid "Cannot commit uninitialized/unreferenced notes tree"

1587 +#: fetch-pack.c:857

1588 +msgid "Server supports multi_ack"

1589 msgstr ""

1590

1149 -#: notes-utils.c:100

1150 -#, c-format

1151 -msgid "Bad notes.rewriteMode value: '%s'"

1591 +#: fetch-pack.c:861

1592 +msgid "Server supports side-band-64k"

1593 msgstr ""

1594

1154 -#: notes-utils.c:110

1155 -#, c-format

1156 -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

1595 +#: fetch-pack.c:865

1596 +msgid "Server supports side-band"

1597 msgstr ""

1598

1159 -#. TRANSLATORS: The first %s is the name of the

1160 -#. environment variable, the second %s is its value

1161 -#: notes-utils.c:137

1162 -#, c-format

1163 -msgid "Bad %s value: '%s'"

1599 +#: fetch-pack.c:869

1600 +msgid "Server supports allow-tip-sha1-in-want"

1601 msgstr ""

1602

1166 -#: object.c:242

1167 -#, c-format

1168 -msgid "unable to parse object: %s"

1603 +#: fetch-pack.c:873

1604 +msgid "Server supports allow-reachable-sha1-in-want"

1605 msgstr ""

1606

1171 -#: parse-options.c:572

1172 -msgid "..."

1607 +#: fetch-pack.c:883

1608 +msgid "Server supports ofs-delta"

1609 msgstr ""

1610

1175 -#: parse-options.c:590

1611 +#: fetch-pack.c:890

1612 #, c-format

1177 -msgid "usage: %s"

1613 +msgid "Server version is %.*s"

1614 msgstr ""

1615

1180 -#. TRANSLATORS: the colon here should align with the

1181 -#. one in "usage: %s" translation

1182 -#: parse-options.c:594

1183 -#, c-format

1184 -msgid " or: %s"

1616 +#: fetch-pack.c:896

1617 +msgid "Server does not support --shallow-since"

1618 msgstr ""

1619

1187 -#: parse-options.c:597

1188 -#, c-format

1189 -msgid " %s"

1620 +#: fetch-pack.c:900

1621 +msgid "Server does not support --shallow-exclude"

1622 msgstr ""

1623

1192 -#: parse-options.c:631

1193 -msgid "-NUM"

1624 +#: fetch-pack.c:902

1625 +msgid "Server does not support --deepen"

1626 msgstr ""

1627

1196 -#: parse-options-cb.c:108

1197 -#, c-format

1198 -msgid "malformed object name '%s'"

1628 +#: fetch-pack.c:913

1629 +msgid "no common commits"

1630 msgstr ""

1631

1201 -#: path.c:798

1202 -#, c-format

1203 -msgid "Could not make %s writable by group"

1632 +#: fetch-pack.c:925

1633 +msgid "git fetch-pack: fetch failed."

1634 msgstr ""

1635

1206 -#: pathspec.c:133

1207 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

1636 +#: fetch-pack.c:1087

1637 +msgid "no matching remote head"

1638 msgstr ""

1639

1210 -#: pathspec.c:143

1211 -msgid ""

1212 -"global 'literal' pathspec setting is incompatible with all other global "

1213 -"pathspec settings"

1640 +#: gpg-interface.c:185

1641 +msgid "gpg failed to sign the data"

1642 msgstr ""

1643

1216 -#: pathspec.c:177

1217 -msgid "invalid parameter for pathspec magic 'prefix'"

1644 +#: gpg-interface.c:215

1645 +msgid "could not create temporary file"

1646 msgstr ""

1647

1220 -#: pathspec.c:183

1648 +#: gpg-interface.c:217

1649 #, c-format

1222 -msgid "Invalid pathspec magic '%.*s' in '%s'"

1650 +msgid "failed writing detached signature to '%s'"

1651 msgstr ""

1652

1225 -#: pathspec.c:187

1653 +#: grep.c:1782

1654 #, c-format

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

1655 +msgid "'%s': unable to read %s"

1656 msgstr ""

1657

1230 -#: pathspec.c:205

1658 +#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155

1659 #, c-format

1232 -msgid "Unimplemented pathspec magic '%c' in '%s'"

1660 +msgid "failed to stat '%s'"

1661 msgstr ""

1662

1235 -#: pathspec.c:230

1663 +#: grep.c:1810

1664 #, c-format

1237 -msgid "%s: 'literal' and 'glob' are incompatible"

1665 +msgid "'%s': short read"

1666 msgstr ""

1667

1240 -#: pathspec.c:241

1668 +#: help.c:203

1669 #, c-format

1242 -msgid "%s: '%s' is outside repository"

1670 +msgid "available git commands in '%s'"

1671 msgstr ""

1672

1245 -#: pathspec.c:291

1246 -#, c-format

1247 -msgid "Pathspec '%s' is in submodule '%.*s'"

1673 +#: help.c:210

1674 +msgid "git commands available from elsewhere on your $PATH"

1675 msgstr ""

1676

1250 -#: pathspec.c:353

1251 -#, c-format

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

1677 +#: help.c:241

1678 +msgid "These are common Git commands used in various situations:"

1679 msgstr ""

1680

1255 -#: pathspec.c:433

1681 +#: help.c:306

1682 #, c-format

1257 -msgid "pathspec '%s' is beyond a symbolic link"

1258 -msgstr ""

1259 -

1260 -#: pathspec.c:442

1683 msgid ""

1262 -"There is nothing to exclude from by :(exclude) patterns.\n"

1263 -"Perhaps you forgot to add either ':/' or '.' ?"

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

1685 +"able to execute it. Maybe git-%s is broken?"

1686 msgstr ""

1687

1266 -#: pretty.c:973

1267 -msgid "unable to parse --pretty format"

1688 +#: help.c:361

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

1690 msgstr ""

1691

1270 -#: progress.c:235

1271 -msgid "done"

1692 +#: help.c:383

1693 +#, c-format

1694 +msgid ""

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

1696 +"Continuing under the assumption that you meant '%s'"

1697 msgstr ""

1698

1274 -#: read-cache.c:1281

1699 +#: help.c:388

1700 #, c-format

1276 -msgid ""

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

1278 -"Using version %i"

1701 +msgid "in %0.1f seconds automatically..."

1702 msgstr ""

1703

1281 -#: read-cache.c:1291

1704 +#: help.c:395

1705 #, c-format

1283 -msgid ""

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

1285 -"Using version %i"

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

1707 msgstr ""

1708

1288 -#: refs.c:551 builtin/merge.c:840

1709 +#: help.c:399 help.c:465

1710 +msgid ""

1711 +"\n"

1712 +"Did you mean this?"

1713 +msgid_plural ""

1714 +"\n"

1715 +"Did you mean one of these?"

1716 +msgstr[0] ""

1717 +msgstr[1] ""

1718 +

1719 +#: help.c:461

1720 #, c-format

1290 -msgid "Could not open '%s' for writing"

1721 +msgid "%s: %s - %s"

1722 msgstr ""

1723

1293 -#: refs/files-backend.c:2534

1294 -#, c-format

1295 -msgid "could not delete reference %s: %s"

1724 +#: ident.c:334

1725 +msgid ""

1726 +"\n"

1727 +"*** Please tell me who you are.\n"

1728 +"\n"

1729 +"Run\n"

1730 +"\n"

1731 +" git config --global user.email \"you@example.com\"\n"

1732 +" git config --global user.name \"Your Name\"\n"

1733 +"\n"

1734 +"to set your account's default identity.\n"

1735 +"Omit --global to set the identity only in this repository.\n"

1736 +"\n"

1737 msgstr ""

1738

1298 -#: refs/files-backend.c:2537

1739 +#: lockfile.c:152

1740 #, c-format

1300 -msgid "could not delete references: %s"

1741 +msgid ""

1742 +"Unable to create '%s.lock': %s.\n"

1743 +"\n"

1744 +"Another git process seems to be running in this repository, e.g.\n"

1745 +"an editor opened by 'git commit'. Please make sure all processes\n"

1746 +"are terminated then try again. If it still fails, a git process\n"

1747 +"may have crashed in this repository earlier:\n"

1748 +"remove the file manually to continue."

1749 msgstr ""

1750

1303 -#: refs/files-backend.c:2546

1751 +#: lockfile.c:160

1752 #, c-format

1305 -msgid "could not remove reference %s"

1753 +msgid "Unable to create '%s.lock': %s"

1754 msgstr ""

1755

1308 -#: ref-filter.c:55

1309 -#, c-format

1310 -msgid "expected format: %%(color:<color>)"

1756 +#: merge.c:41

1757 +msgid "failed to read the cache"

1758 msgstr ""

1759

1313 -#: ref-filter.c:57

1314 -#, c-format

1315 -msgid "unrecognized color: %%(color:%s)"

1760 +#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374

1761 +#: builtin/checkout.c:588 builtin/clone.c:731

1762 +msgid "unable to write new index file"

1763 msgstr ""

1764

1318 -#: ref-filter.c:71

1319 -#, c-format

1320 -msgid "unrecognized format: %%(%s)"

1765 +#: merge-recursive.c:209

1766 +msgid "(bad commit)\n"

1767 msgstr ""

1768

1323 -#: ref-filter.c:77

1769 +#: merge-recursive.c:231

1770 #, c-format

1325 -msgid "%%(body) does not take arguments"

1771 +msgid "addinfo_cache failed for path '%s'"

1772 msgstr ""

1773

1328 -#: ref-filter.c:84

1329 -#, c-format

1330 -msgid "%%(subject) does not take arguments"

1774 +#: merge-recursive.c:301

1775 +msgid "error building trees"

1776 msgstr ""

1777

1333 -#: ref-filter.c:101

1778 +#: merge-recursive.c:720

1779 #, c-format

1335 -msgid "positive value expected contents:lines=%s"

1780 +msgid "failed to create path '%s'%s"

1781 msgstr ""

1782

1338 -#: ref-filter.c:103

1783 +#: merge-recursive.c:731

1784 #, c-format

1340 -msgid "unrecognized %%(contents) argument: %s"

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

1786 msgstr ""

1787

1343 -#: ref-filter.c:113

1344 -#, c-format

1345 -msgid "unrecognized %%(objectname) argument: %s"

1788 +#: merge-recursive.c:745 merge-recursive.c:764

1789 +msgid ": perhaps a D/F conflict?"

1790 msgstr ""

1791

1348 -#: ref-filter.c:135

1792 +#: merge-recursive.c:754

1793 #, c-format

1350 -msgid "expected format: %%(align:<width>,<position>)"

1794 +msgid "refusing to lose untracked file at '%s'"

1795 msgstr ""

1796

1353 -#: ref-filter.c:147

1797 +#: merge-recursive.c:796 builtin/cat-file.c:34

1798 #, c-format

1355 -msgid "unrecognized position:%s"

1799 +msgid "cannot read object %s '%s'"

1800 msgstr ""

1801

1358 -#: ref-filter.c:151

1802 +#: merge-recursive.c:798

1803 #, c-format

1360 -msgid "unrecognized width:%s"

1804 +msgid "blob expected for %s '%s'"

1805 msgstr ""

1806

1363 -#: ref-filter.c:157

1807 +#: merge-recursive.c:822

1808 #, c-format

1365 -msgid "unrecognized %%(align) argument: %s"

1809 +msgid "failed to open '%s': %s"

1810 msgstr ""

1811

1368 -#: ref-filter.c:161

1812 +#: merge-recursive.c:833

1813 #, c-format

1370 -msgid "positive width expected with the %%(align) atom"

1814 +msgid "failed to symlink '%s': %s"

1815 msgstr ""

1816

1373 -#: ref-filter.c:244

1817 +#: merge-recursive.c:838

1818 #, c-format

1375 -msgid "malformed field name: %.*s"

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

1820 msgstr ""

1821

1378 -#: ref-filter.c:270

1379 -#, c-format

1380 -msgid "unknown field name: %.*s"

1822 +#: merge-recursive.c:978

1823 +msgid "Failed to execute internal merge"

1824 msgstr ""

1825

1383 -#: ref-filter.c:372

1826 +#: merge-recursive.c:982

1827 #, c-format

1385 -msgid "format: %%(end) atom used without corresponding atom"

1828 +msgid "Unable to add %s to database"

1829 msgstr ""

1830

1388 -#: ref-filter.c:424

1831 +#: merge-recursive.c:1081 merge-recursive.c:1095

1832 #, c-format

1390 -msgid "malformed format string %s"

1833 +msgid ""

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

1835 +"in tree."

1836 msgstr ""

1837

1393 -#: ref-filter.c:878

1394 -msgid ":strip= requires a positive integer argument"

1838 +#: merge-recursive.c:1087 merge-recursive.c:1100

1839 +#, c-format

1840 +msgid ""

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

1842 +"in tree at %s."

1843 msgstr ""

1844

1397 -#: ref-filter.c:883

1398 -#, c-format

1399 -msgid "ref '%s' does not have %ld components to :strip"

1845 +#: merge-recursive.c:1143

1846 +msgid "rename"

1847 msgstr ""

1848

1402 -#: ref-filter.c:1046

1403 -#, c-format

1404 -msgid "unknown %.*s format %s"

1849 +#: merge-recursive.c:1143

1850 +msgid "renamed"

1851 msgstr ""

1852

1407 -#: ref-filter.c:1066 ref-filter.c:1097

1853 +#: merge-recursive.c:1200

1854 #, c-format

1409 -msgid "missing object %s for %s"

1855 +msgid "%s is a directory in %s adding as %s instead"

1856 msgstr ""

1857

1412 -#: ref-filter.c:1069 ref-filter.c:1100

1858 +#: merge-recursive.c:1225

1859 #, c-format

1414 -msgid "parse_object_buffer failed on %s for %s"

1860 +msgid ""

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

1862 +"\"->\"%s\" in \"%s\"%s"

1863 msgstr ""

1864

1417 -#: ref-filter.c:1311

1418 -#, c-format

1419 -msgid "malformed object at '%s'"

1865 +#: merge-recursive.c:1230

1866 +msgid " (left unresolved)"

1867 msgstr ""

1868

1422 -#: ref-filter.c:1373

1869 +#: merge-recursive.c:1292

1870 #, c-format

1424 -msgid "ignoring ref with broken name %s"

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

1872 msgstr ""

1873

1427 -#: ref-filter.c:1378

1874 +#: merge-recursive.c:1325

1875 #, c-format

1429 -msgid "ignoring broken ref %s"

1876 +msgid "Renaming %s to %s and %s to %s instead"

1877 msgstr ""

1878

1432 -#: ref-filter.c:1651

1879 +#: merge-recursive.c:1531

1880 #, c-format

1434 -msgid "format: %%(end) atom missing"

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

1882 msgstr ""

1883

1437 -#: ref-filter.c:1705

1884 +#: merge-recursive.c:1546

1885 #, c-format

1439 -msgid "malformed object name %s"

1886 +msgid "Adding merged %s"

1887 msgstr ""

1888

1442 -#: remote.c:746

1889 +#: merge-recursive.c:1553 merge-recursive.c:1766

1890 #, c-format

1444 -msgid "Cannot fetch both %s and %s to %s"

1891 +msgid "Adding as %s instead"

1892 msgstr ""

1893

1447 -#: remote.c:750

1894 +#: merge-recursive.c:1610

1895 #, c-format

1449 -msgid "%s usually tracks %s, not %s"

1896 +msgid "cannot read object %s"

1897 msgstr ""

1898

1452 -#: remote.c:754

1899 +#: merge-recursive.c:1613

1900 #, c-format

1454 -msgid "%s tracks both %s and %s"

1901 +msgid "object %s is not a blob"

1902 msgstr ""

1903

1457 -#: remote.c:762

1458 -msgid "Internal error"

1904 +#: merge-recursive.c:1666

1905 +msgid "modify"

1906 msgstr ""

1907

1461 -#: remote.c:1677 remote.c:1720

1462 -msgid "HEAD does not point to a branch"

1908 +#: merge-recursive.c:1666

1909 +msgid "modified"

1910 msgstr ""

1911

1465 -#: remote.c:1686

1466 -#, c-format

1467 -msgid "no such branch: '%s'"

1912 +#: merge-recursive.c:1676

1913 +msgid "content"

1914 msgstr ""

1915

1470 -#: remote.c:1689

1471 -#, c-format

1472 -msgid "no upstream configured for branch '%s'"

1916 +#: merge-recursive.c:1683

1917 +msgid "add/add"

1918 msgstr ""

1919

1475 -#: remote.c:1695

1920 +#: merge-recursive.c:1718

1921 #, c-format

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

1922 +msgid "Skipped %s (merged same as existing)"

1923 msgstr ""

1924

1480 -#: remote.c:1710

1925 +#: merge-recursive.c:1732

1926 #, c-format

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

1927 +msgid "Auto-merging %s"

1928 msgstr ""

1929

1485 -#: remote.c:1725

1486 -#, c-format

1487 -msgid "branch '%s' has no remote for pushing"

1930 +#: merge-recursive.c:1736 git-submodule.sh:924

1931 +msgid "submodule"

1932 msgstr ""

1933

1490 -#: remote.c:1736

1934 +#: merge-recursive.c:1737

1935 #, c-format

1492 -msgid "push refspecs for '%s' do not include '%s'"

1493 -msgstr ""

1494 -

1495 -#: remote.c:1749

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

1497 -msgstr ""

1498 -

1499 -#: remote.c:1771

1500 -msgid "cannot resolve 'simple' push to a single destination"

1936 +msgid "CONFLICT (%s): Merge conflict in %s"

1937 msgstr ""

1938

1503 -#: remote.c:2073

1939 +#: merge-recursive.c:1831

1940 #, c-format

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

1506 -msgstr ""

1507 -

1508 -#: remote.c:2077

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

1941 +msgid "Removing %s"

1942 msgstr ""

1943

1512 -#: remote.c:2080

1513 -#, c-format

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

1944 +#: merge-recursive.c:1857

1945 +msgid "file/directory"

1946 msgstr ""

1947

1517 -#: remote.c:2084

1518 -#, c-format

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

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

1521 -msgstr[0] ""

1522 -msgstr[1] ""

1523 -

1524 -#: remote.c:2090

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

1948 +#: merge-recursive.c:1863

1949 +msgid "directory/file"

1950 msgstr ""

1951

1528 -#: remote.c:2093

1952 +#: merge-recursive.c:1868

1953 #, c-format

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

1531 -msgid_plural ""

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

1533 -msgstr[0] ""

1534 -msgstr[1] ""

1535 -

1536 -#: remote.c:2101

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

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

1955 msgstr ""

1956

1540 -#: remote.c:2104

1957 +#: merge-recursive.c:1877

1958 #, c-format

1542 -msgid ""

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

1544 -"and have %d and %d different commit each, respectively.\n"

1545 -msgid_plural ""

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

1547 -"and have %d and %d different commits each, respectively.\n"

1548 -msgstr[0] ""

1549 -msgstr[1] ""

1550 -

1551 -#: remote.c:2114

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

1959 +msgid "Adding %s"

1960 msgstr ""

1961

1555 -#: revision.c:2132

1556 -msgid "your current branch appears to be broken"

1962 +#: merge-recursive.c:1914

1963 +msgid "Already up-to-date!"

1964 msgstr ""

1965

1559 -#: revision.c:2135

1966 +#: merge-recursive.c:1923

1967 #, c-format

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

1562 -msgstr ""

1563 -

1564 -#: revision.c:2329

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

1968 +msgid "merging of trees %s and %s failed"

1969 msgstr ""

1970

1568 -#: run-command.c:92

1569 -msgid "open /dev/null failed"

1971 +#: merge-recursive.c:2006

1972 +msgid "Merging:"

1973 msgstr ""

1974

1572 -#: run-command.c:94

1975 +#: merge-recursive.c:2019

1976 #, c-format

1574 -msgid "dup2(%d,%d) failed"

1575 -msgstr ""

1977 +msgid "found %u common ancestor:"

1978 +msgid_plural "found %u common ancestors:"

1979 +msgstr[0] ""

1980 +msgstr[1] ""

1981

1577 -#: send-pack.c:298

1578 -msgid "failed to sign the push certificate"

1982 +#: merge-recursive.c:2058

1983 +msgid "merge returned no commit"

1984 msgstr ""

1985

1581 -#: send-pack.c:411

1582 -msgid "the receiving end does not support --signed push"

1986 +#: merge-recursive.c:2121

1987 +#, c-format

1988 +msgid "Could not parse object '%s'"

1989 msgstr ""

1990

1585 -#: send-pack.c:413

1586 -msgid ""

1587 -"not sending a push certificate since the receiving end does not support --"

1588 -"signed push"

1991 +#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788

1992 +msgid "Unable to write index."

1993 msgstr ""

1994

1591 -#: send-pack.c:425

1592 -msgid "the receiving end does not support --atomic push"

1995 +#: notes-merge.c:273

1996 +#, c-format

1997 +msgid ""

1998 +"You have not concluded your previous notes merge (%s exists).\n"

1999 +"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "

2000 +"commit/abort the previous merge before you start a new notes merge."

2001 msgstr ""

2002

1595 -#: send-pack.c:430

1596 -msgid "the receiving end does not support push options"

2003 +#: notes-merge.c:280

2004 +#, c-format

2005 +msgid "You have not concluded your notes merge (%s exists)."

2006 msgstr ""

2007

1599 -#: sequencer.c:174

1600 -msgid ""

1601 -"after resolving the conflicts, mark the corrected paths\n"

1602 -"with 'git add <paths>' or 'git rm <paths>'"

2008 +#: notes-utils.c:41

2009 +msgid "Cannot commit uninitialized/unreferenced notes tree"

2010 msgstr ""

2011

1605 -#: sequencer.c:177

1606 -msgid ""

1607 -"after resolving the conflicts, mark the corrected paths\n"

1608 -"with 'git add <paths>' or 'git rm <paths>'\n"

1609 -"and commit the result with 'git commit'"

2012 +#: notes-utils.c:100

2013 +#, c-format

2014 +msgid "Bad notes.rewriteMode value: '%s'"

2015 msgstr ""

2016

1612 -#: sequencer.c:190 sequencer.c:841 sequencer.c:924

2017 +#: notes-utils.c:110

2018 #, c-format

1614 -msgid "Could not write to %s"

2019 +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

2020 msgstr ""

2021

1617 -#: sequencer.c:193 sequencer.c:843 sequencer.c:928

2022 +#. TRANSLATORS: The first %s is the name of the

2023 +#. environment variable, the second %s is its value

2024 +#: notes-utils.c:137

2025 #, c-format

1619 -msgid "Error wrapping up %s."

2026 +msgid "Bad %s value: '%s'"

2027 msgstr ""

2028

1622 -#: sequencer.c:208

1623 -msgid "Your local changes would be overwritten by cherry-pick."

2029 +#: object.c:242

2030 +#, c-format

2031 +msgid "unable to parse object: %s"

2032 msgstr ""

2033

1626 -#: sequencer.c:210

1627 -msgid "Your local changes would be overwritten by revert."

2034 +#: parse-options.c:572

2035 +msgid "..."

2036 msgstr ""

2037

1630 -#: sequencer.c:213

1631 -msgid "Commit your changes or stash them to proceed."

2038 +#: parse-options.c:590

2039 +#, c-format

2040 +msgid "usage: %s"

2041 msgstr ""

2042

1634 -#: sequencer.c:228

2043 +#. TRANSLATORS: the colon here should align with the

2044 +#. one in "usage: %s" translation

2045 +#: parse-options.c:594

2046 #, c-format

1636 -msgid "%s: fast-forward"

2047 +msgid " or: %s"

2048 msgstr ""

2049

1639 -#. TRANSLATORS: %s will be "revert" or "cherry-pick"

1640 -#: sequencer.c:303

2050 +#: parse-options.c:597

2051 #, c-format

1642 -msgid "%s: Unable to write new index file"

2052 +msgid " %s"

2053 msgstr ""

2054

1645 -#: sequencer.c:321

1646 -msgid "Could not resolve HEAD commit\n"

2055 +#: parse-options.c:631

2056 +msgid "-NUM"

2057 msgstr ""

2058

1649 -#: sequencer.c:341

1650 -msgid "Unable to update cache tree\n"

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

2060 +#, c-format

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

2062 msgstr ""

2063

1653 -#: sequencer.c:393

2064 +#: path.c:826

2065 #, c-format

1655 -msgid "Could not parse commit %s\n"

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

2067 msgstr ""

2068

1658 -#: sequencer.c:398

1659 -#, c-format

1660 -msgid "Could not parse parent commit %s\n"

2069 +#: pathspec.c:133

2070 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

2071 msgstr ""

2072

1663 -#: sequencer.c:463

1664 -msgid "Your index file is unmerged."

2073 +#: pathspec.c:143

2074 +msgid ""

2075 +"global 'literal' pathspec setting is incompatible with all other global "

2076 +"pathspec settings"

2077 msgstr ""

2078

1667 -#: sequencer.c:482

1668 -#, c-format

1669 -msgid "Commit %s is a merge but no -m option was given."

2079 +#: pathspec.c:177

2080 +msgid "invalid parameter for pathspec magic 'prefix'"

2081 msgstr ""

2082

1672 -#: sequencer.c:490

2083 +#: pathspec.c:183

2084 #, c-format

1674 -msgid "Commit %s does not have parent %d"

2085 +msgid "Invalid pathspec magic '%.*s' in '%s'"

2086 msgstr ""

2087

1677 -#: sequencer.c:494

2088 +#: pathspec.c:187

2089 #, c-format

1679 -msgid "Mainline was specified but commit %s is not a merge."

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

2091 msgstr ""

2092

1682 -#. TRANSLATORS: The first %s will be "revert" or

1683 -#. "cherry-pick", the second %s a SHA1

1684 -#: sequencer.c:507

2093 +#: pathspec.c:205

2094 #, c-format

1686 -msgid "%s: cannot parse parent commit %s"

2095 +msgid "Unimplemented pathspec magic '%c' in '%s'"

2096 msgstr ""

2097

1689 -#: sequencer.c:511

2098 +#: pathspec.c:230

2099 #, c-format

1691 -msgid "Cannot get commit message for %s"

2100 +msgid "%s: 'literal' and 'glob' are incompatible"

2101 msgstr ""

2102

1694 -#: sequencer.c:597

2103 +#: pathspec.c:241

2104 #, c-format

1696 -msgid "could not revert %s... %s"

2105 +msgid "%s: '%s' is outside repository"

2106 msgstr ""

2107

1699 -#: sequencer.c:598

2108 +#: pathspec.c:291

2109 #, c-format

1701 -msgid "could not apply %s... %s"

2110 +msgid "Pathspec '%s' is in submodule '%.*s'"

2111 msgstr ""

2112

1704 -#: sequencer.c:633

1705 -msgid "empty commit set passed"

2113 +#: pathspec.c:353

2114 +#, c-format

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

2116 msgstr ""

2117

1708 -#: sequencer.c:641

1709 -#, c-format

1710 -msgid "git %s: failed to read the index"

2118 +#: pathspec.c:408

2119 +msgid ""

2120 +"empty strings as pathspecs will be made invalid in upcoming releases. please "

2121 +"use . instead if you meant to match all paths"

2122 msgstr ""

2123

1713 -#: sequencer.c:645

2124 +#: pathspec.c:440

2125 #, c-format

1715 -msgid "git %s: failed to refresh the index"

2126 +msgid "pathspec '%s' is beyond a symbolic link"

2127 msgstr ""

2128

1718 -#: sequencer.c:705

1719 -msgid "Cannot revert during another revert."

2129 +#: pathspec.c:449

2130 +msgid ""

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

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

2133 msgstr ""

2134

1722 -#: sequencer.c:706

1723 -msgid "Cannot revert during a cherry-pick."

2135 +#: pretty.c:971

2136 +msgid "unable to parse --pretty format"

2137 msgstr ""

2138

1726 -#: sequencer.c:709

1727 -msgid "Cannot cherry-pick during a revert."

2139 +#: read-cache.c:1315

2140 +#, c-format

2141 +msgid ""

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

2143 +"Using version %i"

2144 msgstr ""

2145

1730 -#: sequencer.c:710

1731 -msgid "Cannot cherry-pick during another cherry-pick."

2146 +#: read-cache.c:1325

2147 +#, c-format

2148 +msgid ""

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

2150 +"Using version %i"

2151 msgstr ""

2152

1734 -#: sequencer.c:732

2153 +#: refs.c:576 builtin/merge.c:840

2154 #, c-format

1736 -msgid "Could not parse line %d."

2155 +msgid "Could not open '%s' for writing"

2156 msgstr ""

2157

1739 -#: sequencer.c:737

1740 -msgid "No commits parsed."

2158 +#: refs/files-backend.c:2481

2159 +#, c-format

2160 +msgid "could not delete reference %s: %s"

2161 msgstr ""

2162

1743 -#: sequencer.c:749

2163 +#: refs/files-backend.c:2484

2164 #, c-format

1745 -msgid "Could not open %s"

2165 +msgid "could not delete references: %s"

2166 msgstr ""

2167

1748 -#: sequencer.c:753

2168 +#: refs/files-backend.c:2493

2169 #, c-format

1750 -msgid "Could not read %s."

2170 +msgid "could not remove reference %s"

2171 msgstr ""

2172

1753 -#: sequencer.c:760

2173 +#: ref-filter.c:55

2174 #, c-format

1755 -msgid "Unusable instruction sheet: %s"

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

2176 msgstr ""

2177

1758 -#: sequencer.c:790

2178 +#: ref-filter.c:57

2179 #, c-format

1760 -msgid "Invalid key: %s"

2180 +msgid "unrecognized color: %%(color:%s)"

2181 msgstr ""

2182

1763 -#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52

2183 +#: ref-filter.c:71

2184 #, c-format

1765 -msgid "Invalid value for %s: %s"

2185 +msgid "unrecognized format: %%(%s)"

2186 msgstr ""

2187

1768 -#: sequencer.c:803

2188 +#: ref-filter.c:77

2189 #, c-format

1770 -msgid "Malformed options sheet: %s"

2190 +msgid "%%(body) does not take arguments"

2191 msgstr ""

2192

1773 -#: sequencer.c:822

1774 -msgid "a cherry-pick or revert is already in progress"

2193 +#: ref-filter.c:84

2194 +#, c-format

2195 +msgid "%%(subject) does not take arguments"

2196 msgstr ""

2197

1777 -#: sequencer.c:823

1778 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

2198 +#: ref-filter.c:101

2199 +#, c-format

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

2201 msgstr ""

2202

1781 -#: sequencer.c:827

2203 +#: ref-filter.c:103

2204 #, c-format

1783 -msgid "Could not create sequencer directory %s"

2205 +msgid "unrecognized %%(contents) argument: %s"

2206 msgstr ""

2207

1786 -#: sequencer.c:862 sequencer.c:998

1787 -msgid "no cherry-pick or revert in progress"

2208 +#: ref-filter.c:113

2209 +#, c-format

2210 +msgid "unrecognized %%(objectname) argument: %s"

2211 msgstr ""

2212

1790 -#: sequencer.c:864

1791 -msgid "cannot resolve HEAD"

2213 +#: ref-filter.c:135

2214 +#, c-format

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

2216 msgstr ""

2217

1794 -#: sequencer.c:866 sequencer.c:900

1795 -msgid "cannot abort from a branch yet to be born"

2218 +#: ref-filter.c:147

2219 +#, c-format

2220 +msgid "unrecognized position:%s"

2221 msgstr ""

2222

1798 -#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970

2223 +#: ref-filter.c:151

2224 #, c-format

1800 -msgid "cannot open %s"

2225 +msgid "unrecognized width:%s"

2226 msgstr ""

2227

1803 -#: sequencer.c:888

2228 +#: ref-filter.c:157

2229 #, c-format

1805 -msgid "cannot read %s: %s"

2230 +msgid "unrecognized %%(align) argument: %s"

2231 msgstr ""

2232

1808 -#: sequencer.c:889

1809 -msgid "unexpected end of file"

2233 +#: ref-filter.c:161

2234 +#, c-format

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

2236 msgstr ""

2237

1812 -#: sequencer.c:895

2238 +#: ref-filter.c:244

2239 #, c-format

1814 -msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

2240 +msgid "malformed field name: %.*s"

2241 msgstr ""

2242

1817 -#: sequencer.c:921

2243 +#: ref-filter.c:270

2244 #, c-format

1819 -msgid "Could not format %s."

2245 +msgid "unknown field name: %.*s"

2246 msgstr ""

2247

1822 -#: sequencer.c:1066

2248 +#: ref-filter.c:372

2249 #, c-format

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

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

2251 msgstr ""

2252

1827 -#: sequencer.c:1069

2253 +#: ref-filter.c:424

2254 #, c-format

1829 -msgid "%s: bad revision"

2255 +msgid "malformed format string %s"

2256 msgstr ""

2257

1832 -#: sequencer.c:1102

1833 -msgid "Can't revert as initial commit"

2258 +#: ref-filter.c:878

2259 +msgid ":strip= requires a positive integer argument"

2260 msgstr ""

2261

1836 -#: setup.c:160

2262 +#: ref-filter.c:883

2263 #, c-format

1838 -msgid ""

1839 -"%s: no such path in the working tree.\n"

1840 -"Use 'git <command> -- <path>...' to specify paths that do not exist locally."

2264 +msgid "ref '%s' does not have %ld components to :strip"

2265 msgstr ""

2266

1843 -#: setup.c:173

2267 +#: ref-filter.c:1046

2268 #, c-format

1845 -msgid ""

1846 -"ambiguous argument '%s': unknown revision or path not in the working tree.\n"

1847 -"Use '--' to separate paths from revisions, like this:\n"

1848 -"'git <command> [<revision>...] -- [<file>...]'"

2269 +msgid "unknown %.*s format %s"

2270 msgstr ""

2271

1851 -#: setup.c:223

2272 +#: ref-filter.c:1066 ref-filter.c:1097

2273 #, c-format

1853 -msgid ""

1854 -"ambiguous argument '%s': both revision and filename\n"

1855 -"Use '--' to separate paths from revisions, like this:\n"

1856 -"'git <command> [<revision>...] -- [<file>...]'"

2274 +msgid "missing object %s for %s"

2275 msgstr ""

2276

1859 -#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419

2277 +#: ref-filter.c:1069 ref-filter.c:1100

2278 #, c-format

1861 -msgid "failed to read %s"

2279 +msgid "parse_object_buffer failed on %s for %s"

2280 msgstr ""

2281

1864 -#: setup.c:468

2282 +#: ref-filter.c:1311

2283 #, c-format

1866 -msgid "Expected git repo version <= %d, found %d"

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

2285 msgstr ""

2286

1869 -#: setup.c:476

1870 -msgid "unknown repository extensions found:"

2287 +#: ref-filter.c:1373

2288 +#, c-format

2289 +msgid "ignoring ref with broken name %s"

2290 msgstr ""

2291

1873 -#: setup.c:762

2292 +#: ref-filter.c:1378

2293 #, c-format

1875 -msgid "Not a git repository (or any of the parent directories): %s"

2294 +msgid "ignoring broken ref %s"

2295 msgstr ""

2296

1878 -#: setup.c:764 setup.c:915 builtin/index-pack.c:1641

1879 -msgid "Cannot come back to cwd"

2297 +#: ref-filter.c:1633

2298 +#, c-format

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

2300 msgstr ""

2301

1882 -#: setup.c:845

1883 -msgid "Unable to read current working directory"

2302 +#: ref-filter.c:1687

2303 +#, c-format

2304 +msgid "malformed object name %s"

2305 msgstr ""

2306

1886 -#: setup.c:920

2307 +#: remote.c:746

2308 #, c-format

1888 -msgid ""

1889 -"Not a git repository (or any parent up to mount point %s)\n"

1890 -"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

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

2310 msgstr ""

2311

1893 -#: setup.c:927

2312 +#: remote.c:750

2313 #, c-format

1895 -msgid "Cannot change to '%s/..'"

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

2315 msgstr ""

2316

1898 -#: setup.c:989

2317 +#: remote.c:754

2318 #, c-format

1900 -msgid ""

1901 -"Problem with core.sharedRepository filemode value (0%.3o).\n"

1902 -"The owner of files must always have read and write permissions."

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

2320 msgstr ""

2321

1905 -#: sha1_file.c:1046

1906 -msgid "offset before end of packfile (broken .idx?)"

2322 +#: remote.c:762

2323 +msgid "Internal error"

2324 msgstr ""

2325

1909 -#: sha1_file.c:2434

1910 -#, c-format

1911 -msgid "offset before start of pack index for %s (corrupt index?)"

2326 +#: remote.c:1677 remote.c:1720

2327 +msgid "HEAD does not point to a branch"

2328 msgstr ""

2329

1914 -#: sha1_file.c:2438

2330 +#: remote.c:1686

2331 #, c-format

1916 -msgid "offset beyond end of pack index for %s (truncated index?)"

2332 +msgid "no such branch: '%s'"

2333 msgstr ""

2334

1919 -#: sha1_name.c:462

1920 -msgid ""

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

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

1923 -"may be created by mistake. For example,\n"

1924 -"\n"

1925 -" git checkout -b $br $(git rev-parse ...)\n"

1926 -"\n"

1927 -"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"

1928 -"examine these refs and maybe delete them. Turn this message off by\n"

1929 -"running \"git config advice.objectNameWarning false\""

2335 +#: remote.c:1689

2336 +#, c-format

2337 +msgid "no upstream configured for branch '%s'"

2338 msgstr ""

2339

1932 -#: submodule.c:64 submodule.c:98

1933 -msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

2340 +#: remote.c:1695

2341 +#, c-format

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

2343 msgstr ""

2344

1936 -#: submodule.c:68 submodule.c:102

2345 +#: remote.c:1710

2346 #, c-format

1938 -msgid "Could not find section in .gitmodules where path=%s"

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

2348 msgstr ""

2349

1941 -#: submodule.c:76

2350 +#: remote.c:1725

2351 #, c-format

1943 -msgid "Could not update .gitmodules entry %s"

2352 +msgid "branch '%s' has no remote for pushing"

2353 msgstr ""

2354

1946 -#: submodule.c:109

2355 +#: remote.c:1736

2356 #, c-format

1948 -msgid "Could not remove .gitmodules entry for %s"

2357 +msgid "push refspecs for '%s' do not include '%s'"

2358 msgstr ""

2359

1951 -#: submodule.c:120

1952 -msgid "staging updated .gitmodules failed"

2360 +#: remote.c:1749

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

2362 msgstr ""

2363

1955 -#: submodule.c:177

1956 -msgid "negative values not allowed for submodule.fetchJobs"

2364 +#: remote.c:1771

2365 +msgid "cannot resolve 'simple' push to a single destination"

2366 msgstr ""

2367

1959 -#: submodule-config.c:358

2368 +#: remote.c:2073

2369 #, c-format

1961 -msgid "invalid value for %s"

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

2371 msgstr ""

2372

1964 -#: trailer.c:237

1965 -#, c-format

1966 -msgid "running trailer command '%s' failed"

2373 +#: remote.c:2077

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

2375 msgstr ""

2376

1969 -#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558

1970 -#: trailer.c:562

2377 +#: remote.c:2080

2378 #, c-format

1972 -msgid "unknown value '%s' for key '%s'"

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

2380 msgstr ""

2381

1975 -#: trailer.c:544 trailer.c:549 builtin/remote.c:289

2382 +#: remote.c:2084

2383 #, c-format

1977 -msgid "more than one %s"

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

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

2386 +msgstr[0] ""

2387 +msgstr[1] ""

2388 +

2389 +#: remote.c:2090

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

2391 msgstr ""

2392

1980 -#: trailer.c:582

2393 +#: remote.c:2093

2394 #, c-format

1982 -msgid "empty trailer token in trailer '%.*s'"

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

2396 +msgid_plural ""

2397 +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"

2398 +msgstr[0] ""

2399 +msgstr[1] ""

2400 +

2401 +#: remote.c:2101

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

2403 msgstr ""

2404

1985 -#: trailer.c:702

2405 +#: remote.c:2104

2406 #, c-format

1987 -msgid "could not read input file '%s'"

1988 -msgstr ""

2407 +msgid ""

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

2409 +"and have %d and %d different commit each, respectively.\n"

2410 +msgid_plural ""

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

2412 +"and have %d and %d different commits each, respectively.\n"

2413 +msgstr[0] ""

2414 +msgstr[1] ""

2415

1990 -#: trailer.c:705

1991 -msgid "could not read from stdin"

2416 +#: remote.c:2114

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

2418 msgstr ""

2419

1994 -#: trailer.c:857 builtin/am.c:42

1995 -#, c-format

1996 -msgid "could not stat %s"

2420 +#: revision.c:2158

2421 +msgid "your current branch appears to be broken"

2422 msgstr ""

2423

1999 -#: trailer.c:859

2424 +#: revision.c:2161

2425 #, c-format

2001 -msgid "file %s is not a regular file"

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

2427 msgstr ""

2428

2004 -#: trailer.c:861

2005 -#, c-format

2006 -msgid "file %s is not writable by user"

2429 +#: revision.c:2355

2430 +msgid "--first-parent is incompatible with --bisect"

2431 msgstr ""

2432

2009 -#: trailer.c:873

2010 -msgid "could not open temporary file"

2433 +#: run-command.c:106

2434 +msgid "open /dev/null failed"

2435 msgstr ""

2436

2013 -#: trailer.c:912

2437 +#: run-command.c:108

2438 #, c-format

2015 -msgid "could not rename temporary file to %s"

2439 +msgid "dup2(%d,%d) failed"

2440 msgstr ""

2441

2018 -#: transport.c:62

2019 -#, c-format

2020 -msgid "Would set upstream of '%s' to '%s' of '%s'\n"

2442 +#: send-pack.c:297

2443 +msgid "failed to sign the push certificate"

2444 msgstr ""

2445

2023 -#: transport.c:151

2024 -#, c-format

2025 -msgid "transport: invalid depth option '%s'"

2446 +#: send-pack.c:410

2447 +msgid "the receiving end does not support --signed push"

2448 msgstr ""

2449

2028 -#: transport.c:771

2029 -#, c-format

2450 +#: send-pack.c:412

2451 msgid ""

2031 -"The following submodule paths contain changes that can\n"

2032 -"not be found on any remote:\n"

2452 +"not sending a push certificate since the receiving end does not support --"

2453 +"signed push"

2454 msgstr ""

2455

2035 -#: transport.c:775

2036 -#, c-format

2037 -msgid ""

2038 -"\n"

2039 -"Please try\n"

2040 -"\n"

2041 -"\tgit push --recurse-submodules=on-demand\n"

2042 -"\n"

2043 -"or cd to the path and use\n"

2044 -"\n"

2045 -"\tgit push\n"

2046 -"\n"

2047 -"to push them to a remote.\n"

2048 -"\n"

2456 +#: send-pack.c:424

2457 +msgid "the receiving end does not support --atomic push"

2458 msgstr ""

2459

2051 -#: transport.c:783

2052 -msgid "Aborting."

2460 +#: send-pack.c:429

2461 +msgid "the receiving end does not support push options"

2462 msgstr ""

2463

2055 -#: transport-helper.c:1041

2056 -#, c-format

2057 -msgid "Could not read ref %s"

2464 +#: sequencer.c:171

2465 +msgid "revert"

2466 msgstr ""

2467

2060 -#: unpack-trees.c:64

2061 -#, c-format

2062 -msgid ""

2063 -"Your local changes to the following files would be overwritten by checkout:\n"

2064 -"%%sPlease commit your changes or stash them before you switch branches."

2468 +#: sequencer.c:171

2469 +msgid "cherry-pick"

2470 msgstr ""

2471

2067 -#: unpack-trees.c:66

2068 -#, c-format

2472 +#: sequencer.c:228

2473 msgid ""

2070 -"Your local changes to the following files would be overwritten by checkout:\n"

2071 -"%%s"

2474 +"after resolving the conflicts, mark the corrected paths\n"

2475 +"with 'git add <paths>' or 'git rm <paths>'"

2476 msgstr ""

2477

2074 -#: unpack-trees.c:69

2075 -#, c-format

2478 +#: sequencer.c:231

2479 msgid ""

2077 -"Your local changes to the following files would be overwritten by merge:\n"

2078 -"%%sPlease commit your changes or stash them before you merge."

2480 +"after resolving the conflicts, mark the corrected paths\n"

2481 +"with 'git add <paths>' or 'git rm <paths>'\n"

2482 +"and commit the result with 'git commit'"

2483 msgstr ""

2484

2081 -#: unpack-trees.c:71

2485 +#: sequencer.c:244 sequencer.c:1209

2486 #, c-format

2083 -msgid ""

2084 -"Your local changes to the following files would be overwritten by merge:\n"

2085 -"%%s"

2487 +msgid "could not lock '%s'"

2488 msgstr ""

2489

2088 -#: unpack-trees.c:74

2490 +#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214

2491 #, c-format

2090 -msgid ""

2091 -"Your local changes to the following files would be overwritten by %s:\n"

2092 -"%%sPlease commit your changes or stash them before you %s."

2492 +msgid "could not write to '%s'"

2493 msgstr ""

2494

2095 -#: unpack-trees.c:76

2495 +#: sequencer.c:251

2496 #, c-format

2097 -msgid ""

2098 -"Your local changes to the following files would be overwritten by %s:\n"

2099 -"%%s"

2497 +msgid "could not write eol to '%s"

2498 msgstr ""

2499

2102 -#: unpack-trees.c:81

2500 +#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216

2501 #, c-format

2104 -msgid ""

2105 -"Updating the following directories would lose untracked files in it:\n"

2106 -"%s"

2502 +msgid "failed to finalize '%s'."

2503 msgstr ""

2504

2109 -#: unpack-trees.c:85

2505 +#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032

2506 #, c-format

2111 -msgid ""

2112 -"The following untracked working tree files would be removed by checkout:\n"

2113 -"%%sPlease move or remove them before you switch branches."

2507 +msgid "could not read '%s'"

2508 msgstr ""

2509

2116 -#: unpack-trees.c:87

2510 +#: sequencer.c:305

2511 #, c-format

2118 -msgid ""

2119 -"The following untracked working tree files would be removed by checkout:\n"

2120 -"%%s"

2512 +msgid "your local changes would be overwritten by %s."

2513 msgstr ""

2514

2123 -#: unpack-trees.c:90

2124 -#, c-format

2125 -msgid ""

2126 -"The following untracked working tree files would be removed by merge:\n"

2127 -"%%sPlease move or remove them before you merge."

2515 +#: sequencer.c:309

2516 +msgid "commit your changes or stash them to proceed."

2517 msgstr ""

2518

2130 -#: unpack-trees.c:92

2519 +#: sequencer.c:324

2520 #, c-format

2132 -msgid ""

2133 -"The following untracked working tree files would be removed by merge:\n"

2134 -"%%s"

2521 +msgid "%s: fast-forward"

2522 msgstr ""

2523

2137 -#: unpack-trees.c:95

2524 +#. TRANSLATORS: %s will be "revert" or "cherry-pick"

2525 +#: sequencer.c:399

2526 #, c-format

2139 -msgid ""

2140 -"The following untracked working tree files would be removed by %s:\n"

2141 -"%%sPlease move or remove them before you %s."

2527 +msgid "%s: Unable to write new index file"

2528 msgstr ""

2529

2144 -#: unpack-trees.c:97

2145 -#, c-format

2146 -msgid ""

2147 -"The following untracked working tree files would be removed by %s:\n"

2148 -"%%s"

2530 +#: sequencer.c:418

2531 +msgid "could not resolve HEAD commit\n"

2532 msgstr ""

2533

2151 -#: unpack-trees.c:102

2152 -#, c-format

2153 -msgid ""

2154 -"The following untracked working tree files would be overwritten by "

2155 -"checkout:\n"

2156 -"%%sPlease move or remove them before you switch branches."

2534 +#: sequencer.c:438

2535 +msgid "unable to update cache tree\n"

2536 msgstr ""

2537

2159 -#: unpack-trees.c:104

2538 +#: sequencer.c:483

2539 #, c-format

2540 msgid ""

2162 -"The following untracked working tree files would be overwritten by "

2163 -"checkout:\n"

2164 -"%%s"

2541 +"you have staged changes in your working tree\n"

2542 +"If these changes are meant to be squashed into the previous commit, run:\n"

2543 +"\n"

2544 +" git commit --amend %s\n"

2545 +"\n"

2546 +"If they are meant to go into a new commit, run:\n"

2547 +"\n"

2548 +" git commit %s\n"

2549 +"\n"

2550 +"In both cases, once you're done, continue with:\n"

2551 +"\n"

2552 +" git rebase --continue\n"

2553 msgstr ""

2554

2167 -#: unpack-trees.c:107

2555 +#: sequencer.c:567

2556 #, c-format

2169 -msgid ""

2170 -"The following untracked working tree files would be overwritten by merge:\n"

2171 -"%%sPlease move or remove them before you merge."

2557 +msgid "could not parse commit %s\n"

2558 msgstr ""

2559

2174 -#: unpack-trees.c:109

2560 +#: sequencer.c:572

2561 #, c-format

2176 -msgid ""

2177 -"The following untracked working tree files would be overwritten by merge:\n"

2178 -"%%s"

2562 +msgid "could not parse parent commit %s\n"

2563 msgstr ""

2564

2181 -#: unpack-trees.c:112

2182 -#, c-format

2183 -msgid ""

2184 -"The following untracked working tree files would be overwritten by %s:\n"

2185 -"%%sPlease move or remove them before you %s."

2565 +#: sequencer.c:656

2566 +msgid "your index file is unmerged."

2567 msgstr ""

2568

2188 -#: unpack-trees.c:114

2569 +#: sequencer.c:675

2570 #, c-format

2190 -msgid ""

2191 -"The following untracked working tree files would be overwritten by %s:\n"

2192 -"%%s"

2571 +msgid "commit %s is a merge but no -m option was given."

2572 msgstr ""

2573

2195 -#: unpack-trees.c:121

2574 +#: sequencer.c:683

2575 #, c-format

2197 -msgid "Entry '%s' overlaps with '%s'. Cannot bind."

2576 +msgid "commit %s does not have parent %d"

2577 msgstr ""

2578

2200 -#: unpack-trees.c:124

2579 +#: sequencer.c:687

2580 #, c-format

2202 -msgid ""

2203 -"Cannot update sparse checkout: the following entries are not up-to-date:\n"

2204 -"%s"

2581 +msgid "mainline was specified but commit %s is not a merge."

2582 msgstr ""

2583

2207 -#: unpack-trees.c:126

2584 +#. TRANSLATORS: The first %s will be a "todo" command like

2585 +#. "revert" or "pick", the second %s a SHA1.

2586 +#: sequencer.c:700

2587 #, c-format

2209 -msgid ""

2210 -"The following Working tree files would be overwritten by sparse checkout "

2211 -"update:\n"

2212 -"%s"

2588 +msgid "%s: cannot parse parent commit %s"

2589 msgstr ""

2590

2215 -#: unpack-trees.c:128

2591 +#: sequencer.c:705

2592 #, c-format

2217 -msgid ""

2218 -"The following Working tree files would be removed by sparse checkout "

2219 -"update:\n"

2220 -"%s"

2593 +msgid "cannot get commit message for %s"

2594 msgstr ""

2595

2223 -#: unpack-trees.c:205

2596 +#: sequencer.c:797

2597 #, c-format

2225 -msgid "Aborting\n"

2598 +msgid "could not revert %s... %s"

2599 msgstr ""

2600

2228 -#: unpack-trees.c:237

2229 -msgid "Checking out files"

2601 +#: sequencer.c:798

2602 +#, c-format

2603 +msgid "could not apply %s... %s"

2604 msgstr ""

2605

2232 -#: urlmatch.c:120

2233 -msgid "invalid URL scheme name or missing '://' suffix"

2606 +#: sequencer.c:833

2607 +msgid "empty commit set passed"

2608 msgstr ""

2609

2236 -#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356

2610 +#: sequencer.c:843

2611 #, c-format

2238 -msgid "invalid %XX escape sequence"

2612 +msgid "git %s: failed to read the index"

2613 msgstr ""

2614

2241 -#: urlmatch.c:172

2242 -msgid "missing host and scheme is not 'file:'"

2615 +#: sequencer.c:850

2616 +#, c-format

2617 +msgid "git %s: failed to refresh the index"

2618 msgstr ""

2619

2245 -#: urlmatch.c:189

2246 -msgid "a 'file:' URL may not have a port number"

2620 +#: sequencer.c:944

2621 +#, c-format

2622 +msgid "invalid line %d: %.*s"

2623 msgstr ""

2624

2249 -#: urlmatch.c:199

2250 -msgid "invalid characters in host name"

2625 +#: sequencer.c:950

2626 +msgid "no commits parsed."

2627 msgstr ""

2628

2253 -#: urlmatch.c:244 urlmatch.c:255

2254 -msgid "invalid port number"

2629 +#: sequencer.c:966

2630 +#, c-format

2631 +msgid "could not read '%s'."

2632 msgstr ""

2633

2257 -#: urlmatch.c:322

2258 -msgid "invalid '..' path segment"

2634 +#: sequencer.c:972

2635 +#, c-format

2636 +msgid "unusable instruction sheet: '%s'"

2637 +msgstr ""

2638 +

2639 +#: sequencer.c:983

2640 +msgid "cannot cherry-pick during a revert."

2641 msgstr ""

2642

2261 -#: worktree.c:282

2262 -#, c-format

2263 -msgid "failed to read '%s'"

2643 +#: sequencer.c:985

2644 +msgid "cannot revert during a cherry-pick."

2645 msgstr ""

2646

2266 -#: wrapper.c:222 wrapper.c:392

2647 +#: sequencer.c:1028

2648 #, c-format

2268 -msgid "could not open '%s' for reading and writing"

2649 +msgid "invalid key: %s"

2650 msgstr ""

2651

2271 -#: wrapper.c:224 wrapper.c:394 builtin/am.c:778

2652 +#: sequencer.c:1031

2653 #, c-format

2273 -msgid "could not open '%s' for writing"

2654 +msgid "invalid value for %s: %s"

2655 msgstr ""

2656

2276 -#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771

2277 -#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029

2278 -#: builtin/pull.c:407

2657 +#: sequencer.c:1063

2658 #, c-format

2280 -msgid "could not open '%s' for reading"

2659 +msgid "malformed options sheet: '%s'"

2660 msgstr ""

2661

2283 -#: wrapper.c:605 wrapper.c:626

2284 -#, c-format

2285 -msgid "unable to access '%s'"

2662 +#: sequencer.c:1101

2663 +msgid "a cherry-pick or revert is already in progress"

2664 msgstr ""

2665

2288 -#: wrapper.c:634

2289 -msgid "unable to get current working directory"

2666 +#: sequencer.c:1102

2667 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

2668 msgstr ""

2669

2292 -#: wrapper.c:658

2670 +#: sequencer.c:1106

2671 #, c-format

2294 -msgid "could not write to %s"

2672 +msgid "could not create sequencer directory '%s'"

2673 msgstr ""

2674

2297 -#: wrapper.c:660

2298 -#, c-format

2299 -msgid "could not close %s"

2675 +#: sequencer.c:1120

2676 +msgid "could not lock HEAD"

2677 msgstr ""

2678

2302 -#: wt-status.c:150

2303 -msgid "Unmerged paths:"

2679 +#: sequencer.c:1151 sequencer.c:1289

2680 +msgid "no cherry-pick or revert in progress"

2681 msgstr ""

2682

2306 -#: wt-status.c:177 wt-status.c:204

2307 -#, c-format

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

2683 +#: sequencer.c:1153

2684 +msgid "cannot resolve HEAD"

2685 msgstr ""

2686

2311 -#: wt-status.c:179 wt-status.c:206

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

2687 +#: sequencer.c:1155 sequencer.c:1189

2688 +msgid "cannot abort from a branch yet to be born"

2689 msgstr ""

2690

2315 -#: wt-status.c:183

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

2691 +#: sequencer.c:1175 builtin/grep.c:578

2692 +#, c-format

2693 +msgid "cannot open '%s'"

2694 msgstr ""

2695

2319 -#: wt-status.c:185 wt-status.c:189

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

2696 +#: sequencer.c:1177

2697 +#, c-format

2698 +msgid "cannot read '%s': %s"

2699 msgstr ""

2700

2323 -#: wt-status.c:187

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

2701 +#: sequencer.c:1178

2702 +msgid "unexpected end of file"

2703 msgstr ""

2704

2327 -#: wt-status.c:198 wt-status.c:882

2328 -msgid "Changes to be committed:"

2705 +#: sequencer.c:1184

2706 +#, c-format

2707 +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

2708 msgstr ""

2709

2331 -#: wt-status.c:216 wt-status.c:891

2332 -msgid "Changes not staged for commit:"

2710 +#: sequencer.c:1354

2711 +#, c-format

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

2713 msgstr ""

2714

2335 -#: wt-status.c:220

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

2715 +#: sequencer.c:1358

2716 +#, c-format

2717 +msgid "%s: bad revision"

2718 msgstr ""

2719

2339 -#: wt-status.c:222

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

2720 +#: sequencer.c:1391

2721 +msgid "can't revert as initial commit"

2722 msgstr ""

2723

2343 -#: wt-status.c:223

2724 +#: setup.c:160

2725 +#, c-format

2726 msgid ""

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

2727 +"%s: no such path in the working tree.\n"

2728 +"Use 'git <command> -- <path>...' to specify paths that do not exist locally."

2729 msgstr ""

2730

2348 -#: wt-status.c:225

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

2731 +#: setup.c:173

2732 +#, c-format

2733 +msgid ""

2734 +"ambiguous argument '%s': unknown revision or path not in the working tree.\n"

2735 +"Use '--' to separate paths from revisions, like this:\n"

2736 +"'git <command> [<revision>...] -- [<file>...]'"

2737 msgstr ""

2738

2352 -#: wt-status.c:237

2739 +#: setup.c:223

2740 #, c-format

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

2741 +msgid ""

2742 +"ambiguous argument '%s': both revision and filename\n"

2743 +"Use '--' to separate paths from revisions, like this:\n"

2744 +"'git <command> [<revision>...] -- [<file>...]'"

2745 msgstr ""

2746

2357 -#: wt-status.c:252

2358 -msgid "both deleted:"

2747 +#: setup.c:468

2748 +#, c-format

2749 +msgid "Expected git repo version <= %d, found %d"

2750 msgstr ""

2751

2361 -#: wt-status.c:254

2362 -msgid "added by us:"

2752 +#: setup.c:476

2753 +msgid "unknown repository extensions found:"

2754 msgstr ""

2755

2365 -#: wt-status.c:256

2366 -msgid "deleted by them:"

2756 +#: setup.c:762

2757 +#, c-format

2758 +msgid "Not a git repository (or any of the parent directories): %s"

2759 msgstr ""

2760

2369 -#: wt-status.c:258

2370 -msgid "added by them:"

2761 +#: setup.c:764 setup.c:915 builtin/index-pack.c:1641

2762 +msgid "Cannot come back to cwd"

2763 msgstr ""

2764

2373 -#: wt-status.c:260

2374 -msgid "deleted by us:"

2765 +#: setup.c:845

2766 +msgid "Unable to read current working directory"

2767 msgstr ""

2768

2377 -#: wt-status.c:262

2378 -msgid "both added:"

2769 +#: setup.c:920

2770 +#, c-format

2771 +msgid ""

2772 +"Not a git repository (or any parent up to mount point %s)\n"

2773 +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

2774 msgstr ""

2775

2381 -#: wt-status.c:264

2382 -msgid "both modified:"

2776 +#: setup.c:927

2777 +#, c-format

2778 +msgid "Cannot change to '%s/..'"

2779 msgstr ""

2780

2385 -#: wt-status.c:274

2386 -msgid "new file:"

2781 +#: setup.c:989

2782 +#, c-format

2783 +msgid ""

2784 +"Problem with core.sharedRepository filemode value (0%.3o).\n"

2785 +"The owner of files must always have read and write permissions."

2786 msgstr ""

2787

2389 -#: wt-status.c:276

2390 -msgid "copied:"

2788 +#: sha1_file.c:473

2789 +#, c-format

2790 +msgid "path '%s' does not exist"

2791 msgstr ""

2792

2393 -#: wt-status.c:278

2394 -msgid "deleted:"

2793 +#: sha1_file.c:499

2794 +#, c-format

2795 +msgid "reference repository '%s' as a linked checkout is not supported yet."

2796 msgstr ""

2797

2397 -#: wt-status.c:280

2398 -msgid "modified:"

2798 +#: sha1_file.c:505

2799 +#, c-format

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

2801 msgstr ""

2802

2401 -#: wt-status.c:282

2402 -msgid "renamed:"

2803 +#: sha1_file.c:511

2804 +#, c-format

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

2806 msgstr ""

2807

2405 -#: wt-status.c:284

2406 -msgid "typechange:"

2808 +#: sha1_file.c:519

2809 +#, c-format

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

2811 msgstr ""

2812

2409 -#: wt-status.c:286

2410 -msgid "unknown:"

2813 +#: sha1_file.c:1159

2814 +msgid "offset before end of packfile (broken .idx?)"

2815 msgstr ""

2816

2413 -#: wt-status.c:288

2414 -msgid "unmerged:"

2817 +#: sha1_file.c:2592

2818 +#, c-format

2819 +msgid "offset before start of pack index for %s (corrupt index?)"

2820 msgstr ""

2821

2417 -#: wt-status.c:370

2418 -msgid "new commits, "

2822 +#: sha1_file.c:2596

2823 +#, c-format

2824 +msgid "offset beyond end of pack index for %s (truncated index?)"

2825 msgstr ""

2826

2421 -#: wt-status.c:372

2422 -msgid "modified content, "

2827 +#: sha1_name.c:407

2828 +#, c-format

2829 +msgid "short SHA1 %s is ambiguous"

2830 msgstr ""

2831

2425 -#: wt-status.c:374

2426 -msgid "untracked content, "

2832 +#: sha1_name.c:418

2833 +msgid "The candidates are:"

2834 msgstr ""

2835

2429 -#: wt-status.c:756

2430 -msgid "Submodules changed but not updated:"

2836 +#: sha1_name.c:577

2837 +msgid ""

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

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

2840 +"may be created by mistake. For example,\n"

2841 +"\n"

2842 +" git checkout -b $br $(git rev-parse ...)\n"

2843 +"\n"

2844 +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"

2845 +"examine these refs and maybe delete them. Turn this message off by\n"

2846 +"running \"git config advice.objectNameWarning false\""

2847 msgstr ""

2848

2433 -#: wt-status.c:758

2434 -msgid "Submodule changes to be committed:"

2849 +#: submodule.c:64 submodule.c:98

2850 +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

2851 msgstr ""

2852

2437 -#: wt-status.c:839

2438 -msgid ""

2439 -"Do not touch the line above.\n"

2440 -"Everything below will be removed."

2853 +#: submodule.c:68 submodule.c:102

2854 +#, c-format

2855 +msgid "Could not find section in .gitmodules where path=%s"

2856 msgstr ""

2857

2443 -#: wt-status.c:950

2444 -msgid "You have unmerged paths."

2858 +#: submodule.c:76

2859 +#, c-format

2860 +msgid "Could not update .gitmodules entry %s"

2861 msgstr ""

2862

2447 -#: wt-status.c:953

2448 -msgid " (fix conflicts and run \"git commit\")"

2863 +#: submodule.c:109

2864 +#, c-format

2865 +msgid "Could not remove .gitmodules entry for %s"

2866 msgstr ""

2867

2451 -#: wt-status.c:955

2452 -msgid " (use \"git merge --abort\" to abort the merge)"

2868 +#: submodule.c:120

2869 +msgid "staging updated .gitmodules failed"

2870 msgstr ""

2871

2455 -#: wt-status.c:960

2456 -msgid "All conflicts fixed but you are still merging."

2872 +#: submodule.c:158

2873 +msgid "negative values not allowed for submodule.fetchJobs"

2874 msgstr ""

2875

2459 -#: wt-status.c:963

2460 -msgid " (use \"git commit\" to conclude merge)"

2876 +#: submodule-config.c:358

2877 +#, c-format

2878 +msgid "invalid value for %s"

2879 msgstr ""

2880

2463 -#: wt-status.c:973

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

2881 +#: trailer.c:238

2882 +#, c-format

2883 +msgid "running trailer command '%s' failed"

2884 msgstr ""

2885

2467 -#: wt-status.c:976

2468 -msgid "The current patch is empty."

2886 +#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537

2887 +#: trailer.c:541

2888 +#, c-format

2889 +msgid "unknown value '%s' for key '%s'"

2890 msgstr ""

2891

2471 -#: wt-status.c:980

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

2892 +#: trailer.c:523 trailer.c:528 builtin/remote.c:289

2893 +#, c-format

2894 +msgid "more than one %s"

2895 msgstr ""

2896

2475 -#: wt-status.c:982

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

2897 +#: trailer.c:672

2898 +#, c-format

2899 +msgid "empty trailer token in trailer '%.*s'"

2900 msgstr ""

2901

2479 -#: wt-status.c:984

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

2902 +#: trailer.c:695

2903 +#, c-format

2904 +msgid "could not read input file '%s'"

2905 msgstr ""

2906

2483 -#: wt-status.c:1109

2484 -msgid "No commands done."

2907 +#: trailer.c:698

2908 +msgid "could not read from stdin"

2909 msgstr ""

2910

2487 -#: wt-status.c:1112

2911 +#: trailer.c:929 builtin/am.c:44

2912 #, c-format

2489 -msgid "Last command done (%d command done):"

2490 -msgid_plural "Last commands done (%d commands done):"

2491 -msgstr[0] ""

2492 -msgstr[1] ""

2913 +msgid "could not stat %s"

2914 +msgstr ""

2915

2494 -#: wt-status.c:1123

2916 +#: trailer.c:931

2917 #, c-format

2496 -msgid " (see more in file %s)"

2918 +msgid "file %s is not a regular file"

2919 msgstr ""

2920

2499 -#: wt-status.c:1128

2500 -msgid "No commands remaining."

2921 +#: trailer.c:933

2922 +#, c-format

2923 +msgid "file %s is not writable by user"

2924 +msgstr ""

2925 +

2926 +#: trailer.c:945

2927 +msgid "could not open temporary file"

2928 msgstr ""

2929

2503 -#: wt-status.c:1131

2930 +#: trailer.c:983

2931 #, c-format

2505 -msgid "Next command to do (%d remaining command):"

2506 -msgid_plural "Next commands to do (%d remaining commands):"

2507 -msgstr[0] ""

2508 -msgstr[1] ""

2932 +msgid "could not rename temporary file to %s"

2933 +msgstr ""

2934

2510 -#: wt-status.c:1139

2511 -msgid " (use \"git rebase --edit-todo\" to view and edit)"

2935 +#: transport.c:62

2936 +#, c-format

2937 +msgid "Would set upstream of '%s' to '%s' of '%s'\n"

2938 msgstr ""

2939

2514 -#: wt-status.c:1152

2940 +#: transport.c:151

2941 #, c-format

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

2942 +msgid "transport: invalid depth option '%s'"

2943 msgstr ""

2944

2519 -#: wt-status.c:1157

2520 -msgid "You are currently rebasing."

2945 +#: transport.c:817

2946 +#, c-format

2947 +msgid ""

2948 +"The following submodule paths contain changes that can\n"

2949 +"not be found on any remote:\n"

2950 msgstr ""

2951

2523 -#: wt-status.c:1171

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

2952 +#: transport.c:821

2953 +#, c-format

2954 +msgid ""

2955 +"\n"

2956 +"Please try\n"

2957 +"\n"

2958 +"\tgit push --recurse-submodules=on-demand\n"

2959 +"\n"

2960 +"or cd to the path and use\n"

2961 +"\n"

2962 +"\tgit push\n"

2963 +"\n"

2964 +"to push them to a remote.\n"

2965 +"\n"

2966 msgstr ""

2967

2527 -#: wt-status.c:1173

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

2968 +#: transport.c:829

2969 +msgid "Aborting."

2970 msgstr ""

2971

2531 -#: wt-status.c:1175

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

2972 +#: transport-helper.c:1075

2973 +#, c-format

2974 +msgid "Could not read ref %s"

2975 msgstr ""

2976

2535 -#: wt-status.c:1181

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

2977 +#: tree-walk.c:31

2978 +msgid "too-short tree object"

2979 msgstr ""

2980

2539 -#: wt-status.c:1185

2540 -#, c-format

2541 -msgid ""

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

2981 +#: tree-walk.c:37

2982 +msgid "malformed mode in tree entry"

2983 msgstr ""

2984

2545 -#: wt-status.c:1190

2546 -msgid "You are currently splitting a commit during a rebase."

2985 +#: tree-walk.c:41

2986 +msgid "empty filename in tree entry"

2987 msgstr ""

2988

2549 -#: wt-status.c:1193

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

2989 +#: tree-walk.c:113

2990 +msgid "too-short tree file"

2991 msgstr ""

2992

2553 -#: wt-status.c:1197

2993 +#: unpack-trees.c:64

2994 #, c-format

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

2995 +msgid ""

2996 +"Your local changes to the following files would be overwritten by checkout:\n"

2997 +"%%sPlease commit your changes or stash them before you switch branches."

2998 msgstr ""

2999

2558 -#: wt-status.c:1202

2559 -msgid "You are currently editing a commit during a rebase."

3000 +#: unpack-trees.c:66

3001 +#, c-format

3002 +msgid ""

3003 +"Your local changes to the following files would be overwritten by checkout:\n"

3004 +"%%s"

3005 msgstr ""

3006

2562 -#: wt-status.c:1205

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

3007 +#: unpack-trees.c:69

3008 +#, c-format

3009 +msgid ""

3010 +"Your local changes to the following files would be overwritten by merge:\n"

3011 +"%%sPlease commit your changes or stash them before you merge."

3012 +msgstr ""

3013 +

3014 +#: unpack-trees.c:71

3015 +#, c-format

3016 +msgid ""

3017 +"Your local changes to the following files would be overwritten by merge:\n"

3018 +"%%s"

3019 msgstr ""

3020

2566 -#: wt-status.c:1207

3021 +#: unpack-trees.c:74

3022 +#, c-format

3023 msgid ""

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

3024 +"Your local changes to the following files would be overwritten by %s:\n"

3025 +"%%sPlease commit your changes or stash them before you %s."

3026 msgstr ""

3027

2571 -#: wt-status.c:1217

3028 +#: unpack-trees.c:76

3029 #, c-format

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

3030 +msgid ""

3031 +"Your local changes to the following files would be overwritten by %s:\n"

3032 +"%%s"

3033 msgstr ""

3034

2576 -#: wt-status.c:1222

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

3035 +#: unpack-trees.c:81

3036 +#, c-format

3037 +msgid ""

3038 +"Updating the following directories would lose untracked files in it:\n"

3039 +"%s"

3040 msgstr ""

3041

2580 -#: wt-status.c:1225

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

3042 +#: unpack-trees.c:85

3043 +#, c-format

3044 +msgid ""

3045 +"The following untracked working tree files would be removed by checkout:\n"

3046 +"%%sPlease move or remove them before you switch branches."

3047 msgstr ""

3048

2584 -#: wt-status.c:1227

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

3049 +#: unpack-trees.c:87

3050 +#, c-format

3051 +msgid ""

3052 +"The following untracked working tree files would be removed by checkout:\n"

3053 +"%%s"

3054 msgstr ""

3055

2588 -#: wt-status.c:1236

3056 +#: unpack-trees.c:90

3057 #, c-format

2590 -msgid "You are currently reverting commit %s."

3058 +msgid ""

3059 +"The following untracked working tree files would be removed by merge:\n"

3060 +"%%sPlease move or remove them before you merge."

3061 msgstr ""

3062

2593 -#: wt-status.c:1241

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

3063 +#: unpack-trees.c:92

3064 +#, c-format

3065 +msgid ""

3066 +"The following untracked working tree files would be removed by merge:\n"

3067 +"%%s"

3068 msgstr ""

3069

2597 -#: wt-status.c:1244

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

3070 +#: unpack-trees.c:95

3071 +#, c-format

3072 +msgid ""

3073 +"The following untracked working tree files would be removed by %s:\n"

3074 +"%%sPlease move or remove them before you %s."

3075 msgstr ""

3076

2601 -#: wt-status.c:1246

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

3077 +#: unpack-trees.c:97

3078 +#, c-format

3079 +msgid ""

3080 +"The following untracked working tree files would be removed by %s:\n"

3081 +"%%s"

3082 msgstr ""

3083

2605 -#: wt-status.c:1257

3084 +#: unpack-trees.c:102

3085 #, c-format

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

3086 +msgid ""

3087 +"The following untracked working tree files would be overwritten by "

3088 +"checkout:\n"

3089 +"%%sPlease move or remove them before you switch branches."

3090 msgstr ""

3091

2610 -#: wt-status.c:1261

2611 -msgid "You are currently bisecting."

3092 +#: unpack-trees.c:104

3093 +#, c-format

3094 +msgid ""

3095 +"The following untracked working tree files would be overwritten by "

3096 +"checkout:\n"

3097 +"%%s"

3098 msgstr ""

3099

2614 -#: wt-status.c:1264

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

3100 +#: unpack-trees.c:107

3101 +#, c-format

3102 +msgid ""

3103 +"The following untracked working tree files would be overwritten by merge:\n"

3104 +"%%sPlease move or remove them before you merge."

3105 msgstr ""

3106

2618 -#: wt-status.c:1464

2619 -msgid "On branch "

3107 +#: unpack-trees.c:109

3108 +#, c-format

3109 +msgid ""

3110 +"The following untracked working tree files would be overwritten by merge:\n"

3111 +"%%s"

3112 msgstr ""

3113

2622 -#: wt-status.c:1470

2623 -msgid "interactive rebase in progress; onto "

3114 +#: unpack-trees.c:112

3115 +#, c-format

3116 +msgid ""

3117 +"The following untracked working tree files would be overwritten by %s:\n"

3118 +"%%sPlease move or remove them before you %s."

3119 msgstr ""

3120

2626 -#: wt-status.c:1472

2627 -msgid "rebase in progress; onto "

3121 +#: unpack-trees.c:114

3122 +#, c-format

3123 +msgid ""

3124 +"The following untracked working tree files would be overwritten by %s:\n"

3125 +"%%s"

3126 msgstr ""

3127

2630 -#: wt-status.c:1477

2631 -msgid "HEAD detached at "

3128 +#: unpack-trees.c:121

3129 +#, c-format

3130 +msgid "Entry '%s' overlaps with '%s'. Cannot bind."

3131 msgstr ""

3132

2634 -#: wt-status.c:1479

2635 -msgid "HEAD detached from "

3133 +#: unpack-trees.c:124

3134 +#, c-format

3135 +msgid ""

3136 +"Cannot update sparse checkout: the following entries are not up-to-date:\n"

3137 +"%s"

3138 msgstr ""

3139

2638 -#: wt-status.c:1482

2639 -msgid "Not currently on any branch."

3140 +#: unpack-trees.c:126

3141 +#, c-format

3142 +msgid ""

3143 +"The following working tree files would be overwritten by sparse checkout "

3144 +"update:\n"

3145 +"%s"

3146 msgstr ""

3147

2642 -#: wt-status.c:1500

2643 -msgid "Initial commit"

3148 +#: unpack-trees.c:128

3149 +#, c-format

3150 +msgid ""

3151 +"The following working tree files would be removed by sparse checkout "

3152 +"update:\n"

3153 +"%s"

3154 msgstr ""

3155

2646 -#: wt-status.c:1514

2647 -msgid "Untracked files"

3156 +#: unpack-trees.c:205

3157 +#, c-format

3158 +msgid "Aborting\n"

3159 msgstr ""

3160

2650 -#: wt-status.c:1516

2651 -msgid "Ignored files"

3161 +#: unpack-trees.c:237

3162 +msgid "Checking out files"

3163 msgstr ""

3164

2654 -#: wt-status.c:1520

2655 -#, c-format

2656 -msgid ""

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

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

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

3165 +#: urlmatch.c:120

3166 +msgid "invalid URL scheme name or missing '://' suffix"

3167 msgstr ""

3168

2662 -#: wt-status.c:1526

3169 +#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356

3170 #, c-format

2664 -msgid "Untracked files not listed%s"

3171 +msgid "invalid %XX escape sequence"

3172 msgstr ""

3173

2667 -#: wt-status.c:1528

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

3174 +#: urlmatch.c:172

3175 +msgid "missing host and scheme is not 'file:'"

3176 msgstr ""

3177

2671 -#: wt-status.c:1534

2672 -msgid "No changes"

3178 +#: urlmatch.c:189

3179 +msgid "a 'file:' URL may not have a port number"

3180 msgstr ""

3181

2675 -#: wt-status.c:1539

2676 -#, c-format

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

3182 +#: urlmatch.c:199

3183 +msgid "invalid characters in host name"

3184 msgstr ""

3185

2680 -#: wt-status.c:1542

2681 -#, c-format

2682 -msgid "no changes added to commit\n"

3186 +#: urlmatch.c:244 urlmatch.c:255

3187 +msgid "invalid port number"

3188 msgstr ""

3189

2685 -#: wt-status.c:1545

2686 -#, c-format

2687 -msgid ""

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

2689 -"track)\n"

3190 +#: urlmatch.c:322

3191 +msgid "invalid '..' path segment"

3192 msgstr ""

3193

2692 -#: wt-status.c:1548

3194 +#: worktree.c:282

3195 #, c-format

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

3196 +msgid "failed to read '%s'"

3197 msgstr ""

3198

2697 -#: wt-status.c:1551

3199 +#: wrapper.c:222 wrapper.c:392

3200 #, c-format

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

3201 +msgid "could not open '%s' for reading and writing"

3202 msgstr ""

3203

2702 -#: wt-status.c:1554 wt-status.c:1559

3204 +#: wrapper.c:224 wrapper.c:394 builtin/am.c:766

3205 #, c-format

2704 -msgid "nothing to commit\n"

3206 +msgid "could not open '%s' for writing"

3207 msgstr ""

3208

2707 -#: wt-status.c:1557

3209 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759

3210 +#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029

3211 +#: builtin/pull.c:341

3212 #, c-format

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

3213 +msgid "could not open '%s' for reading"

3214 msgstr ""

3215

2712 -#: wt-status.c:1561

3216 +#: wrapper.c:605 wrapper.c:626

3217 #, c-format

2714 -msgid "nothing to commit, working tree clean\n"

2715 -msgstr ""

2716 -

2717 -#: wt-status.c:1668

2718 -msgid "Initial commit on "

3218 +msgid "unable to access '%s'"

3219 msgstr ""

3220

2721 -#: wt-status.c:1672

2722 -msgid "HEAD (no branch)"

3221 +#: wrapper.c:634

3222 +msgid "unable to get current working directory"

3223 msgstr ""

3224

2725 -#: wt-status.c:1701

2726 -msgid "gone"

3225 +#: wrapper.c:658

3226 +#, c-format

3227 +msgid "could not write to %s"

3228 msgstr ""

3229

2729 -#: wt-status.c:1703 wt-status.c:1711

2730 -msgid "behind "

3230 +#: wrapper.c:660

3231 +#, c-format

3232 +msgid "could not close %s"

3233 msgstr ""

3234

2733 -#: wt-status.c:1706 wt-status.c:1709

2734 -msgid "ahead "

3235 +#: wt-status.c:151

3236 +msgid "Unmerged paths:"

3237 msgstr ""

3238

2737 -#: compat/precompose_utf8.c:57 builtin/clone.c:415

3239 +#: wt-status.c:178 wt-status.c:205

3240 #, c-format

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

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

3242 msgstr ""

3243

2742 -#: builtin/add.c:22

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

3244 +#: wt-status.c:180 wt-status.c:207

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

3246 msgstr ""

3247

2746 -#: builtin/add.c:65

2747 -#, c-format

2748 -msgid "unexpected diff status %c"

3248 +#: wt-status.c:184

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

3250 msgstr ""

3251

2751 -#: builtin/add.c:71 builtin/commit.c:281

2752 -msgid "updating files failed"

3252 +#: wt-status.c:186 wt-status.c:190

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

3254 msgstr ""

3255

2755 -#: builtin/add.c:81

2756 -#, c-format

2757 -msgid "remove '%s'\n"

3256 +#: wt-status.c:188

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

3258 msgstr ""

3259

2760 -#: builtin/add.c:136

2761 -msgid "Unstaged changes after refreshing the index:"

3260 +#: wt-status.c:199 wt-status.c:945

3261 +msgid "Changes to be committed:"

3262 msgstr ""

3263

2764 -#: builtin/add.c:196 builtin/rev-parse.c:811

2765 -msgid "Could not read the index"

3264 +#: wt-status.c:217 wt-status.c:954

3265 +msgid "Changes not staged for commit:"

3266 msgstr ""

3267

2768 -#: builtin/add.c:207

2769 -#, c-format

2770 -msgid "Could not open '%s' for writing."

3268 +#: wt-status.c:221

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

3270 msgstr ""

3271

2773 -#: builtin/add.c:211

2774 -msgid "Could not write patch"

3272 +#: wt-status.c:223

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

3274 msgstr ""

3275

2777 -#: builtin/add.c:214

2778 -msgid "editing patch failed"

3276 +#: wt-status.c:224

3277 +msgid ""

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

3279 msgstr ""

3280

2781 -#: builtin/add.c:217

2782 -#, c-format

2783 -msgid "Could not stat '%s'"

3281 +#: wt-status.c:226

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

3283 msgstr ""

3284

2786 -#: builtin/add.c:219

2787 -msgid "Empty patch. Aborted."

3285 +#: wt-status.c:238

3286 +#, c-format

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

3288 msgstr ""

3289

2790 -#: builtin/add.c:224

2791 -#, c-format

2792 -msgid "Could not apply '%s'"

3290 +#: wt-status.c:253

3291 +msgid "both deleted:"

3292 msgstr ""

3293

2795 -#: builtin/add.c:234

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

3294 +#: wt-status.c:255

3295 +msgid "added by us:"

3296 msgstr ""

3297

2799 -#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111

2800 -#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521

2801 -#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162

2802 -msgid "dry run"

3298 +#: wt-status.c:257

3299 +msgid "deleted by them:"

3300 msgstr ""

3301

2805 -#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19

2806 -#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593

2807 -#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114

2808 -msgid "be verbose"

3302 +#: wt-status.c:259

3303 +msgid "added by them:"

3304 msgstr ""

3305

2811 -#: builtin/add.c:256

2812 -msgid "interactive picking"

3306 +#: wt-status.c:261

3307 +msgid "deleted by us:"

3308 msgstr ""

3309

2815 -#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286

2816 -msgid "select hunks interactively"

3310 +#: wt-status.c:263

3311 +msgid "both added:"

3312 msgstr ""

3313

2819 -#: builtin/add.c:258

2820 -msgid "edit current diff and apply"

3314 +#: wt-status.c:265

3315 +msgid "both modified:"

3316 msgstr ""

3317

2823 -#: builtin/add.c:259

2824 -msgid "allow adding otherwise ignored files"

3318 +#: wt-status.c:275

3319 +msgid "new file:"

3320 msgstr ""

3321

2827 -#: builtin/add.c:260

2828 -msgid "update tracked files"

3322 +#: wt-status.c:277

3323 +msgid "copied:"

3324 msgstr ""

3325

2831 -#: builtin/add.c:261

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

3326 +#: wt-status.c:279

3327 +msgid "deleted:"

3328 msgstr ""

3329

2835 -#: builtin/add.c:262

2836 -msgid "add changes from all tracked and untracked files"

3330 +#: wt-status.c:281

3331 +msgid "modified:"

3332 msgstr ""

3333

2839 -#: builtin/add.c:265

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

3334 +#: wt-status.c:283

3335 +msgid "renamed:"

3336 msgstr ""

3337

2843 -#: builtin/add.c:267

2844 -msgid "don't add, only refresh the index"

3338 +#: wt-status.c:285

3339 +msgid "typechange:"

3340 msgstr ""

3341

2847 -#: builtin/add.c:268

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

3342 +#: wt-status.c:287

3343 +msgid "unknown:"

3344 msgstr ""

3345

2851 -#: builtin/add.c:269

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

3346 +#: wt-status.c:289

3347 +msgid "unmerged:"

3348 msgstr ""

3349

2855 -#: builtin/add.c:270 builtin/update-index.c:958

2856 -msgid "(+/-)x"

3350 +#: wt-status.c:371

3351 +msgid "new commits, "

3352 msgstr ""

3353

2859 -#: builtin/add.c:270 builtin/update-index.c:959

2860 -msgid "override the executable bit of the listed files"

3354 +#: wt-status.c:373

3355 +msgid "modified content, "

3356 msgstr ""

3357

2863 -#: builtin/add.c:292

2864 -#, c-format

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

3358 +#: wt-status.c:375

3359 +msgid "untracked content, "

3360 msgstr ""

3361

2868 -#: builtin/add.c:300

2869 -msgid "adding files failed"

3362 +#: wt-status.c:818

3363 +msgid "Submodules changed but not updated:"

3364 msgstr ""

3365

2872 -#: builtin/add.c:336

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

3366 +#: wt-status.c:820

3367 +msgid "Submodule changes to be committed:"

3368 msgstr ""

3369

2876 -#: builtin/add.c:343

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

3370 +#: wt-status.c:901

3371 +msgid ""

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

3373 +"Everything below will be removed."

3374 msgstr ""

3375

2880 -#: builtin/add.c:352

2881 -#, c-format

2882 -msgid "--chmod param '%s' must be either -x or +x"

3376 +#: wt-status.c:1013

3377 +msgid "You have unmerged paths."

3378 msgstr ""

3379

2885 -#: builtin/add.c:367

2886 -#, c-format

2887 -msgid "Nothing specified, nothing added.\n"

3380 +#: wt-status.c:1016

3381 +msgid " (fix conflicts and run \"git commit\")"

3382 msgstr ""

3383

2890 -#: builtin/add.c:368

2891 -#, c-format

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

3384 +#: wt-status.c:1018

3385 +msgid " (use \"git merge --abort\" to abort the merge)"

3386 msgstr ""

3387

2895 -#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279

2896 -#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340

2897 -#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

2898 -#: builtin/submodule--helper.c:240

2899 -msgid "index file corrupt"

3388 +#: wt-status.c:1023

3389 +msgid "All conflicts fixed but you are still merging."

3390 msgstr ""

3391

2902 -#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431

2903 -msgid "Unable to write new index file"

3392 +#: wt-status.c:1026

3393 +msgid " (use \"git commit\" to conclude merge)"

3394 msgstr ""

3395

2906 -#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032

2907 -#, c-format

2908 -msgid "could not read '%s'"

3396 +#: wt-status.c:1036

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

3398 msgstr ""

3399

2911 -#: builtin/am.c:426

2912 -msgid "could not parse author script"

3400 +#: wt-status.c:1039

3401 +msgid "The current patch is empty."

3402 msgstr ""

3403

2915 -#: builtin/am.c:503

2916 -#, c-format

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

3404 +#: wt-status.c:1043

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

3406 msgstr ""

3407

2920 -#: builtin/am.c:544 builtin/notes.c:301

2921 -#, c-format

2922 -msgid "Malformed input line: '%s'."

3408 +#: wt-status.c:1045

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

3410 msgstr ""

3411

2925 -#: builtin/am.c:581 builtin/notes.c:316

2926 -#, c-format

2927 -msgid "Failed to copy notes from '%s' to '%s'"

3412 +#: wt-status.c:1047

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

3414 msgstr ""

3415

2930 -#: builtin/am.c:607

2931 -msgid "fseek failed"

3416 +#: wt-status.c:1172

3417 +msgid "No commands done."

3418 msgstr ""

3419

2934 -#: builtin/am.c:787

3420 +#: wt-status.c:1175

3421 #, c-format

2936 -msgid "could not parse patch '%s'"

2937 -msgstr ""

3422 +msgid "Last command done (%d command done):"

3423 +msgid_plural "Last commands done (%d commands done):"

3424 +msgstr[0] ""

3425 +msgstr[1] ""

3426

2939 -#: builtin/am.c:852

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

3427 +#: wt-status.c:1186

3428 +#, c-format

3429 +msgid " (see more in file %s)"

3430 msgstr ""

3431

2943 -#: builtin/am.c:899

2944 -msgid "invalid timestamp"

3432 +#: wt-status.c:1191

3433 +msgid "No commands remaining."

3434 msgstr ""

3435

2947 -#: builtin/am.c:902 builtin/am.c:910

2948 -msgid "invalid Date line"

2949 -msgstr ""

3436 +#: wt-status.c:1194

3437 +#, c-format

3438 +msgid "Next command to do (%d remaining command):"

3439 +msgid_plural "Next commands to do (%d remaining commands):"

3440 +msgstr[0] ""

3441 +msgstr[1] ""

3442

2951 -#: builtin/am.c:907

2952 -msgid "invalid timezone offset"

3443 +#: wt-status.c:1202

3444 +msgid " (use \"git rebase --edit-todo\" to view and edit)"

3445 msgstr ""

3446

2955 -#: builtin/am.c:996

2956 -msgid "Patch format detection failed."

3447 +#: wt-status.c:1215

3448 +#, c-format

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

3450 msgstr ""

3451

2959 -#: builtin/am.c:1001 builtin/clone.c:380

2960 -#, c-format

2961 -msgid "failed to create directory '%s'"

3452 +#: wt-status.c:1220

3453 +msgid "You are currently rebasing."

3454 msgstr ""

3455

2964 -#: builtin/am.c:1005

2965 -msgid "Failed to split patches."

3456 +#: wt-status.c:1234

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

3458 msgstr ""

3459

2968 -#: builtin/am.c:1137 builtin/commit.c:366

2969 -msgid "unable to write index file"

3460 +#: wt-status.c:1236

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

3462 msgstr ""

3463

2972 -#: builtin/am.c:1188

2973 -#, c-format

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

3464 +#: wt-status.c:1238

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

3466 msgstr ""

3467

2977 -#: builtin/am.c:1189

2978 -#, c-format

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

3468 +#: wt-status.c:1244

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

3470 msgstr ""

3471

2982 -#: builtin/am.c:1190

3472 +#: wt-status.c:1248

3473 #, c-format

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

3474 +msgid ""

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

3476 msgstr ""

3477

2987 -#: builtin/am.c:1328

2988 -msgid "Patch is empty. Was it split wrong?"

3478 +#: wt-status.c:1253

3479 +msgid "You are currently splitting a commit during a rebase."

3480 msgstr ""

3481

2991 -#: builtin/am.c:1402 builtin/log.c:1543

2992 -#, c-format

2993 -msgid "invalid ident line: %s"

3482 +#: wt-status.c:1256

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

3484 msgstr ""

3485

2996 -#: builtin/am.c:1429

3486 +#: wt-status.c:1260

3487 #, c-format

2998 -msgid "unable to parse commit %s"

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

3489 msgstr ""

3490

3001 -#: builtin/am.c:1602

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

3491 +#: wt-status.c:1265

3492 +msgid "You are currently editing a commit during a rebase."

3493 msgstr ""

3494

3005 -#: builtin/am.c:1604

3006 -msgid "Using index info to reconstruct a base tree..."

3495 +#: wt-status.c:1268

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

3497 msgstr ""

3498

3009 -#: builtin/am.c:1623

3499 +#: wt-status.c:1270

3500 msgid ""

3011 -"Did you hand edit your patch?\n"

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

3013 -msgstr ""

3014 -

3015 -#: builtin/am.c:1629

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

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

3502 msgstr ""

3503

3019 -#: builtin/am.c:1654

3020 -msgid "Failed to merge in the changes."

3504 +#: wt-status.c:1280

3505 +#, c-format

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

3507 msgstr ""

3508

3023 -#: builtin/am.c:1679 builtin/merge.c:628

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

3509 +#: wt-status.c:1285

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

3511 msgstr ""

3512

3027 -#: builtin/am.c:1686

3028 -msgid "applying to an empty history"

3513 +#: wt-status.c:1288

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

3515 msgstr ""

3516

3031 -#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798

3032 -#: builtin/merge.c:823

3033 -msgid "failed to write commit object"

3517 +#: wt-status.c:1290

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

3519 msgstr ""

3520

3036 -#: builtin/am.c:1731 builtin/am.c:1735

3521 +#: wt-status.c:1299

3522 #, c-format

3038 -msgid "cannot resume: %s does not exist."

3039 -msgstr ""

3040 -

3041 -#: builtin/am.c:1751

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

3523 +msgid "You are currently reverting commit %s."

3524 msgstr ""

3525

3045 -#: builtin/am.c:1756

3046 -msgid "Commit Body is:"

3526 +#: wt-status.c:1304

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

3528 msgstr ""

3529

3049 -#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]

3050 -#. in your translation. The program will only accept English

3051 -#. input at this point.

3052 -#.

3053 -#: builtin/am.c:1766

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

3530 +#: wt-status.c:1307

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

3532 msgstr ""

3533

3057 -#: builtin/am.c:1816

3058 -#, c-format

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

3534 +#: wt-status.c:1309

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

3536 msgstr ""

3537

3062 -#: builtin/am.c:1853 builtin/am.c:1925

3538 +#: wt-status.c:1320

3539 #, c-format

3064 -msgid "Applying: %.*s"

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

3541 msgstr ""

3542

3067 -#: builtin/am.c:1869

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

3543 +#: wt-status.c:1324

3544 +msgid "You are currently bisecting."

3545 msgstr ""

3546

3071 -#: builtin/am.c:1877

3072 -#, c-format

3073 -msgid "Patch failed at %s %.*s"

3547 +#: wt-status.c:1327

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

3549 msgstr ""

3550

3076 -#: builtin/am.c:1883

3077 -#, c-format

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

3551 +#: wt-status.c:1524

3552 +msgid "On branch "

3553 msgstr ""

3554

3081 -#: builtin/am.c:1928

3082 -msgid ""

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

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

3085 -"already introduced the same changes; you might want to skip this patch."

3555 +#: wt-status.c:1530

3556 +msgid "interactive rebase in progress; onto "

3557 msgstr ""

3558

3088 -#: builtin/am.c:1935

3089 -msgid ""

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

3091 -"Did you forget to use 'git add'?"

3559 +#: wt-status.c:1532

3560 +msgid "rebase in progress; onto "

3561 msgstr ""

3562

3094 -#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308

3095 -#: builtin/reset.c:316

3096 -#, c-format

3097 -msgid "Could not parse object '%s'."

3563 +#: wt-status.c:1537

3564 +msgid "HEAD detached at "

3565 msgstr ""

3566

3100 -#: builtin/am.c:2095

3101 -msgid "failed to clean index"

3567 +#: wt-status.c:1539

3568 +msgid "HEAD detached from "

3569 msgstr ""

3570

3104 -#: builtin/am.c:2129

3105 -msgid ""

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

3107 -"Not rewinding to ORIG_HEAD"

3571 +#: wt-status.c:1542

3572 +msgid "Not currently on any branch."

3573 msgstr ""

3574

3110 -#: builtin/am.c:2192

3111 -#, c-format

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

3575 +#: wt-status.c:1560

3576 +msgid "Initial commit"

3577 msgstr ""

3578

3115 -#: builtin/am.c:2225

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

3579 +#: wt-status.c:1574

3580 +msgid "Untracked files"

3581 msgstr ""

3582

3119 -#: builtin/am.c:2226

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

3583 +#: wt-status.c:1576

3584 +msgid "Ignored files"

3585 msgstr ""

3586

3123 -#: builtin/am.c:2232

3124 -msgid "run interactively"

3587 +#: wt-status.c:1580

3588 +#, c-format

3589 +msgid ""

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

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

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

3593 msgstr ""

3594

3127 -#: builtin/am.c:2234

3128 -msgid "historical option -- no-op"

3595 +#: wt-status.c:1586

3596 +#, c-format

3597 +msgid "Untracked files not listed%s"

3598 msgstr ""

3599

3131 -#: builtin/am.c:2236

3132 -msgid "allow fall back on 3way merging if needed"

3600 +#: wt-status.c:1588

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

3602 msgstr ""

3603

3135 -#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57

3136 -#: builtin/repack.c:172

3137 -msgid "be quiet"

3604 +#: wt-status.c:1594

3605 +msgid "No changes"

3606 msgstr ""

3607

3140 -#: builtin/am.c:2239

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

3608 +#: wt-status.c:1599

3609 +#, c-format

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

3611 msgstr ""

3612

3144 -#: builtin/am.c:2242

3145 -msgid "recode into utf8 (default)"

3613 +#: wt-status.c:1602

3614 +#, c-format

3615 +msgid "no changes added to commit\n"

3616 msgstr ""

3617

3148 -#: builtin/am.c:2244

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

3618 +#: wt-status.c:1605

3619 +#, c-format

3620 +msgid ""

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

3622 +"track)\n"

3623 msgstr ""

3624

3152 -#: builtin/am.c:2246

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

3625 +#: wt-status.c:1608

3626 +#, c-format

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

3628 msgstr ""

3629

3156 -#: builtin/am.c:2248

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

3630 +#: wt-status.c:1611

3631 +#, c-format

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

3633 msgstr ""

3634

3160 -#: builtin/am.c:2250

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

3635 +#: wt-status.c:1614 wt-status.c:1619

3636 +#, c-format

3637 +msgid "nothing to commit\n"

3638 msgstr ""

3639

3164 -#: builtin/am.c:2253

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

3640 +#: wt-status.c:1617

3641 +#, c-format

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

3643 msgstr ""

3644

3168 -#: builtin/am.c:2256

3169 -msgid "strip everything before a scissors line"

3645 +#: wt-status.c:1621

3646 +#, c-format

3647 +msgid "nothing to commit, working tree clean\n"

3648 msgstr ""

3649

3172 -#: builtin/am.c:2257 builtin/apply.c:4837

3173 -msgid "action"

3650 +#: wt-status.c:1728

3651 +msgid "Initial commit on "

3652 msgstr ""

3653

3176 -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267

3177 -#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279

3178 -#: builtin/am.c:2285

3179 -msgid "pass it through git-apply"

3654 +#: wt-status.c:1732

3655 +msgid "HEAD (no branch)"

3656 msgstr ""

3657

3182 -#: builtin/am.c:2266 builtin/apply.c:4861

3183 -msgid "root"

3658 +#: wt-status.c:1761

3659 +msgid "gone"

3660 msgstr ""

3661

3186 -#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799

3187 -#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96

3188 -#: builtin/pull.c:179 builtin/submodule--helper.c:277

3189 -#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482

3190 -#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823

3191 -#: builtin/submodule--helper.c:826

3192 -msgid "path"

3662 +#: wt-status.c:1763 wt-status.c:1771

3663 +msgid "behind "

3664 msgstr ""

3665

3195 -#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

3196 -#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134

3197 -#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185

3198 -#: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340

3199 -#: parse-options.h:132 parse-options.h:134 parse-options.h:244

3200 -msgid "n"

3666 +#: wt-status.c:1766 wt-status.c:1769

3667 +msgid "ahead "

3668 msgstr ""

3669

3203 -#: builtin/am.c:2278 builtin/apply.c:4805

3204 -msgid "num"

3670 +#. TRANSLATORS: the action is e.g. "pull with rebase"

3671 +#: wt-status.c:2270

3672 +#, c-format

3673 +msgid "cannot %s: You have unstaged changes."

3674 msgstr ""

3675

l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)