c2ea120885 · 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: 2015-01-21 14:21+0800\n"

11 +"POT-Creation-Date: 2015-03-27 13:33+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"

@@ -30,7 +30,7 @@ msgid ""

30 msgstr ""

31

32 #: archive.c:11

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

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

34 msgstr ""

35

36 #: archive.c:12

@@ -39,7 +39,7 @@ msgstr ""

39

40 #: archive.c:13

41 msgid ""

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

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

43 msgstr ""

44

45 #: archive.c:14

@@ -67,10 +67,10 @@ msgstr ""

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

68 msgstr ""

69

70 -#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2517

71 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986

70 +#: archive.c:430 builtin/archive.c:88 builtin/blame.c:2516

71 +#: builtin/blame.c:2517 builtin/config.c:57 builtin/fast-export.c:986

72 #: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101

73 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:394

73 +#: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:394

74 #: builtin/notes.c:557 builtin/read-tree.c:109 parse-options.h:151

75 msgid "file"

76 msgstr ""

@@ -119,7 +119,7 @@ msgstr ""

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

120 msgstr ""

121

122 -#: attr.c:258

122 +#: attr.c:264

123 msgid ""

124 "Negative patterns are ignored in git attributes\n"

125 "Use '\\!' for literal leading exclamation."

@@ -236,7 +236,7 @@ msgstr ""

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

237 msgstr ""

238

239 -#: bundle.c:87 builtin/commit.c:770

239 +#: bundle.c:87 builtin/commit.c:764

240 #, c-format

241 msgid "could not open '%s'"

242 msgstr ""

@@ -245,8 +245,8 @@ msgstr ""

245 msgid "Repository lacks these prerequisite commits:"

246 msgstr ""

247

248 -#: bundle.c:163 sequencer.c:645 sequencer.c:1100 builtin/blame.c:2706

249 -#: builtin/branch.c:652 builtin/commit.c:1049 builtin/log.c:330

248 +#: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705

249 +#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330

250 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358

251 #: builtin/shortlog.c:158

252 msgid "revision walk setup failed"

@@ -287,21 +287,21 @@ msgstr ""

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

288 msgstr ""

289

290 -#: bundle.c:438 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261

290 +#: bundle.c:437 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261

291 #, c-format

292 msgid "unrecognized argument: %s"

293 msgstr ""

294

295 -#: bundle.c:444

295 +#: bundle.c:443

296 msgid "Refusing to create empty bundle."

297 msgstr ""

298

299 -#: bundle.c:454

299 +#: bundle.c:453

300 #, c-format

301 msgid "cannot create '%s'"

302 msgstr ""

303

304 -#: bundle.c:475

304 +#: bundle.c:474

305 msgid "index-pack died"

306 msgstr ""

307

@@ -324,55 +324,55 @@ msgstr ""

324 msgid "memory exhausted"

325 msgstr ""

326

327 -#: config.c:469 config.c:471

327 +#: config.c:474 config.c:476

328 #, c-format

329 msgid "bad config file line %d in %s"

330 msgstr ""

331

332 -#: config.c:587

332 +#: config.c:592

333 #, c-format

334 msgid "bad numeric config value '%s' for '%s' in %s: %s"

335 msgstr ""

336

337 -#: config.c:589

337 +#: config.c:594

338 #, c-format

339 msgid "bad numeric config value '%s' for '%s': %s"

340 msgstr ""

341

342 -#: config.c:674

342 +#: config.c:679

343 #, c-format

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

345 msgstr ""

346

347 -#: config.c:752 config.c:763

347 +#: config.c:757 config.c:768

348 #, c-format

349 msgid "bad zlib compression level %d"

350 msgstr ""

351

352 -#: config.c:885

352 +#: config.c:890

353 #, c-format

354 msgid "invalid mode for object creation: %s"

355 msgstr ""

356

357 -#: config.c:1211

357 +#: config.c:1216

358 msgid "unable to parse command-line config"

359 msgstr ""

360

361 -#: config.c:1272

361 +#: config.c:1277

362 msgid "unknown error occured while reading the configuration files"

363 msgstr ""

364

365 -#: config.c:1596

365 +#: config.c:1601

366 #, c-format

367 msgid "unable to parse '%s' from command-line config"

368 msgstr ""

369

370 -#: config.c:1598

370 +#: config.c:1603

371 #, c-format

372 msgid "bad config variable '%s' in file '%s' at line %d"

373 msgstr ""

374

375 -#: config.c:1657

375 +#: config.c:1662

376 #, c-format

377 msgid "%s has multiple values"

378 msgstr ""

@@ -464,7 +464,7 @@ msgstr[1] ""

464 msgid "failed to read orderfile '%s'"

465 msgstr ""

466

467 -#: diffcore-rename.c:516

467 +#: diffcore-rename.c:536

468 msgid "Performing inexact rename detection"

469 msgstr ""

470

@@ -490,23 +490,23 @@ msgid ""

490 "%s"

491 msgstr ""

492

493 -#: diff.c:2957

493 +#: diff.c:2956

494 #, c-format

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

496 msgstr ""

497

498 -#: diff.c:3352

498 +#: diff.c:3351

499 msgid "--follow requires exactly one pathspec"

500 msgstr ""

501

502 -#: diff.c:3515

502 +#: diff.c:3514

503 #, c-format

504 msgid ""

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

506 "%s"

507 msgstr ""

508

509 -#: diff.c:3529

509 +#: diff.c:3528

510 #, c-format

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

512 msgstr ""

@@ -984,14 +984,14 @@ msgstr ""

984 msgid "done"

985 msgstr ""

986

987 -#: read-cache.c:1267

987 +#: read-cache.c:1273

988 #, c-format

989 msgid ""

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

991 "Using version %i"

992 msgstr ""

993

994 -#: read-cache.c:1277

994 +#: read-cache.c:1283

995 #, c-format

996 msgid ""

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

@@ -1069,23 +1069,31 @@ msgstr[1] ""

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

1070 msgstr ""

1071

1072 -#: run-command.c:87

1072 +#: revision.c:2348

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

1074 +msgstr ""

1075 +

1076 +#: run-command.c:83

1077 msgid "open /dev/null failed"

1078 msgstr ""

1079

1076 -#: run-command.c:89

1080 +#: run-command.c:85

1081 #, c-format

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

1083 msgstr ""

1084

1081 -#: send-pack.c:268

1085 +#: send-pack.c:272

1086 msgid "failed to sign the push certificate"

1087 msgstr ""

1088

1085 -#: send-pack.c:325

1089 +#: send-pack.c:356

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

1091 msgstr ""

1092

1093 +#: send-pack.c:366

1094 +msgid "server does not support --atomic push"

1095 +msgstr ""

1096 +

1097 #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995

1098 #: builtin/merge.c:1005

1099 #, c-format

@@ -1111,7 +1119,7 @@ msgid ""

1119 "and commit the result with 'git commit'"

1120 msgstr ""

1121

1114 -#: sequencer.c:211 sequencer.c:856 sequencer.c:939

1122 +#: sequencer.c:211 sequencer.c:861 sequencer.c:944

1123 #, c-format

1124 msgid "Could not write to %s"

1125 msgstr ""

@@ -1147,184 +1155,184 @@ msgstr ""

1155 msgid "Unable to update cache tree\n"

1156 msgstr ""

1157

1150 -#: sequencer.c:406

1158 +#: sequencer.c:411

1159 #, c-format

1160 msgid "Could not parse commit %s\n"

1161 msgstr ""

1162

1155 -#: sequencer.c:411

1163 +#: sequencer.c:416

1164 #, c-format

1165 msgid "Could not parse parent commit %s\n"

1166 msgstr ""

1167

1160 -#: sequencer.c:477

1168 +#: sequencer.c:482

1169 msgid "Your index file is unmerged."

1170 msgstr ""

1171

1164 -#: sequencer.c:496

1172 +#: sequencer.c:501

1173 #, c-format

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

1175 msgstr ""

1176

1169 -#: sequencer.c:504

1177 +#: sequencer.c:509

1178 #, c-format

1179 msgid "Commit %s does not have parent %d"

1180 msgstr ""

1181

1174 -#: sequencer.c:508

1182 +#: sequencer.c:513

1183 #, c-format

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

1185 msgstr ""

1186

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

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

1181 -#: sequencer.c:521

1189 +#: sequencer.c:526

1190 #, c-format

1191 msgid "%s: cannot parse parent commit %s"

1192 msgstr ""

1193

1186 -#: sequencer.c:525

1194 +#: sequencer.c:530

1195 #, c-format

1196 msgid "Cannot get commit message for %s"

1197 msgstr ""

1198

1191 -#: sequencer.c:611

1199 +#: sequencer.c:616

1200 #, c-format

1201 msgid "could not revert %s... %s"

1202 msgstr ""

1203

1196 -#: sequencer.c:612

1204 +#: sequencer.c:617

1205 #, c-format

1206 msgid "could not apply %s... %s"

1207 msgstr ""

1208

1201 -#: sequencer.c:648

1209 +#: sequencer.c:653

1210 msgid "empty commit set passed"

1211 msgstr ""

1212

1205 -#: sequencer.c:656

1213 +#: sequencer.c:661

1214 #, c-format

1215 msgid "git %s: failed to read the index"

1216 msgstr ""

1217

1210 -#: sequencer.c:660

1218 +#: sequencer.c:665

1219 #, c-format

1220 msgid "git %s: failed to refresh the index"

1221 msgstr ""

1222

1215 -#: sequencer.c:720

1223 +#: sequencer.c:725

1224 #, c-format

1225 msgid "Cannot %s during a %s"

1226 msgstr ""

1227

1220 -#: sequencer.c:742

1228 +#: sequencer.c:747

1229 #, c-format

1230 msgid "Could not parse line %d."

1231 msgstr ""

1232

1225 -#: sequencer.c:747

1233 +#: sequencer.c:752

1234 msgid "No commits parsed."

1235 msgstr ""

1236

1229 -#: sequencer.c:760

1237 +#: sequencer.c:765

1238 #, c-format

1239 msgid "Could not open %s"

1240 msgstr ""

1241

1234 -#: sequencer.c:764

1242 +#: sequencer.c:769

1243 #, c-format

1244 msgid "Could not read %s."

1245 msgstr ""

1246

1239 -#: sequencer.c:771

1247 +#: sequencer.c:776

1248 #, c-format

1249 msgid "Unusable instruction sheet: %s"

1250 msgstr ""

1251

1244 -#: sequencer.c:801

1252 +#: sequencer.c:806

1253 #, c-format

1254 msgid "Invalid key: %s"

1255 msgstr ""

1256

1249 -#: sequencer.c:804

1257 +#: sequencer.c:809

1258 #, c-format

1259 msgid "Invalid value for %s: %s"

1260 msgstr ""

1261

1254 -#: sequencer.c:816

1262 +#: sequencer.c:821

1263 #, c-format

1264 msgid "Malformed options sheet: %s"

1265 msgstr ""

1266

1259 -#: sequencer.c:837

1267 +#: sequencer.c:842

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

1269 msgstr ""

1270

1263 -#: sequencer.c:838

1271 +#: sequencer.c:843

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

1273 msgstr ""

1274

1267 -#: sequencer.c:842

1275 +#: sequencer.c:847

1276 #, c-format

1277 msgid "Could not create sequencer directory %s"

1278 msgstr ""

1279

1272 -#: sequencer.c:858 sequencer.c:943

1280 +#: sequencer.c:863 sequencer.c:948

1281 #, c-format

1282 msgid "Error wrapping up %s."

1283 msgstr ""

1284

1277 -#: sequencer.c:877 sequencer.c:1013

1285 +#: sequencer.c:882 sequencer.c:1018

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

1287 msgstr ""

1288

1281 -#: sequencer.c:879

1289 +#: sequencer.c:884

1290 msgid "cannot resolve HEAD"

1291 msgstr ""

1292

1285 -#: sequencer.c:881

1293 +#: sequencer.c:886

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

1295 msgstr ""

1296

1289 -#: sequencer.c:903 builtin/apply.c:4128

1297 +#: sequencer.c:908 builtin/apply.c:4286

1298 #, c-format

1299 msgid "cannot open %s: %s"

1300 msgstr ""

1301

1294 -#: sequencer.c:906

1302 +#: sequencer.c:911

1303 #, c-format

1304 msgid "cannot read %s: %s"

1305 msgstr ""

1306

1299 -#: sequencer.c:907

1307 +#: sequencer.c:912

1308 msgid "unexpected end of file"

1309 msgstr ""

1310

1303 -#: sequencer.c:913

1311 +#: sequencer.c:918

1312 #, c-format

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

1314 msgstr ""

1315

1308 -#: sequencer.c:936

1316 +#: sequencer.c:941

1317 #, c-format

1318 msgid "Could not format %s."

1319 msgstr ""

1320

1313 -#: sequencer.c:1081

1321 +#: sequencer.c:1086

1322 #, c-format

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

1324 msgstr ""

1325

1318 -#: sequencer.c:1084

1326 +#: sequencer.c:1089

1327 #, c-format

1328 msgid "%s: bad revision"

1329 msgstr ""

1330

1323 -#: sequencer.c:1118

1331 +#: sequencer.c:1123

1332 msgid "Can't revert as initial commit"

1333 msgstr ""

1334

1327 -#: sequencer.c:1119

1335 +#: sequencer.c:1124

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

1337 msgstr ""

1338

@@ -1383,38 +1391,38 @@ msgstr ""

1391 msgid "staging updated .gitmodules failed"

1392 msgstr ""

1393

1386 -#: submodule.c:1111 builtin/init-db.c:371

1394 +#: submodule.c:1109 builtin/init-db.c:371

1395 #, c-format

1396 msgid "Could not create git link %s"

1397 msgstr ""

1398

1391 -#: submodule.c:1122

1399 +#: submodule.c:1120

1400 #, c-format

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

1402 msgstr ""

1403

1396 -#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566

1397 -#: trailer.c:570

1404 +#: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557

1405 +#: trailer.c:561

1406 #, c-format

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

1408 msgstr ""

1409

1402 -#: trailer.c:552 trailer.c:557 builtin/remote.c:290

1410 +#: trailer.c:543 trailer.c:548 builtin/remote.c:290

1411 #, c-format

1412 msgid "more than one %s"

1413 msgstr ""

1414

1407 -#: trailer.c:590

1415 +#: trailer.c:581

1416 #, c-format

1417 msgid "empty trailer token in trailer '%.*s'"

1418 msgstr ""

1419

1412 -#: trailer.c:710

1420 +#: trailer.c:701

1421 #, c-format

1422 msgid "could not read input file '%s'"

1423 msgstr ""

1424

1417 -#: trailer.c:713

1425 +#: trailer.c:704

1426 msgid "could not read from stdin"

1427 msgstr ""

1428

@@ -1451,26 +1459,26 @@ msgstr ""

1459 msgid "invalid '..' path segment"

1460 msgstr ""

1461

1454 -#: wrapper.c:509

1462 +#: wrapper.c:523

1463 #, c-format

1464 msgid "unable to access '%s': %s"

1465 msgstr ""

1466

1459 -#: wrapper.c:530

1467 +#: wrapper.c:544

1468 #, c-format

1469 msgid "unable to access '%s'"

1470 msgstr ""

1471

1464 -#: wrapper.c:541

1472 +#: wrapper.c:555

1473 #, c-format

1474 msgid "unable to look up current user in the passwd file: %s"

1475 msgstr ""

1476

1469 -#: wrapper.c:542

1477 +#: wrapper.c:556

1478 msgid "no such user"

1479 msgstr ""

1480

1473 -#: wrapper.c:550

1481 +#: wrapper.c:564

1482 msgid "unable to get current working directory"

1483 msgstr ""

1484

@@ -1499,11 +1507,11 @@ msgstr ""

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

1508 msgstr ""

1509

1502 -#: wt-status.c:198

1510 +#: wt-status.c:198 wt-status.c:878

1511 msgid "Changes to be committed:"

1512 msgstr ""

1513

1506 -#: wt-status.c:216

1514 +#: wt-status.c:216 wt-status.c:887

1515 msgid "Changes not staged for commit:"

1516 msgstr ""

1517

@@ -1611,193 +1619,193 @@ msgstr ""

1619 msgid "bug: unhandled diff status %c"

1620 msgstr ""

1621

1614 -#: wt-status.c:758

1622 +#: wt-status.c:753

1623 msgid "Submodules changed but not updated:"

1624 msgstr ""

1625

1618 -#: wt-status.c:760

1626 +#: wt-status.c:755

1627 msgid "Submodule changes to be committed:"

1628 msgstr ""

1629

1622 -#: wt-status.c:839

1630 +#: wt-status.c:835

1631 msgid ""

1632 "Do not touch the line above.\n"

1633 "Everything below will be removed."

1634 msgstr ""

1635

1628 -#: wt-status.c:930

1636 +#: wt-status.c:946

1637 msgid "You have unmerged paths."

1638 msgstr ""

1639

1632 -#: wt-status.c:933

1640 +#: wt-status.c:949

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

1642 msgstr ""

1643

1636 -#: wt-status.c:936

1644 +#: wt-status.c:952

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

1646 msgstr ""

1647

1640 -#: wt-status.c:939

1648 +#: wt-status.c:955

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

1650 msgstr ""

1651

1644 -#: wt-status.c:949

1652 +#: wt-status.c:965

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

1654 msgstr ""

1655

1648 -#: wt-status.c:952

1656 +#: wt-status.c:968

1657 msgid "The current patch is empty."

1658 msgstr ""

1659

1652 -#: wt-status.c:956

1660 +#: wt-status.c:972

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

1662 msgstr ""

1663

1656 -#: wt-status.c:958

1664 +#: wt-status.c:974

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

1666 msgstr ""

1667

1660 -#: wt-status.c:960

1668 +#: wt-status.c:976

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

1670 msgstr ""

1671

1664 -#: wt-status.c:1020 wt-status.c:1037

1672 +#: wt-status.c:1036 wt-status.c:1053

1673 #, c-format

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

1675 msgstr ""

1676

1669 -#: wt-status.c:1025 wt-status.c:1042

1677 +#: wt-status.c:1041 wt-status.c:1058

1678 msgid "You are currently rebasing."

1679 msgstr ""

1680

1673 -#: wt-status.c:1028

1681 +#: wt-status.c:1044

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

1683 msgstr ""

1684

1677 -#: wt-status.c:1030

1685 +#: wt-status.c:1046

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

1687 msgstr ""

1688

1681 -#: wt-status.c:1032

1689 +#: wt-status.c:1048

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

1691 msgstr ""

1692

1685 -#: wt-status.c:1045

1693 +#: wt-status.c:1061

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

1695 msgstr ""

1696

1689 -#: wt-status.c:1049

1697 +#: wt-status.c:1065

1698 #, c-format

1699 msgid ""

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

1701 msgstr ""

1702

1695 -#: wt-status.c:1054

1703 +#: wt-status.c:1070

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

1705 msgstr ""

1706

1699 -#: wt-status.c:1057

1707 +#: wt-status.c:1073

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

1709 msgstr ""

1710

1703 -#: wt-status.c:1061

1711 +#: wt-status.c:1077

1712 #, c-format

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

1714 msgstr ""

1715

1708 -#: wt-status.c:1066

1716 +#: wt-status.c:1082

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

1718 msgstr ""

1719

1712 -#: wt-status.c:1069

1720 +#: wt-status.c:1085

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

1722 msgstr ""

1723

1716 -#: wt-status.c:1071

1724 +#: wt-status.c:1087

1725 msgid ""

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

1727 msgstr ""

1728

1721 -#: wt-status.c:1081

1729 +#: wt-status.c:1097

1730 #, c-format

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

1732 msgstr ""

1733

1726 -#: wt-status.c:1086

1734 +#: wt-status.c:1102

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

1736 msgstr ""

1737

1730 -#: wt-status.c:1089

1738 +#: wt-status.c:1105

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

1740 msgstr ""

1741

1734 -#: wt-status.c:1091

1742 +#: wt-status.c:1107

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

1744 msgstr ""

1745

1738 -#: wt-status.c:1100

1746 +#: wt-status.c:1116

1747 #, c-format

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

1749 msgstr ""

1750

1743 -#: wt-status.c:1105

1751 +#: wt-status.c:1121

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

1753 msgstr ""

1754

1747 -#: wt-status.c:1108

1755 +#: wt-status.c:1124

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

1757 msgstr ""

1758

1751 -#: wt-status.c:1110

1759 +#: wt-status.c:1126

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

1761 msgstr ""

1762

1755 -#: wt-status.c:1121

1763 +#: wt-status.c:1137

1764 #, c-format

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

1766 msgstr ""

1767

1760 -#: wt-status.c:1125

1768 +#: wt-status.c:1141

1769 msgid "You are currently bisecting."

1770 msgstr ""

1771

1764 -#: wt-status.c:1128

1772 +#: wt-status.c:1144

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

1774 msgstr ""

1775

1768 -#: wt-status.c:1303

1776 +#: wt-status.c:1321

1777 msgid "On branch "

1778 msgstr ""

1779

1772 -#: wt-status.c:1310

1780 +#: wt-status.c:1328

1781 msgid "rebase in progress; onto "

1782 msgstr ""

1783

1776 -#: wt-status.c:1317

1784 +#: wt-status.c:1333

1785 msgid "HEAD detached at "

1786 msgstr ""

1787

1780 -#: wt-status.c:1319

1788 +#: wt-status.c:1335

1789 msgid "HEAD detached from "

1790 msgstr ""

1791

1784 -#: wt-status.c:1322

1792 +#: wt-status.c:1338

1793 msgid "Not currently on any branch."

1794 msgstr ""

1795

1788 -#: wt-status.c:1339

1796 +#: wt-status.c:1355

1797 msgid "Initial commit"

1798 msgstr ""

1799

1792 -#: wt-status.c:1353

1800 +#: wt-status.c:1369

1801 msgid "Untracked files"

1802 msgstr ""

1803

1796 -#: wt-status.c:1355

1804 +#: wt-status.c:1371

1805 msgid "Ignored files"

1806 msgstr ""

1807

1800 -#: wt-status.c:1359

1808 +#: wt-status.c:1375

1809 #, c-format

1810 msgid ""

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

@@ -1805,74 +1813,74 @@ msgid ""

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

1814 msgstr ""

1815

1808 -#: wt-status.c:1365

1816 +#: wt-status.c:1381

1817 #, c-format

1818 msgid "Untracked files not listed%s"

1819 msgstr ""

1820

1813 -#: wt-status.c:1367

1821 +#: wt-status.c:1383

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

1823 msgstr ""

1824

1817 -#: wt-status.c:1373

1825 +#: wt-status.c:1389

1826 msgid "No changes"

1827 msgstr ""

1828

1821 -#: wt-status.c:1378

1829 +#: wt-status.c:1394

1830 #, c-format

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

1832 msgstr ""

1833

1826 -#: wt-status.c:1381

1834 +#: wt-status.c:1397

1835 #, c-format

1836 msgid "no changes added to commit\n"

1837 msgstr ""

1838

1831 -#: wt-status.c:1384

1839 +#: wt-status.c:1400

1840 #, c-format

1841 msgid ""

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

1843 "track)\n"

1844 msgstr ""

1845

1838 -#: wt-status.c:1387

1846 +#: wt-status.c:1403

1847 #, c-format

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

1849 msgstr ""

1850

1843 -#: wt-status.c:1390

1851 +#: wt-status.c:1406

1852 #, c-format

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

1854 msgstr ""

1855

1848 -#: wt-status.c:1393 wt-status.c:1398

1856 +#: wt-status.c:1409 wt-status.c:1414

1857 #, c-format

1858 msgid "nothing to commit\n"

1859 msgstr ""

1860

1853 -#: wt-status.c:1396

1861 +#: wt-status.c:1412

1862 #, c-format

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

1864 msgstr ""

1865

1858 -#: wt-status.c:1400

1866 +#: wt-status.c:1416

1867 #, c-format

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

1869 msgstr ""

1870

1863 -#: wt-status.c:1509

1871 +#: wt-status.c:1525

1872 msgid "HEAD (no branch)"

1873 msgstr ""

1874

1867 -#: wt-status.c:1515

1875 +#: wt-status.c:1531

1876 msgid "Initial commit on "

1877 msgstr ""

1878

1871 -#: wt-status.c:1547

1879 +#: wt-status.c:1563

1880 msgid "gone"

1881 msgstr ""

1882

1875 -#: wt-status.c:1549 wt-status.c:1557

1883 +#: wt-status.c:1565 wt-status.c:1573

1884 msgid "behind "

1885 msgstr ""

1886

@@ -1882,7 +1890,7 @@ msgid "failed to unlink '%s'"

1890 msgstr ""

1891

1892 #: builtin/add.c:22

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

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

1894 msgstr ""

1895

1896 #: builtin/add.c:65

@@ -1934,14 +1942,14 @@ msgstr ""

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

1943 msgstr ""

1944

1937 -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110

1938 -#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1372

1945 +#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:107 builtin/mv.c:110

1946 +#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1372

1947 #: builtin/rm.c:269

1948 msgid "dry run"

1949 msgstr ""

1950

1943 -#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19

1944 -#: builtin/commit.c:1326 builtin/count-objects.c:63 builtin/fsck.c:608

1951 +#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19

1952 +#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608

1953 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114

1954 msgid "be verbose"

1955 msgstr ""

@@ -2017,75 +2025,75 @@ msgstr ""

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

2026 msgstr ""

2027

2020 -#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919

2028 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920

2029 #: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299

2030 msgid "index file corrupt"

2031 msgstr ""

2032

2025 -#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431

2033 +#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431

2034 msgid "Unable to write new index file"

2035 msgstr ""

2036

2029 -#: builtin/apply.c:58

2030 -msgid "git apply [options] [<patch>...]"

2037 +#: builtin/apply.c:59

2038 +msgid "git apply [<options>] [<patch>...]"

2039 msgstr ""

2040

2033 -#: builtin/apply.c:111

2041 +#: builtin/apply.c:112

2042 #, c-format

2043 msgid "unrecognized whitespace option '%s'"

2044 msgstr ""

2045

2038 -#: builtin/apply.c:126

2046 +#: builtin/apply.c:127

2047 #, c-format

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

2049 msgstr ""

2050

2043 -#: builtin/apply.c:826

2051 +#: builtin/apply.c:822

2052 #, c-format

2053 msgid "Cannot prepare timestamp regexp %s"

2054 msgstr ""

2055

2048 -#: builtin/apply.c:835

2056 +#: builtin/apply.c:831

2057 #, c-format

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

2059 msgstr ""

2060

2053 -#: builtin/apply.c:916

2061 +#: builtin/apply.c:912

2062 #, c-format

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

2064 msgstr ""

2065

2058 -#: builtin/apply.c:948

2066 +#: builtin/apply.c:944

2067 #, c-format

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

2069 msgstr ""

2070

2063 -#: builtin/apply.c:952

2071 +#: builtin/apply.c:948

2072 #, c-format

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

2074 msgstr ""

2075

2068 -#: builtin/apply.c:953

2076 +#: builtin/apply.c:949

2077 #, c-format

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

2079 msgstr ""

2080

2073 -#: builtin/apply.c:960

2081 +#: builtin/apply.c:956

2082 #, c-format

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

2084 msgstr ""

2085

2078 -#: builtin/apply.c:1423

2086 +#: builtin/apply.c:1419

2087 #, c-format

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

2089 msgstr ""

2090

2083 -#: builtin/apply.c:1480

2091 +#: builtin/apply.c:1476

2092 #, c-format

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

2094 msgstr ""

2095

2088 -#: builtin/apply.c:1497

2096 +#: builtin/apply.c:1493

2097 #, c-format

2098 msgid ""

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

@@ -2096,394 +2104,413 @@ msgid_plural ""

2104 msgstr[0] ""

2105 msgstr[1] ""

2106

2099 -#: builtin/apply.c:1657

2107 +#: builtin/apply.c:1656

2108 msgid "new file depends on old contents"

2109 msgstr ""

2110

2103 -#: builtin/apply.c:1659

2111 +#: builtin/apply.c:1658

2112 msgid "deleted file still has contents"

2113 msgstr ""

2114

2107 -#: builtin/apply.c:1685

2115 +#: builtin/apply.c:1684

2116 #, c-format

2117 msgid "corrupt patch at line %d"

2118 msgstr ""

2119

2112 -#: builtin/apply.c:1721

2120 +#: builtin/apply.c:1720

2121 #, c-format

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

2123 msgstr ""

2124

2117 -#: builtin/apply.c:1723

2125 +#: builtin/apply.c:1722

2126 #, c-format

2127 msgid "deleted file %s still has contents"

2128 msgstr ""

2129

2122 -#: builtin/apply.c:1726

2130 +#: builtin/apply.c:1725

2131 #, c-format

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

2133 msgstr ""

2134

2127 -#: builtin/apply.c:1872

2135 +#: builtin/apply.c:1871

2136 #, c-format

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

2138 msgstr ""

2139

2132 -#: builtin/apply.c:1901

2140 +#: builtin/apply.c:1900

2141 #, c-format

2142 msgid "unrecognized binary patch at line %d"

2143 msgstr ""

2144

2137 -#: builtin/apply.c:2052

2145 +#: builtin/apply.c:2051

2146 #, c-format

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

2148 msgstr ""

2149

2142 -#: builtin/apply.c:2142

2150 +#: builtin/apply.c:2141

2151 #, c-format

2152 msgid "unable to read symlink %s"

2153 msgstr ""

2154

2147 -#: builtin/apply.c:2146

2155 +#: builtin/apply.c:2145

2156 #, c-format

2157 msgid "unable to open or read %s"

2158 msgstr ""

2159

2152 -#: builtin/apply.c:2754

2160 +#: builtin/apply.c:2778

2161 #, c-format

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

2163 msgstr ""

2164

2157 -#: builtin/apply.c:2872

2165 +#: builtin/apply.c:2896

2166 #, c-format

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

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

2169 msgstr[0] ""

2170 msgstr[1] ""

2171

2164 -#: builtin/apply.c:2884

2172 +#: builtin/apply.c:2908

2173 #, c-format

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

2175 msgstr ""

2176

2169 -#: builtin/apply.c:2890

2177 +#: builtin/apply.c:2914

2178 #, c-format

2179 msgid ""

2180 "while searching for:\n"

2181 "%.*s"

2182 msgstr ""

2183

2176 -#: builtin/apply.c:2909

2184 +#: builtin/apply.c:2933

2185 #, c-format

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

2187 msgstr ""

2188

2181 -#: builtin/apply.c:3010

2189 +#: builtin/apply.c:3034

2190 #, c-format

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

2192 msgstr ""

2193

2186 -#: builtin/apply.c:3016

2194 +#: builtin/apply.c:3040

2195 #, c-format

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

2197 msgstr ""

2198

2191 -#: builtin/apply.c:3037

2199 +#: builtin/apply.c:3061

2200 #, c-format

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

2202 msgstr ""

2203

2196 -#: builtin/apply.c:3161

2204 +#: builtin/apply.c:3185

2205 #, c-format

2206 msgid "cannot checkout %s"

2207 msgstr ""

2208

2201 -#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260

2209 +#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286

2210 #, c-format

2211 msgid "read of %s failed"

2212 msgstr ""

2213

2206 -#: builtin/apply.c:3240 builtin/apply.c:3462

2214 +#: builtin/apply.c:3238

2215 +#, c-format

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

2217 +msgstr ""

2218 +

2219 +#: builtin/apply.c:3266 builtin/apply.c:3488

2220 #, c-format

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

2222 msgstr ""

2223

2211 -#: builtin/apply.c:3321 builtin/apply.c:3476

2224 +#: builtin/apply.c:3347 builtin/apply.c:3502

2225 #, c-format

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

2227 msgstr ""

2228

2216 -#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490

2229 +#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516

2230 #, c-format

2231 msgid "%s: %s"

2232 msgstr ""

2233

2221 -#: builtin/apply.c:3330 builtin/apply.c:3484

2234 +#: builtin/apply.c:3356 builtin/apply.c:3510

2235 #, c-format

2236 msgid "%s: does not match index"

2237 msgstr ""

2238

2226 -#: builtin/apply.c:3432

2239 +#: builtin/apply.c:3458

2240 msgid "removal patch leaves file contents"

2241 msgstr ""

2242

2230 -#: builtin/apply.c:3501

2243 +#: builtin/apply.c:3527

2244 #, c-format

2245 msgid "%s: wrong type"

2246 msgstr ""

2247

2235 -#: builtin/apply.c:3503

2248 +#: builtin/apply.c:3529

2249 #, c-format

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

2251 msgstr ""

2252

2240 -#: builtin/apply.c:3604

2253 +#: builtin/apply.c:3688 builtin/apply.c:3690

2254 +#, c-format

2255 +msgid "invalid path '%s'"

2256 +msgstr ""

2257 +

2258 +#: builtin/apply.c:3745

2259 #, c-format

2260 msgid "%s: already exists in index"

2261 msgstr ""

2262

2245 -#: builtin/apply.c:3607

2263 +#: builtin/apply.c:3748

2264 #, c-format

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

2266 msgstr ""

2267

2250 -#: builtin/apply.c:3627

2268 +#: builtin/apply.c:3768

2269 #, c-format

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

2271 msgstr ""

2272

2255 -#: builtin/apply.c:3632

2273 +#: builtin/apply.c:3773

2274 #, c-format

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

2276 msgstr ""

2277

2260 -#: builtin/apply.c:3640

2278 +#: builtin/apply.c:3793

2279 +#, c-format

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

2281 +msgstr ""

2282 +

2283 +#: builtin/apply.c:3797

2284 #, c-format

2285 msgid "%s: patch does not apply"

2286 msgstr ""

2287

2265 -#: builtin/apply.c:3653

2288 +#: builtin/apply.c:3811

2289 #, c-format

2290 msgid "Checking patch %s..."

2291 msgstr ""

2292

2270 -#: builtin/apply.c:3746 builtin/checkout.c:231 builtin/reset.c:135

2293 +#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135

2294 #, c-format

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

2296 msgstr ""

2297

2275 -#: builtin/apply.c:3889

2298 +#: builtin/apply.c:4047

2299 #, c-format

2300 msgid "unable to remove %s from index"

2301 msgstr ""

2302

2280 -#: builtin/apply.c:3918

2303 +#: builtin/apply.c:4076

2304 #, c-format

2305 msgid "corrupt patch for submodule %s"

2306 msgstr ""

2307

2285 -#: builtin/apply.c:3922

2308 +#: builtin/apply.c:4080

2309 #, c-format

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

2311 msgstr ""

2312

2290 -#: builtin/apply.c:3927

2313 +#: builtin/apply.c:4085

2314 #, c-format

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

2316 msgstr ""

2317

2295 -#: builtin/apply.c:3930 builtin/apply.c:4038

2318 +#: builtin/apply.c:4088 builtin/apply.c:4196

2319 #, c-format

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

2321 msgstr ""

2322

2300 -#: builtin/apply.c:3963

2323 +#: builtin/apply.c:4121

2324 #, c-format

2325 msgid "closing file '%s'"

2326 msgstr ""

2327

2305 -#: builtin/apply.c:4012

2328 +#: builtin/apply.c:4170

2329 #, c-format

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

2331 msgstr ""

2332

2310 -#: builtin/apply.c:4099

2333 +#: builtin/apply.c:4257

2334 #, c-format

2335 msgid "Applied patch %s cleanly."

2336 msgstr ""

2337

2315 -#: builtin/apply.c:4107

2338 +#: builtin/apply.c:4265

2339 msgid "internal error"

2340 msgstr ""

2341

2319 -#: builtin/apply.c:4110

2342 +#: builtin/apply.c:4268

2343 #, c-format

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

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

2346 msgstr[0] ""

2347 msgstr[1] ""

2348

2326 -#: builtin/apply.c:4120

2349 +#: builtin/apply.c:4278

2350 #, c-format

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

2352 msgstr ""

2353

2331 -#: builtin/apply.c:4141

2354 +#: builtin/apply.c:4299

2355 #, c-format

2356 msgid "Hunk #%d applied cleanly."

2357 msgstr ""

2358

2336 -#: builtin/apply.c:4144

2359 +#: builtin/apply.c:4302

2360 #, c-format

2361 msgid "Rejected hunk #%d."

2362 msgstr ""

2363

2341 -#: builtin/apply.c:4234

2364 +#: builtin/apply.c:4392

2365 msgid "unrecognized input"

2366 msgstr ""

2367

2345 -#: builtin/apply.c:4245

2368 +#: builtin/apply.c:4403

2369 msgid "unable to read index file"

2370 msgstr ""

2371

2349 -#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:92

2350 -#: builtin/fetch.c:93

2372 +#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92

2373 +#: builtin/fetch.c:92

2374 msgid "path"

2375 msgstr ""

2376

2354 -#: builtin/apply.c:4363

2377 +#: builtin/apply.c:4521

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

2379 msgstr ""

2380

2358 -#: builtin/apply.c:4366

2381 +#: builtin/apply.c:4524

2382 msgid "apply changes matching the given path"

2383 msgstr ""

2384

2362 -#: builtin/apply.c:4368

2385 +#: builtin/apply.c:4526

2386 msgid "num"

2387 msgstr ""

2388

2366 -#: builtin/apply.c:4369

2389 +#: builtin/apply.c:4527

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

2391 msgstr ""

2392

2370 -#: builtin/apply.c:4372

2393 +#: builtin/apply.c:4530

2394 msgid "ignore additions made by the patch"

2395 msgstr ""

2396

2374 -#: builtin/apply.c:4374

2397 +#: builtin/apply.c:4532

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

2399 msgstr ""

2400

2378 -#: builtin/apply.c:4378

2401 +#: builtin/apply.c:4536

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

2403 msgstr ""

2404

2382 -#: builtin/apply.c:4380

2405 +#: builtin/apply.c:4538

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

2407 msgstr ""

2408

2386 -#: builtin/apply.c:4382

2409 +#: builtin/apply.c:4540

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

2411 msgstr ""

2412

2390 -#: builtin/apply.c:4384

2413 +#: builtin/apply.c:4542

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

2415 msgstr ""

2416

2394 -#: builtin/apply.c:4386

2417 +#: builtin/apply.c:4544

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

2419 msgstr ""

2420

2398 -#: builtin/apply.c:4388

2421 +#: builtin/apply.c:4546

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

2423 +msgstr ""

2424 +

2425 +#: builtin/apply.c:4548

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

2427 msgstr ""

2428

2402 -#: builtin/apply.c:4390

2429 +#: builtin/apply.c:4550

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

2431 msgstr ""

2432

2406 -#: builtin/apply.c:4392

2433 +#: builtin/apply.c:4552

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

2435 msgstr ""

2436

2410 -#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455

2437 +#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412

2438 msgid "paths are separated with NUL character"

2439 msgstr ""

2440

2414 -#: builtin/apply.c:4397

2441 +#: builtin/apply.c:4557

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

2443 msgstr ""

2444

2418 -#: builtin/apply.c:4398

2445 +#: builtin/apply.c:4558

2446 msgid "action"

2447 msgstr ""

2448

2422 -#: builtin/apply.c:4399

2449 +#: builtin/apply.c:4559

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

2451 msgstr ""

2452

2426 -#: builtin/apply.c:4402 builtin/apply.c:4405

2453 +#: builtin/apply.c:4562 builtin/apply.c:4565

2454 msgid "ignore changes in whitespace when finding context"

2455 msgstr ""

2456

2430 -#: builtin/apply.c:4408

2457 +#: builtin/apply.c:4568

2458 msgid "apply the patch in reverse"

2459 msgstr ""

2460

2434 -#: builtin/apply.c:4410

2461 +#: builtin/apply.c:4570

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

2463 msgstr ""

2464

2438 -#: builtin/apply.c:4412

2465 +#: builtin/apply.c:4572

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

2467 msgstr ""

2468

2442 -#: builtin/apply.c:4414

2469 +#: builtin/apply.c:4574

2470 msgid "allow overlapping hunks"

2471 msgstr ""

2472

2446 -#: builtin/apply.c:4417

2473 +#: builtin/apply.c:4577

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

2475 msgstr ""

2476

2450 -#: builtin/apply.c:4420

2477 +#: builtin/apply.c:4580

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

2479 msgstr ""

2480

2454 -#: builtin/apply.c:4422

2481 +#: builtin/apply.c:4582

2482 msgid "root"

2483 msgstr ""

2484

2458 -#: builtin/apply.c:4423

2485 +#: builtin/apply.c:4583

2486 msgid "prepend <root> to all filenames"

2487 msgstr ""

2488

2462 -#: builtin/apply.c:4445

2489 +#: builtin/apply.c:4605

2490 msgid "--3way outside a repository"

2491 msgstr ""

2492

2466 -#: builtin/apply.c:4453

2493 +#: builtin/apply.c:4613

2494 msgid "--index outside a repository"

2495 msgstr ""

2496

2470 -#: builtin/apply.c:4456

2497 +#: builtin/apply.c:4616

2498 msgid "--cached outside a repository"

2499 msgstr ""

2500

2474 -#: builtin/apply.c:4472

2501 +#: builtin/apply.c:4635

2502 #, c-format

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

2504 msgstr ""

2505

2479 -#: builtin/apply.c:4486

2506 +#: builtin/apply.c:4649

2507 #, c-format

2508 msgid "squelched %d whitespace error"

2509 msgid_plural "squelched %d whitespace errors"

2510 msgstr[0] ""

2511 msgstr[1] ""

2512

2486 -#: builtin/apply.c:4492 builtin/apply.c:4502

2513 +#: builtin/apply.c:4655 builtin/apply.c:4665

2514 #, c-format

2515 msgid "%d line adds whitespace errors."

2516 msgid_plural "%d lines add whitespace errors."

@@ -2538,102 +2565,102 @@ msgid "update BISECT_HEAD instead of checking out the current commit"

2565 msgstr ""

2566

2567 #: builtin/blame.c:30

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

2568 +msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] file"

2569 msgstr ""

2570

2571 #: builtin/blame.c:35

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

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

2573 msgstr ""

2574

2548 -#: builtin/blame.c:2501

2575 +#: builtin/blame.c:2500

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

2577 msgstr ""

2578

2552 -#: builtin/blame.c:2502

2579 +#: builtin/blame.c:2501

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

2581 msgstr ""

2582

2556 -#: builtin/blame.c:2503

2583 +#: builtin/blame.c:2502

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

2585 msgstr ""

2586

2560 -#: builtin/blame.c:2504

2587 +#: builtin/blame.c:2503

2588 msgid "Show work cost statistics"

2589 msgstr ""

2590

2564 -#: builtin/blame.c:2505

2591 +#: builtin/blame.c:2504

2592 msgid "Show output score for blame entries"

2593 msgstr ""

2594

2568 -#: builtin/blame.c:2506

2595 +#: builtin/blame.c:2505

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

2597 msgstr ""

2598

2572 -#: builtin/blame.c:2507

2599 +#: builtin/blame.c:2506

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

2601 msgstr ""

2602

2576 -#: builtin/blame.c:2508

2603 +#: builtin/blame.c:2507

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

2605 msgstr ""

2606

2580 -#: builtin/blame.c:2509

2607 +#: builtin/blame.c:2508

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

2609 msgstr ""

2610

2584 -#: builtin/blame.c:2510

2611 +#: builtin/blame.c:2509

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

2613 msgstr ""

2614

2588 -#: builtin/blame.c:2511

2615 +#: builtin/blame.c:2510

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

2617 msgstr ""

2618

2592 -#: builtin/blame.c:2512

2619 +#: builtin/blame.c:2511

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

2621 msgstr ""

2622

2596 -#: builtin/blame.c:2513

2623 +#: builtin/blame.c:2512

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

2625 msgstr ""

2626

2600 -#: builtin/blame.c:2514

2627 +#: builtin/blame.c:2513

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

2629 msgstr ""

2630

2604 -#: builtin/blame.c:2515

2631 +#: builtin/blame.c:2514

2632 msgid "Ignore whitespace differences"

2633 msgstr ""

2634

2608 -#: builtin/blame.c:2516

2635 +#: builtin/blame.c:2515

2636 msgid "Spend extra cycles to find better match"

2637 msgstr ""

2638

2612 -#: builtin/blame.c:2517

2639 +#: builtin/blame.c:2516

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

2641 msgstr ""

2642

2616 -#: builtin/blame.c:2518

2643 +#: builtin/blame.c:2517

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

2645 msgstr ""

2646

2620 -#: builtin/blame.c:2519 builtin/blame.c:2520

2647 +#: builtin/blame.c:2518 builtin/blame.c:2519

2648 msgid "score"

2649 msgstr ""

2650

2624 -#: builtin/blame.c:2519

2651 +#: builtin/blame.c:2518

2652 msgid "Find line copies within and across files"

2653 msgstr ""

2654

2628 -#: builtin/blame.c:2520

2655 +#: builtin/blame.c:2519

2656 msgid "Find line movements within and across files"

2657 msgstr ""

2658

2632 -#: builtin/blame.c:2521

2659 +#: builtin/blame.c:2520

2660 msgid "n,m"

2661 msgstr ""

2662

2636 -#: builtin/blame.c:2521

2663 +#: builtin/blame.c:2520

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

2665 msgstr ""

2666

@@ -2643,24 +2670,24 @@ msgstr ""

2670 #. takes 22 places, is the longest among various forms of

2671 #. relative timestamps, but your language may need more or

2672 #. fewer display columns.

2646 -#: builtin/blame.c:2602

2673 +#: builtin/blame.c:2601

2674 msgid "4 years, 11 months ago"

2675 msgstr ""

2676

2677 #: builtin/branch.c:24

2651 -msgid "git branch [options] [-r | -a] [--merged | --no-merged]"

2678 +msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"

2679 msgstr ""

2680

2681 #: builtin/branch.c:25

2655 -msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"

2682 +msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"

2683 msgstr ""

2684

2685 #: builtin/branch.c:26

2659 -msgid "git branch [options] [-r] (-d | -D) <branchname>..."

2686 +msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."

2687 msgstr ""

2688

2689 #: builtin/branch.c:27

2663 -msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"

2690 +msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

2691 msgstr ""

2692

2693 #: builtin/branch.c:152

@@ -2795,239 +2822,244 @@ msgstr ""

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

2823 msgstr ""

2824

2798 -#: builtin/branch.c:593

2825 +#: builtin/branch.c:596

2826 #, c-format

2800 -msgid "(detached from %s)"

2827 +msgid "(HEAD detached at %s)"

2828 msgstr ""

2829

2803 -#: builtin/branch.c:596

2830 +#: builtin/branch.c:599

2831 +#, c-format

2832 +msgid "(HEAD detached from %s)"

2833 +msgstr ""

2834 +

2835 +#: builtin/branch.c:603

2836 msgid "(no branch)"

2837 msgstr ""

2838

2807 -#: builtin/branch.c:643

2839 +#: builtin/branch.c:650

2840 #, c-format

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

2842 msgstr ""

2843

2812 -#: builtin/branch.c:691

2844 +#: builtin/branch.c:698

2845 msgid "some refs could not be read"

2846 msgstr ""

2847

2816 -#: builtin/branch.c:704

2848 +#: builtin/branch.c:711

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

2850 msgstr ""

2851

2820 -#: builtin/branch.c:714

2852 +#: builtin/branch.c:721

2853 #, c-format

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

2855 msgstr ""

2856

2825 -#: builtin/branch.c:729

2857 +#: builtin/branch.c:736

2858 msgid "Branch rename failed"

2859 msgstr ""

2860

2829 -#: builtin/branch.c:733

2861 +#: builtin/branch.c:740

2862 #, c-format

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

2864 msgstr ""

2865

2834 -#: builtin/branch.c:737

2866 +#: builtin/branch.c:744

2867 #, c-format

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

2869 msgstr ""

2870

2839 -#: builtin/branch.c:744

2871 +#: builtin/branch.c:751

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

2873 msgstr ""

2874

2843 -#: builtin/branch.c:759

2875 +#: builtin/branch.c:766

2876 #, c-format

2877 msgid "malformed object name %s"

2878 msgstr ""

2879

2848 -#: builtin/branch.c:783

2880 +#: builtin/branch.c:790

2881 #, c-format

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

2883 msgstr ""

2884

2853 -#: builtin/branch.c:813

2885 +#: builtin/branch.c:820

2886 msgid "Generic options"

2887 msgstr ""

2888

2857 -#: builtin/branch.c:815

2889 +#: builtin/branch.c:822

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

2891 msgstr ""

2892

2861 -#: builtin/branch.c:816

2893 +#: builtin/branch.c:823

2894 msgid "suppress informational messages"

2895 msgstr ""

2896

2865 -#: builtin/branch.c:817

2897 +#: builtin/branch.c:824

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

2899 msgstr ""

2900

2869 -#: builtin/branch.c:819

2901 +#: builtin/branch.c:826

2902 msgid "change upstream info"

2903 msgstr ""

2904

2873 -#: builtin/branch.c:823

2905 +#: builtin/branch.c:830

2906 msgid "use colored output"

2907 msgstr ""

2908

2877 -#: builtin/branch.c:824

2909 +#: builtin/branch.c:831

2910 msgid "act on remote-tracking branches"

2911 msgstr ""

2912

2881 -#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854

2882 -#: builtin/branch.c:860 builtin/commit.c:1586 builtin/commit.c:1587

2883 -#: builtin/commit.c:1588 builtin/commit.c:1589 builtin/tag.c:616

2913 +#: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861

2914 +#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581

2915 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616

2916 #: builtin/tag.c:622

2917 msgid "commit"

2918 msgstr ""

2919

2888 -#: builtin/branch.c:828 builtin/branch.c:834

2920 +#: builtin/branch.c:835 builtin/branch.c:841

2921 msgid "print only branches that contain the commit"

2922 msgstr ""

2923

2892 -#: builtin/branch.c:840

2924 +#: builtin/branch.c:847

2925 msgid "Specific git-branch actions:"

2926 msgstr ""

2927

2896 -#: builtin/branch.c:841

2928 +#: builtin/branch.c:848

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

2930 msgstr ""

2931

2900 -#: builtin/branch.c:843

2932 +#: builtin/branch.c:850

2933 msgid "delete fully merged branch"

2934 msgstr ""

2935

2904 -#: builtin/branch.c:844

2936 +#: builtin/branch.c:851

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

2938 msgstr ""

2939

2908 -#: builtin/branch.c:845

2940 +#: builtin/branch.c:852

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

2942 msgstr ""

2943

2912 -#: builtin/branch.c:846

2944 +#: builtin/branch.c:853

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

2946 msgstr ""

2947

2916 -#: builtin/branch.c:847

2948 +#: builtin/branch.c:854

2949 msgid "list branch names"

2950 msgstr ""

2951

2920 -#: builtin/branch.c:848

2952 +#: builtin/branch.c:855

2953 msgid "create the branch's reflog"

2954 msgstr ""

2955

2924 -#: builtin/branch.c:850

2956 +#: builtin/branch.c:857

2957 msgid "edit the description for the branch"

2958 msgstr ""

2959

2928 -#: builtin/branch.c:851

2960 +#: builtin/branch.c:858

2961 msgid "force creation, move/rename, deletion"

2962 msgstr ""

2963

2932 -#: builtin/branch.c:854

2964 +#: builtin/branch.c:861

2965 msgid "print only not merged branches"

2966 msgstr ""

2967

2936 -#: builtin/branch.c:860

2968 +#: builtin/branch.c:867

2969 msgid "print only merged branches"

2970 msgstr ""

2971

2940 -#: builtin/branch.c:864

2972 +#: builtin/branch.c:871

2973 msgid "list branches in columns"

2974 msgstr ""

2975

2944 -#: builtin/branch.c:877

2976 +#: builtin/branch.c:884

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

2978 msgstr ""

2979

2948 -#: builtin/branch.c:881 builtin/clone.c:637

2980 +#: builtin/branch.c:888 builtin/clone.c:637

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

2982 msgstr ""

2983

2952 -#: builtin/branch.c:903

2984 +#: builtin/branch.c:910

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

2986 msgstr ""

2987

2956 -#: builtin/branch.c:914 builtin/branch.c:953

2988 +#: builtin/branch.c:921 builtin/branch.c:960

2989 msgid "branch name required"

2990 msgstr ""

2991

2960 -#: builtin/branch.c:929

2992 +#: builtin/branch.c:936

2993 msgid "Cannot give description to detached HEAD"

2994 msgstr ""

2995

2964 -#: builtin/branch.c:934

2996 +#: builtin/branch.c:941

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

2998 msgstr ""

2999

2968 -#: builtin/branch.c:941

3000 +#: builtin/branch.c:948

3001 #, c-format

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

3003 msgstr ""

3004

2973 -#: builtin/branch.c:944

3005 +#: builtin/branch.c:951

3006 #, c-format

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

3008 msgstr ""

3009

2978 -#: builtin/branch.c:959

3010 +#: builtin/branch.c:966

3011 msgid "too many branches for a rename operation"

3012 msgstr ""

3013

2982 -#: builtin/branch.c:964

3014 +#: builtin/branch.c:971

3015 msgid "too many branches to set new upstream"

3016 msgstr ""

3017

2986 -#: builtin/branch.c:968

3018 +#: builtin/branch.c:975

3019 #, c-format

3020 msgid ""

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

3022 msgstr ""

3023

2992 -#: builtin/branch.c:971 builtin/branch.c:993 builtin/branch.c:1014

3024 +#: builtin/branch.c:978 builtin/branch.c:1000 builtin/branch.c:1021

3025 #, c-format

3026 msgid "no such branch '%s'"

3027 msgstr ""

3028

2997 -#: builtin/branch.c:975

3029 +#: builtin/branch.c:982

3030 #, c-format

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

3032 msgstr ""

3033

3002 -#: builtin/branch.c:987

3034 +#: builtin/branch.c:994

3035 msgid "too many branches to unset upstream"

3036 msgstr ""

3037

3006 -#: builtin/branch.c:991

3038 +#: builtin/branch.c:998

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

3040 msgstr ""

3041

3010 -#: builtin/branch.c:997

3042 +#: builtin/branch.c:1004

3043 #, c-format

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

3045 msgstr ""

3046

3015 -#: builtin/branch.c:1011

3047 +#: builtin/branch.c:1018

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

3049 msgstr ""

3050

3019 -#: builtin/branch.c:1017

3051 +#: builtin/branch.c:1024

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

3053 msgstr ""

3054

3023 -#: builtin/branch.c:1020

3055 +#: builtin/branch.c:1027

3056 #, c-format

3057 msgid ""

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

3059 "track or --set-upstream-to\n"

3060 msgstr ""

3061

3030 -#: builtin/branch.c:1037

3062 +#: builtin/branch.c:1044

3063 #, c-format

3064 msgid ""

3065 "\n"

@@ -3035,12 +3067,12 @@ msgid ""

3067 "\n"

3068 msgstr ""

3069

3038 -#: builtin/branch.c:1038

3070 +#: builtin/branch.c:1045

3071 #, c-format

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

3073 msgstr ""

3074

3043 -#: builtin/branch.c:1039

3075 +#: builtin/branch.c:1046

3076 #, c-format

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

3078 msgstr ""

@@ -3058,52 +3090,52 @@ msgstr ""

3090 msgid "Need a repository to unbundle."

3091 msgstr ""

3092

3061 -#: builtin/cat-file.c:328

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

3093 +#: builtin/cat-file.c:326

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

3095 msgstr ""

3096

3065 -#: builtin/cat-file.c:329

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

3097 +#: builtin/cat-file.c:327

3098 +msgid "git cat-file (--batch | --batch-check) < <list-of-objects>"

3099 msgstr ""

3100

3069 -#: builtin/cat-file.c:366

3101 +#: builtin/cat-file.c:364

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

3103 msgstr ""

3104

3073 -#: builtin/cat-file.c:367

3105 +#: builtin/cat-file.c:365

3106 msgid "show object type"

3107 msgstr ""

3108

3077 -#: builtin/cat-file.c:368

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

3110 msgid "show object size"

3111 msgstr ""

3112

3081 -#: builtin/cat-file.c:370

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

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

3115 msgstr ""

3116

3085 -#: builtin/cat-file.c:371

3117 +#: builtin/cat-file.c:369

3118 msgid "pretty-print object's content"

3119 msgstr ""

3120

3089 -#: builtin/cat-file.c:373

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

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

3123 msgstr ""

3124

3093 -#: builtin/cat-file.c:375

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

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

3127 msgstr ""

3128

3097 -#: builtin/cat-file.c:378

3129 +#: builtin/cat-file.c:376

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

3131 msgstr ""

3132

3133 #: builtin/check-attr.c:11

3102 -msgid "git check-attr [-a | --all | attr...] [--] pathname..."

3134 +msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

3135 msgstr ""

3136

3137 #: builtin/check-attr.c:12

3106 -msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"

3138 +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"

3139 msgstr ""

3140

3141 #: builtin/check-attr.c:19

@@ -3159,7 +3191,7 @@ msgid "--non-matching is only valid with --verbose"

3191 msgstr ""

3192

3193 #: builtin/check-mailmap.c:8

3162 -msgid "git check-mailmap [options] <contact>..."

3194 +msgid "git check-mailmap [<options>] <contact>..."

3195 msgstr ""

3196

3197 #: builtin/check-mailmap.c:13

@@ -3176,7 +3208,7 @@ msgid "no contacts specified"

3208 msgstr ""

3209

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

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

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

3212 msgstr ""

3213

3214 #: builtin/checkout-index.c:188

@@ -3220,11 +3252,11 @@ msgid "copy out the files from named stage"

3252 msgstr ""

3253

3254 #: builtin/checkout.c:25

3223 -msgid "git checkout [options] <branch>"

3255 +msgid "git checkout [<options>] <branch>"

3256 msgstr ""

3257

3258 #: builtin/checkout.c:26

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

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

3260 msgstr ""

3261

3262 #: builtin/checkout.c:132 builtin/checkout.c:165

@@ -3346,7 +3378,7 @@ msgid ""

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

3379 "to do so with:\n"

3380 "\n"

3349 -" git branch new_branch_name %s\n"

3381 +" git branch <new-branch-name> %s\n"

3382 "\n"

3383 msgstr ""

3384

@@ -3463,7 +3495,7 @@ msgid "do not limit pathspecs to sparse entries only"

3495 msgstr ""

3496

3497 #: builtin/checkout.c:1130

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

3498 +msgid "second guess 'git checkout <no-such-branch>'"

3499 msgstr ""

3500

3501 #: builtin/checkout.c:1153

@@ -3569,16 +3601,17 @@ msgstr ""

3601 msgid "Select items to delete"

3602 msgstr ""

3603

3572 -#: builtin/clean.c:757

3604 +#. TRANSLATORS: Make sure to keep [y/N] as is

3605 +#: builtin/clean.c:758

3606 #, c-format

3574 -msgid "remove %s? "

3607 +msgid "Remove %s [y/N]? "

3608 msgstr ""

3609

3577 -#: builtin/clean.c:782

3610 +#: builtin/clean.c:783

3611 msgid "Bye."

3612 msgstr ""

3613

3581 -#: builtin/clean.c:790

3614 +#: builtin/clean.c:791

3615 msgid ""

3616 "clean - start cleaning\n"

3617 "filter by pattern - exclude items from deletion\n"

@@ -3589,79 +3622,79 @@ msgid ""

3622 "? - help for prompt selection"

3623 msgstr ""

3624

3592 -#: builtin/clean.c:817

3625 +#: builtin/clean.c:818

3626 msgid "*** Commands ***"

3627 msgstr ""

3628

3596 -#: builtin/clean.c:818

3629 +#: builtin/clean.c:819

3630 msgid "What now"

3631 msgstr ""

3632

3600 -#: builtin/clean.c:826

3633 +#: builtin/clean.c:827

3634 msgid "Would remove the following item:"

3635 msgid_plural "Would remove the following items:"

3636 msgstr[0] ""

3637 msgstr[1] ""

3638

3606 -#: builtin/clean.c:843

3639 +#: builtin/clean.c:844

3640 msgid "No more files to clean, exiting."

3641 msgstr ""

3642

3610 -#: builtin/clean.c:874

3643 +#: builtin/clean.c:875

3644 msgid "do not print names of files removed"

3645 msgstr ""

3646

3614 -#: builtin/clean.c:876

3647 +#: builtin/clean.c:877

3648 msgid "force"

3649 msgstr ""

3650

3618 -#: builtin/clean.c:877

3651 +#: builtin/clean.c:878

3652 msgid "interactive cleaning"

3653 msgstr ""

3654

3622 -#: builtin/clean.c:879

3655 +#: builtin/clean.c:880

3656 msgid "remove whole directories"

3657 msgstr ""

3658

3626 -#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714

3627 -#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185

3659 +#: builtin/clean.c:881 builtin/describe.c:407 builtin/grep.c:714

3660 +#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:185

3661 msgid "pattern"

3662 msgstr ""

3663

3631 -#: builtin/clean.c:881

3664 +#: builtin/clean.c:882

3665 msgid "add <pattern> to ignore rules"

3666 msgstr ""

3667

3635 -#: builtin/clean.c:882

3668 +#: builtin/clean.c:883

3669 msgid "remove ignored files, too"

3670 msgstr ""

3671

3639 -#: builtin/clean.c:884

3672 +#: builtin/clean.c:885

3673 msgid "remove only ignored files"

3674 msgstr ""

3675

3643 -#: builtin/clean.c:902

3676 +#: builtin/clean.c:903

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

3678 msgstr ""

3679

3647 -#: builtin/clean.c:906

3680 +#: builtin/clean.c:907

3681 msgid ""

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

3683 "clean"

3684 msgstr ""

3685

3653 -#: builtin/clean.c:909

3686 +#: builtin/clean.c:910

3687 msgid ""

3688 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

3689 "refusing to clean"

3690 msgstr ""

3691

3692 #: builtin/clone.c:37

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

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

3694 msgstr ""

3695

3663 -#: builtin/clone.c:66 builtin/fetch.c:112 builtin/merge.c:224

3664 -#: builtin/push.c:514

3696 +#: builtin/clone.c:66 builtin/fetch.c:111 builtin/merge.c:224

3697 +#: builtin/push.c:523

3698 msgid "force progress reporting"

3699 msgstr ""

3700

@@ -3721,7 +3754,7 @@ msgstr ""

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

3755 msgstr ""

3756

3724 -#: builtin/clone.c:94 builtin/fetch.c:113 builtin/grep.c:659

3757 +#: builtin/clone.c:94 builtin/fetch.c:112 builtin/grep.c:659

3758 msgid "depth"

3759 msgstr ""

3760

@@ -3862,7 +3895,7 @@ msgstr ""

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

3896 msgstr ""

3897

3865 -#: builtin/clone.c:815 builtin/fetch.c:1155

3898 +#: builtin/clone.c:815 builtin/fetch.c:1156

3899 #, c-format

3900 msgid "depth %s is not a positive number"

3901 msgstr ""

@@ -3877,58 +3910,58 @@ msgstr ""

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

3911 msgstr ""

3912

3880 -#: builtin/clone.c:848 builtin/clone.c:860

3913 +#: builtin/clone.c:850 builtin/clone.c:861

3914 #, c-format

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

3916 msgstr ""

3917

3885 -#: builtin/clone.c:851

3918 +#: builtin/clone.c:853

3919 #, c-format

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

3920 +msgid "could not create work tree dir '%s'"

3921 msgstr ""

3922

3890 -#: builtin/clone.c:870

3923 +#: builtin/clone.c:871

3924 #, c-format

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

3926 msgstr ""

3927

3895 -#: builtin/clone.c:872

3928 +#: builtin/clone.c:873

3929 #, c-format

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

3931 msgstr ""

3932

3900 -#: builtin/clone.c:897

3933 +#: builtin/clone.c:898

3934 msgid "--dissociate given, but there is no --reference"

3935 msgstr ""

3936

3904 -#: builtin/clone.c:912

3937 +#: builtin/clone.c:913

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

3939 msgstr ""

3940

3908 -#: builtin/clone.c:915

3941 +#: builtin/clone.c:916

3942 msgid "source repository is shallow, ignoring --local"

3943 msgstr ""

3944

3912 -#: builtin/clone.c:920

3945 +#: builtin/clone.c:921

3946 msgid "--local is ignored"

3947 msgstr ""

3948

3916 -#: builtin/clone.c:924

3949 +#: builtin/clone.c:925

3950 #, c-format

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

3952 msgstr ""

3953

3921 -#: builtin/clone.c:975 builtin/clone.c:983

3954 +#: builtin/clone.c:976 builtin/clone.c:984

3955 #, c-format

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

3957 msgstr ""

3958

3926 -#: builtin/clone.c:986

3959 +#: builtin/clone.c:987

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

3961 msgstr ""

3962

3963 #: builtin/column.c:9

3931 -msgid "git column [options]"

3964 +msgid "git column [<options>]"

3965 msgstr ""

3966

3967 #: builtin/column.c:26

@@ -3960,11 +3993,11 @@ msgid "--command must be the first argument"

3993 msgstr ""

3994

3995 #: builtin/commit.c:37

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

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

3997 msgstr ""

3998

3999 #: builtin/commit.c:42

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

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

4001 msgstr ""

4002

4003 #: builtin/commit.c:47

@@ -4070,68 +4103,68 @@ msgstr ""

4103 msgid "unable to write temporary index file"

4104 msgstr ""

4105

4073 -#: builtin/commit.c:584

4106 +#: builtin/commit.c:578

4107 #, c-format

4108 msgid "commit '%s' lacks author header"

4109 msgstr ""

4110

4078 -#: builtin/commit.c:586

4111 +#: builtin/commit.c:580

4112 #, c-format

4113 msgid "commit '%s' has malformed author line"

4114 msgstr ""

4115

4083 -#: builtin/commit.c:605

4116 +#: builtin/commit.c:599

4117 msgid "malformed --author parameter"

4118 msgstr ""

4119

4087 -#: builtin/commit.c:613

4120 +#: builtin/commit.c:607

4121 #, c-format

4122 msgid "invalid date format: %s"

4123 msgstr ""

4124

4092 -#: builtin/commit.c:657

4125 +#: builtin/commit.c:651

4126 msgid ""

4127 "unable to select a comment character that is not used\n"

4128 "in the current commit message"

4129 msgstr ""

4130

4098 -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1084

4131 +#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078

4132 #, c-format

4133 msgid "could not lookup commit %s"

4134 msgstr ""

4135

4103 -#: builtin/commit.c:706 builtin/shortlog.c:273

4136 +#: builtin/commit.c:700 builtin/shortlog.c:273

4137 #, c-format

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

4139 msgstr ""

4140

4108 -#: builtin/commit.c:708

4141 +#: builtin/commit.c:702

4142 msgid "could not read log from standard input"

4143 msgstr ""

4144

4112 -#: builtin/commit.c:712

4145 +#: builtin/commit.c:706

4146 #, c-format

4147 msgid "could not read log file '%s'"

4148 msgstr ""

4149

4117 -#: builtin/commit.c:734

4150 +#: builtin/commit.c:728

4151 msgid "could not read MERGE_MSG"

4152 msgstr ""

4153

4121 -#: builtin/commit.c:738

4154 +#: builtin/commit.c:732

4155 msgid "could not read SQUASH_MSG"

4156 msgstr ""

4157

4125 -#: builtin/commit.c:742

4158 +#: builtin/commit.c:736

4159 #, c-format

4160 msgid "could not read '%s'"

4161 msgstr ""

4162

4130 -#: builtin/commit.c:789

4163 +#: builtin/commit.c:783

4164 msgid "could not write commit template"

4165 msgstr ""

4166

4134 -#: builtin/commit.c:807

4167 +#: builtin/commit.c:801

4168 #, c-format

4169 msgid ""

4170 "\n"

@@ -4141,7 +4174,7 @@ msgid ""

4174 "and try again.\n"

4175 msgstr ""

4176

4144 -#: builtin/commit.c:812

4177 +#: builtin/commit.c:806

4178 #, c-format

4179 msgid ""

4180 "\n"

@@ -4151,14 +4184,14 @@ msgid ""

4184 "and try again.\n"

4185 msgstr ""

4186

4154 -#: builtin/commit.c:825

4187 +#: builtin/commit.c:819

4188 #, c-format

4189 msgid ""

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

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

4192 msgstr ""

4193

4161 -#: builtin/commit.c:832

4194 +#: builtin/commit.c:826

4195 #, c-format

4196 msgid ""

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

@@ -4166,348 +4199,348 @@ msgid ""

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

4200 msgstr ""

4201

4169 -#: builtin/commit.c:852

4202 +#: builtin/commit.c:846

4203 #, c-format

4204 msgid "%sAuthor: %.*s <%.*s>"

4205 msgstr ""

4206

4174 -#: builtin/commit.c:860

4207 +#: builtin/commit.c:854

4208 #, c-format

4209 msgid "%sDate: %s"

4210 msgstr ""

4211

4179 -#: builtin/commit.c:867

4212 +#: builtin/commit.c:861

4213 #, c-format

4214 msgid "%sCommitter: %.*s <%.*s>"

4215 msgstr ""

4216

4184 -#: builtin/commit.c:885

4217 +#: builtin/commit.c:879

4218 msgid "Cannot read index"

4219 msgstr ""

4220

4188 -#: builtin/commit.c:942

4221 +#: builtin/commit.c:936

4222 msgid "Error building trees"

4223 msgstr ""

4224

4192 -#: builtin/commit.c:957 builtin/tag.c:495

4225 +#: builtin/commit.c:951 builtin/tag.c:495

4226 #, c-format

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

4228 msgstr ""

4229

4197 -#: builtin/commit.c:1059

4230 +#: builtin/commit.c:1053

4231 #, c-format

4199 -msgid "No existing author found with '%s'"

4232 +msgid "--author '%s' is not 'Name <email>' and matches no existing author"

4233 msgstr ""

4234

4202 -#: builtin/commit.c:1074 builtin/commit.c:1314

4235 +#: builtin/commit.c:1068 builtin/commit.c:1308

4236 #, c-format

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

4238 msgstr ""

4239

4207 -#: builtin/commit.c:1111

4240 +#: builtin/commit.c:1105

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

4242 msgstr ""

4243

4211 -#: builtin/commit.c:1141

4244 +#: builtin/commit.c:1135

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

4246 msgstr ""

4247

4215 -#: builtin/commit.c:1150

4248 +#: builtin/commit.c:1144

4249 msgid "You have nothing to amend."

4250 msgstr ""

4251

4219 -#: builtin/commit.c:1153

4252 +#: builtin/commit.c:1147

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

4254 msgstr ""

4255

4223 -#: builtin/commit.c:1155

4256 +#: builtin/commit.c:1149

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

4258 msgstr ""

4259

4227 -#: builtin/commit.c:1158

4260 +#: builtin/commit.c:1152

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

4262 msgstr ""

4263

4231 -#: builtin/commit.c:1168

4264 +#: builtin/commit.c:1162

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

4266 msgstr ""

4267

4235 -#: builtin/commit.c:1170

4268 +#: builtin/commit.c:1164

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

4270 msgstr ""

4271

4239 -#: builtin/commit.c:1178

4272 +#: builtin/commit.c:1172

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

4274 msgstr ""

4275

4243 -#: builtin/commit.c:1195

4276 +#: builtin/commit.c:1189

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

4278 msgstr ""

4279

4247 -#: builtin/commit.c:1197

4280 +#: builtin/commit.c:1191

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

4282 msgstr ""

4283

4251 -#: builtin/commit.c:1199

4284 +#: builtin/commit.c:1193

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

4286 msgstr ""

4287

4255 -#: builtin/commit.c:1201

4288 +#: builtin/commit.c:1195

4289 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

4290 msgstr ""

4291

4259 -#: builtin/commit.c:1213 builtin/tag.c:728

4292 +#: builtin/commit.c:1207 builtin/tag.c:728

4293 #, c-format

4294 msgid "Invalid cleanup mode %s"

4295 msgstr ""

4296

4264 -#: builtin/commit.c:1218

4297 +#: builtin/commit.c:1212

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

4299 msgstr ""

4300

4268 -#: builtin/commit.c:1328 builtin/commit.c:1608

4301 +#: builtin/commit.c:1322 builtin/commit.c:1602

4302 msgid "show status concisely"

4303 msgstr ""

4304

4272 -#: builtin/commit.c:1330 builtin/commit.c:1610

4305 +#: builtin/commit.c:1324 builtin/commit.c:1604

4306 msgid "show branch information"

4307 msgstr ""

4308

4276 -#: builtin/commit.c:1332 builtin/commit.c:1612 builtin/push.c:500

4309 +#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509

4310 msgid "machine-readable output"

4311 msgstr ""

4312

4280 -#: builtin/commit.c:1335 builtin/commit.c:1614

4313 +#: builtin/commit.c:1329 builtin/commit.c:1608

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

4315 msgstr ""

4316

4284 -#: builtin/commit.c:1338 builtin/commit.c:1617

4317 +#: builtin/commit.c:1332 builtin/commit.c:1611

4318 msgid "terminate entries with NUL"

4319 msgstr ""

4320

4288 -#: builtin/commit.c:1340 builtin/commit.c:1620 builtin/fast-export.c:980

4321 +#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980

4322 #: builtin/fast-export.c:983 builtin/tag.c:603

4323 msgid "mode"

4324 msgstr ""

4325

4293 -#: builtin/commit.c:1341 builtin/commit.c:1620

4326 +#: builtin/commit.c:1335 builtin/commit.c:1614

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

4328 msgstr ""

4329

4297 -#: builtin/commit.c:1344

4330 +#: builtin/commit.c:1338

4331 msgid "show ignored files"

4332 msgstr ""

4333

4301 -#: builtin/commit.c:1345 parse-options.h:153

4334 +#: builtin/commit.c:1339 parse-options.h:153

4335 msgid "when"

4336 msgstr ""

4337

4305 -#: builtin/commit.c:1346

4338 +#: builtin/commit.c:1340

4339 msgid ""

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

4341 "(Default: all)"

4342 msgstr ""

4343

4311 -#: builtin/commit.c:1348

4344 +#: builtin/commit.c:1342

4345 msgid "list untracked files in columns"

4346 msgstr ""

4347

4315 -#: builtin/commit.c:1435

4348 +#: builtin/commit.c:1429

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

4350 msgstr ""

4351

4319 -#: builtin/commit.c:1437

4352 +#: builtin/commit.c:1431

4353 msgid "could not parse newly created commit"

4354 msgstr ""

4355

4323 -#: builtin/commit.c:1482

4356 +#: builtin/commit.c:1476

4357 msgid "detached HEAD"

4358 msgstr ""

4359

4327 -#: builtin/commit.c:1485

4360 +#: builtin/commit.c:1479

4361 msgid " (root-commit)"

4362 msgstr ""

4363

4331 -#: builtin/commit.c:1578

4364 +#: builtin/commit.c:1572

4365 msgid "suppress summary after successful commit"

4366 msgstr ""

4367

4335 -#: builtin/commit.c:1579

4368 +#: builtin/commit.c:1573

4369 msgid "show diff in commit message template"

4370 msgstr ""

4371

4339 -#: builtin/commit.c:1581

4372 +#: builtin/commit.c:1575

4373 msgid "Commit message options"

4374 msgstr ""

4375

4343 -#: builtin/commit.c:1582 builtin/tag.c:601

4376 +#: builtin/commit.c:1576 builtin/tag.c:601

4377 msgid "read message from file"

4378 msgstr ""

4379

4347 -#: builtin/commit.c:1583

4380 +#: builtin/commit.c:1577

4381 msgid "author"

4382 msgstr ""

4383

4351 -#: builtin/commit.c:1583

4384 +#: builtin/commit.c:1577

4385 msgid "override author for commit"

4386 msgstr ""

4387

4355 -#: builtin/commit.c:1584 builtin/gc.c:275

4388 +#: builtin/commit.c:1578 builtin/gc.c:275

4389 msgid "date"

4390 msgstr ""

4391

4359 -#: builtin/commit.c:1584

4392 +#: builtin/commit.c:1578

4393 msgid "override date for commit"

4394 msgstr ""

4395

4363 -#: builtin/commit.c:1585 builtin/merge.c:218 builtin/notes.c:391

4396 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391

4397 #: builtin/notes.c:554 builtin/tag.c:599

4398 msgid "message"

4399 msgstr ""

4400

4368 -#: builtin/commit.c:1585

4401 +#: builtin/commit.c:1579

4402 msgid "commit message"

4403 msgstr ""

4404

4372 -#: builtin/commit.c:1586

4405 +#: builtin/commit.c:1580

4406 msgid "reuse and edit message from specified commit"

4407 msgstr ""

4408

4376 -#: builtin/commit.c:1587

4409 +#: builtin/commit.c:1581

4410 msgid "reuse message from specified commit"

4411 msgstr ""

4412

4380 -#: builtin/commit.c:1588

4413 +#: builtin/commit.c:1582

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

4415 msgstr ""

4416

4384 -#: builtin/commit.c:1589

4417 +#: builtin/commit.c:1583

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

4419 msgstr ""

4420

4388 -#: builtin/commit.c:1590

4421 +#: builtin/commit.c:1584

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

4423 msgstr ""

4424

4392 -#: builtin/commit.c:1591 builtin/log.c:1191 builtin/revert.c:86

4425 +#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86

4426 msgid "add Signed-off-by:"

4427 msgstr ""

4428

4396 -#: builtin/commit.c:1592

4429 +#: builtin/commit.c:1586

4430 msgid "use specified template file"

4431 msgstr ""

4432

4400 -#: builtin/commit.c:1593

4433 +#: builtin/commit.c:1587

4434 msgid "force edit of commit"

4435 msgstr ""

4436

4404 -#: builtin/commit.c:1594

4437 +#: builtin/commit.c:1588

4438 msgid "default"

4439 msgstr ""

4440

4408 -#: builtin/commit.c:1594 builtin/tag.c:604

4441 +#: builtin/commit.c:1588 builtin/tag.c:604

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

4443 msgstr ""

4444

4412 -#: builtin/commit.c:1595

4445 +#: builtin/commit.c:1589

4446 msgid "include status in commit message template"

4447 msgstr ""

4448

4416 -#: builtin/commit.c:1596 builtin/merge.c:225 builtin/revert.c:92

4449 +#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92

4450 #: builtin/tag.c:605

4451 msgid "key-id"

4452 msgstr ""

4453

4421 -#: builtin/commit.c:1597 builtin/merge.c:226 builtin/revert.c:93

4454 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93

4455 msgid "GPG sign commit"

4456 msgstr ""

4457

4425 -#: builtin/commit.c:1600

4458 +#: builtin/commit.c:1594

4459 msgid "Commit contents options"

4460 msgstr ""

4461

4429 -#: builtin/commit.c:1601

4462 +#: builtin/commit.c:1595

4463 msgid "commit all changed files"

4464 msgstr ""

4465

4433 -#: builtin/commit.c:1602

4466 +#: builtin/commit.c:1596

4467 msgid "add specified files to index for commit"

4468 msgstr ""

4469

4437 -#: builtin/commit.c:1603

4470 +#: builtin/commit.c:1597

4471 msgid "interactively add files"

4472 msgstr ""

4473

4441 -#: builtin/commit.c:1604

4474 +#: builtin/commit.c:1598

4475 msgid "interactively add changes"

4476 msgstr ""

4477

4445 -#: builtin/commit.c:1605

4478 +#: builtin/commit.c:1599

4479 msgid "commit only specified files"

4480 msgstr ""

4481

4449 -#: builtin/commit.c:1606

4482 +#: builtin/commit.c:1600

4483 msgid "bypass pre-commit hook"

4484 msgstr ""

4485

4453 -#: builtin/commit.c:1607

4486 +#: builtin/commit.c:1601

4487 msgid "show what would be committed"

4488 msgstr ""

4489

4457 -#: builtin/commit.c:1618

4490 +#: builtin/commit.c:1612

4491 msgid "amend previous commit"

4492 msgstr ""

4493

4461 -#: builtin/commit.c:1619

4494 +#: builtin/commit.c:1613

4495 msgid "bypass post-rewrite hook"

4496 msgstr ""

4497

4465 -#: builtin/commit.c:1624

4498 +#: builtin/commit.c:1618

4499 msgid "ok to record an empty change"

4500 msgstr ""

4501

4469 -#: builtin/commit.c:1626

4502 +#: builtin/commit.c:1620

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

4504 msgstr ""

4505

4473 -#: builtin/commit.c:1655

4506 +#: builtin/commit.c:1649

4507 msgid "could not parse HEAD commit"

4508 msgstr ""

4509

4477 -#: builtin/commit.c:1694 builtin/merge.c:519

4510 +#: builtin/commit.c:1688 builtin/merge.c:519

4511 #, c-format

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

4513 msgstr ""

4514

4482 -#: builtin/commit.c:1701

4515 +#: builtin/commit.c:1695

4516 #, c-format

4517 msgid "Corrupt MERGE_HEAD file (%s)"

4518 msgstr ""

4519

4487 -#: builtin/commit.c:1708

4520 +#: builtin/commit.c:1702

4521 msgid "could not read MERGE_MODE"

4522 msgstr ""

4523

4491 -#: builtin/commit.c:1727

4524 +#: builtin/commit.c:1721

4525 #, c-format

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

4527 msgstr ""

4528

4496 -#: builtin/commit.c:1738

4529 +#: builtin/commit.c:1732

4530 #, c-format

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

4532 msgstr ""

4533

4501 -#: builtin/commit.c:1743

4534 +#: builtin/commit.c:1737

4535 #, c-format

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

4537 msgstr ""

4538

4506 -#: builtin/commit.c:1758 builtin/merge.c:851 builtin/merge.c:876

4539 +#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876

4540 msgid "failed to write commit object"

4541 msgstr ""

4542

4510 -#: builtin/commit.c:1791

4543 +#: builtin/commit.c:1785

4544 msgid ""

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

4546 "new_index file. Check that disk is not full and quota is\n"

@@ -4515,7 +4548,7 @@ msgid ""

4548 msgstr ""

4549

4550 #: builtin/config.c:8

4518 -msgid "git config [options]"

4551 +msgid "git config [<options>]"

4552 msgstr ""

4553

4554 #: builtin/config.c:53

@@ -4666,11 +4699,11 @@ msgid "print sizes in human readable format"

4699 msgstr ""

4700

4701 #: builtin/describe.c:17

4669 -msgid "git describe [options] <commit-ish>*"

4702 +msgid "git describe [<options>] [<commit-ish>...]"

4703 msgstr ""

4704

4705 #: builtin/describe.c:18

4673 -msgid "git describe [options] --dirty"

4706 +msgid "git describe [<options>] --dirty"

4707 msgstr ""

4708

4709 #: builtin/describe.c:217

@@ -4880,268 +4913,269 @@ msgstr ""

4913 msgid "anonymize output"

4914 msgstr ""

4915

4883 -#: builtin/fetch.c:20

4916 +#: builtin/fetch.c:19

4917 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

4918 msgstr ""

4919

4887 -#: builtin/fetch.c:21

4920 +#: builtin/fetch.c:20

4921 msgid "git fetch [<options>] <group>"

4922 msgstr ""

4923

4891 -#: builtin/fetch.c:22

4924 +#: builtin/fetch.c:21

4925 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"

4926 msgstr ""

4927

4895 -#: builtin/fetch.c:23

4928 +#: builtin/fetch.c:22

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

4930 msgstr ""

4931

4899 -#: builtin/fetch.c:90

4932 +#: builtin/fetch.c:89

4933 msgid "fetch from all remotes"

4934 msgstr ""

4935

4903 -#: builtin/fetch.c:92

4936 +#: builtin/fetch.c:91

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

4938 msgstr ""

4939

4907 -#: builtin/fetch.c:94

4940 +#: builtin/fetch.c:93

4941 msgid "path to upload pack on remote end"

4942 msgstr ""

4943

4911 -#: builtin/fetch.c:95

4944 +#: builtin/fetch.c:94

4945 msgid "force overwrite of local branch"

4946 msgstr ""

4947

4915 -#: builtin/fetch.c:97

4948 +#: builtin/fetch.c:96

4949 msgid "fetch from multiple remotes"

4950 msgstr ""

4951

4919 -#: builtin/fetch.c:99

4952 +#: builtin/fetch.c:98

4953 msgid "fetch all tags and associated objects"

4954 msgstr ""

4955

4923 -#: builtin/fetch.c:101

4956 +#: builtin/fetch.c:100

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

4958 msgstr ""

4959

4927 -#: builtin/fetch.c:103

4960 +#: builtin/fetch.c:102

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

4962 msgstr ""

4963

4931 -#: builtin/fetch.c:104

4964 +#: builtin/fetch.c:103

4965 msgid "on-demand"

4966 msgstr ""

4967

4935 -#: builtin/fetch.c:105

4968 +#: builtin/fetch.c:104

4969 msgid "control recursive fetching of submodules"

4970 msgstr ""

4971

4939 -#: builtin/fetch.c:109

4972 +#: builtin/fetch.c:108

4973 msgid "keep downloaded pack"

4974 msgstr ""

4975

4943 -#: builtin/fetch.c:111

4976 +#: builtin/fetch.c:110

4977 msgid "allow updating of HEAD ref"

4978 msgstr ""

4979

4947 -#: builtin/fetch.c:114

4980 +#: builtin/fetch.c:113

4981 msgid "deepen history of shallow clone"

4982 msgstr ""

4983

4951 -#: builtin/fetch.c:116

4984 +#: builtin/fetch.c:115

4985 msgid "convert to a complete repository"

4986 msgstr ""

4987

4955 -#: builtin/fetch.c:118 builtin/log.c:1208

4988 +#: builtin/fetch.c:117 builtin/log.c:1208

4989 msgid "dir"

4990 msgstr ""

4991

4959 -#: builtin/fetch.c:119

4992 +#: builtin/fetch.c:118

4993 msgid "prepend this to submodule path output"

4994 msgstr ""

4995

4963 -#: builtin/fetch.c:122

4996 +#: builtin/fetch.c:121

4997 msgid "default mode for recursion"

4998 msgstr ""

4999

4967 -#: builtin/fetch.c:124

5000 +#: builtin/fetch.c:123

5001 msgid "accept refs that update .git/shallow"

5002 msgstr ""

5003

4971 -#: builtin/fetch.c:125

5004 +#: builtin/fetch.c:124

5005 msgid "refmap"

5006 msgstr ""

5007

4975 -#: builtin/fetch.c:126

5008 +#: builtin/fetch.c:125

5009 msgid "specify fetch refmap"

5010 msgstr ""

5011

4979 -#: builtin/fetch.c:376

5012 +#: builtin/fetch.c:375

5013 msgid "Couldn't find remote ref HEAD"

5014 msgstr ""

5015

4983 -#: builtin/fetch.c:454

5016 +#: builtin/fetch.c:455

5017 #, c-format

5018 msgid "object %s not found"

5019 msgstr ""

5020

4988 -#: builtin/fetch.c:459

5021 +#: builtin/fetch.c:460

5022 msgid "[up to date]"

5023 msgstr ""

5024

4992 -#: builtin/fetch.c:473

5025 +#: builtin/fetch.c:474

5026 #, c-format

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

5028 msgstr ""

5029

4997 -#: builtin/fetch.c:474 builtin/fetch.c:560

5030 +#: builtin/fetch.c:475 builtin/fetch.c:561

5031 msgid "[rejected]"

5032 msgstr ""

5033

5001 -#: builtin/fetch.c:485

5034 +#: builtin/fetch.c:486

5035 msgid "[tag update]"

5036 msgstr ""

5037

5005 -#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540

5038 +#: builtin/fetch.c:488 builtin/fetch.c:523 builtin/fetch.c:541

5039 msgid " (unable to update local ref)"

5040 msgstr ""

5041

5009 -#: builtin/fetch.c:505

5042 +#: builtin/fetch.c:506

5043 msgid "[new tag]"

5044 msgstr ""

5045

5013 -#: builtin/fetch.c:508

5046 +#: builtin/fetch.c:509

5047 msgid "[new branch]"

5048 msgstr ""

5049

5017 -#: builtin/fetch.c:511

5050 +#: builtin/fetch.c:512

5051 msgid "[new ref]"

5052 msgstr ""

5053

5021 -#: builtin/fetch.c:556

5054 +#: builtin/fetch.c:557

5055 msgid "unable to update local ref"

5056 msgstr ""

5057

5025 -#: builtin/fetch.c:556

5058 +#: builtin/fetch.c:557

5059 msgid "forced update"

5060 msgstr ""

5061

5029 -#: builtin/fetch.c:562

5062 +#: builtin/fetch.c:563

5063 msgid "(non-fast-forward)"

5064 msgstr ""

5065

5033 -#: builtin/fetch.c:595 builtin/fetch.c:828

5066 +#: builtin/fetch.c:596 builtin/fetch.c:829

5067 #, c-format

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

5069 msgstr ""

5070

5038 -#: builtin/fetch.c:604

5071 +#: builtin/fetch.c:605

5072 #, c-format

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

5074 msgstr ""

5075

5043 -#: builtin/fetch.c:622

5076 +#: builtin/fetch.c:623

5077 #, c-format

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

5079 msgstr ""

5080

5048 -#: builtin/fetch.c:710 builtin/fetch.c:793

5081 +#: builtin/fetch.c:711 builtin/fetch.c:794

5082 #, c-format

5083 msgid "From %.*s\n"

5084 msgstr ""

5085

5053 -#: builtin/fetch.c:721

5086 +#: builtin/fetch.c:722

5087 #, c-format

5088 msgid ""

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

5090 " 'git remote prune %s' to remove any old, conflicting branches"

5091 msgstr ""

5092

5060 -#: builtin/fetch.c:773

5093 +#: builtin/fetch.c:774

5094 #, c-format

5095 msgid " (%s will become dangling)"

5096 msgstr ""

5097

5065 -#: builtin/fetch.c:774

5098 +#: builtin/fetch.c:775

5099 #, c-format

5100 msgid " (%s has become dangling)"

5101 msgstr ""

5102

5070 -#: builtin/fetch.c:798

5103 +#: builtin/fetch.c:799

5104 msgid "[deleted]"

5105 msgstr ""

5106

5074 -#: builtin/fetch.c:799 builtin/remote.c:1060

5107 +#: builtin/fetch.c:800 builtin/remote.c:1060

5108 msgid "(none)"

5109 msgstr ""

5110

5078 -#: builtin/fetch.c:818

5111 +#: builtin/fetch.c:819

5112 #, c-format

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

5114 msgstr ""

5115

5083 -#: builtin/fetch.c:837

5116 +#: builtin/fetch.c:838

5117 #, c-format

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

5119 msgstr ""

5120

5088 -#: builtin/fetch.c:840

5121 +#: builtin/fetch.c:841

5122 #, c-format

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

5124 msgstr ""

5125

5093 -#: builtin/fetch.c:896

5126 +#: builtin/fetch.c:897

5127 #, c-format

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

5129 msgstr ""

5130

5098 -#: builtin/fetch.c:1058

5131 +#: builtin/fetch.c:1059

5132 #, c-format

5133 msgid "Fetching %s\n"

5134 msgstr ""

5135

5103 -#: builtin/fetch.c:1060 builtin/remote.c:90

5136 +#: builtin/fetch.c:1061 builtin/remote.c:90

5137 #, c-format

5138 msgid "Could not fetch %s"

5139 msgstr ""

5140

5108 -#: builtin/fetch.c:1078

5141 +#: builtin/fetch.c:1079

5142 msgid ""

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

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

5145 msgstr ""

5146

5114 -#: builtin/fetch.c:1101

5147 +#: builtin/fetch.c:1102

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

5149 msgstr ""

5150

5118 -#: builtin/fetch.c:1143

5151 +#: builtin/fetch.c:1144

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

5153 msgstr ""

5154

5122 -#: builtin/fetch.c:1145

5155 +#: builtin/fetch.c:1146

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

5157 msgstr ""

5158

5126 -#: builtin/fetch.c:1168

5159 +#: builtin/fetch.c:1169

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

5161 msgstr ""

5162

5130 -#: builtin/fetch.c:1170

5163 +#: builtin/fetch.c:1171

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

5165 msgstr ""

5166

5134 -#: builtin/fetch.c:1181

5167 +#: builtin/fetch.c:1182

5168 #, c-format

5169 msgid "No such remote or remote group: %s"

5170 msgstr ""

5171

5139 -#: builtin/fetch.c:1189

5172 +#: builtin/fetch.c:1190

5173 msgid "Fetching a group and specifying refspecs does not make sense"

5174 msgstr ""

5175

5176 #: builtin/fmt-merge-msg.c:13

5144 -msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5177 +msgid ""

5178 +"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"

5179 msgstr ""

5180

5181 #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698

@@ -5171,51 +5205,51 @@ msgstr ""

5205 msgid "file to read from"

5206 msgstr ""

5207

5174 -#: builtin/for-each-ref.c:676

5208 +#: builtin/for-each-ref.c:675

5209 msgid "unable to parse format"

5210 msgstr ""

5211

5178 -#: builtin/for-each-ref.c:1064

5179 -msgid "git for-each-ref [options] [<pattern>]"

5212 +#: builtin/for-each-ref.c:1063

5213 +msgid "git for-each-ref [<options>] [<pattern>]"

5214 msgstr ""

5215

5182 -#: builtin/for-each-ref.c:1079

5216 +#: builtin/for-each-ref.c:1078

5217 msgid "quote placeholders suitably for shells"

5218 msgstr ""

5219

5186 -#: builtin/for-each-ref.c:1081

5220 +#: builtin/for-each-ref.c:1080

5221 msgid "quote placeholders suitably for perl"

5222 msgstr ""

5223

5190 -#: builtin/for-each-ref.c:1083

5224 +#: builtin/for-each-ref.c:1082

5225 msgid "quote placeholders suitably for python"

5226 msgstr ""

5227

5194 -#: builtin/for-each-ref.c:1085

5228 +#: builtin/for-each-ref.c:1084

5229 msgid "quote placeholders suitably for Tcl"

5230 msgstr ""

5231

5198 -#: builtin/for-each-ref.c:1088

5232 +#: builtin/for-each-ref.c:1087

5233 msgid "show only <n> matched refs"

5234 msgstr ""

5235

5202 -#: builtin/for-each-ref.c:1089 builtin/replace.c:438

5236 +#: builtin/for-each-ref.c:1088 builtin/replace.c:438

5237 msgid "format"

5238 msgstr ""

5239

5206 -#: builtin/for-each-ref.c:1089

5240 +#: builtin/for-each-ref.c:1088

5241 msgid "format to use for the output"

5242 msgstr ""

5243

5210 -#: builtin/for-each-ref.c:1090

5244 +#: builtin/for-each-ref.c:1089

5245 msgid "key"

5246 msgstr ""

5247

5214 -#: builtin/for-each-ref.c:1091

5248 +#: builtin/for-each-ref.c:1090

5249 msgid "field name to sort on"

5250 msgstr ""

5251

5218 -#: builtin/fsck.c:147 builtin/prune.c:136

5252 +#: builtin/fsck.c:147 builtin/prune.c:137

5253 msgid "Checking connectivity"

5254 msgstr ""

5255

@@ -5224,7 +5258,7 @@ msgid "Checking object directories"

5258 msgstr ""

5259

5260 #: builtin/fsck.c:603

5227 -msgid "git fsck [options] [<object>...]"

5261 +msgid "git fsck [<options>] [<object>...]"

5262 msgstr ""

5263

5264 #: builtin/fsck.c:609

@@ -5272,7 +5306,7 @@ msgid "Checking objects"

5306 msgstr ""

5307

5308 #: builtin/gc.c:24

5275 -msgid "git gc [options]"

5309 +msgid "git gc [<options>]"

5310 msgstr ""

5311

5312 #: builtin/gc.c:79

@@ -5328,7 +5362,7 @@ msgid ""

5362 msgstr ""

5363

5364 #: builtin/grep.c:23

5331 -msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"

5365 +msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"

5366 msgstr ""

5367

5368 #: builtin/grep.c:218

@@ -5369,7 +5403,7 @@ msgid "search in both tracked and untracked files"

5403 msgstr ""

5404

5405 #: builtin/grep.c:644

5372 -msgid "search also in ignored files"

5406 +msgid "ignore files specified via '.gitignore'"

5407 msgstr ""

5408

5409 #: builtin/grep.c:647

@@ -5554,15 +5588,15 @@ msgstr ""

5588

5589 #: builtin/hash-object.c:82

5590 msgid ""

5557 -"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "

5558 -"<file>..."

5591 +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "

5592 +"[--] <file>..."

5593 msgstr ""

5594

5595 #: builtin/hash-object.c:83

5596 msgid "git hash-object --stdin-paths < <list-of-paths>"

5597 msgstr ""

5598

5565 -#: builtin/hash-object.c:94 builtin/tag.c:610

5599 +#: builtin/hash-object.c:94 builtin/tag.c:612

5600 msgid "type"

5601 msgstr ""

5602

@@ -5612,7 +5646,7 @@ msgid "show info page"

5646 msgstr ""

5647

5648 #: builtin/help.c:52

5615 -msgid "git help [--all] [--guides] [--man|--web|--info] [command]"

5649 +msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"

5650 msgstr ""

5651

5652 #: builtin/help.c:64

@@ -5817,8 +5851,8 @@ msgstr ""

5851 msgid "SHA1 COLLISION FOUND WITH %s !"

5852 msgstr ""

5853

5820 -#: builtin/index-pack.c:689 builtin/pack-objects.c:164

5821 -#: builtin/pack-objects.c:256

5854 +#: builtin/index-pack.c:689 builtin/pack-objects.c:162

5855 +#: builtin/pack-objects.c:254

5856 #, c-format

5857 msgid "unable to read %s"

5858 msgstr ""

@@ -5905,97 +5939,97 @@ msgid_plural "pack has %d unresolved deltas"

5939 msgstr[0] ""

5940 msgstr[1] ""

5941

5908 -#: builtin/index-pack.c:1220

5942 +#: builtin/index-pack.c:1219

5943 #, c-format

5944 msgid "unable to deflate appended object (%d)"

5945 msgstr ""

5946

5913 -#: builtin/index-pack.c:1299

5947 +#: builtin/index-pack.c:1298

5948 #, c-format

5949 msgid "local object %s is corrupt"

5950 msgstr ""

5951

5918 -#: builtin/index-pack.c:1323

5952 +#: builtin/index-pack.c:1322

5953 msgid "error while closing pack file"

5954 msgstr ""

5955

5922 -#: builtin/index-pack.c:1336

5956 +#: builtin/index-pack.c:1335

5957 #, c-format

5958 msgid "cannot write keep file '%s'"

5959 msgstr ""

5960

5927 -#: builtin/index-pack.c:1344

5961 +#: builtin/index-pack.c:1343

5962 #, c-format

5963 msgid "cannot close written keep file '%s'"

5964 msgstr ""

5965

5932 -#: builtin/index-pack.c:1357

5966 +#: builtin/index-pack.c:1356

5967 msgid "cannot store pack file"

5968 msgstr ""

5969

5936 -#: builtin/index-pack.c:1368

5970 +#: builtin/index-pack.c:1367

5971 msgid "cannot store index file"

5972 msgstr ""

5973

5940 -#: builtin/index-pack.c:1401

5974 +#: builtin/index-pack.c:1400

5975 #, c-format

5976 msgid "bad pack.indexversion=%<PRIu32>"

5977 msgstr ""

5978

5945 -#: builtin/index-pack.c:1407

5979 +#: builtin/index-pack.c:1406

5980 #, c-format

5981 msgid "invalid number of threads specified (%d)"

5982 msgstr ""

5983

5950 -#: builtin/index-pack.c:1411 builtin/index-pack.c:1590

5984 +#: builtin/index-pack.c:1410 builtin/index-pack.c:1589

5985 #, c-format

5986 msgid "no threads support, ignoring %s"

5987 msgstr ""

5988

5955 -#: builtin/index-pack.c:1469

5989 +#: builtin/index-pack.c:1468

5990 #, c-format

5991 msgid "Cannot open existing pack file '%s'"

5992 msgstr ""

5993

5960 -#: builtin/index-pack.c:1471

5994 +#: builtin/index-pack.c:1470

5995 #, c-format

5996 msgid "Cannot open existing pack idx file for '%s'"

5997 msgstr ""

5998

5965 -#: builtin/index-pack.c:1518

5999 +#: builtin/index-pack.c:1517

6000 #, c-format

6001 msgid "non delta: %d object"

6002 msgid_plural "non delta: %d objects"

6003 msgstr[0] ""

6004 msgstr[1] ""

6005

5972 -#: builtin/index-pack.c:1525

6006 +#: builtin/index-pack.c:1524

6007 #, c-format

6008 msgid "chain length = %d: %lu object"

6009 msgid_plural "chain length = %d: %lu objects"

6010 msgstr[0] ""

6011 msgstr[1] ""

6012

5979 -#: builtin/index-pack.c:1554

6013 +#: builtin/index-pack.c:1553

6014 msgid "Cannot come back to cwd"

6015 msgstr ""

6016

5983 -#: builtin/index-pack.c:1602 builtin/index-pack.c:1605

5984 -#: builtin/index-pack.c:1617 builtin/index-pack.c:1621

6017 +#: builtin/index-pack.c:1601 builtin/index-pack.c:1604

6018 +#: builtin/index-pack.c:1616 builtin/index-pack.c:1620

6019 #, c-format

6020 msgid "bad %s"

6021 msgstr ""

6022

5989 -#: builtin/index-pack.c:1635

6023 +#: builtin/index-pack.c:1634

6024 msgid "--fix-thin cannot be used without --stdin"

6025 msgstr ""

6026

5993 -#: builtin/index-pack.c:1639 builtin/index-pack.c:1648

6027 +#: builtin/index-pack.c:1638 builtin/index-pack.c:1647

6028 #, c-format

6029 msgid "packfile name '%s' does not end with '.pack'"

6030 msgstr ""

6031

5998 -#: builtin/index-pack.c:1656

6032 +#: builtin/index-pack.c:1655

6033 msgid "--verify with no packfile name given"

6034 msgstr ""

6035

@@ -6107,7 +6141,7 @@ msgstr ""

6141 #: builtin/init-db.c:475

6142 msgid ""

6143 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"

6110 -"shared[=<permissions>]] [directory]"

6144 +"shared[=<permissions>]] [<directory>]"

6145 msgstr ""

6146

6147 #: builtin/init-db.c:498

@@ -6167,7 +6201,7 @@ msgid "git log [<options>] [<revision range>] [[--] <path>...]"

6201 msgstr ""

6202

6203 #: builtin/log.c:42

6170 -msgid "git show [options] <object>..."

6204 +msgid "git show [<options>] <object>..."

6205 msgstr ""

6206

6207 #: builtin/log.c:81

@@ -6246,7 +6280,7 @@ msgid "insane in-reply-to: %s"

6280 msgstr ""

6281

6282 #: builtin/log.c:1026

6249 -msgid "git format-patch [options] [<since> | <revision range>]"

6283 +msgid "git format-patch [<options>] [<since> | <revision-range>]"

6284 msgstr ""

6285

6286 #: builtin/log.c:1071

@@ -6443,95 +6477,95 @@ msgstr ""

6477 msgid "Unknown commit %s"

6478 msgstr ""

6479

6446 -#: builtin/ls-files.c:401

6447 -msgid "git ls-files [options] [<file>...]"

6480 +#: builtin/ls-files.c:358

6481 +msgid "git ls-files [<options>] [<file>...]"

6482 msgstr ""

6483

6450 -#: builtin/ls-files.c:458

6484 +#: builtin/ls-files.c:415

6485 msgid "identify the file status with tags"

6486 msgstr ""

6487

6454 -#: builtin/ls-files.c:460

6488 +#: builtin/ls-files.c:417

6489 msgid "use lowercase letters for 'assume unchanged' files"

6490 msgstr ""

6491

6458 -#: builtin/ls-files.c:462

6492 +#: builtin/ls-files.c:419

6493 msgid "show cached files in the output (default)"

6494 msgstr ""

6495

6462 -#: builtin/ls-files.c:464

6496 +#: builtin/ls-files.c:421

6497 msgid "show deleted files in the output"

6498 msgstr ""

6499

6466 -#: builtin/ls-files.c:466

6500 +#: builtin/ls-files.c:423

6501 msgid "show modified files in the output"

6502 msgstr ""

6503

6470 -#: builtin/ls-files.c:468

6504 +#: builtin/ls-files.c:425

6505 msgid "show other files in the output"

6506 msgstr ""

6507

6474 -#: builtin/ls-files.c:470

6508 +#: builtin/ls-files.c:427

6509 msgid "show ignored files in the output"

6510 msgstr ""

6511

6478 -#: builtin/ls-files.c:473

6512 +#: builtin/ls-files.c:430

6513 msgid "show staged contents' object name in the output"

6514 msgstr ""

6515

6482 -#: builtin/ls-files.c:475

6516 +#: builtin/ls-files.c:432

6517 msgid "show files on the filesystem that need to be removed"

6518 msgstr ""

6519

6486 -#: builtin/ls-files.c:477

6520 +#: builtin/ls-files.c:434

6521 msgid "show 'other' directories' names only"

6522 msgstr ""

6523

6490 -#: builtin/ls-files.c:480

6524 +#: builtin/ls-files.c:437

6525 msgid "don't show empty directories"

6526 msgstr ""

6527

6494 -#: builtin/ls-files.c:483

6528 +#: builtin/ls-files.c:440

6529 msgid "show unmerged files in the output"

6530 msgstr ""

6531

6498 -#: builtin/ls-files.c:485

6532 +#: builtin/ls-files.c:442

6533 msgid "show resolve-undo information"

6534 msgstr ""

6535

6502 -#: builtin/ls-files.c:487

6536 +#: builtin/ls-files.c:444

6537 msgid "skip files matching pattern"

6538 msgstr ""

6539

6506 -#: builtin/ls-files.c:490

6540 +#: builtin/ls-files.c:447

6541 msgid "exclude patterns are read from <file>"

6542 msgstr ""

6543

6510 -#: builtin/ls-files.c:493

6544 +#: builtin/ls-files.c:450

6545 msgid "read additional per-directory exclude patterns in <file>"

6546 msgstr ""

6547

6514 -#: builtin/ls-files.c:495

6548 +#: builtin/ls-files.c:452

6549 msgid "add the standard git exclusions"

6550 msgstr ""

6551

6518 -#: builtin/ls-files.c:498

6552 +#: builtin/ls-files.c:455

6553 msgid "make the output relative to the project top directory"

6554 msgstr ""

6555

6522 -#: builtin/ls-files.c:501

6556 +#: builtin/ls-files.c:458

6557 msgid "if any <file> is not in the index, treat this as an error"

6558 msgstr ""

6559

6526 -#: builtin/ls-files.c:502

6560 +#: builtin/ls-files.c:459

6561 msgid "tree-ish"

6562 msgstr ""

6563

6530 -#: builtin/ls-files.c:503

6564 +#: builtin/ls-files.c:460

6565 msgid "pretend that paths removed since <tree-ish> are still present"

6566 msgstr ""

6567

6534 -#: builtin/ls-files.c:505

6568 +#: builtin/ls-files.c:462

6569 msgid "show debugging data"

6570 msgstr ""

6571

@@ -6572,11 +6606,11 @@ msgid "list entire tree; not just current directory (implies --full-name)"

6606 msgstr ""

6607

6608 #: builtin/merge.c:45

6575 -msgid "git merge [options] [<commit>...]"

6609 +msgid "git merge [<options>] [<commit>...]"

6610 msgstr ""

6611

6612 #: builtin/merge.c:46

6579 -msgid "git merge [options] <msg> HEAD <commit>"

6613 +msgid "git merge [<options>] <msg> HEAD <commit>"

6614 msgstr ""

6615

6616 #: builtin/merge.c:47

@@ -6908,11 +6942,11 @@ msgid "Automatic merge went well; stopped before committing as requested\n"

6942 msgstr ""

6943

6944 #: builtin/merge-base.c:29

6911 -msgid "git merge-base [-a|--all] <commit> <commit>..."

6945 +msgid "git merge-base [-a | --all] <commit> <commit>..."

6946 msgstr ""

6947

6948 #: builtin/merge-base.c:30

6915 -msgid "git merge-base [-a|--all] --octopus <commit>..."

6949 +msgid "git merge-base [-a | --all] --octopus <commit>..."

6950 msgstr ""

6951

6952 #: builtin/merge-base.c:31

@@ -6949,8 +6983,8 @@ msgstr ""

6983

6984 #: builtin/merge-file.c:8

6985 msgid ""

6952 -"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "

6953 -"file2"

6986 +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "

6987 +"<orig-file> <file2>"

6988 msgstr ""

6989

6990 #: builtin/merge-file.c:33

@@ -6982,7 +7016,7 @@ msgid "do not warn about conflicts"

7016 msgstr ""

7017

7018 #: builtin/merge-file.c:45

6985 -msgid "set labels for file1/orig_file/file2"

7019 +msgid "set labels for file1/orig-file/file2"

7020 msgstr ""

7021

7022 #: builtin/mktree.c:64

@@ -7002,7 +7036,7 @@ msgid "allow creation of more than one tree"

7036 msgstr ""

7037

7038 #: builtin/mv.c:15

7005 -msgid "git mv [options] <source>... <destination>"

7039 +msgid "git mv [<options>] <source>... <destination>"

7040 msgstr ""

7041

7042 #: builtin/mv.c:69

@@ -7088,21 +7122,21 @@ msgstr ""

7122 msgid "Renaming %s to %s\n"

7123 msgstr ""

7124

7091 -#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:355

7125 +#: builtin/mv.c:256 builtin/remote.c:728 builtin/repack.c:359

7126 #, c-format

7127 msgid "renaming '%s' failed"

7128 msgstr ""

7129

7130 #: builtin/name-rev.c:255

7097 -msgid "git name-rev [options] <commit>..."

7131 +msgid "git name-rev [<options>] <commit>..."

7132 msgstr ""

7133

7134 #: builtin/name-rev.c:256

7101 -msgid "git name-rev [options] --all"

7135 +msgid "git name-rev [<options>] --all"

7136 msgstr ""

7137

7138 #: builtin/name-rev.c:257

7105 -msgid "git name-rev [options] --stdin"

7139 +msgid "git name-rev [<options>] --stdin"

7140 msgstr ""

7141

7142 #: builtin/name-rev.c:309

@@ -7134,36 +7168,36 @@ msgid "dereference tags in the input (internal use)"

7168 msgstr ""

7169

7170 #: builtin/notes.c:24

7137 -msgid "git notes [--ref <notes_ref>] [list [<object>]]"

7171 +msgid "git notes [--ref <notes-ref>] [list [<object>]]"

7172 msgstr ""

7173

7174 #: builtin/notes.c:25

7175 msgid ""

7142 -"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "

7176 +"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "

7177 "| (-c | -C) <object>] [<object>]"

7178 msgstr ""

7179

7180 #: builtin/notes.c:26

7147 -msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"

7181 +msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"

7182 msgstr ""

7183

7184 #: builtin/notes.c:27

7185 msgid ""

7152 -"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | "

7186 +"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "

7187 "(-c | -C) <object>] [<object>]"

7188 msgstr ""

7189

7190 #: builtin/notes.c:28

7157 -msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]"

7191 +msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"

7192 msgstr ""

7193

7194 #: builtin/notes.c:29

7161 -msgid "git notes [--ref <notes_ref>] show [<object>]"

7195 +msgid "git notes [--ref <notes-ref>] show [<object>]"

7196 msgstr ""

7197

7198 #: builtin/notes.c:30

7199 msgid ""

7166 -"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"

7200 +"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"

7201 msgstr ""

7202

7203 #: builtin/notes.c:31

@@ -7175,15 +7209,15 @@ msgid "git notes merge --abort [-v | -q]"

7209 msgstr ""

7210

7211 #: builtin/notes.c:33

7178 -msgid "git notes [--ref <notes_ref>] remove [<object>...]"

7212 +msgid "git notes [--ref <notes-ref>] remove [<object>...]"

7213 msgstr ""

7214

7215 #: builtin/notes.c:34

7182 -msgid "git notes [--ref <notes_ref>] prune [-n | -v]"

7216 +msgid "git notes [--ref <notes-ref>] prune [-n | -v]"

7217 msgstr ""

7218

7219 #: builtin/notes.c:35

7186 -msgid "git notes [--ref <notes_ref>] get-ref"

7220 +msgid "git notes [--ref <notes-ref>] get-ref"

7221 msgstr ""

7222

7223 #: builtin/notes.c:40

@@ -7215,7 +7249,7 @@ msgid "git notes show [<object>]"

7249 msgstr ""

7250

7251 #: builtin/notes.c:71

7218 -msgid "git notes merge [<options>] <notes_ref>"

7252 +msgid "git notes merge [<options>] <notes-ref>"

7253 msgstr ""

7254

7255 #: builtin/notes.c:72

@@ -7444,7 +7478,7 @@ msgid "notes-ref"

7478 msgstr ""

7479

7480 #: builtin/notes.c:954

7447 -msgid "use notes from <notes_ref>"

7481 +msgid "use notes from <notes-ref>"

7482 msgstr ""

7483

7484 #: builtin/notes.c:989 builtin/remote.c:1621

@@ -7460,185 +7494,185 @@ msgstr ""

7494 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"

7495 msgstr ""

7496

7463 -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180

7497 +#: builtin/pack-objects.c:175 builtin/pack-objects.c:178

7498 #, c-format

7499 msgid "deflate error (%d)"

7500 msgstr ""

7501

7468 -#: builtin/pack-objects.c:773

7502 +#: builtin/pack-objects.c:771

7503 msgid "Writing objects"

7504 msgstr ""

7505

7472 -#: builtin/pack-objects.c:1015

7506 +#: builtin/pack-objects.c:1013

7507 msgid "disabling bitmap writing, as some objects are not being packed"

7508 msgstr ""

7509

7476 -#: builtin/pack-objects.c:2175

7510 +#: builtin/pack-objects.c:2173

7511 msgid "Compressing objects"

7512 msgstr ""

7513

7480 -#: builtin/pack-objects.c:2572

7514 +#: builtin/pack-objects.c:2570

7515 #, c-format

7516 msgid "unsupported index version %s"

7517 msgstr ""

7518

7485 -#: builtin/pack-objects.c:2576

7519 +#: builtin/pack-objects.c:2574

7520 #, c-format

7521 msgid "bad index version '%s'"

7522 msgstr ""

7523

7490 -#: builtin/pack-objects.c:2599

7524 +#: builtin/pack-objects.c:2597

7525 #, c-format

7526 msgid "option %s does not accept negative form"

7527 msgstr ""

7528

7495 -#: builtin/pack-objects.c:2603

7529 +#: builtin/pack-objects.c:2601

7530 #, c-format

7531 msgid "unable to parse value '%s' for option %s"

7532 msgstr ""

7533

7500 -#: builtin/pack-objects.c:2623

7534 +#: builtin/pack-objects.c:2621

7535 msgid "do not show progress meter"

7536 msgstr ""

7537

7504 -#: builtin/pack-objects.c:2625

7538 +#: builtin/pack-objects.c:2623

7539 msgid "show progress meter"

7540 msgstr ""

7541

7508 -#: builtin/pack-objects.c:2627

7542 +#: builtin/pack-objects.c:2625

7543 msgid "show progress meter during object writing phase"

7544 msgstr ""

7545

7512 -#: builtin/pack-objects.c:2630

7546 +#: builtin/pack-objects.c:2628

7547 msgid "similar to --all-progress when progress meter is shown"

7548 msgstr ""

7549

7516 -#: builtin/pack-objects.c:2631

7550 +#: builtin/pack-objects.c:2629

7551 msgid "version[,offset]"

7552 msgstr ""

7553

7520 -#: builtin/pack-objects.c:2632

7554 +#: builtin/pack-objects.c:2630

7555 msgid "write the pack index file in the specified idx format version"

7556 msgstr ""

7557

7524 -#: builtin/pack-objects.c:2635

7558 +#: builtin/pack-objects.c:2633

7559 msgid "maximum size of each output pack file"

7560 msgstr ""

7561

7528 -#: builtin/pack-objects.c:2637

7562 +#: builtin/pack-objects.c:2635

7563 msgid "ignore borrowed objects from alternate object store"

7564 msgstr ""

7565

7532 -#: builtin/pack-objects.c:2639

7566 +#: builtin/pack-objects.c:2637

7567 msgid "ignore packed objects"

7568 msgstr ""

7569

7536 -#: builtin/pack-objects.c:2641

7570 +#: builtin/pack-objects.c:2639

7571 msgid "limit pack window by objects"

7572 msgstr ""

7573

7540 -#: builtin/pack-objects.c:2643

7574 +#: builtin/pack-objects.c:2641

7575 msgid "limit pack window by memory in addition to object limit"

7576 msgstr ""

7577

7544 -#: builtin/pack-objects.c:2645

7578 +#: builtin/pack-objects.c:2643

7579 msgid "maximum length of delta chain allowed in the resulting pack"

7580 msgstr ""

7581

7548 -#: builtin/pack-objects.c:2647

7582 +#: builtin/pack-objects.c:2645

7583 msgid "reuse existing deltas"

7584 msgstr ""

7585

7552 -#: builtin/pack-objects.c:2649

7586 +#: builtin/pack-objects.c:2647

7587 msgid "reuse existing objects"

7588 msgstr ""

7589

7556 -#: builtin/pack-objects.c:2651

7590 +#: builtin/pack-objects.c:2649

7591 msgid "use OFS_DELTA objects"

7592 msgstr ""

7593

7560 -#: builtin/pack-objects.c:2653

7594 +#: builtin/pack-objects.c:2651

7595 msgid "use threads when searching for best delta matches"

7596 msgstr ""

7597

7564 -#: builtin/pack-objects.c:2655

7598 +#: builtin/pack-objects.c:2653

7599 msgid "do not create an empty pack output"

7600 msgstr ""

7601

7568 -#: builtin/pack-objects.c:2657

7602 +#: builtin/pack-objects.c:2655

7603 msgid "read revision arguments from standard input"

7604 msgstr ""

7605

7572 -#: builtin/pack-objects.c:2659

7606 +#: builtin/pack-objects.c:2657

7607 msgid "limit the objects to those that are not yet packed"

7608 msgstr ""

7609

7576 -#: builtin/pack-objects.c:2662

7610 +#: builtin/pack-objects.c:2660

7611 msgid "include objects reachable from any reference"

7612 msgstr ""

7613

7580 -#: builtin/pack-objects.c:2665

7614 +#: builtin/pack-objects.c:2663

7615 msgid "include objects referred by reflog entries"

7616 msgstr ""

7617

7584 -#: builtin/pack-objects.c:2668

7618 +#: builtin/pack-objects.c:2666

7619 msgid "include objects referred to by the index"

7620 msgstr ""

7621

7588 -#: builtin/pack-objects.c:2671

7622 +#: builtin/pack-objects.c:2669

7623 msgid "output pack to stdout"

7624 msgstr ""

7625

7592 -#: builtin/pack-objects.c:2673

7626 +#: builtin/pack-objects.c:2671

7627 msgid "include tag objects that refer to objects to be packed"

7628 msgstr ""

7629

7596 -#: builtin/pack-objects.c:2675

7630 +#: builtin/pack-objects.c:2673

7631 msgid "keep unreachable objects"

7632 msgstr ""

7633

7600 -#: builtin/pack-objects.c:2676 parse-options.h:140

7634 +#: builtin/pack-objects.c:2674 parse-options.h:140

7635 msgid "time"

7636 msgstr ""

7637

7604 -#: builtin/pack-objects.c:2677

7638 +#: builtin/pack-objects.c:2675

7639 msgid "unpack unreachable objects newer than <time>"

7640 msgstr ""

7641

7608 -#: builtin/pack-objects.c:2680

7642 +#: builtin/pack-objects.c:2678

7643 msgid "create thin packs"

7644 msgstr ""

7645

7612 -#: builtin/pack-objects.c:2682

7646 +#: builtin/pack-objects.c:2680

7647 msgid "create packs suitable for shallow fetches"

7648 msgstr ""

7649

7616 -#: builtin/pack-objects.c:2684

7650 +#: builtin/pack-objects.c:2682

7651 msgid "ignore packs that have companion .keep file"

7652 msgstr ""

7653

7620 -#: builtin/pack-objects.c:2686

7654 +#: builtin/pack-objects.c:2684

7655 msgid "pack compression level"

7656 msgstr ""

7657

7624 -#: builtin/pack-objects.c:2688

7658 +#: builtin/pack-objects.c:2686

7659 msgid "do not hide commits by grafts"

7660 msgstr ""

7661

7628 -#: builtin/pack-objects.c:2690

7662 +#: builtin/pack-objects.c:2688

7663 msgid "use a bitmap index if available to speed up counting objects"

7664 msgstr ""

7665

7632 -#: builtin/pack-objects.c:2692

7666 +#: builtin/pack-objects.c:2690

7667 msgid "write a bitmap index together with the pack index"

7668 msgstr ""

7669

7636 -#: builtin/pack-objects.c:2783

7670 +#: builtin/pack-objects.c:2781

7671 msgid "Counting objects"

7672 msgstr ""

7673

7674 #: builtin/pack-refs.c:6

7641 -msgid "git pack-refs [options]"

7675 +msgid "git pack-refs [<options>]"

7676 msgstr ""

7677

7678 #: builtin/pack-refs.c:14

@@ -7650,7 +7684,7 @@ msgid "prune loose refs (default)"

7684 msgstr ""

7685

7686 #: builtin/prune-packed.c:7

7653 -msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"

7687 +msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"

7688 msgstr ""

7689

7690 #: builtin/prune-packed.c:40

@@ -7852,75 +7886,79 @@ msgstr ""

7886 msgid "--all and --mirror are incompatible"

7887 msgstr ""

7888

7855 -#: builtin/push.c:493

7889 +#: builtin/push.c:502

7890 msgid "repository"

7891 msgstr ""

7892

7859 -#: builtin/push.c:494

7893 +#: builtin/push.c:503

7894 msgid "push all refs"

7895 msgstr ""

7896

7863 -#: builtin/push.c:495

7897 +#: builtin/push.c:504

7898 msgid "mirror all refs"

7899 msgstr ""

7900

7867 -#: builtin/push.c:497

7901 +#: builtin/push.c:506

7902 msgid "delete refs"

7903 msgstr ""

7904

7871 -#: builtin/push.c:498

7905 +#: builtin/push.c:507

7906 msgid "push tags (can't be used with --all or --mirror)"

7907 msgstr ""

7908

7875 -#: builtin/push.c:501

7909 +#: builtin/push.c:510

7910 msgid "force updates"

7911 msgstr ""

7912

7879 -#: builtin/push.c:503

7913 +#: builtin/push.c:512

7914 msgid "refname>:<expect"

7915 msgstr ""

7916

7883 -#: builtin/push.c:504

7917 +#: builtin/push.c:513

7918 msgid "require old value of ref to be at this value"

7919 msgstr ""

7920

7887 -#: builtin/push.c:507

7921 +#: builtin/push.c:516

7922 msgid "control recursive pushing of submodules"

7923 msgstr ""

7924

7891 -#: builtin/push.c:509

7925 +#: builtin/push.c:518

7926 msgid "use thin pack"

7927 msgstr ""

7928

7895 -#: builtin/push.c:510 builtin/push.c:511

7929 +#: builtin/push.c:519 builtin/push.c:520

7930 msgid "receive pack program"

7931 msgstr ""

7932

7899 -#: builtin/push.c:512

7933 +#: builtin/push.c:521

7934 msgid "set upstream for git pull/status"

7935 msgstr ""

7936

7903 -#: builtin/push.c:515

7937 +#: builtin/push.c:524

7938 msgid "prune locally removed refs"

7939 msgstr ""

7940

7907 -#: builtin/push.c:517

7941 +#: builtin/push.c:526

7942 msgid "bypass pre-push hook"

7943 msgstr ""

7944

7911 -#: builtin/push.c:518

7945 +#: builtin/push.c:527

7946 msgid "push missing but relevant tags"

7947 msgstr ""

7948

7915 -#: builtin/push.c:520

7949 +#: builtin/push.c:529

7950 msgid "GPG sign the push"

7951 msgstr ""

7952

7919 -#: builtin/push.c:529

7953 +#: builtin/push.c:530

7954 +msgid "request atomic transaction on remote side"

7955 +msgstr ""

7956 +

7957 +#: builtin/push.c:539

7958 msgid "--delete is incompatible with --all, --mirror and --tags"

7959 msgstr ""

7960

7923 -#: builtin/push.c:531

7961 +#: builtin/push.c:541

7962 msgid "--delete doesn't make sense without any refs"

7963 msgstr ""

7964

@@ -7995,12 +8033,12 @@ msgstr ""

8033 msgid "debug unpack-trees"

8034 msgstr ""

8035

7998 -#: builtin/reflog.c:499

8036 +#: builtin/reflog.c:429

8037 #, c-format

8038 msgid "%s' for '%s' is not a valid timestamp"

8039 msgstr ""

8040

8003 -#: builtin/reflog.c:615 builtin/reflog.c:620

8041 +#: builtin/reflog.c:546 builtin/reflog.c:551

8042 #, c-format

8043 msgid "'%s' is not a valid timestamp"

8044 msgstr ""

@@ -8011,7 +8049,7 @@ msgstr ""

8049

8050 #: builtin/remote.c:13

8051 msgid ""

8014 -"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"

8052 +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"

8053 "mirror=<fetch|push>] <name> <url>"

8054 msgstr ""

8055

@@ -8023,8 +8061,8 @@ msgstr ""

8061 msgid "git remote remove <name>"

8062 msgstr ""

8063

8026 -#: builtin/remote.c:16

8027 -msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"

8064 +#: builtin/remote.c:16 builtin/remote.c:43

8065 +msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"

8066 msgstr ""

8067

8068 #: builtin/remote.c:17

@@ -8060,10 +8098,6 @@ msgstr ""

8098 msgid "git remote add [<options>] <name> <url>"

8099 msgstr ""

8100

8063 -#: builtin/remote.c:43

8064 -msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"

8065 -msgstr ""

8066 -

8101 #: builtin/remote.c:48

8102 msgid "git remote set-branches <name> <branch>..."

8103 msgstr ""

@@ -8487,7 +8521,7 @@ msgid "be verbose; must be placed before a subcommand"

8521 msgstr ""

8522

8523 #: builtin/repack.c:17

8490 -msgid "git repack [options]"

8524 +msgid "git repack [<options>]"

8525 msgstr ""

8526

8527 #: builtin/repack.c:159

@@ -8554,7 +8588,7 @@ msgstr ""

8588 msgid "repack objects in packs marked with .keep"

8589 msgstr ""

8590

8557 -#: builtin/repack.c:371

8591 +#: builtin/repack.c:375

8592 #, c-format

8593 msgid "removing '%s' failed"

8594 msgstr ""

@@ -8644,7 +8678,7 @@ msgid "use this format"

8678 msgstr ""

8679

8680 #: builtin/rerere.c:12

8682 msgstr ""

8683

8684 #: builtin/rerere.c:57

@@ -8782,7 +8816,7 @@ msgid "Could not write new index file."

8816 msgstr ""

8817

8818 #: builtin/rev-parse.c:361

8785 -msgid "git rev-parse --parseopt [options] -- [<args>...]"

8819 +msgid "git rev-parse --parseopt [<options>] -- [<args>...]"

8820 msgstr ""

8821

8822 #: builtin/rev-parse.c:366

@@ -8799,15 +8833,15 @@ msgstr ""

8833

8834 #: builtin/rev-parse.c:499

8835 msgid ""

8802 -"git rev-parse --parseopt [options] -- [<args>...]\n"

8836 +"git rev-parse --parseopt [<options>] -- [<args>...]\n"

8837 " or: git rev-parse --sq-quote [<arg>...]\n"

8804 -" or: git rev-parse [options] [<arg>...]\n"

8838 +" or: git rev-parse [<options>] [<arg>...]\n"

8839 "\n"

8840 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."

8841 msgstr ""

8842

8843 #: builtin/revert.c:22

8810 -msgid "git revert [options] <commit-ish>..."

8844 +msgid "git revert [<options>] <commit-ish>..."

8845 msgstr ""

8846

8847 #: builtin/revert.c:23

@@ -8815,7 +8849,7 @@ msgid "git revert <subcommand>"

8849 msgstr ""

8850

8851 #: builtin/revert.c:28

8818 -msgid "git cherry-pick [options] <commit-ish>..."

8852 +msgid "git cherry-pick [<options>] <commit-ish>..."

8853 msgstr ""

8854

8855 #: builtin/revert.c:29

@@ -8896,7 +8930,7 @@ msgid "cherry-pick failed"

8930 msgstr ""

8931

8932 #: builtin/rm.c:17

8899 -msgid "git rm [options] [--] <file>..."

8933 +msgid "git rm [<options>] [--] <file>..."

8934 msgstr ""

8935

8936 #: builtin/rm.c:65

@@ -8984,7 +9018,7 @@ msgid "git rm: unable to remove %s"

9018 msgstr ""

9019

9020 #: builtin/shortlog.c:13

8987 -msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"

9021 +msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"

9022 msgstr ""

9023

9024 #: builtin/shortlog.c:131

@@ -9014,14 +9048,14 @@ msgstr ""

9048

9049 #: builtin/show-branch.c:9

9050 msgid ""

9017 -"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"

9051 +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"

9052 "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"

9053 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"

9054 "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"

9055 msgstr ""

9056

9057 #: builtin/show-branch.c:13

9024 -msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"

9058 +msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"

9059 msgstr ""

9060

9061 #: builtin/show-branch.c:652

@@ -9090,8 +9124,8 @@ msgstr ""

9124

9125 #: builtin/show-ref.c:10

9126 msgid ""

9093 -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"

9094 -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "

9127 +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"

9128 +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"

9129 msgstr ""

9130

9131 #: builtin/show-ref.c:11

@@ -9131,11 +9165,11 @@ msgid "show refs from stdin that aren't in local repository"

9165 msgstr ""

9166

9167 #: builtin/symbolic-ref.c:7

9134 -msgid "git symbolic-ref [options] name [ref]"

9168 +msgid "git symbolic-ref [<options>] <name> [<ref>]"

9169 msgstr ""

9170

9171 #: builtin/symbolic-ref.c:8

9138 -msgid "git symbolic-ref -d [-q] name"

9172 +msgid "git symbolic-ref -d [-q] <name>"

9173 msgstr ""

9174

9175 #: builtin/symbolic-ref.c:40

@@ -9160,7 +9194,8 @@ msgstr ""

9194

9195 #: builtin/tag.c:22

9196 msgid ""

9163 -"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"

9197 +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "

9198 +"[<head>]"

9199 msgstr ""

9200

9201 #: builtin/tag.c:23

@@ -9169,7 +9204,7 @@ msgstr ""

9204

9205 #: builtin/tag.c:24

9206 msgid ""

9172 -"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"

9207 +"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"

9208 "\t\t[<pattern>...]"

9209 msgstr ""

9210

@@ -9305,16 +9340,16 @@ msgstr ""

9340 msgid "replace the tag if exists"

9341 msgstr ""

9342

9308 -#: builtin/tag.c:608

9309 -msgid "show tag list in columns"

9343 +#: builtin/tag.c:609

9344 +msgid "Tag listing options"

9345 msgstr ""

9346

9347 #: builtin/tag.c:610

9313 -msgid "sort tags"

9348 +msgid "show tag list in columns"

9349 msgstr ""

9350

9316 -#: builtin/tag.c:614

9317 -msgid "Tag listing options"

9351 +#: builtin/tag.c:612

9352 +msgid "sort tags"

9353 msgstr ""

9354

9355 #: builtin/tag.c:617 builtin/tag.c:623

@@ -9373,7 +9408,7 @@ msgid "Unpacking objects"

9408 msgstr ""

9409

9410 #: builtin/update-index.c:403

9376 -msgid "git update-index [options] [--] [<file>...]"

9411 +msgid "git update-index [<options>] [--] [<file>...]"

9412 msgstr ""

9413

9414 #: builtin/update-index.c:756

@@ -9489,15 +9524,15 @@ msgid "enable or disable split index"

9524 msgstr ""

9525

9526 #: builtin/update-ref.c:9

9492 -msgid "git update-ref [options] -d <refname> [<oldval>]"

9527 +msgid "git update-ref [<options>] -d <refname> [<old-val>]"

9528 msgstr ""

9529

9530 #: builtin/update-ref.c:10

9496 -msgid "git update-ref [options] <refname> <newval> [<oldval>]"

9531 +msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"

9532 msgstr ""

9533

9534 #: builtin/update-ref.c:11

9500 -msgid "git update-ref [options] --stdin [-z]"

9535 +msgid "git update-ref [<options>] --stdin [-z]"

9536 msgstr ""

9537

9538 #: builtin/update-ref.c:359

@@ -9525,7 +9560,7 @@ msgid "update the info files from scratch"

9560 msgstr ""

9561

9562 #: builtin/verify-commit.c:17

9528 -msgid "git verify-commit [-v|--verbose] <commit>..."

9563 +msgid "git verify-commit [-v | --verbose] <commit>..."

9564 msgstr ""

9565

9566 #: builtin/verify-commit.c:75

@@ -9533,7 +9568,7 @@ msgid "print commit contents"

9568 msgstr ""

9569

9570 #: builtin/verify-pack.c:54

9536 -msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."

9571 +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."

9572 msgstr ""

9573

9574 #: builtin/verify-pack.c:64

@@ -9545,7 +9580,7 @@ msgid "show statistics only"

9580 msgstr ""

9581

9582 #: builtin/verify-tag.c:17

9548 -msgid "git verify-tag [-v|--verbose] <tag>..."

9583 +msgid "git verify-tag [-v | --verbose] <tag>..."

9584 msgstr ""

9585

9586 #: builtin/verify-tag.c:73

@@ -9868,7 +9903,7 @@ msgstr ""

9903 #: git-bisect.sh:130

9904 #, sh-format

9905 msgid ""

9871 -"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."

9906 +"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."

9907 msgstr ""

9908

9909 #: git-bisect.sh:140

l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)