df0617bfa7 · 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-07-14 07:19+0800\n"

11 +"POT-Creation-Date: 2015-09-05 09:16+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"

@@ -29,93 +29,105 @@ msgid ""

29 "as appropriate to mark resolution and make a commit."

30 msgstr ""

31

32 -#: archive.c:11

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

32 +#: advice.c:101 builtin/merge.c:1227

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

34 +msgstr ""

35 +

36 +#: advice.c:103

37 +msgid "Please, commit your changes before you can merge."

38 +msgstr ""

39 +

40 +#: advice.c:104

41 +msgid "Exiting because of unfinished merge."

42 msgstr ""

43

44 #: archive.c:12

37 -msgid "git archive --list"

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

46 msgstr ""

47

48 #: archive.c:13

49 +msgid "git archive --list"

50 +msgstr ""

51 +

52 +#: archive.c:14

53 msgid ""

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

55 msgstr ""

56

45 -#: archive.c:14

57 +#: archive.c:15

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

59 msgstr ""

60

49 -#: archive.c:342 builtin/add.c:137 builtin/add.c:428 builtin/rm.c:327

61 +#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327

62 #, c-format

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

64 msgstr ""

65

54 -#: archive.c:427

66 +#: archive.c:428

67 msgid "fmt"

68 msgstr ""

69

58 -#: archive.c:427

70 +#: archive.c:428

71 msgid "archive format"

72 msgstr ""

73

62 -#: archive.c:428 builtin/log.c:1204

74 +#: archive.c:429 builtin/log.c:1229

75 msgid "prefix"

76 msgstr ""

77

66 -#: archive.c:429

78 +#: archive.c:430

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

80 msgstr ""

81

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:99

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:150

82 +#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516

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

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

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

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

87 msgid "file"

88 msgstr ""

89

78 -#: archive.c:431 builtin/archive.c:89

90 +#: archive.c:432 builtin/archive.c:89

91 msgid "write the archive to this file"

92 msgstr ""

93

82 -#: archive.c:433

94 +#: archive.c:434

95 msgid "read .gitattributes in working directory"

96 msgstr ""

97

86 -#: archive.c:434

98 +#: archive.c:435

99 msgid "report archived files on stderr"

100 msgstr ""

101

90 -#: archive.c:435

102 +#: archive.c:436

103 msgid "store only"

104 msgstr ""

105

94 -#: archive.c:436

106 +#: archive.c:437

107 msgid "compress faster"

108 msgstr ""

109

98 -#: archive.c:444

110 +#: archive.c:445

111 msgid "compress better"

112 msgstr ""

113

102 -#: archive.c:447

114 +#: archive.c:448

115 msgid "list supported archive formats"

116 msgstr ""

117

106 -#: archive.c:449 builtin/archive.c:90 builtin/clone.c:77

118 +#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77

119 msgid "repo"

120 msgstr ""

121

110 -#: archive.c:450 builtin/archive.c:91

122 +#: archive.c:451 builtin/archive.c:91

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

124 msgstr ""

125

114 -#: archive.c:451 builtin/archive.c:92 builtin/notes.c:478

126 +#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479

127 msgid "command"

128 msgstr ""

129

118 -#: archive.c:452 builtin/archive.c:93

130 +#: archive.c:453 builtin/archive.c:93

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

132 msgstr ""

133

@@ -226,6 +238,11 @@ msgstr ""

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

239 msgstr ""

240

241 +#: branch.c:399

242 +#, c-format

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

244 +msgstr ""

245 +

246 #: bundle.c:34

247 #, c-format

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

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

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

254 msgstr ""

255

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

256 +#: bundle.c:87 builtin/commit.c:765

257 #, c-format

258 msgid "could not open '%s'"

259 msgstr ""

@@ -245,9 +262,9 @@ msgstr ""

262 msgid "Repository lacks these prerequisite commits:"

263 msgstr ""

264

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

249 -#: builtin/branch.c:651 builtin/commit.c:1045 builtin/log.c:330

250 -#: builtin/log.c:825 builtin/log.c:1432 builtin/log.c:1666 builtin/merge.c:358

265 +#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708

266 +#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334

267 +#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358

268 #: builtin/shortlog.c:158

269 msgid "revision walk setup failed"

270 msgstr ""

@@ -270,38 +287,38 @@ msgid_plural "The bundle requires these %d refs:"

287 msgstr[0] ""

288 msgstr[1] ""

289

273 -#: bundle.c:251

290 +#: bundle.c:253

291 msgid "Could not spawn pack-objects"

292 msgstr ""

293

277 -#: bundle.c:269

294 +#: bundle.c:264

295 msgid "pack-objects died"

296 msgstr ""

297

281 -#: bundle.c:309

298 +#: bundle.c:304

299 msgid "rev-list died"

300 msgstr ""

301

285 -#: bundle.c:358

302 +#: bundle.c:353

303 #, c-format

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

305 msgstr ""

306

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

307 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261

308 #, c-format

309 msgid "unrecognized argument: %s"

310 msgstr ""

311

295 -#: bundle.c:443

312 +#: bundle.c:449

313 msgid "Refusing to create empty bundle."

314 msgstr ""

315

299 -#: bundle.c:453

316 +#: bundle.c:459

317 #, c-format

318 msgid "cannot create '%s'"

319 msgstr ""

320

304 -#: bundle.c:474

321 +#: bundle.c:480

322 msgid "index-pack died"

323 msgstr ""

324

@@ -310,7 +327,8 @@ msgstr ""

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

328 msgstr ""

329

313 -#: commit.c:40

330 +#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1489

331 +#: builtin/am.c:2101

332 #, c-format

333 msgid "could not parse %s"

334 msgstr ""

@@ -468,75 +486,75 @@ msgstr ""

486 msgid "Performing inexact rename detection"

487 msgstr ""

488

471 -#: diff.c:114

489 +#: diff.c:116

490 #, c-format

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

492 msgstr ""

493

476 -#: diff.c:119

494 +#: diff.c:121

495 #, c-format

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

497 msgstr ""

498

481 -#: diff.c:214

499 +#: diff.c:216

500 #, c-format

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

502 msgstr ""

503

486 -#: diff.c:266

504 +#: diff.c:268

505 #, c-format

506 msgid ""

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

508 "%s"

509 msgstr ""

510

493 -#: diff.c:2997

511 +#: diff.c:2998

512 #, c-format

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

514 msgstr ""

515

498 -#: diff.c:3393

516 +#: diff.c:3394

517 msgid "--follow requires exactly one pathspec"

518 msgstr ""

519

502 -#: diff.c:3556

520 +#: diff.c:3557

521 #, c-format

522 msgid ""

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

524 "%s"

525 msgstr ""

526

509 -#: diff.c:3570

527 +#: diff.c:3571

528 #, c-format

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

530 msgstr ""

531

514 -#: dir.c:1852

532 +#: dir.c:1853

533 msgid "failed to get kernel name and information"

534 msgstr ""

535

518 -#: dir.c:1945

536 +#: dir.c:1936

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

538 msgstr ""

539

522 -#: gpg-interface.c:129 gpg-interface.c:200

540 +#: gpg-interface.c:166 gpg-interface.c:237

541 msgid "could not run gpg."

542 msgstr ""

543

526 -#: gpg-interface.c:141

544 +#: gpg-interface.c:178

545 msgid "gpg did not accept the data"

546 msgstr ""

547

530 -#: gpg-interface.c:152

548 +#: gpg-interface.c:189

549 msgid "gpg failed to sign the data"

550 msgstr ""

551

534 -#: gpg-interface.c:185

552 +#: gpg-interface.c:222

553 #, c-format

554 msgid "could not create temporary file '%s': %s"

555 msgstr ""

556

539 -#: gpg-interface.c:188

557 +#: gpg-interface.c:225

558 #, c-format

559 msgid "failed writing detached signature to '%s': %s"

560 msgstr ""

@@ -612,20 +630,12 @@ msgstr[1] ""

630 msgid "%s: %s - %s"

631 msgstr ""

632

615 -#: lockfile.c:345

616 -msgid "BUG: reopen a lockfile that is still open"

617 -msgstr ""

618 -

619 -#: lockfile.c:347

620 -msgid "BUG: reopen a lockfile that has been committed"

621 -msgstr ""

622 -

633 #: merge.c:41

634 msgid "failed to read the cache"

635 msgstr ""

636

627 -#: merge.c:94 builtin/checkout.c:376 builtin/checkout.c:587

628 -#: builtin/clone.c:647

637 +#: merge.c:94 builtin/am.c:1974 builtin/am.c:2009 builtin/checkout.c:375

638 +#: builtin/checkout.c:586 builtin/clone.c:715

639 msgid "unable to write new index file"

640 msgstr ""

641

@@ -672,7 +682,7 @@ msgstr ""

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

683 msgstr ""

684

675 -#: merge-recursive.c:788 builtin/clone.c:306

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

686 #, c-format

687 msgid "failed to open '%s'"

688 msgstr ""

@@ -877,19 +887,19 @@ msgstr ""

887 msgid "Cannot commit uninitialized/unreferenced notes tree"

888 msgstr ""

889

880 -#: notes-utils.c:82

890 +#: notes-utils.c:100

891 #, c-format

892 msgid "Bad notes.rewriteMode value: '%s'"

893 msgstr ""

894

885 -#: notes-utils.c:92

895 +#: notes-utils.c:110

896 #, c-format

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

898 msgstr ""

899

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

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

892 -#: notes-utils.c:119

902 +#: notes-utils.c:137

903 #, c-format

904 msgid "Bad %s value: '%s'"

905 msgstr ""

@@ -899,28 +909,28 @@ msgstr ""

909 msgid "unable to parse object: %s"

910 msgstr ""

911

902 -#: parse-options.c:546

912 +#: parse-options.c:563

913 msgid "..."

914 msgstr ""

915

906 -#: parse-options.c:564

916 +#: parse-options.c:581

917 #, c-format

918 msgid "usage: %s"

919 msgstr ""

920

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

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

913 -#: parse-options.c:568

923 +#: parse-options.c:585

924 #, c-format

925 msgid " or: %s"

926 msgstr ""

927

918 -#: parse-options.c:571

928 +#: parse-options.c:588

929 #, c-format

930 msgid " %s"

931 msgstr ""

932

923 -#: parse-options.c:605

933 +#: parse-options.c:622

934 msgid "-NUM"

935 msgstr ""

936

@@ -984,7 +994,7 @@ msgid ""

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

995 msgstr ""

996

987 -#: pretty.c:968

997 +#: pretty.c:969

998 msgid "unable to parse --pretty format"

999 msgstr ""

1000

@@ -992,20 +1002,45 @@ msgstr ""

1002 msgid "done"

1003 msgstr ""

1004

995 -#: read-cache.c:1295

1005 +#: read-cache.c:1296

1006 #, c-format

1007 msgid ""

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

1009 "Using version %i"

1010 msgstr ""

1011

1002 -#: read-cache.c:1305

1012 +#: read-cache.c:1306

1013 #, c-format

1014 msgid ""

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

1016 "Using version %i"

1017 msgstr ""

1018

1019 +#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1020 +#: builtin/merge.c:983

1021 +#, c-format

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

1023 +msgstr ""

1024 +

1025 +#: refs.c:3001

1026 +#, c-format

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

1028 +msgstr ""

1029 +

1030 +#: refs.c:3004

1031 +#, c-format

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

1033 +msgstr ""

1034 +

1035 +#: refs.c:3013

1036 +#, c-format

1037 +msgid "could not remove reference %s"

1038 +msgstr ""

1039 +

1040 +#: ref-filter.c:660

1041 +msgid "unable to parse format"

1042 +msgstr ""

1043 +

1044 #: remote.c:792

1045 #, c-format

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

@@ -1119,7 +1154,16 @@ msgstr[1] ""

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

1155 msgstr ""

1156

1122 -#: revision.c:2366

1157 +#: revision.c:2198

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

1159 +msgstr ""

1160 +

1161 +#: revision.c:2201

1162 +#, c-format

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

1164 +msgstr ""

1165 +

1166 +#: revision.c:2395

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

1168 msgstr ""

1169

@@ -1132,257 +1176,251 @@ msgstr ""

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

1177 msgstr ""

1178

1135 -#: send-pack.c:272

1179 +#: send-pack.c:295

1180 msgid "failed to sign the push certificate"

1181 msgstr ""

1182

1139 -#: send-pack.c:378

1183 +#: send-pack.c:404

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

1185 msgstr ""

1186

1143 -#: send-pack.c:389

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

1145 -msgstr ""

1146 -

1147 -#: sequencer.c:172 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1148 -#: builtin/merge.c:983

1149 -#, c-format

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

1187 +#: send-pack.c:406

1188 +msgid ""

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

1190 +"signed push"

1191 msgstr ""

1192

1153 -#: sequencer.c:174 builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975

1154 -#: builtin/merge.c:988

1155 -#, c-format

1156 -msgid "Could not write to '%s'"

1193 +#: send-pack.c:418

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

1195 msgstr ""

1196

1159 -#: sequencer.c:195

1197 +#: sequencer.c:183

1198 msgid ""

1199 "after resolving the conflicts, mark the corrected paths\n"

1200 "with 'git add <paths>' or 'git rm <paths>'"

1201 msgstr ""

1202

1165 -#: sequencer.c:198

1203 +#: sequencer.c:186

1204 msgid ""

1205 "after resolving the conflicts, mark the corrected paths\n"

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

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

1208 msgstr ""

1209

1172 -#: sequencer.c:211 sequencer.c:861 sequencer.c:944

1210 +#: sequencer.c:199 sequencer.c:842 sequencer.c:922

1211 #, c-format

1212 msgid "Could not write to %s"

1213 msgstr ""

1214

1177 -#: sequencer.c:214

1215 +#: sequencer.c:202

1216 #, c-format

1217 msgid "Error wrapping up %s"

1218 msgstr ""

1219

1182 -#: sequencer.c:229

1220 +#: sequencer.c:217

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

1222 msgstr ""

1223

1186 -#: sequencer.c:231

1224 +#: sequencer.c:219

1225 msgid "Your local changes would be overwritten by revert."

1226 msgstr ""

1227

1190 -#: sequencer.c:234

1228 +#: sequencer.c:222

1229 msgid "Commit your changes or stash them to proceed."

1230 msgstr ""

1231

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

1195 -#: sequencer.c:321

1233 +#: sequencer.c:309

1234 #, c-format

1235 msgid "%s: Unable to write new index file"

1236 msgstr ""

1237

1200 -#: sequencer.c:339

1238 +#: sequencer.c:327

1239 msgid "Could not resolve HEAD commit\n"

1240 msgstr ""

1241

1204 -#: sequencer.c:359

1242 +#: sequencer.c:347

1243 msgid "Unable to update cache tree\n"

1244 msgstr ""

1245

1208 -#: sequencer.c:411

1246 +#: sequencer.c:399

1247 #, c-format

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

1249 msgstr ""

1250

1213 -#: sequencer.c:416

1251 +#: sequencer.c:404

1252 #, c-format

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

1254 msgstr ""

1255

1218 -#: sequencer.c:482

1256 +#: sequencer.c:469

1257 msgid "Your index file is unmerged."

1258 msgstr ""

1259

1222 -#: sequencer.c:501

1260 +#: sequencer.c:488

1261 #, c-format

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

1263 msgstr ""

1264

1227 -#: sequencer.c:509

1265 +#: sequencer.c:496

1266 #, c-format

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

1268 msgstr ""

1269

1232 -#: sequencer.c:513

1270 +#: sequencer.c:500

1271 #, c-format

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

1273 msgstr ""

1274

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

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

1239 -#: sequencer.c:526

1277 +#: sequencer.c:513

1278 #, c-format

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

1280 msgstr ""

1281

1244 -#: sequencer.c:530

1282 +#: sequencer.c:517

1283 #, c-format

1284 msgid "Cannot get commit message for %s"

1285 msgstr ""

1286

1249 -#: sequencer.c:616

1287 +#: sequencer.c:603

1288 #, c-format

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

1290 msgstr ""

1291

1254 -#: sequencer.c:617

1292 +#: sequencer.c:604

1293 #, c-format

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

1295 msgstr ""

1296

1259 -#: sequencer.c:653

1297 +#: sequencer.c:639

1298 msgid "empty commit set passed"

1299 msgstr ""

1300

1263 -#: sequencer.c:661

1301 +#: sequencer.c:647

1302 #, c-format

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

1304 msgstr ""

1305

1268 -#: sequencer.c:665

1306 +#: sequencer.c:651

1307 #, c-format

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

1309 msgstr ""

1310

1273 -#: sequencer.c:725

1311 +#: sequencer.c:711

1312 #, c-format

1313 msgid "Cannot %s during a %s"

1314 msgstr ""

1315

1278 -#: sequencer.c:747

1316 +#: sequencer.c:733

1317 #, c-format

1318 msgid "Could not parse line %d."

1319 msgstr ""

1320

1283 -#: sequencer.c:752

1321 +#: sequencer.c:738

1322 msgid "No commits parsed."

1323 msgstr ""

1324

1287 -#: sequencer.c:765

1325 +#: sequencer.c:750

1326 #, c-format

1327 msgid "Could not open %s"

1328 msgstr ""

1329

1292 -#: sequencer.c:769

1330 +#: sequencer.c:754

1331 #, c-format

1332 msgid "Could not read %s."

1333 msgstr ""

1334

1297 -#: sequencer.c:776

1335 +#: sequencer.c:761

1336 #, c-format

1337 msgid "Unusable instruction sheet: %s"

1338 msgstr ""

1339

1302 -#: sequencer.c:806

1340 +#: sequencer.c:791

1341 #, c-format

1342 msgid "Invalid key: %s"

1343 msgstr ""

1344

1307 -#: sequencer.c:809

1345 +#: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49

1346 #, c-format

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

1348 msgstr ""

1349

1312 -#: sequencer.c:821

1350 +#: sequencer.c:804

1351 #, c-format

1352 msgid "Malformed options sheet: %s"

1353 msgstr ""

1354

1317 -#: sequencer.c:842

1355 +#: sequencer.c:823

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

1357 msgstr ""

1358

1321 -#: sequencer.c:843

1359 +#: sequencer.c:824

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

1361 msgstr ""

1362

1325 -#: sequencer.c:847

1363 +#: sequencer.c:828

1364 #, c-format

1365 msgid "Could not create sequencer directory %s"

1366 msgstr ""

1367

1330 -#: sequencer.c:863 sequencer.c:948

1368 +#: sequencer.c:844 sequencer.c:926

1369 #, c-format

1370 msgid "Error wrapping up %s."

1371 msgstr ""

1372

1335 -#: sequencer.c:882 sequencer.c:1018

1373 +#: sequencer.c:863 sequencer.c:996

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

1375 msgstr ""

1376

1339 -#: sequencer.c:884

1377 +#: sequencer.c:865

1378 msgid "cannot resolve HEAD"

1379 msgstr ""

1380

1343 -#: sequencer.c:886

1381 +#: sequencer.c:867

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

1383 msgstr ""

1384

1347 -#: sequencer.c:908 builtin/apply.c:4291

1385 +#: sequencer.c:887 builtin/apply.c:4291

1386 #, c-format

1387 msgid "cannot open %s: %s"

1388 msgstr ""

1389

1352 -#: sequencer.c:911

1390 +#: sequencer.c:890

1391 #, c-format

1392 msgid "cannot read %s: %s"

1393 msgstr ""

1394

1357 -#: sequencer.c:912

1395 +#: sequencer.c:891

1396 msgid "unexpected end of file"

1397 msgstr ""

1398

1361 -#: sequencer.c:918

1399 +#: sequencer.c:897

1400 #, c-format

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

1402 msgstr ""

1403

1366 -#: sequencer.c:941

1404 +#: sequencer.c:919

1405 #, c-format

1406 msgid "Could not format %s."

1407 msgstr ""

1408

1371 -#: sequencer.c:1086

1409 +#: sequencer.c:1064

1410 #, c-format

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

1412 msgstr ""

1413

1376 -#: sequencer.c:1089

1414 +#: sequencer.c:1067

1415 #, c-format

1416 msgid "%s: bad revision"

1417 msgstr ""

1418

1381 -#: sequencer.c:1123

1419 +#: sequencer.c:1101

1420 msgid "Can't revert as initial commit"

1421 msgstr ""

1422

1385 -#: sequencer.c:1124

1423 +#: sequencer.c:1102

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

1425 msgstr ""

1426

@@ -1404,30 +1442,30 @@ msgid ""

1442 "running \"git config advice.objectNameWarning false\""

1443 msgstr ""

1444

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

1445 +#: submodule.c:61 submodule.c:95

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

1447 msgstr ""

1448

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

1449 +#: submodule.c:65 submodule.c:99

1450 #, c-format

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

1452 msgstr ""

1453

1416 -#: submodule.c:76

1454 +#: submodule.c:73

1455 #, c-format

1456 msgid "Could not update .gitmodules entry %s"

1457 msgstr ""

1458

1421 -#: submodule.c:109

1459 +#: submodule.c:106

1460 #, c-format

1461 msgid "Could not remove .gitmodules entry for %s"

1462 msgstr ""

1463

1426 -#: submodule.c:120

1464 +#: submodule.c:117

1465 msgid "staging updated .gitmodules failed"

1466 msgstr ""

1467

1430 -#: submodule.c:1115

1468 +#: submodule.c:1045

1469 #, c-format

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

1471 msgstr ""

@@ -1457,6 +1495,11 @@ msgstr ""

1495 msgid "could not read from stdin"

1496 msgstr ""

1497

1498 +#: transport-helper.c:1025

1499 +#, c-format

1500 +msgid "Could not read ref %s"

1501 +msgstr ""

1502 +

1503 #: unpack-trees.c:203

1504 msgid "Checking out files"

1505 msgstr ""

@@ -1490,368 +1533,419 @@ msgstr ""

1533 msgid "invalid '..' path segment"

1534 msgstr ""

1535

1493 -#: wrapper.c:523

1536 +#: wrapper.c:219 wrapper.c:362

1537 +#, c-format

1538 +msgid "could not open '%s' for reading and writing"

1539 +msgstr ""

1540 +

1541 +#: wrapper.c:221 wrapper.c:364

1542 +#, c-format

1543 +msgid "could not open '%s' for writing"

1544 +msgstr ""

1545 +

1546 +#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688

1547 +#: builtin/merge.c:1076 builtin/pull.c:380

1548 +#, c-format

1549 +msgid "could not open '%s' for reading"

1550 +msgstr ""

1551 +

1552 +#: wrapper.c:579

1553 #, c-format

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

1555 msgstr ""

1556

1498 -#: wrapper.c:544

1557 +#: wrapper.c:600

1558 #, c-format

1559 msgid "unable to access '%s'"

1560 msgstr ""

1561

1503 -#: wrapper.c:555

1562 +#: wrapper.c:611

1563 #, c-format

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

1565 msgstr ""

1566

1508 -#: wrapper.c:556

1567 +#: wrapper.c:612

1568 msgid "no such user"

1569 msgstr ""

1570

1512 -#: wrapper.c:564

1571 +#: wrapper.c:620

1572 msgid "unable to get current working directory"

1573 msgstr ""

1574

1516 -#: wrapper.c:575

1575 +#: wrapper.c:631

1576 #, c-format

1577 msgid "could not open %s for writing"

1578 msgstr ""

1579

1521 -#: wrapper.c:587

1580 +#: wrapper.c:642 builtin/am.c:424

1581 #, c-format

1582 msgid "could not write to %s"

1583 msgstr ""

1584

1526 -#: wrapper.c:593

1585 +#: wrapper.c:648

1586 #, c-format

1587 msgid "could not close %s"

1588 msgstr ""

1589

1531 -#: wt-status.c:150

1590 +#: wt-status.c:149

1591 msgid "Unmerged paths:"

1592 msgstr ""

1593

1535 -#: wt-status.c:177 wt-status.c:204

1594 +#: wt-status.c:176 wt-status.c:203

1595 #, c-format

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

1597 msgstr ""

1598

1540 -#: wt-status.c:179 wt-status.c:206

1599 +#: wt-status.c:178 wt-status.c:205

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

1601 msgstr ""

1602

1544 -#: wt-status.c:183

1603 +#: wt-status.c:182

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

1605 msgstr ""

1606

1548 -#: wt-status.c:185 wt-status.c:189

1607 +#: wt-status.c:184 wt-status.c:188

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

1609 msgstr ""

1610

1552 -#: wt-status.c:187

1611 +#: wt-status.c:186

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

1613 msgstr ""

1614

1556 -#: wt-status.c:198 wt-status.c:881

1615 +#: wt-status.c:197 wt-status.c:880

1616 msgid "Changes to be committed:"

1617 msgstr ""

1618

1560 -#: wt-status.c:216 wt-status.c:890

1619 +#: wt-status.c:215 wt-status.c:889

1620 msgid "Changes not staged for commit:"

1621 msgstr ""

1622

1564 -#: wt-status.c:220

1623 +#: wt-status.c:219

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

1625 msgstr ""

1626

1568 -#: wt-status.c:222

1627 +#: wt-status.c:221

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

1629 msgstr ""

1630

1572 -#: wt-status.c:223

1631 +#: wt-status.c:222

1632 msgid ""

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

1634 msgstr ""

1635

1577 -#: wt-status.c:225

1636 +#: wt-status.c:224

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

1638 msgstr ""

1639

1581 -#: wt-status.c:237

1640 +#: wt-status.c:236

1641 #, c-format

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

1643 msgstr ""

1644

1586 -#: wt-status.c:252

1645 +#: wt-status.c:251

1646 msgid "both deleted:"

1647 msgstr ""

1648

1590 -#: wt-status.c:254

1649 +#: wt-status.c:253

1650 msgid "added by us:"

1651 msgstr ""

1652

1594 -#: wt-status.c:256

1653 +#: wt-status.c:255

1654 msgid "deleted by them:"

1655 msgstr ""

1656

1598 -#: wt-status.c:258

1657 +#: wt-status.c:257

1658 msgid "added by them:"

1659 msgstr ""

1660

1602 -#: wt-status.c:260

1661 +#: wt-status.c:259

1662 msgid "deleted by us:"

1663 msgstr ""

1664

1606 -#: wt-status.c:262

1665 +#: wt-status.c:261

1666 msgid "both added:"

1667 msgstr ""

1668

1610 -#: wt-status.c:264

1669 +#: wt-status.c:263

1670 msgid "both modified:"

1671 msgstr ""

1672

1614 -#: wt-status.c:266

1673 +#: wt-status.c:265

1674 #, c-format

1675 msgid "bug: unhandled unmerged status %x"

1676 msgstr ""

1677

1619 -#: wt-status.c:274

1678 +#: wt-status.c:273

1679 msgid "new file:"

1680 msgstr ""

1681

1623 -#: wt-status.c:276

1682 +#: wt-status.c:275

1683 msgid "copied:"

1684 msgstr ""

1685

1627 -#: wt-status.c:278

1686 +#: wt-status.c:277

1687 msgid "deleted:"

1688 msgstr ""

1689

1631 -#: wt-status.c:280

1690 +#: wt-status.c:279

1691 msgid "modified:"

1692 msgstr ""

1693

1635 -#: wt-status.c:282

1694 +#: wt-status.c:281

1695 msgid "renamed:"

1696 msgstr ""

1697

1639 -#: wt-status.c:284

1698 +#: wt-status.c:283

1699 msgid "typechange:"

1700 msgstr ""

1701

1643 -#: wt-status.c:286

1702 +#: wt-status.c:285

1703 msgid "unknown:"

1704 msgstr ""

1705

1647 -#: wt-status.c:288

1706 +#: wt-status.c:287

1707 msgid "unmerged:"

1708 msgstr ""

1709

1651 -#: wt-status.c:370

1710 +#: wt-status.c:369

1711 msgid "new commits, "

1712 msgstr ""

1713

1655 -#: wt-status.c:372

1714 +#: wt-status.c:371

1715 msgid "modified content, "

1716 msgstr ""

1717

1659 -#: wt-status.c:374

1718 +#: wt-status.c:373

1719 msgid "untracked content, "

1720 msgstr ""

1721

1663 -#: wt-status.c:391

1722 +#: wt-status.c:390

1723 #, c-format

1724 msgid "bug: unhandled diff status %c"

1725 msgstr ""

1726

1668 -#: wt-status.c:755

1727 +#: wt-status.c:754

1728 msgid "Submodules changed but not updated:"

1729 msgstr ""

1730

1672 -#: wt-status.c:757

1731 +#: wt-status.c:756

1732 msgid "Submodule changes to be committed:"

1733 msgstr ""

1734

1676 -#: wt-status.c:838

1735 +#: wt-status.c:837

1736 msgid ""

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

1738 "Everything below will be removed."

1739 msgstr ""

1740

1682 -#: wt-status.c:949

1741 +#: wt-status.c:948

1742 msgid "You have unmerged paths."

1743 msgstr ""

1744

1686 -#: wt-status.c:952

1745 +#: wt-status.c:951

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

1747 msgstr ""

1748

1690 -#: wt-status.c:955

1749 +#: wt-status.c:954

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

1751 msgstr ""

1752

1694 -#: wt-status.c:958

1753 +#: wt-status.c:957

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

1755 msgstr ""

1756

1698 -#: wt-status.c:968

1757 +#: wt-status.c:967

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

1759 msgstr ""

1760

1702 -#: wt-status.c:971

1761 +#: wt-status.c:970

1762 msgid "The current patch is empty."

1763 msgstr ""

1764

1706 -#: wt-status.c:975

1765 +#: wt-status.c:974

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

1767 msgstr ""

1768

1710 -#: wt-status.c:977

1769 +#: wt-status.c:976

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

1771 msgstr ""

1772

1714 -#: wt-status.c:979

1773 +#: wt-status.c:978

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

1775 msgstr ""

1776

1718 -#: wt-status.c:1039 wt-status.c:1056

1777 +#: wt-status.c:1105

1778 +msgid "No commands done."

1779 +msgstr ""

1780 +

1781 +#: wt-status.c:1108

1782 +#, c-format

1783 +msgid "Last command done (%d command done):"

1784 +msgid_plural "Last commands done (%d commands done):"

1785 +msgstr[0] ""

1786 +msgstr[1] ""

1787 +

1788 +#: wt-status.c:1119

1789 +#, c-format

1790 +msgid " (see more in file %s)"

1791 +msgstr ""

1792 +

1793 +#: wt-status.c:1124

1794 +msgid "No commands remaining."

1795 +msgstr ""

1796 +

1797 +#: wt-status.c:1127

1798 +#, c-format

1799 +msgid "Next command to do (%d remaining command):"

1800 +msgid_plural "Next commands to do (%d remaining commands):"

1801 +msgstr[0] ""

1802 +msgstr[1] ""

1803 +

1804 +#: wt-status.c:1135

1805 +msgid " (use \"git rebase --edit-todo\" to view and edit)"

1806 +msgstr ""

1807 +

1808 +#: wt-status.c:1148

1809 #, c-format

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

1811 msgstr ""

1812

1723 -#: wt-status.c:1044 wt-status.c:1061

1813 +#: wt-status.c:1153

1814 msgid "You are currently rebasing."

1815 msgstr ""

1816

1727 -#: wt-status.c:1047

1817 +#: wt-status.c:1167

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

1819 msgstr ""

1820

1731 -#: wt-status.c:1049

1821 +#: wt-status.c:1169

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

1823 msgstr ""

1824

1735 -#: wt-status.c:1051

1825 +#: wt-status.c:1171

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

1827 msgstr ""

1828

1739 -#: wt-status.c:1064

1829 +#: wt-status.c:1177

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

1831 msgstr ""

1832

1743 -#: wt-status.c:1068

1833 +#: wt-status.c:1181

1834 #, c-format

1835 msgid ""

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

1837 msgstr ""

1838

1749 -#: wt-status.c:1073

1839 +#: wt-status.c:1186

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

1841 msgstr ""

1842

1753 -#: wt-status.c:1076

1843 +#: wt-status.c:1189

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

1845 msgstr ""

1846

1757 -#: wt-status.c:1080

1847 +#: wt-status.c:1193

1848 #, c-format

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

1850 msgstr ""

1851

1762 -#: wt-status.c:1085

1852 +#: wt-status.c:1198

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

1854 msgstr ""

1855

1766 -#: wt-status.c:1088

1856 +#: wt-status.c:1201

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

1858 msgstr ""

1859

1770 -#: wt-status.c:1090

1860 +#: wt-status.c:1203

1861 msgid ""

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

1863 msgstr ""

1864

1775 -#: wt-status.c:1100

1865 +#: wt-status.c:1213

1866 #, c-format

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

1868 msgstr ""

1869

1780 -#: wt-status.c:1105

1870 +#: wt-status.c:1218

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

1872 msgstr ""

1873

1784 -#: wt-status.c:1108

1874 +#: wt-status.c:1221

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

1876 msgstr ""

1877

1788 -#: wt-status.c:1110

1878 +#: wt-status.c:1223

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

1880 msgstr ""

1881

1792 -#: wt-status.c:1119

1882 +#: wt-status.c:1232

1883 #, c-format

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

1885 msgstr ""

1886

1797 -#: wt-status.c:1124

1887 +#: wt-status.c:1237

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

1889 msgstr ""

1890

1801 -#: wt-status.c:1127

1891 +#: wt-status.c:1240

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

1893 msgstr ""

1894

1805 -#: wt-status.c:1129

1895 +#: wt-status.c:1242

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

1897 msgstr ""

1898

1809 -#: wt-status.c:1140

1899 +#: wt-status.c:1253

1900 #, c-format

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

1902 msgstr ""

1903

1814 -#: wt-status.c:1144

1904 +#: wt-status.c:1257

1905 msgid "You are currently bisecting."

1906 msgstr ""

1907

1818 -#: wt-status.c:1147

1908 +#: wt-status.c:1260

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

1910 msgstr ""

1911

1822 -#: wt-status.c:1324

1912 +#: wt-status.c:1437

1913 msgid "On branch "

1914 msgstr ""

1915

1826 -#: wt-status.c:1331

1916 +#: wt-status.c:1445

1917 +msgid "interactive rebase in progress; onto "

1918 +msgstr ""

1919 +

1920 +#: wt-status.c:1447

1921 msgid "rebase in progress; onto "

1922 msgstr ""

1923

1830 -#: wt-status.c:1336

1924 +#: wt-status.c:1452

1925 msgid "HEAD detached at "

1926 msgstr ""

1927

1834 -#: wt-status.c:1338

1928 +#: wt-status.c:1454

1929 msgid "HEAD detached from "

1930 msgstr ""

1931

1838 -#: wt-status.c:1341

1932 +#: wt-status.c:1457

1933 msgid "Not currently on any branch."

1934 msgstr ""

1935

1842 -#: wt-status.c:1358

1936 +#: wt-status.c:1474

1937 msgid "Initial commit"

1938 msgstr ""

1939

1846 -#: wt-status.c:1372

1940 +#: wt-status.c:1488

1941 msgid "Untracked files"

1942 msgstr ""

1943

1850 -#: wt-status.c:1374

1944 +#: wt-status.c:1490

1945 msgid "Ignored files"

1946 msgstr ""

1947

1854 -#: wt-status.c:1378

1948 +#: wt-status.c:1494

1949 #, c-format

1950 msgid ""

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

@@ -1859,78 +1953,78 @@ msgid ""

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

1954 msgstr ""

1955

1862 -#: wt-status.c:1384

1956 +#: wt-status.c:1500

1957 #, c-format

1958 msgid "Untracked files not listed%s"

1959 msgstr ""

1960

1867 -#: wt-status.c:1386

1961 +#: wt-status.c:1502

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

1963 msgstr ""

1964

1871 -#: wt-status.c:1392

1965 +#: wt-status.c:1508

1966 msgid "No changes"

1967 msgstr ""

1968

1875 -#: wt-status.c:1397

1969 +#: wt-status.c:1513

1970 #, c-format

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

1972 msgstr ""

1973

1880 -#: wt-status.c:1400

1974 +#: wt-status.c:1516

1975 #, c-format

1976 msgid "no changes added to commit\n"

1977 msgstr ""

1978

1885 -#: wt-status.c:1403

1979 +#: wt-status.c:1519

1980 #, c-format

1981 msgid ""

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

1983 "track)\n"

1984 msgstr ""

1985

1892 -#: wt-status.c:1406

1986 +#: wt-status.c:1522

1987 #, c-format

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

1989 msgstr ""

1990

1897 -#: wt-status.c:1409

1991 +#: wt-status.c:1525

1992 #, c-format

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

1994 msgstr ""

1995

1902 -#: wt-status.c:1412 wt-status.c:1417

1996 +#: wt-status.c:1528 wt-status.c:1533

1997 #, c-format

1998 msgid "nothing to commit\n"

1999 msgstr ""

2000

1907 -#: wt-status.c:1415

2001 +#: wt-status.c:1531

2002 #, c-format

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

2004 msgstr ""

2005

1912 -#: wt-status.c:1419

2006 +#: wt-status.c:1535

2007 #, c-format

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

2009 msgstr ""

2010

1917 -#: wt-status.c:1528

2011 +#: wt-status.c:1644

2012 msgid "HEAD (no branch)"

2013 msgstr ""

2014

1921 -#: wt-status.c:1534

2015 +#: wt-status.c:1650

2016 msgid "Initial commit on "

2017 msgstr ""

2018

1925 -#: wt-status.c:1561

2019 +#: wt-status.c:1677

2020 msgid "gone"

2021 msgstr ""

2022

1929 -#: wt-status.c:1563 wt-status.c:1571

2023 +#: wt-status.c:1679 wt-status.c:1687

2024 msgid "behind "

2025 msgstr ""

2026

1933 -#: compat/precompose_utf8.c:55 builtin/clone.c:345

2027 +#: compat/precompose_utf8.c:55 builtin/clone.c:403

2028 #, c-format

2029 msgid "failed to unlink '%s'"

2030 msgstr ""

@@ -1957,7 +2051,7 @@ msgstr ""

2051 msgid "Unstaged changes after refreshing the index:"

2052 msgstr ""

2053

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

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

2055 msgid "Could not read the index"

2056 msgstr ""

2057

@@ -1992,15 +2086,15 @@ msgstr ""

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

2087 msgstr ""

2088

1995 -#: builtin/add.c:249 builtin/clean.c:874 builtin/fetch.c:107 builtin/mv.c:110

1996 -#: builtin/prune-packed.c:55 builtin/push.c:508 builtin/remote.c:1369

1997 -#: builtin/rm.c:268

2089 +#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110

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

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

2092 msgid "dry run"

2093 msgstr ""

2094

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

2002 -#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:616

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

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

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

2098 msgid "be verbose"

2099 msgstr ""

2100

@@ -2008,7 +2102,7 @@ msgstr ""

2102 msgid "interactive picking"

2103 msgstr ""

2104

2011 -#: builtin/add.c:253 builtin/checkout.c:1221 builtin/reset.c:286

2105 +#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286

2106 msgid "select hunks interactively"

2107 msgstr ""

2108

@@ -2075,15 +2169,404 @@ msgstr ""

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

2170 msgstr ""

2171

2078 -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:918

2079 -#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

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

2173 +#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2174 msgid "index file corrupt"

2175 msgstr ""

2176

2083 -#: builtin/add.c:447 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2177 +#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2178 msgid "Unable to write new index file"

2179 msgstr ""

2180

2181 +#: builtin/am.c:41

2182 +#, c-format

2183 +msgid "could not stat %s"

2184 +msgstr ""

2185 +

2186 +#: builtin/am.c:270 builtin/am.c:1318 builtin/commit.c:737

2187 +#: builtin/merge.c:1079

2188 +#, c-format

2189 +msgid "could not read '%s'"

2190 +msgstr ""

2191 +

2192 +#: builtin/am.c:444

2193 +msgid "could not parse author script"

2194 +msgstr ""

2195 +

2196 +#: builtin/am.c:521

2197 +#, c-format

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

2199 +msgstr ""

2200 +

2201 +#: builtin/am.c:562 builtin/notes.c:300

2202 +#, c-format

2203 +msgid "Malformed input line: '%s'."

2204 +msgstr ""

2205 +

2206 +#: builtin/am.c:599 builtin/notes.c:315

2207 +#, c-format

2208 +msgid "Failed to copy notes from '%s' to '%s'"

2209 +msgstr ""

2210 +

2211 +#: builtin/am.c:625

2212 +msgid "fseek failed"

2213 +msgstr ""

2214 +

2215 +#: builtin/am.c:786 builtin/am.c:874

2216 +#, c-format

2217 +msgid "could not open '%s' for reading: %s"

2218 +msgstr ""

2219 +

2220 +#: builtin/am.c:793

2221 +#, c-format

2222 +msgid "could not open '%s' for writing: %s"

2223 +msgstr ""

2224 +

2225 +#: builtin/am.c:802

2226 +#, c-format

2227 +msgid "could not parse patch '%s'"

2228 +msgstr ""

2229 +

2230 +#: builtin/am.c:867

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

2232 +msgstr ""

2233 +

2234 +#: builtin/am.c:915

2235 +msgid "invalid timestamp"

2236 +msgstr ""

2237 +

2238 +#: builtin/am.c:918 builtin/am.c:926

2239 +msgid "invalid Date line"

2240 +msgstr ""

2241 +

2242 +#: builtin/am.c:923

2243 +msgid "invalid timezone offset"

2244 +msgstr ""

2245 +

2246 +#: builtin/am.c:1010

2247 +msgid "Patch format detection failed."

2248 +msgstr ""

2249 +

2250 +#: builtin/am.c:1015 builtin/clone.c:368

2251 +#, c-format

2252 +msgid "failed to create directory '%s'"

2253 +msgstr ""

2254 +

2255 +#: builtin/am.c:1019

2256 +msgid "Failed to split patches."

2257 +msgstr ""

2258 +

2259 +#: builtin/am.c:1151 builtin/commit.c:362

2260 +msgid "unable to write index file"

2261 +msgstr ""

2262 +

2263 +#: builtin/am.c:1202

2264 +#, c-format

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

2266 +msgstr ""

2267 +

2268 +#: builtin/am.c:1203

2269 +#, c-format

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

2271 +msgstr ""

2272 +

2273 +#: builtin/am.c:1204

2274 +#, c-format

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

2276 +msgstr ""

2277 +

2278 +#: builtin/am.c:1312

2279 +msgid "Patch is empty. Was it split wrong?"

2280 +msgstr ""

2281 +

2282 +#: builtin/am.c:1386 builtin/log.c:1345

2283 +#, c-format

2284 +msgid "invalid ident line: %s"

2285 +msgstr ""

2286 +

2287 +#: builtin/am.c:1413

2288 +#, c-format

2289 +msgid "unable to parse commit %s"

2290 +msgstr ""

2291 +

2292 +#: builtin/am.c:1587

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

2294 +msgstr ""

2295 +

2296 +#: builtin/am.c:1589

2297 +msgid "Using index info to reconstruct a base tree..."

2298 +msgstr ""

2299 +

2300 +#: builtin/am.c:1608

2301 +msgid ""

2302 +"Did you hand edit your patch?\n"

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

2304 +msgstr ""

2305 +

2306 +#: builtin/am.c:1614

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

2308 +msgstr ""

2309 +

2310 +#: builtin/am.c:1639

2311 +msgid "Failed to merge in the changes."

2312 +msgstr ""

2313 +

2314 +#: builtin/am.c:1664 builtin/merge.c:632

2315 +msgid "git write-tree failed to write a tree"

2316 +msgstr ""

2317 +

2318 +#: builtin/am.c:1671

2319 +msgid "applying to an empty history"

2320 +msgstr ""

2321 +

2322 +#: builtin/am.c:1684 builtin/commit.c:1752 builtin/merge.c:829

2323 +#: builtin/merge.c:854

2324 +msgid "failed to write commit object"

2325 +msgstr ""

2326 +

2327 +#: builtin/am.c:1716 builtin/am.c:1720

2328 +#, c-format

2329 +msgid "cannot resume: %s does not exist."

2330 +msgstr ""

2331 +

2332 +#: builtin/am.c:1736

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

2334 +msgstr ""

2335 +

2336 +#: builtin/am.c:1741

2337 +msgid "Commit Body is:"

2338 +msgstr ""

2339 +

2340 +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]

2341 +#. in your translation. The program will only accept English

2342 +#. input at this point.

2343 +#.

2344 +#: builtin/am.c:1751

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

2346 +msgstr ""

2347 +

2348 +#: builtin/am.c:1801

2349 +#, c-format

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

2351 +msgstr ""

2352 +

2353 +#: builtin/am.c:1836 builtin/am.c:1907

2354 +#, c-format

2355 +msgid "Applying: %.*s"

2356 +msgstr ""

2357 +

2358 +#: builtin/am.c:1852

2359 +msgid "No changes -- Patch already applied."

2360 +msgstr ""

2361 +

2362 +#: builtin/am.c:1860

2363 +#, c-format

2364 +msgid "Patch failed at %s %.*s"

2365 +msgstr ""

2366 +

2367 +#: builtin/am.c:1866

2368 +#, c-format

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

2370 +msgstr ""

2371 +

2372 +#: builtin/am.c:1910

2373 +msgid ""

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

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

2376 +"already introduced the same changes; you might want to skip this patch."

2377 +msgstr ""

2378 +

2379 +#: builtin/am.c:1917

2380 +msgid ""

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

2382 +"Did you forget to use 'git add'?"

2383 +msgstr ""

2384 +

2385 +#: builtin/am.c:2025 builtin/am.c:2029 builtin/am.c:2041 builtin/reset.c:308

2386 +#: builtin/reset.c:316

2387 +#, c-format

2388 +msgid "Could not parse object '%s'."

2389 +msgstr ""

2390 +

2391 +#: builtin/am.c:2077

2392 +msgid "failed to clean index"

2393 +msgstr ""

2394 +

2395 +#: builtin/am.c:2111

2396 +msgid ""

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

2398 +"Not rewinding to ORIG_HEAD"

2399 +msgstr ""

2400 +

2401 +#: builtin/am.c:2172

2402 +#, c-format

2403 +msgid "Invalid value for --patch-format: %s"

2404 +msgstr ""

2405 +

2406 +#: builtin/am.c:2194

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

2408 +msgstr ""

2409 +

2410 +#: builtin/am.c:2195

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

2412 +msgstr ""

2413 +

2414 +#: builtin/am.c:2201

2415 +msgid "run interactively"

2416 +msgstr ""

2417 +

2418 +#: builtin/am.c:2203

2419 +msgid "historical option -- no-op"

2420 +msgstr ""

2421 +

2422 +#: builtin/am.c:2205

2423 +msgid "allow fall back on 3way merging if needed"

2424 +msgstr ""

2425 +

2426 +#: builtin/am.c:2206 builtin/init-db.c:509 builtin/prune-packed.c:57

2427 +#: builtin/repack.c:171

2428 +msgid "be quiet"

2429 +msgstr ""

2430 +

2431 +#: builtin/am.c:2208

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

2433 +msgstr ""

2434 +

2435 +#: builtin/am.c:2211

2436 +msgid "recode into utf8 (default)"

2437 +msgstr ""

2438 +

2439 +#: builtin/am.c:2213

2440 +msgid "pass -k flag to git-mailinfo"

2441 +msgstr ""

2442 +

2443 +#: builtin/am.c:2215

2444 +msgid "pass -b flag to git-mailinfo"

2445 +msgstr ""

2446 +

2447 +#: builtin/am.c:2217

2448 +msgid "pass -m flag to git-mailinfo"

2449 +msgstr ""

2450 +

2451 +#: builtin/am.c:2219

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

2453 +msgstr ""

2454 +

2455 +#: builtin/am.c:2222

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

2457 +msgstr ""

2458 +

2459 +#: builtin/am.c:2225

2460 +msgid "strip everything before a scissors line"

2461 +msgstr ""

2462 +

2463 +#: builtin/am.c:2226 builtin/apply.c:4563

2464 +msgid "action"

2465 +msgstr ""

2466 +

2467 +#: builtin/am.c:2227 builtin/am.c:2230 builtin/am.c:2233 builtin/am.c:2236

2468 +#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248

2469 +#: builtin/am.c:2254

2470 +msgid "pass it through git-apply"

2471 +msgstr ""

2472 +

2473 +#: builtin/am.c:2235 builtin/apply.c:4587

2474 +msgid "root"

2475 +msgstr ""

2476 +

2477 +#: builtin/am.c:2238 builtin/am.c:2241 builtin/apply.c:4525

2478 +#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93

2479 +#: builtin/pull.c:167

2480 +msgid "path"

2481 +msgstr ""

2482 +

2483 +#: builtin/am.c:2244 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672

2484 +#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127

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

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

2487 +#: parse-options.h:134 parse-options.h:243

2488 +msgid "n"

2489 +msgstr ""

2490 +

2491 +#: builtin/am.c:2247 builtin/apply.c:4531

2492 +msgid "num"

2493 +msgstr ""

2494 +

2495 +#: builtin/am.c:2250 builtin/for-each-ref.c:34 builtin/replace.c:438

2496 +msgid "format"

2497 +msgstr ""

2498 +

2499 +#: builtin/am.c:2251

2500 +msgid "format the patch(es) are in"

2501 +msgstr ""

2502 +

2503 +#: builtin/am.c:2257

2504 +msgid "override error message when patch failure occurs"

2505 +msgstr ""

2506 +

2507 +#: builtin/am.c:2259

2508 +msgid "continue applying patches after resolving a conflict"

2509 +msgstr ""

2510 +

2511 +#: builtin/am.c:2262

2512 +msgid "synonyms for --continue"

2513 +msgstr ""

2514 +

2515 +#: builtin/am.c:2265

2516 +msgid "skip the current patch"

2517 +msgstr ""

2518 +

2519 +#: builtin/am.c:2268

2520 +msgid "restore the original branch and abort the patching operation."

2521 +msgstr ""

2522 +

2523 +#: builtin/am.c:2272

2524 +msgid "lie about committer date"

2525 +msgstr ""

2526 +

2527 +#: builtin/am.c:2274

2528 +msgid "use current timestamp for author date"

2529 +msgstr ""

2530 +

2531 +#: builtin/am.c:2276 builtin/commit.c:1590 builtin/merge.c:225

2532 +#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606

2533 +msgid "key-id"

2534 +msgstr ""

2535 +

2536 +#: builtin/am.c:2277

2537 +msgid "GPG-sign commits"

2538 +msgstr ""

2539 +

2540 +#: builtin/am.c:2280

2541 +msgid "(internal use for git-rebase)"

2542 +msgstr ""

2543 +

2544 +#: builtin/am.c:2295

2545 +msgid ""

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

2547 +"it will be removed. Please do not use it anymore."

2548 +msgstr ""

2549 +

2550 +#: builtin/am.c:2302

2551 +msgid "failed to read the index"

2552 +msgstr ""

2553 +

2554 +#: builtin/am.c:2317

2555 +#, c-format

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

2557 +msgstr ""

2558 +

2559 +#: builtin/am.c:2341

2560 +#, c-format

2561 +msgid ""

2562 +"Stray %s directory found.\n"

2563 +"Use \"git am --abort\" to remove it."

2564 +msgstr ""

2565 +

2566 +#: builtin/am.c:2347

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

2568 +msgstr ""

2569 +

2570 #: builtin/apply.c:59

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

2572 msgstr ""

@@ -2340,7 +2823,7 @@ msgstr ""

2823 msgid "Checking patch %s..."

2824 msgstr ""

2825

2343 -#: builtin/apply.c:3909 builtin/checkout.c:233 builtin/reset.c:135

2826 +#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135

2827 #, c-format

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

2829 msgstr ""

@@ -2419,11 +2902,6 @@ msgstr ""

2902 msgid "unable to read index file"

2903 msgstr ""

2904

2422 -#: builtin/apply.c:4525 builtin/apply.c:4528 builtin/clone.c:85

2423 -#: builtin/fetch.c:92

2424 -msgid "path"

2425 -msgstr ""

2426 -

2905 #: builtin/apply.c:4526

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

2907 msgstr ""

@@ -2432,10 +2910,6 @@ msgstr ""

2910 msgid "apply changes matching the given path"

2911 msgstr ""

2912

2435 -#: builtin/apply.c:4531

2436 -msgid "num"

2437 -msgstr ""

2438 -

2913 #: builtin/apply.c:4532

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

2915 msgstr ""

@@ -2492,10 +2966,6 @@ msgstr ""

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

2967 msgstr ""

2968

2495 -#: builtin/apply.c:4563

2496 -msgid "action"

2497 -msgstr ""

2498 -

2969 #: builtin/apply.c:4564

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

2971 msgstr ""

@@ -2528,10 +2998,6 @@ msgstr ""

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

2999 msgstr ""

3000

2531 -#: builtin/apply.c:4587

2532 -msgid "root"

2533 -msgstr ""

2534 -

3001 #: builtin/apply.c:4588

3002 msgid "prepend <root> to all filenames"

3003 msgstr ""

@@ -2614,11 +3080,11 @@ msgstr ""

3080 msgid "update BISECT_HEAD instead of checking out the current commit"

3081 msgstr ""

3082

2617 -#: builtin/blame.c:31

3083 +#: builtin/blame.c:32

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

3085 msgstr ""

3086

2621 -#: builtin/blame.c:36

3087 +#: builtin/blame.c:37

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

3089 msgstr ""

3090

@@ -2793,323 +3259,323 @@ msgstr ""

3259 msgid "branch '%s' not found."

3260 msgstr ""

3261

2796 -#: builtin/branch.c:258

3262 +#: builtin/branch.c:259

3263 #, c-format

3264 msgid "Error deleting remote-tracking branch '%s'"

3265 msgstr ""

3266

2801 -#: builtin/branch.c:259

3267 +#: builtin/branch.c:260

3268 #, c-format

3269 msgid "Error deleting branch '%s'"

3270 msgstr ""

3271

2806 -#: builtin/branch.c:266

3272 +#: builtin/branch.c:267

3273 #, c-format

3274 msgid "Deleted remote-tracking branch %s (was %s).\n"

3275 msgstr ""

3276

2811 -#: builtin/branch.c:267

3277 +#: builtin/branch.c:268

3278 #, c-format

3279 msgid "Deleted branch %s (was %s).\n"

3280 msgstr ""

3281

2816 -#: builtin/branch.c:368

3282 +#: builtin/branch.c:369

3283 #, c-format

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

3285 msgstr ""

3286

2821 -#: builtin/branch.c:451

3287 +#: builtin/branch.c:452

3288 #, c-format

3289 msgid "[%s: gone]"

3290 msgstr ""

3291

2826 -#: builtin/branch.c:456

3292 +#: builtin/branch.c:457

3293 #, c-format

3294 msgid "[%s]"

3295 msgstr ""

3296

2831 -#: builtin/branch.c:461

3297 +#: builtin/branch.c:462

3298 #, c-format

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

3300 msgstr ""

3301

2836 -#: builtin/branch.c:463

3302 +#: builtin/branch.c:464

3303 #, c-format

3304 msgid "[behind %d]"

3305 msgstr ""

3306

2841 -#: builtin/branch.c:467

3307 +#: builtin/branch.c:468

3308 #, c-format

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

3310 msgstr ""

3311

2846 -#: builtin/branch.c:469

3312 +#: builtin/branch.c:470

3313 #, c-format

3314 msgid "[ahead %d]"

3315 msgstr ""

3316

2851 -#: builtin/branch.c:472

3317 +#: builtin/branch.c:473

3318 #, c-format

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

3320 msgstr ""

3321

2856 -#: builtin/branch.c:475

3322 +#: builtin/branch.c:476

3323 #, c-format

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

3325 msgstr ""

3326

2861 -#: builtin/branch.c:488

3327 +#: builtin/branch.c:489

3328 msgid " **** invalid ref ****"

3329 msgstr ""

3330

2865 -#: builtin/branch.c:579

3331 +#: builtin/branch.c:580

3332 #, c-format

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

3334 msgstr ""

3335

2870 -#: builtin/branch.c:582

3336 +#: builtin/branch.c:583

3337 #, c-format

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

3339 msgstr ""

3340

2875 -#: builtin/branch.c:588

3341 +#: builtin/branch.c:589

3342 #, c-format

3343 msgid "(HEAD detached at %s)"

3344 msgstr ""

3345

2880 -#: builtin/branch.c:591

3346 +#: builtin/branch.c:592

3347 #, c-format

3348 msgid "(HEAD detached from %s)"

3349 msgstr ""

3350

2885 -#: builtin/branch.c:595

3351 +#: builtin/branch.c:596

3352 msgid "(no branch)"

3353 msgstr ""

3354

2889 -#: builtin/branch.c:642

3355 +#: builtin/branch.c:643

3356 #, c-format

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

3358 msgstr ""

3359

2894 -#: builtin/branch.c:690

3360 +#: builtin/branch.c:691

3361 msgid "some refs could not be read"

3362 msgstr ""

3363

2898 -#: builtin/branch.c:703

3364 +#: builtin/branch.c:704

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

3366 msgstr ""

3367

2902 -#: builtin/branch.c:713

3368 +#: builtin/branch.c:714

3369 #, c-format

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

3371 msgstr ""

3372

2907 -#: builtin/branch.c:728

3373 +#: builtin/branch.c:729

3374 msgid "Branch rename failed"

3375 msgstr ""

3376

2911 -#: builtin/branch.c:732

3377 +#: builtin/branch.c:733

3378 #, c-format

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

3380 msgstr ""

3381

2916 -#: builtin/branch.c:736

3382 +#: builtin/branch.c:737

3383 #, c-format

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

3385 msgstr ""

3386

2921 -#: builtin/branch.c:743

3387 +#: builtin/branch.c:744

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

3389 msgstr ""

3390

2925 -#: builtin/branch.c:758

3391 +#: builtin/branch.c:759

3392 #, c-format

3393 msgid "malformed object name %s"

3394 msgstr ""

3395

2930 -#: builtin/branch.c:780

3396 +#: builtin/branch.c:781

3397 #, c-format

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

3399 msgstr ""

3400

2935 -#: builtin/branch.c:810

3401 +#: builtin/branch.c:811

3402 msgid "Generic options"

3403 msgstr ""

3404

2939 -#: builtin/branch.c:812

3405 +#: builtin/branch.c:813

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

3407 msgstr ""

3408

2943 -#: builtin/branch.c:813

3409 +#: builtin/branch.c:814

3410 msgid "suppress informational messages"

3411 msgstr ""

3412

2947 -#: builtin/branch.c:814

3413 +#: builtin/branch.c:815

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

3415 msgstr ""

3416

2951 -#: builtin/branch.c:816

3417 +#: builtin/branch.c:817

3418 msgid "change upstream info"

3419 msgstr ""

3420

2955 -#: builtin/branch.c:820

3421 +#: builtin/branch.c:821

3422 msgid "use colored output"

3423 msgstr ""

3424

2959 -#: builtin/branch.c:821

3425 +#: builtin/branch.c:822

3426 msgid "act on remote-tracking branches"

3427 msgstr ""

3428

2963 -#: builtin/branch.c:824 builtin/branch.c:830 builtin/branch.c:851

2964 -#: builtin/branch.c:857 builtin/commit.c:1581 builtin/commit.c:1582

2965 -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/tag.c:616

2966 -#: builtin/tag.c:622

3429 +#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852

3430 +#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581

3431 +#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618

3432 +#: builtin/tag.c:624

3433 msgid "commit"

3434 msgstr ""

3435

2970 -#: builtin/branch.c:825 builtin/branch.c:831

3436 +#: builtin/branch.c:826 builtin/branch.c:832

3437 msgid "print only branches that contain the commit"

3438 msgstr ""

3439

2974 -#: builtin/branch.c:837

3440 +#: builtin/branch.c:838

3441 msgid "Specific git-branch actions:"

3442 msgstr ""

3443

2978 -#: builtin/branch.c:838

3444 +#: builtin/branch.c:839

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

3446 msgstr ""

3447

2982 -#: builtin/branch.c:840

3448 +#: builtin/branch.c:841

3449 msgid "delete fully merged branch"

3450 msgstr ""

3451

2986 -#: builtin/branch.c:841

3452 +#: builtin/branch.c:842

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

3454 msgstr ""

3455

2990 -#: builtin/branch.c:842

3456 +#: builtin/branch.c:843

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

3458 msgstr ""

3459

2994 -#: builtin/branch.c:843

3460 +#: builtin/branch.c:844

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

3462 msgstr ""

3463

2998 -#: builtin/branch.c:844

3464 +#: builtin/branch.c:845

3465 msgid "list branch names"

3466 msgstr ""

3467

3002 -#: builtin/branch.c:845

3468 +#: builtin/branch.c:846

3469 msgid "create the branch's reflog"

3470 msgstr ""

3471

3006 -#: builtin/branch.c:847

3472 +#: builtin/branch.c:848

3473 msgid "edit the description for the branch"

3474 msgstr ""

3475

3010 -#: builtin/branch.c:848

3476 +#: builtin/branch.c:849

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

3478 msgstr ""

3479

3014 -#: builtin/branch.c:851

3480 +#: builtin/branch.c:852

3481 msgid "print only not merged branches"

3482 msgstr ""

3483

3018 -#: builtin/branch.c:857

3484 +#: builtin/branch.c:858

3485 msgid "print only merged branches"

3486 msgstr ""

3487

3022 -#: builtin/branch.c:861

3488 +#: builtin/branch.c:862

3489 msgid "list branches in columns"

3490 msgstr ""

3491

3026 -#: builtin/branch.c:874

3492 +#: builtin/branch.c:875

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

3494 msgstr ""

3495

3030 -#: builtin/branch.c:878 builtin/clone.c:622

3496 +#: builtin/branch.c:879 builtin/clone.c:690

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

3498 msgstr ""

3499

3034 -#: builtin/branch.c:900

3500 +#: builtin/branch.c:901

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

3502 msgstr ""

3503

3038 -#: builtin/branch.c:911 builtin/branch.c:950

3504 +#: builtin/branch.c:912 builtin/branch.c:951

3505 msgid "branch name required"

3506 msgstr ""

3507

3042 -#: builtin/branch.c:926

3508 +#: builtin/branch.c:927

3509 msgid "Cannot give description to detached HEAD"

3510 msgstr ""

3511

3046 -#: builtin/branch.c:931

3512 +#: builtin/branch.c:932

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

3514 msgstr ""

3515

3050 -#: builtin/branch.c:938

3516 +#: builtin/branch.c:939

3517 #, c-format

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

3519 msgstr ""

3520

3055 -#: builtin/branch.c:941

3521 +#: builtin/branch.c:942

3522 #, c-format

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

3524 msgstr ""

3525

3060 -#: builtin/branch.c:956

3526 +#: builtin/branch.c:957

3527 msgid "too many branches for a rename operation"

3528 msgstr ""

3529

3064 -#: builtin/branch.c:961

3530 +#: builtin/branch.c:962

3531 msgid "too many branches to set new upstream"

3532 msgstr ""

3533

3068 -#: builtin/branch.c:965

3534 +#: builtin/branch.c:966

3535 #, c-format

3536 msgid ""

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

3538 msgstr ""

3539

3074 -#: builtin/branch.c:968 builtin/branch.c:990 builtin/branch.c:1011

3540 +#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012

3541 #, c-format

3542 msgid "no such branch '%s'"

3543 msgstr ""

3544

3079 -#: builtin/branch.c:972

3545 +#: builtin/branch.c:973

3546 #, c-format

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

3548 msgstr ""

3549

3084 -#: builtin/branch.c:984

3550 +#: builtin/branch.c:985

3551 msgid "too many branches to unset upstream"

3552 msgstr ""

3553

3088 -#: builtin/branch.c:988

3554 +#: builtin/branch.c:989

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

3556 msgstr ""

3557

3092 -#: builtin/branch.c:994

3558 +#: builtin/branch.c:995

3559 #, c-format

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

3561 msgstr ""

3562

3097 -#: builtin/branch.c:1008

3563 +#: builtin/branch.c:1009

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

3565 msgstr ""

3566

3101 -#: builtin/branch.c:1014

3567 +#: builtin/branch.c:1015

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

3569 msgstr ""

3570

3105 -#: builtin/branch.c:1017

3571 +#: builtin/branch.c:1018

3572 #, c-format

3573 msgid ""

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

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

3576 msgstr ""

3577

3112 -#: builtin/branch.c:1034

3578 +#: builtin/branch.c:1035

3579 #, c-format

3580 msgid ""

3581 "\n"

@@ -3117,12 +3583,12 @@ msgid ""

3583 "\n"

3584 msgstr ""

3585

3120 -#: builtin/branch.c:1035

3586 +#: builtin/branch.c:1036

3587 #, c-format

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

3589 msgstr ""

3590

3125 -#: builtin/branch.c:1036

3591 +#: builtin/branch.c:1037

3592 #, c-format

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

3594 msgstr ""

@@ -3140,58 +3606,66 @@ msgstr ""

3606 msgid "Need a repository to unbundle."

3607 msgstr ""

3608

3143 -#: builtin/cat-file.c:369

3609 +#: builtin/cat-file.c:428

3610 msgid ""

3611 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"

3612 "<type>|--textconv) <object>"

3613 msgstr ""

3614

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

3615 +#: builtin/cat-file.c:429

3616 msgid ""

3617 "git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"

3618 "objects>"

3619 msgstr ""

3620

3155 -#: builtin/cat-file.c:407

3621 +#: builtin/cat-file.c:466

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

3623 msgstr ""

3624

3159 -#: builtin/cat-file.c:408

3625 +#: builtin/cat-file.c:467

3626 msgid "show object type"

3627 msgstr ""

3628

3163 -#: builtin/cat-file.c:409

3629 +#: builtin/cat-file.c:468

3630 msgid "show object size"

3631 msgstr ""

3632

3167 -#: builtin/cat-file.c:411

3633 +#: builtin/cat-file.c:470

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

3635 msgstr ""

3636

3171 -#: builtin/cat-file.c:412

3637 +#: builtin/cat-file.c:471

3638 msgid "pretty-print object's content"

3639 msgstr ""

3640

3175 -#: builtin/cat-file.c:414

3641 +#: builtin/cat-file.c:473

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

3643 msgstr ""

3644

3179 -#: builtin/cat-file.c:416

3645 +#: builtin/cat-file.c:475

3646 msgid "allow -s and -t to work with broken/corrupt objects"

3647 msgstr ""

3648

3183 -#: builtin/cat-file.c:418

3649 +#: builtin/cat-file.c:476

3650 +msgid "buffer --batch output"

3651 +msgstr ""

3652 +

3653 +#: builtin/cat-file.c:478

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

3655 msgstr ""

3656

3187 -#: builtin/cat-file.c:421

3657 +#: builtin/cat-file.c:481

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

3659 msgstr ""

3660

3191 -#: builtin/cat-file.c:424

3661 +#: builtin/cat-file.c:484

3662 msgid "follow in-tree symlinks (used with --batch or --batch-check)"

3663 msgstr ""

3664

3665 +#: builtin/cat-file.c:486

3666 +msgid "show all objects with --batch or --batch-check"

3667 +msgstr ""

3668 +

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

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

3671 msgstr ""

@@ -3216,7 +3690,7 @@ msgstr ""

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

3691 msgstr ""

3692

3219 -#: builtin/check-ignore.c:18 builtin/checkout.c:1202 builtin/gc.c:279

3693 +#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267

3694 msgid "suppress progress reporting"

3695 msgstr ""

3696

@@ -3313,113 +3787,113 @@ msgstr ""

3787 msgid "copy out the files from named stage"

3788 msgstr ""

3789

3316 -#: builtin/checkout.c:24

3790 +#: builtin/checkout.c:25

3791 msgid "git checkout [<options>] <branch>"

3792 msgstr ""

3793

3320 -#: builtin/checkout.c:25

3794 +#: builtin/checkout.c:26

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

3796 msgstr ""

3797

3324 -#: builtin/checkout.c:134 builtin/checkout.c:167

3798 +#: builtin/checkout.c:133 builtin/checkout.c:166

3799 #, c-format

3800 msgid "path '%s' does not have our version"

3801 msgstr ""

3802

3329 -#: builtin/checkout.c:136 builtin/checkout.c:169

3803 +#: builtin/checkout.c:135 builtin/checkout.c:168

3804 #, c-format

3805 msgid "path '%s' does not have their version"

3806 msgstr ""

3807

3334 -#: builtin/checkout.c:152

3808 +#: builtin/checkout.c:151

3809 #, c-format

3810 msgid "path '%s' does not have all necessary versions"

3811 msgstr ""

3812

3339 -#: builtin/checkout.c:196

3813 +#: builtin/checkout.c:195

3814 #, c-format

3815 msgid "path '%s' does not have necessary versions"

3816 msgstr ""

3817

3344 -#: builtin/checkout.c:213

3818 +#: builtin/checkout.c:212

3819 #, c-format

3820 msgid "path '%s': cannot merge"

3821 msgstr ""

3822

3349 -#: builtin/checkout.c:230

3823 +#: builtin/checkout.c:229

3824 #, c-format

3825 msgid "Unable to add merge result for '%s'"

3826 msgstr ""

3827

3354 -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

3355 -#: builtin/checkout.c:260

3828 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

3829 +#: builtin/checkout.c:259

3830 #, c-format

3831 msgid "'%s' cannot be used with updating paths"

3832 msgstr ""

3833

3360 -#: builtin/checkout.c:263 builtin/checkout.c:266

3834 +#: builtin/checkout.c:262 builtin/checkout.c:265

3835 #, c-format

3836 msgid "'%s' cannot be used with %s"

3837 msgstr ""

3838

3365 -#: builtin/checkout.c:269

3839 +#: builtin/checkout.c:268

3840 #, c-format

3841 msgid "Cannot update paths and switch to branch '%s' at the same time."

3842 msgstr ""

3843

3370 -#: builtin/checkout.c:280 builtin/checkout.c:474

3844 +#: builtin/checkout.c:279 builtin/checkout.c:473

3845 msgid "corrupt index file"

3846 msgstr ""

3847

3374 -#: builtin/checkout.c:340 builtin/checkout.c:347

3848 +#: builtin/checkout.c:339 builtin/checkout.c:346

3849 #, c-format

3850 msgid "path '%s' is unmerged"

3851 msgstr ""

3852

3379 -#: builtin/checkout.c:496

3853 +#: builtin/checkout.c:495

3854 msgid "you need to resolve your current index first"

3855 msgstr ""

3856

3383 -#: builtin/checkout.c:627

3857 +#: builtin/checkout.c:622

3858 #, c-format

3385 -msgid "Can not do reflog for '%s'\n"

3859 +msgid "Can not do reflog for '%s': %s\n"

3860 msgstr ""

3861

3388 -#: builtin/checkout.c:663

3862 +#: builtin/checkout.c:660

3863 msgid "HEAD is now at"

3864 msgstr ""

3865

3392 -#: builtin/checkout.c:670

3866 +#: builtin/checkout.c:667

3867 #, c-format

3868 msgid "Reset branch '%s'\n"

3869 msgstr ""

3870

3397 -#: builtin/checkout.c:673

3871 +#: builtin/checkout.c:670

3872 #, c-format

3873 msgid "Already on '%s'\n"

3874 msgstr ""

3875

3402 -#: builtin/checkout.c:677

3876 +#: builtin/checkout.c:674

3877 #, c-format

3878 msgid "Switched to and reset branch '%s'\n"

3879 msgstr ""

3880

3407 -#: builtin/checkout.c:679 builtin/checkout.c:1134

3881 +#: builtin/checkout.c:676 builtin/checkout.c:1065

3882 #, c-format

3883 msgid "Switched to a new branch '%s'\n"

3884 msgstr ""

3885

3412 -#: builtin/checkout.c:681

3886 +#: builtin/checkout.c:678

3887 #, c-format

3888 msgid "Switched to branch '%s'\n"

3889 msgstr ""

3890

3417 -#: builtin/checkout.c:733

3891 +#: builtin/checkout.c:730

3892 #, c-format

3893 msgid " ... and %d more.\n"

3894 msgstr ""

3895

3422 -#: builtin/checkout.c:739

3896 +#: builtin/checkout.c:736

3897 #, c-format

3898 msgid ""

3899 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3434,7 +3908,7 @@ msgid_plural ""

3908 msgstr[0] ""

3909 msgstr[1] ""

3910

3437 -#: builtin/checkout.c:758

3911 +#: builtin/checkout.c:755

3912 #, c-format

3913 msgid ""

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

@@ -3451,197 +3925,192 @@ msgid_plural ""

3925 msgstr[0] ""

3926 msgstr[1] ""

3927

3454 -#: builtin/checkout.c:794

3928 +#: builtin/checkout.c:791

3929 msgid "internal error in revision walk"

3930 msgstr ""

3931

3458 -#: builtin/checkout.c:798

3932 +#: builtin/checkout.c:795

3933 msgid "Previous HEAD position was"

3934 msgstr ""

3935

3462 -#: builtin/checkout.c:825 builtin/checkout.c:1129

3936 +#: builtin/checkout.c:822 builtin/checkout.c:1060

3937 msgid "You are on a branch yet to be born"

3938 msgstr ""

3939

3466 -#: builtin/checkout.c:931

3467 -#, c-format

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

3469 -msgstr ""

3470 -

3471 -#: builtin/checkout.c:1036

3940 +#: builtin/checkout.c:967

3941 #, c-format

3942 msgid "only one reference expected, %d given."

3943 msgstr ""

3944

3476 -#: builtin/checkout.c:1075

3945 +#: builtin/checkout.c:1006 builtin/worktree.c:210

3946 #, c-format

3947 msgid "invalid reference: %s"

3948 msgstr ""

3949

3481 -#: builtin/checkout.c:1104

3950 +#: builtin/checkout.c:1035

3951 #, c-format

3952 msgid "reference is not a tree: %s"

3953 msgstr ""

3954

3486 -#: builtin/checkout.c:1143

3955 +#: builtin/checkout.c:1074

3956 msgid "paths cannot be used with switching branches"

3957 msgstr ""

3958

3490 -#: builtin/checkout.c:1146 builtin/checkout.c:1150

3959 +#: builtin/checkout.c:1077 builtin/checkout.c:1081

3960 #, c-format

3961 msgid "'%s' cannot be used with switching branches"

3962 msgstr ""

3963

3495 -#: builtin/checkout.c:1154 builtin/checkout.c:1157 builtin/checkout.c:1162

3496 -#: builtin/checkout.c:1165

3964 +#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093

3965 +#: builtin/checkout.c:1096

3966 #, c-format

3967 msgid "'%s' cannot be used with '%s'"

3968 msgstr ""

3969

3501 -#: builtin/checkout.c:1170

3970 +#: builtin/checkout.c:1101

3971 #, c-format

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

3973 msgstr ""

3974

3506 -#: builtin/checkout.c:1203 builtin/checkout.c:1205 builtin/clone.c:83

3507 -#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:282

3508 -#: builtin/worktree.c:284

3975 +#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83

3976 +#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317

3977 +#: builtin/worktree.c:319

3978 msgid "branch"

3979 msgstr ""

3980

3512 -#: builtin/checkout.c:1204

3981 +#: builtin/checkout.c:1135

3982 msgid "create and checkout a new branch"

3983 msgstr ""

3984

3516 -#: builtin/checkout.c:1206

3985 +#: builtin/checkout.c:1137

3986 msgid "create/reset and checkout a branch"

3987 msgstr ""

3988

3520 -#: builtin/checkout.c:1207

3989 +#: builtin/checkout.c:1138

3990 msgid "create reflog for new branch"

3991 msgstr ""

3992

3524 -#: builtin/checkout.c:1208

3993 +#: builtin/checkout.c:1139

3994 msgid "detach the HEAD at named commit"

3995 msgstr ""

3996

3528 -#: builtin/checkout.c:1209

3997 +#: builtin/checkout.c:1140

3998 msgid "set upstream info for new branch"

3999 msgstr ""

4000

3532 -#: builtin/checkout.c:1211

4001 +#: builtin/checkout.c:1142

4002 msgid "new-branch"

4003 msgstr ""

4004

3536 -#: builtin/checkout.c:1211

4005 +#: builtin/checkout.c:1142

4006 msgid "new unparented branch"

4007 msgstr ""

4008

3540 -#: builtin/checkout.c:1212

4009 +#: builtin/checkout.c:1143

4010 msgid "checkout our version for unmerged files"

4011 msgstr ""

4012

3544 -#: builtin/checkout.c:1214

4013 +#: builtin/checkout.c:1145

4014 msgid "checkout their version for unmerged files"

4015 msgstr ""

4016

3548 -#: builtin/checkout.c:1216

4017 +#: builtin/checkout.c:1147

4018 msgid "force checkout (throw away local modifications)"

4019 msgstr ""

4020

3552 -#: builtin/checkout.c:1217

4021 +#: builtin/checkout.c:1148

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

4023 msgstr ""

4024

3556 -#: builtin/checkout.c:1218 builtin/merge.c:227

4025 +#: builtin/checkout.c:1149 builtin/merge.c:227

4026 msgid "update ignored files (default)"

4027 msgstr ""

4028

3560 -#: builtin/checkout.c:1219 builtin/log.c:1239 parse-options.h:244

4029 +#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249

4030 msgid "style"

4031 msgstr ""

4032

3564 -#: builtin/checkout.c:1220

4033 +#: builtin/checkout.c:1151

4034 msgid "conflict style (merge or diff3)"

4035 msgstr ""

4036

3568 -#: builtin/checkout.c:1223

4037 +#: builtin/checkout.c:1154

4038 msgid "do not limit pathspecs to sparse entries only"

4039 msgstr ""

4040

3572 -#: builtin/checkout.c:1225

4041 +#: builtin/checkout.c:1156

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

4043 msgstr ""

4044

3576 -#: builtin/checkout.c:1227

4045 +#: builtin/checkout.c:1158

4046 msgid "do not check if another worktree is holding the given ref"

4047 msgstr ""

4048

3580 -#: builtin/checkout.c:1252

4049 +#: builtin/checkout.c:1181

4050 msgid "-b, -B and --orphan are mutually exclusive"

4051 msgstr ""

4052

3584 -#: builtin/checkout.c:1269

4053 +#: builtin/checkout.c:1198

4054 msgid "--track needs a branch name"

4055 msgstr ""

4056

3588 -#: builtin/checkout.c:1274

4057 +#: builtin/checkout.c:1203

4058 msgid "Missing branch name; try -b"

4059 msgstr ""

4060

3592 -#: builtin/checkout.c:1310

4061 +#: builtin/checkout.c:1239

4062 msgid "invalid path specification"

4063 msgstr ""

4064

3596 -#: builtin/checkout.c:1317

4065 +#: builtin/checkout.c:1246

4066 #, c-format

4067 msgid ""

4068 "Cannot update paths and switch to branch '%s' at the same time.\n"

4069 "Did you intend to checkout '%s' which can not be resolved as commit?"

4070 msgstr ""

4071

3603 -#: builtin/checkout.c:1322

4072 +#: builtin/checkout.c:1251

4073 #, c-format

4074 msgid "git checkout: --detach does not take a path argument '%s'"

4075 msgstr ""

4076

3608 -#: builtin/checkout.c:1326

4077 +#: builtin/checkout.c:1255

4078 msgid ""

4079 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

4080 "checking out of the index."

4081 msgstr ""

4082

3614 -#: builtin/clean.c:26

4083 +#: builtin/clean.c:25

4084 msgid ""

4085 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."

4086 msgstr ""

4087

3619 -#: builtin/clean.c:30

4088 +#: builtin/clean.c:29

4089 #, c-format

4090 msgid "Removing %s\n"

4091 msgstr ""

4092

3624 -#: builtin/clean.c:31

4093 +#: builtin/clean.c:30

4094 #, c-format

4095 msgid "Would remove %s\n"

4096 msgstr ""

4097

3629 -#: builtin/clean.c:32

4098 +#: builtin/clean.c:31

4099 #, c-format

4100 msgid "Skipping repository %s\n"

4101 msgstr ""

4102

3634 -#: builtin/clean.c:33

4103 +#: builtin/clean.c:32

4104 #, c-format

4105 msgid "Would skip repository %s\n"

4106 msgstr ""

4107

3639 -#: builtin/clean.c:34

4108 +#: builtin/clean.c:33

4109 #, c-format

4110 msgid "failed to remove %s"

4111 msgstr ""

4112

3644 -#: builtin/clean.c:295

4113 +#: builtin/clean.c:317

4114 msgid ""

4115 "Prompt help:\n"

4116 "1 - select a numbered item\n"

@@ -3649,7 +4118,7 @@ msgid ""

4118 " - (empty) select nothing"

4119 msgstr ""

4120

3652 -#: builtin/clean.c:299

4121 +#: builtin/clean.c:321

4122 msgid ""

4123 "Prompt help:\n"

4124 "1 - select a single item\n"

@@ -3661,36 +4130,36 @@ msgid ""

4130 " - (empty) finish selecting"

4131 msgstr ""

4132

3664 -#: builtin/clean.c:515

4133 +#: builtin/clean.c:537

4134 #, c-format

4135 msgid "Huh (%s)?"

4136 msgstr ""

4137

3669 -#: builtin/clean.c:657

4138 +#: builtin/clean.c:679

4139 #, c-format

4140 msgid "Input ignore patterns>> "

4141 msgstr ""

4142

3674 -#: builtin/clean.c:694

4143 +#: builtin/clean.c:716

4144 #, c-format

4145 msgid "WARNING: Cannot find items matched by: %s"

4146 msgstr ""

4147

3679 -#: builtin/clean.c:715

4148 +#: builtin/clean.c:737

4149 msgid "Select items to delete"

4150 msgstr ""

4151

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

3684 -#: builtin/clean.c:756

4153 +#: builtin/clean.c:778

4154 #, c-format

4155 msgid "Remove %s [y/N]? "

4156 msgstr ""

4157

3689 -#: builtin/clean.c:781

4158 +#: builtin/clean.c:803

4159 msgid "Bye."

4160 msgstr ""

4161

3693 -#: builtin/clean.c:789

4162 +#: builtin/clean.c:811

4163 msgid ""

4164 "clean - start cleaning\n"

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

@@ -3701,68 +4170,68 @@ msgid ""

4170 "? - help for prompt selection"

4171 msgstr ""

4172

3704 -#: builtin/clean.c:816

4173 +#: builtin/clean.c:838

4174 msgid "*** Commands ***"

4175 msgstr ""

4176

3708 -#: builtin/clean.c:817

4177 +#: builtin/clean.c:839

4178 msgid "What now"

4179 msgstr ""

4180

3712 -#: builtin/clean.c:825

4181 +#: builtin/clean.c:847

4182 msgid "Would remove the following item:"

4183 msgid_plural "Would remove the following items:"

4184 msgstr[0] ""

4185 msgstr[1] ""

4186

3718 -#: builtin/clean.c:842

4187 +#: builtin/clean.c:864

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

4189 msgstr ""

4190

3722 -#: builtin/clean.c:873

4191 +#: builtin/clean.c:895

4192 msgid "do not print names of files removed"

4193 msgstr ""

4194

3726 -#: builtin/clean.c:875

4195 +#: builtin/clean.c:897

4196 msgid "force"

4197 msgstr ""

4198

3730 -#: builtin/clean.c:876

4199 +#: builtin/clean.c:898

4200 msgid "interactive cleaning"

4201 msgstr ""

4202

3734 -#: builtin/clean.c:878

4203 +#: builtin/clean.c:900

4204 msgid "remove whole directories"

4205 msgstr ""

4206

3738 -#: builtin/clean.c:879 builtin/describe.c:407 builtin/grep.c:714

4207 +#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714

4208 #: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187

4209 msgid "pattern"

4210 msgstr ""

4211

3743 -#: builtin/clean.c:880

4212 +#: builtin/clean.c:902

4213 msgid "add <pattern> to ignore rules"

4214 msgstr ""

4215

3747 -#: builtin/clean.c:881

4216 +#: builtin/clean.c:903

4217 msgid "remove ignored files, too"

4218 msgstr ""

4219

3751 -#: builtin/clean.c:883

4220 +#: builtin/clean.c:905

4221 msgid "remove only ignored files"

4222 msgstr ""

4223

3755 -#: builtin/clean.c:901

4224 +#: builtin/clean.c:923

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

4226 msgstr ""

4227

3759 -#: builtin/clean.c:905

4228 +#: builtin/clean.c:927

4229 msgid ""

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

4231 "clean"

4232 msgstr ""

4233

3765 -#: builtin/clean.c:908

4234 +#: builtin/clean.c:930

4235 msgid ""

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

4237 "refusing to clean"

@@ -3772,8 +4241,8 @@ msgstr ""

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

4242 msgstr ""

4243

3775 -#: builtin/clone.c:57 builtin/fetch.c:111 builtin/merge.c:224

3776 -#: builtin/push.c:523

4244 +#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224

4245 +#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168

4246 msgid "force progress reporting"

4247 msgstr ""

4248

@@ -3781,7 +4250,7 @@ msgstr ""

4250 msgid "don't create a checkout"

4251 msgstr ""

4252

3784 -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:503

4253 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504

4254 msgid "create a bare repository"

4255 msgstr ""

4256

@@ -3805,11 +4274,11 @@ msgstr ""

4274 msgid "initialize submodules in the clone"

4275 msgstr ""

4276

3808 -#: builtin/clone.c:75 builtin/init-db.c:500

4277 +#: builtin/clone.c:75 builtin/init-db.c:501

4278 msgid "template-directory"

4279 msgstr ""

4280

3812 -#: builtin/clone.c:76 builtin/init-db.c:501

4281 +#: builtin/clone.c:76 builtin/init-db.c:502

4282 msgid "directory from which templates will be used"

4283 msgstr ""

4284

@@ -3837,7 +4306,8 @@ msgstr ""

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

4307 msgstr ""

4308

3840 -#: builtin/clone.c:87 builtin/fetch.c:112 builtin/grep.c:659

4309 +#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659

4310 +#: builtin/pull.c:186

4311 msgid "depth"

4312 msgstr ""

4313

@@ -3849,11 +4319,11 @@ msgstr ""

4319 msgid "clone only one branch, HEAD or --branch"

4320 msgstr ""

4321

3852 -#: builtin/clone.c:91 builtin/init-db.c:509

4322 +#: builtin/clone.c:91 builtin/init-db.c:510

4323 msgid "gitdir"

4324 msgstr ""

4325

3856 -#: builtin/clone.c:92 builtin/init-db.c:510

4326 +#: builtin/clone.c:92 builtin/init-db.c:511

4327 msgid "separate git dir from working tree"

4328 msgstr ""

4329

@@ -3865,178 +4335,173 @@ msgstr ""

4335 msgid "set config inside the new repository"

4336 msgstr ""

4337

3868 -#: builtin/clone.c:240

4338 +#: builtin/clone.c:298

4339 #, c-format

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

4341 msgstr ""

4342

3873 -#: builtin/clone.c:244

4343 +#: builtin/clone.c:302

4344 #, c-format

4345 msgid "reference repository '%s' is shallow"

4346 msgstr ""

4347

3878 -#: builtin/clone.c:247

4348 +#: builtin/clone.c:305

4349 #, c-format

4350 msgid "reference repository '%s' is grafted"

4351 msgstr ""

4352

3883 -#: builtin/clone.c:310

3884 -#, c-format

3885 -msgid "failed to create directory '%s'"

3886 -msgstr ""

3887 -

3888 -#: builtin/clone.c:312 builtin/diff.c:84

4353 +#: builtin/clone.c:370 builtin/diff.c:84

4354 #, c-format

4355 msgid "failed to stat '%s'"

4356 msgstr ""

4357

3893 -#: builtin/clone.c:314

4358 +#: builtin/clone.c:372

4359 #, c-format

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

4361 msgstr ""

4362

3898 -#: builtin/clone.c:328

4363 +#: builtin/clone.c:386

4364 #, c-format

4365 msgid "failed to stat %s\n"

4366 msgstr ""

4367

3903 -#: builtin/clone.c:350

4368 +#: builtin/clone.c:408

4369 #, c-format

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

4371 msgstr ""

4372

3908 -#: builtin/clone.c:354

4373 +#: builtin/clone.c:412

4374 #, c-format

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

4376 msgstr ""

4377

3913 -#: builtin/clone.c:377 builtin/clone.c:551

4378 +#: builtin/clone.c:435 builtin/clone.c:619

4379 #, c-format

4380 msgid "done.\n"

4381 msgstr ""

4382

3918 -#: builtin/clone.c:389

4383 +#: builtin/clone.c:447

4384 msgid ""

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

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

4387 "and retry the checkout with 'git checkout -f HEAD'\n"

4388 msgstr ""

4389

3925 -#: builtin/clone.c:466

4390 +#: builtin/clone.c:524

4391 #, c-format

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

4393 msgstr ""

4394

3930 -#: builtin/clone.c:546

4395 +#: builtin/clone.c:614

4396 #, c-format

4397 msgid "Checking connectivity... "

4398 msgstr ""

4399

3935 -#: builtin/clone.c:549

4400 +#: builtin/clone.c:617

4401 msgid "remote did not send all necessary objects"

4402 msgstr ""

4403

3939 -#: builtin/clone.c:613

4404 +#: builtin/clone.c:681

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

4406 msgstr ""

4407

3943 -#: builtin/clone.c:644

4408 +#: builtin/clone.c:712

4409 msgid "unable to checkout working tree"

4410 msgstr ""

4411

3947 -#: builtin/clone.c:731

4412 +#: builtin/clone.c:799

4413 msgid "cannot repack to clean up"

4414 msgstr ""

4415

3951 -#: builtin/clone.c:733

4416 +#: builtin/clone.c:801

4417 msgid "cannot unlink temporary alternates file"

4418 msgstr ""

4419

3955 -#: builtin/clone.c:763

4420 +#: builtin/clone.c:831

4421 msgid "Too many arguments."

4422 msgstr ""

4423

3959 -#: builtin/clone.c:767

4424 +#: builtin/clone.c:835

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

4426 msgstr ""

4427

3963 -#: builtin/clone.c:778

4428 +#: builtin/clone.c:846

4429 #, c-format

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

4431 msgstr ""

4432

3968 -#: builtin/clone.c:781

4433 +#: builtin/clone.c:849

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

4435 msgstr ""

4436

3972 -#: builtin/clone.c:794

4437 +#: builtin/clone.c:862

4438 #, c-format

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

4440 msgstr ""

4441

3977 -#: builtin/clone.c:800 builtin/fetch.c:1160

4442 +#: builtin/clone.c:868 builtin/fetch.c:1168

4443 #, c-format

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

4445 msgstr ""

4446

3982 -#: builtin/clone.c:810

4447 +#: builtin/clone.c:878

4448 #, c-format

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

4450 msgstr ""

4451

3987 -#: builtin/clone.c:820

4452 +#: builtin/clone.c:888

4453 #, c-format

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

4455 msgstr ""

4456

3992 -#: builtin/clone.c:835 builtin/clone.c:846 builtin/worktree.c:193

3993 -#: builtin/worktree.c:220

4457 +#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218

4458 +#: builtin/worktree.c:245

4459 #, c-format

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

4461 msgstr ""

4462

3998 -#: builtin/clone.c:838

4463 +#: builtin/clone.c:906

4464 #, c-format

4465 msgid "could not create work tree dir '%s'"

4466 msgstr ""

4467

4003 -#: builtin/clone.c:856

4468 +#: builtin/clone.c:924

4469 #, c-format

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

4471 msgstr ""

4472

4008 -#: builtin/clone.c:858

4473 +#: builtin/clone.c:926

4474 #, c-format

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

4476 msgstr ""

4477

4013 -#: builtin/clone.c:883

4478 +#: builtin/clone.c:951

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

4480 msgstr ""

4481

4017 -#: builtin/clone.c:900

4482 +#: builtin/clone.c:968

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

4484 msgstr ""

4485

4021 -#: builtin/clone.c:903

4486 +#: builtin/clone.c:971

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

4488 msgstr ""

4489

4025 -#: builtin/clone.c:908

4490 +#: builtin/clone.c:976

4491 msgid "--local is ignored"

4492 msgstr ""

4493

4029 -#: builtin/clone.c:912

4494 +#: builtin/clone.c:980

4495 #, c-format

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

4497 msgstr ""

4498

4034 -#: builtin/clone.c:961 builtin/clone.c:969

4499 +#: builtin/clone.c:1029 builtin/clone.c:1037

4500 #, c-format

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

4502 msgstr ""

4503

4039 -#: builtin/clone.c:972

4504 +#: builtin/clone.c:1040

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

4506 msgstr ""

4507

@@ -4143,108 +4608,99 @@ msgstr ""

4608 msgid "failed to unpack HEAD tree object"

4609 msgstr ""

4610

4146 -#: builtin/commit.c:344

4611 +#: builtin/commit.c:345

4612 msgid "unable to create temporary index"

4613 msgstr ""

4614

4150 -#: builtin/commit.c:350

4615 +#: builtin/commit.c:351

4616 msgid "interactive add failed"

4617 msgstr ""

4618

4154 -#: builtin/commit.c:361

4155 -msgid "unable to write index file"

4156 -msgstr ""

4157 -

4158 -#: builtin/commit.c:363

4619 +#: builtin/commit.c:364

4620 msgid "unable to update temporary index"

4621 msgstr ""

4622

4162 -#: builtin/commit.c:365

4623 +#: builtin/commit.c:366

4624 msgid "Failed to update main cache tree"

4625 msgstr ""

4626

4166 -#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463

4627 +#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462

4628 msgid "unable to write new_index file"

4629 msgstr ""

4630

4170 -#: builtin/commit.c:445

4631 +#: builtin/commit.c:444

4632 msgid "cannot do a partial commit during a merge."

4633 msgstr ""

4634

4174 -#: builtin/commit.c:447

4635 +#: builtin/commit.c:446

4636 msgid "cannot do a partial commit during a cherry-pick."

4637 msgstr ""

4638

4178 -#: builtin/commit.c:456

4639 +#: builtin/commit.c:455

4640 msgid "cannot read the index"

4641 msgstr ""

4642

4182 -#: builtin/commit.c:475

4643 +#: builtin/commit.c:474

4644 msgid "unable to write temporary index file"

4645 msgstr ""

4646

4186 -#: builtin/commit.c:580

4647 +#: builtin/commit.c:579

4648 #, c-format

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

4650 msgstr ""

4651

4191 -#: builtin/commit.c:582

4652 +#: builtin/commit.c:581

4653 #, c-format

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

4655 msgstr ""

4656

4196 -#: builtin/commit.c:601

4657 +#: builtin/commit.c:600

4658 msgid "malformed --author parameter"

4659 msgstr ""

4660

4200 -#: builtin/commit.c:609

4661 +#: builtin/commit.c:608

4662 #, c-format

4663 msgid "invalid date format: %s"

4664 msgstr ""

4665

4205 -#: builtin/commit.c:653

4666 +#: builtin/commit.c:652

4667 msgid ""

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

4669 "in the current commit message"

4670 msgstr ""

4671

4211 -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080

4672 +#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079

4673 #, c-format

4674 msgid "could not lookup commit %s"

4675 msgstr ""

4676

4216 -#: builtin/commit.c:702 builtin/shortlog.c:273

4677 +#: builtin/commit.c:701 builtin/shortlog.c:273

4678 #, c-format

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

4680 msgstr ""

4681

4221 -#: builtin/commit.c:704

4682 +#: builtin/commit.c:703

4683 msgid "could not read log from standard input"

4684 msgstr ""

4685

4225 -#: builtin/commit.c:708

4686 +#: builtin/commit.c:707

4687 #, c-format

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

4689 msgstr ""

4690

4230 -#: builtin/commit.c:730

4691 +#: builtin/commit.c:729

4692 msgid "could not read MERGE_MSG"

4693 msgstr ""

4694

4234 -#: builtin/commit.c:734

4695 +#: builtin/commit.c:733

4696 msgid "could not read SQUASH_MSG"

4697 msgstr ""

4698

4238 -#: builtin/commit.c:738 builtin/merge.c:1079

4239 -#, c-format

4240 -msgid "could not read '%s'"

4241 -msgstr ""

4242 -

4243 -#: builtin/commit.c:785

4699 +#: builtin/commit.c:784

4700 msgid "could not write commit template"

4701 msgstr ""

4702

4247 -#: builtin/commit.c:803

4703 +#: builtin/commit.c:802

4704 #, c-format

4705 msgid ""

4706 "\n"

@@ -4254,7 +4710,7 @@ msgid ""

4710 "and try again.\n"

4711 msgstr ""

4712

4257 -#: builtin/commit.c:808

4713 +#: builtin/commit.c:807

4714 #, c-format

4715 msgid ""

4716 "\n"

@@ -4264,14 +4720,14 @@ msgid ""

4720 "and try again.\n"

4721 msgstr ""

4722

4267 -#: builtin/commit.c:821

4723 +#: builtin/commit.c:820

4724 #, c-format

4725 msgid ""

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

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

4728 msgstr ""

4729

4274 -#: builtin/commit.c:828

4730 +#: builtin/commit.c:827

4731 #, c-format

4732 msgid ""

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

@@ -4279,348 +4735,335 @@ msgid ""

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

4736 msgstr ""

4737

4282 -#: builtin/commit.c:848

4738 +#: builtin/commit.c:847

4739 #, c-format

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

4741 msgstr ""

4742

4287 -#: builtin/commit.c:856

4743 +#: builtin/commit.c:855

4744 #, c-format

4745 msgid "%sDate: %s"

4746 msgstr ""

4747

4292 -#: builtin/commit.c:863

4748 +#: builtin/commit.c:862

4749 #, c-format

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

4751 msgstr ""

4752

4297 -#: builtin/commit.c:881

4753 +#: builtin/commit.c:880

4754 msgid "Cannot read index"

4755 msgstr ""

4756

4301 -#: builtin/commit.c:938

4757 +#: builtin/commit.c:937

4758 msgid "Error building trees"

4759 msgstr ""

4760

4305 -#: builtin/commit.c:953 builtin/tag.c:495

4761 +#: builtin/commit.c:952 builtin/tag.c:495

4762 #, c-format

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

4764 msgstr ""

4765

4310 -#: builtin/commit.c:1055

4766 +#: builtin/commit.c:1054

4767 #, c-format

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

4769 msgstr ""

4770

4315 -#: builtin/commit.c:1070 builtin/commit.c:1310

4771 +#: builtin/commit.c:1069 builtin/commit.c:1309

4772 #, c-format

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

4774 msgstr ""

4775

4320 -#: builtin/commit.c:1107

4776 +#: builtin/commit.c:1106

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

4778 msgstr ""

4779

4324 -#: builtin/commit.c:1137

4780 +#: builtin/commit.c:1136

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

4782 msgstr ""

4783

4328 -#: builtin/commit.c:1146

4784 +#: builtin/commit.c:1145

4785 msgid "You have nothing to amend."

4786 msgstr ""

4787

4332 -#: builtin/commit.c:1149

4788 +#: builtin/commit.c:1148

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

4790 msgstr ""

4791

4336 -#: builtin/commit.c:1151

4792 +#: builtin/commit.c:1150

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

4794 msgstr ""

4795

4340 -#: builtin/commit.c:1154

4796 +#: builtin/commit.c:1153

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

4798 msgstr ""

4799

4344 -#: builtin/commit.c:1164

4800 +#: builtin/commit.c:1163

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

4802 msgstr ""

4803

4348 -#: builtin/commit.c:1166

4804 +#: builtin/commit.c:1165

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

4806 msgstr ""

4807

4352 -#: builtin/commit.c:1174

4808 +#: builtin/commit.c:1173

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

4810 msgstr ""

4811

4356 -#: builtin/commit.c:1191

4812 +#: builtin/commit.c:1190

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

4814 msgstr ""

4815

4360 -#: builtin/commit.c:1193

4816 +#: builtin/commit.c:1192

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

4818 msgstr ""

4819

4364 -#: builtin/commit.c:1195

4820 +#: builtin/commit.c:1194

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

4822 msgstr ""

4823

4368 -#: builtin/commit.c:1197

4824 +#: builtin/commit.c:1196

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

4826 msgstr ""

4827

4372 -#: builtin/commit.c:1209 builtin/tag.c:728

4828 +#: builtin/commit.c:1208 builtin/tag.c:730

4829 #, c-format

4830 msgid "Invalid cleanup mode %s"

4831 msgstr ""

4832

4377 -#: builtin/commit.c:1214

4833 +#: builtin/commit.c:1213

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

4835 msgstr ""

4836

4381 -#: builtin/commit.c:1324 builtin/commit.c:1603

4837 +#: builtin/commit.c:1323 builtin/commit.c:1602

4838 msgid "show status concisely"

4839 msgstr ""

4840

4385 -#: builtin/commit.c:1326 builtin/commit.c:1605

4841 +#: builtin/commit.c:1325 builtin/commit.c:1604

4842 msgid "show branch information"

4843 msgstr ""

4844

4389 -#: builtin/commit.c:1328 builtin/commit.c:1607 builtin/push.c:509

4845 +#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546

4846 msgid "machine-readable output"

4847 msgstr ""

4848

4393 -#: builtin/commit.c:1331 builtin/commit.c:1609

4849 +#: builtin/commit.c:1330 builtin/commit.c:1608

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

4851 msgstr ""

4852

4397 -#: builtin/commit.c:1334 builtin/commit.c:1612

4853 +#: builtin/commit.c:1333 builtin/commit.c:1611

4854 msgid "terminate entries with NUL"

4855 msgstr ""

4856

4401 -#: builtin/commit.c:1336 builtin/commit.c:1615 builtin/fast-export.c:980

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

4857 +#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981

4858 +#: builtin/fast-export.c:984 builtin/tag.c:604

4859 msgid "mode"

4860 msgstr ""

4861

4406 -#: builtin/commit.c:1337 builtin/commit.c:1615

4862 +#: builtin/commit.c:1336 builtin/commit.c:1614

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

4864 msgstr ""

4865

4410 -#: builtin/commit.c:1340

4866 +#: builtin/commit.c:1339

4867 msgid "show ignored files"

4868 msgstr ""

4869

4414 -#: builtin/commit.c:1341 parse-options.h:152

4870 +#: builtin/commit.c:1340 parse-options.h:155

4871 msgid "when"

4872 msgstr ""

4873

4418 -#: builtin/commit.c:1342

4874 +#: builtin/commit.c:1341

4875 msgid ""

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

4877 "(Default: all)"

4878 msgstr ""

4879

4424 -#: builtin/commit.c:1344

4880 +#: builtin/commit.c:1343

4881 msgid "list untracked files in columns"

4882 msgstr ""

4883

4428 -#: builtin/commit.c:1430

4884 +#: builtin/commit.c:1429

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

4886 msgstr ""

4887

4432 -#: builtin/commit.c:1432

4888 +#: builtin/commit.c:1431

4889 msgid "could not parse newly created commit"

4890 msgstr ""

4891

4436 -#: builtin/commit.c:1477

4892 +#: builtin/commit.c:1476

4893 msgid "detached HEAD"

4894 msgstr ""

4895

4440 -#: builtin/commit.c:1480

4896 +#: builtin/commit.c:1479

4897 msgid " (root-commit)"

4898 msgstr ""

4899

4444 -#: builtin/commit.c:1573

4900 +#: builtin/commit.c:1572

4901 msgid "suppress summary after successful commit"

4902 msgstr ""

4903

4448 -#: builtin/commit.c:1574

4904 +#: builtin/commit.c:1573

4905 msgid "show diff in commit message template"

4906 msgstr ""

4907

4452 -#: builtin/commit.c:1576

4908 +#: builtin/commit.c:1575

4909 msgid "Commit message options"

4910 msgstr ""

4911

4456 -#: builtin/commit.c:1577 builtin/tag.c:601

4912 +#: builtin/commit.c:1576 builtin/tag.c:602

4913 msgid "read message from file"

4914 msgstr ""

4915

4460 -#: builtin/commit.c:1578

4916 +#: builtin/commit.c:1577

4917 msgid "author"

4918 msgstr ""

4919

4464 -#: builtin/commit.c:1578

4920 +#: builtin/commit.c:1577

4921 msgid "override author for commit"

4922 msgstr ""

4923

4468 -#: builtin/commit.c:1579 builtin/gc.c:280

4924 +#: builtin/commit.c:1578 builtin/gc.c:268

4925 msgid "date"

4926 msgstr ""

4927

4472 -#: builtin/commit.c:1579

4928 +#: builtin/commit.c:1578

4929 msgid "override date for commit"

4930 msgstr ""

4931

4476 -#: builtin/commit.c:1580 builtin/merge.c:218 builtin/notes.c:391

4477 -#: builtin/notes.c:554 builtin/tag.c:599

4932 +#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392

4933 +#: builtin/notes.c:555 builtin/tag.c:600

4934 msgid "message"

4935 msgstr ""

4936

4481 -#: builtin/commit.c:1580

4937 +#: builtin/commit.c:1579

4938 msgid "commit message"

4939 msgstr ""

4940

4485 -#: builtin/commit.c:1581

4941 +#: builtin/commit.c:1580

4942 msgid "reuse and edit message from specified commit"

4943 msgstr ""

4944

4489 -#: builtin/commit.c:1582

4945 +#: builtin/commit.c:1581

4946 msgid "reuse message from specified commit"

4947 msgstr ""

4948

4493 -#: builtin/commit.c:1583

4949 +#: builtin/commit.c:1582

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

4951 msgstr ""

4952

4497 -#: builtin/commit.c:1584

4953 +#: builtin/commit.c:1583

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

4955 msgstr ""

4956

4501 -#: builtin/commit.c:1585

4957 +#: builtin/commit.c:1584

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

4959 msgstr ""

4960

4505 -#: builtin/commit.c:1586 builtin/log.c:1191 builtin/revert.c:86

4961 +#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86

4962 msgid "add Signed-off-by:"

4963 msgstr ""

4964

4509 -#: builtin/commit.c:1587

4965 +#: builtin/commit.c:1586

4966 msgid "use specified template file"

4967 msgstr ""

4968

4513 -#: builtin/commit.c:1588

4969 +#: builtin/commit.c:1587

4970 msgid "force edit of commit"

4971 msgstr ""

4972

4517 -#: builtin/commit.c:1589

4973 +#: builtin/commit.c:1588

4974 msgid "default"

4975 msgstr ""

4976

4521 -#: builtin/commit.c:1589 builtin/tag.c:604

4977 +#: builtin/commit.c:1588 builtin/tag.c:605

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

4979 msgstr ""

4980

4525 -#: builtin/commit.c:1590

4981 +#: builtin/commit.c:1589

4982 msgid "include status in commit message template"

4983 msgstr ""

4984

4529 -#: builtin/commit.c:1591 builtin/merge.c:225 builtin/revert.c:92

4530 -#: builtin/tag.c:605

4531 -msgid "key-id"

4532 -msgstr ""

4533 -

4534 -#: builtin/commit.c:1592 builtin/merge.c:226 builtin/revert.c:93

4985 +#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156

4986 +#: builtin/revert.c:93

4987 msgid "GPG sign commit"

4988 msgstr ""

4989

4538 -#: builtin/commit.c:1595

4990 +#: builtin/commit.c:1594

4991 msgid "Commit contents options"

4992 msgstr ""

4993

4542 -#: builtin/commit.c:1596

4994 +#: builtin/commit.c:1595

4995 msgid "commit all changed files"

4996 msgstr ""

4997

4546 -#: builtin/commit.c:1597

4998 +#: builtin/commit.c:1596

4999 msgid "add specified files to index for commit"

5000 msgstr ""

5001

4550 -#: builtin/commit.c:1598

5002 +#: builtin/commit.c:1597

5003 msgid "interactively add files"

5004 msgstr ""

5005

4554 -#: builtin/commit.c:1599

5006 +#: builtin/commit.c:1598

5007 msgid "interactively add changes"

5008 msgstr ""

5009

4558 -#: builtin/commit.c:1600

5010 +#: builtin/commit.c:1599

5011 msgid "commit only specified files"

5012 msgstr ""

5013

4562 -#: builtin/commit.c:1601

5014 +#: builtin/commit.c:1600

5015 msgid "bypass pre-commit hook"

5016 msgstr ""

5017

4566 -#: builtin/commit.c:1602

5018 +#: builtin/commit.c:1601

5019 msgid "show what would be committed"

5020 msgstr ""

5021

4570 -#: builtin/commit.c:1613

5022 +#: builtin/commit.c:1612

5023 msgid "amend previous commit"

5024 msgstr ""

5025

4574 -#: builtin/commit.c:1614

5026 +#: builtin/commit.c:1613

5027 msgid "bypass post-rewrite hook"

5028 msgstr ""

5029

4578 -#: builtin/commit.c:1619

5030 +#: builtin/commit.c:1618

5031 msgid "ok to record an empty change"

5032 msgstr ""

5033

4582 -#: builtin/commit.c:1621

5034 +#: builtin/commit.c:1620

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

5036 msgstr ""

5037

4586 -#: builtin/commit.c:1650

5038 +#: builtin/commit.c:1649

5039 msgid "could not parse HEAD commit"

5040 msgstr ""

5041

4590 -#: builtin/commit.c:1689 builtin/merge.c:1076

4591 -#, c-format

4592 -msgid "could not open '%s' for reading"

4593 -msgstr ""

4594 -

4595 -#: builtin/commit.c:1696

5042 +#: builtin/commit.c:1695

5043 #, c-format

5044 msgid "Corrupt MERGE_HEAD file (%s)"

5045 msgstr ""

5046

4600 -#: builtin/commit.c:1703

5047 +#: builtin/commit.c:1702

5048 msgid "could not read MERGE_MODE"

5049 msgstr ""

5050

4604 -#: builtin/commit.c:1722

5051 +#: builtin/commit.c:1721

5052 #, c-format

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

5054 msgstr ""

5055

4609 -#: builtin/commit.c:1733

5056 +#: builtin/commit.c:1732

5057 #, c-format

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

5059 msgstr ""

5060

4614 -#: builtin/commit.c:1738

5061 +#: builtin/commit.c:1737

5062 #, c-format

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

5064 msgstr ""

5065

4619 -#: builtin/commit.c:1753 builtin/merge.c:829 builtin/merge.c:854

4620 -msgid "failed to write commit object"

4621 -msgstr ""

4622 -

4623 -#: builtin/commit.c:1786

5066 +#: builtin/commit.c:1785

5067 msgid ""

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

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

@@ -4631,131 +5074,135 @@ msgstr ""

5074 msgid "git config [<options>]"

5075 msgstr ""

5076

4634 -#: builtin/config.c:53

5077 +#: builtin/config.c:54

5078 msgid "Config file location"

5079 msgstr ""

5080

4638 -#: builtin/config.c:54

5081 +#: builtin/config.c:55

5082 msgid "use global config file"

5083 msgstr ""

5084

4642 -#: builtin/config.c:55

5085 +#: builtin/config.c:56

5086 msgid "use system config file"

5087 msgstr ""

5088

4646 -#: builtin/config.c:56

5089 +#: builtin/config.c:57

5090 msgid "use repository config file"

5091 msgstr ""

5092

4650 -#: builtin/config.c:57

5093 +#: builtin/config.c:58

5094 msgid "use given config file"

5095 msgstr ""

5096

4654 -#: builtin/config.c:58

5097 +#: builtin/config.c:59

5098 msgid "blob-id"

5099 msgstr ""

5100

4658 -#: builtin/config.c:58

5101 +#: builtin/config.c:59

5102 msgid "read config from given blob object"

5103 msgstr ""

5104

4662 -#: builtin/config.c:59

5105 +#: builtin/config.c:60

5106 msgid "Action"

5107 msgstr ""

5108

4666 -#: builtin/config.c:60

5109 +#: builtin/config.c:61

5110 msgid "get value: name [value-regex]"

5111 msgstr ""

5112

4670 -#: builtin/config.c:61

5113 +#: builtin/config.c:62

5114 msgid "get all values: key [value-regex]"

5115 msgstr ""

5116

4674 -#: builtin/config.c:62

5117 +#: builtin/config.c:63

5118 msgid "get values for regexp: name-regex [value-regex]"

5119 msgstr ""

5120

4678 -#: builtin/config.c:63

5121 +#: builtin/config.c:64

5122 msgid "get value specific for the URL: section[.var] URL"

5123 msgstr ""

5124

4682 -#: builtin/config.c:64

5125 +#: builtin/config.c:65

5126 msgid "replace all matching variables: name value [value_regex]"

5127 msgstr ""

5128

4686 -#: builtin/config.c:65

5129 +#: builtin/config.c:66

5130 msgid "add a new variable: name value"

5131 msgstr ""

5132

4690 -#: builtin/config.c:66

5133 +#: builtin/config.c:67

5134 msgid "remove a variable: name [value-regex]"

5135 msgstr ""

5136

4694 -#: builtin/config.c:67

5137 +#: builtin/config.c:68

5138 msgid "remove all matches: name [value-regex]"

5139 msgstr ""

5140

4698 -#: builtin/config.c:68

5141 +#: builtin/config.c:69

5142 msgid "rename section: old-name new-name"

5143 msgstr ""

5144

4702 -#: builtin/config.c:69

5145 +#: builtin/config.c:70

5146 msgid "remove a section: name"

5147 msgstr ""

5148

4706 -#: builtin/config.c:70

5149 +#: builtin/config.c:71

5150 msgid "list all"

5151 msgstr ""

5152

4710 -#: builtin/config.c:71

5153 +#: builtin/config.c:72

5154 msgid "open an editor"

5155 msgstr ""

5156

4714 -#: builtin/config.c:72

5157 +#: builtin/config.c:73

5158 msgid "find the color configured: slot [default]"

5159 msgstr ""

5160

4718 -#: builtin/config.c:73

5161 +#: builtin/config.c:74

5162 msgid "find the color setting: slot [stdout-is-tty]"

5163 msgstr ""

5164

4722 -#: builtin/config.c:74

5165 +#: builtin/config.c:75

5166 msgid "Type"

5167 msgstr ""

5168

4726 -#: builtin/config.c:75

5169 +#: builtin/config.c:76

5170 msgid "value is \"true\" or \"false\""

5171 msgstr ""

5172

4730 -#: builtin/config.c:76

5173 +#: builtin/config.c:77

5174 msgid "value is decimal number"

5175 msgstr ""

5176

4734 -#: builtin/config.c:77

5177 +#: builtin/config.c:78

5178 msgid "value is --bool or --int"

5179 msgstr ""

5180

4738 -#: builtin/config.c:78

5181 +#: builtin/config.c:79

5182 msgid "value is a path (file or directory name)"

5183 msgstr ""

5184

4742 -#: builtin/config.c:79

5185 +#: builtin/config.c:80

5186 msgid "Other"

5187 msgstr ""

5188

4746 -#: builtin/config.c:80

5189 +#: builtin/config.c:81

5190 msgid "terminate values with NUL byte"

5191 msgstr ""

5192

4750 -#: builtin/config.c:81

5193 +#: builtin/config.c:82

5194 +msgid "show variable names only"

5195 +msgstr ""

5196 +

5197 +#: builtin/config.c:83

5198 msgid "respect include directives on lookup"

5199 msgstr ""

5200

4754 -#: builtin/config.c:316

5201 +#: builtin/config.c:311

5202 msgid "unable to parse default color value"

5203 msgstr ""

5204

4758 -#: builtin/config.c:457

5205 +#: builtin/config.c:449

5206 #, c-format

5207 msgid ""

5208 "# This is Git's per-user configuration file.\n"

@@ -4765,7 +5212,7 @@ msgid ""

5212 "#\temail = %s\n"

5213 msgstr ""

5214

4768 -#: builtin/config.c:587

5215 +#: builtin/config.c:583

5216 #, c-format

5217 msgid "cannot create configuration file %s"

5218 msgstr ""

@@ -4801,7 +5248,7 @@ msgstr ""

5248 msgid "tag '%s' is really '%s' here"

5249 msgstr ""

5250

4804 -#: builtin/describe.c:250 builtin/log.c:452

5251 +#: builtin/describe.c:250 builtin/log.c:459

5252 #, c-format

5253 msgid "Not a valid object name %s"

5254 msgstr ""

@@ -4941,502 +5388,491 @@ msgstr ""

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

5389 msgstr ""

5390

4944 -#: builtin/fast-export.c:24

5391 +#: builtin/fast-export.c:25

5392 msgid "git fast-export [rev-list-opts]"

5393 msgstr ""

5394

4948 -#: builtin/fast-export.c:979

5395 +#: builtin/fast-export.c:980

5396 msgid "show progress after <n> objects"

5397 msgstr ""

5398

4952 -#: builtin/fast-export.c:981

5399 +#: builtin/fast-export.c:982

5400 msgid "select handling of signed tags"

5401 msgstr ""

5402

4956 -#: builtin/fast-export.c:984

5403 +#: builtin/fast-export.c:985

5404 msgid "select handling of tags that tag filtered objects"

5405 msgstr ""

5406

4960 -#: builtin/fast-export.c:987

5407 +#: builtin/fast-export.c:988

5408 msgid "Dump marks to this file"

5409 msgstr ""

5410

4964 -#: builtin/fast-export.c:989

5411 +#: builtin/fast-export.c:990

5412 msgid "Import marks from this file"

5413 msgstr ""

5414

4968 -#: builtin/fast-export.c:991

5415 +#: builtin/fast-export.c:992

5416 msgid "Fake a tagger when tags lack one"

5417 msgstr ""

5418

4972 -#: builtin/fast-export.c:993

5419 +#: builtin/fast-export.c:994

5420 msgid "Output full tree for each commit"

5421 msgstr ""

5422

4976 -#: builtin/fast-export.c:995

5423 +#: builtin/fast-export.c:996

5424 msgid "Use the done feature to terminate the stream"

5425 msgstr ""

5426

4980 -#: builtin/fast-export.c:996

5427 +#: builtin/fast-export.c:997

5428 msgid "Skip output of blob data"

5429 msgstr ""

5430

4984 -#: builtin/fast-export.c:997

5431 +#: builtin/fast-export.c:998

5432 msgid "refspec"

5433 msgstr ""

5434

4988 -#: builtin/fast-export.c:998

5435 +#: builtin/fast-export.c:999

5436 msgid "Apply refspec to exported refs"

5437 msgstr ""

5438

4992 -#: builtin/fast-export.c:999

5439 +#: builtin/fast-export.c:1000

5440 msgid "anonymize output"

5441 msgstr ""

5442

4996 -#: builtin/fetch.c:19

5443 +#: builtin/fetch.c:20

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

5445 msgstr ""

5446

5000 -#: builtin/fetch.c:20

5447 +#: builtin/fetch.c:21

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

5449 msgstr ""

5450

5004 -#: builtin/fetch.c:21

5451 +#: builtin/fetch.c:22

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

5453 msgstr ""

5454

5008 -#: builtin/fetch.c:22

5455 +#: builtin/fetch.c:23

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

5457 msgstr ""

5458

5012 -#: builtin/fetch.c:89

5459 +#: builtin/fetch.c:90 builtin/pull.c:162

5460 msgid "fetch from all remotes"

5461 msgstr ""

5462

5016 -#: builtin/fetch.c:91

5463 +#: builtin/fetch.c:92 builtin/pull.c:165

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

5465 msgstr ""

5466

5020 -#: builtin/fetch.c:93

5467 +#: builtin/fetch.c:94 builtin/pull.c:168

5468 msgid "path to upload pack on remote end"

5469 msgstr ""

5470

5024 -#: builtin/fetch.c:94

5471 +#: builtin/fetch.c:95 builtin/pull.c:170

5472 msgid "force overwrite of local branch"

5473 msgstr ""

5474

5028 -#: builtin/fetch.c:96

5475 +#: builtin/fetch.c:97

5476 msgid "fetch from multiple remotes"

5477 msgstr ""

5478

5032 -#: builtin/fetch.c:98

5479 +#: builtin/fetch.c:99 builtin/pull.c:172

5480 msgid "fetch all tags and associated objects"

5481 msgstr ""

5482

5036 -#: builtin/fetch.c:100

5483 +#: builtin/fetch.c:101

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

5485 msgstr ""

5486

5040 -#: builtin/fetch.c:102

5487 +#: builtin/fetch.c:103 builtin/pull.c:175

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

5489 msgstr ""

5490

5044 -#: builtin/fetch.c:103

5491 +#: builtin/fetch.c:104 builtin/pull.c:178

5492 msgid "on-demand"

5493 msgstr ""

5494

5048 -#: builtin/fetch.c:104

5495 +#: builtin/fetch.c:105 builtin/pull.c:179

5496 msgid "control recursive fetching of submodules"

5497 msgstr ""

5498

5052 -#: builtin/fetch.c:108

5499 +#: builtin/fetch.c:109 builtin/pull.c:184

5500 msgid "keep downloaded pack"

5501 msgstr ""

5502

5056 -#: builtin/fetch.c:110

5503 +#: builtin/fetch.c:111

5504 msgid "allow updating of HEAD ref"

5505 msgstr ""

5506

5060 -#: builtin/fetch.c:113

5507 +#: builtin/fetch.c:114 builtin/pull.c:187

5508 msgid "deepen history of shallow clone"

5509 msgstr ""

5510

5064 -#: builtin/fetch.c:115

5511 +#: builtin/fetch.c:116 builtin/pull.c:190

5512 msgid "convert to a complete repository"

5513 msgstr ""

5514

5068 -#: builtin/fetch.c:117 builtin/log.c:1208

5515 +#: builtin/fetch.c:118 builtin/log.c:1233

5516 msgid "dir"

5517 msgstr ""

5518

5072 -#: builtin/fetch.c:118

5519 +#: builtin/fetch.c:119

5520 msgid "prepend this to submodule path output"

5521 msgstr ""

5522

5076 -#: builtin/fetch.c:121

5523 +#: builtin/fetch.c:122

5524 msgid "default mode for recursion"

5525 msgstr ""

5526

5080 -#: builtin/fetch.c:123

5527 +#: builtin/fetch.c:124 builtin/pull.c:193

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

5529 msgstr ""

5530

5084 -#: builtin/fetch.c:124

5531 +#: builtin/fetch.c:125 builtin/pull.c:195

5532 msgid "refmap"

5533 msgstr ""

5534

5088 -#: builtin/fetch.c:125

5535 +#: builtin/fetch.c:126 builtin/pull.c:196

5536 msgid "specify fetch refmap"

5537 msgstr ""

5538

5092 -#: builtin/fetch.c:377

5539 +#: builtin/fetch.c:378

5540 msgid "Couldn't find remote ref HEAD"

5541 msgstr ""

5542

5096 -#: builtin/fetch.c:457

5543 +#: builtin/fetch.c:458

5544 #, c-format

5545 msgid "object %s not found"

5546 msgstr ""

5547

5101 -#: builtin/fetch.c:462

5548 +#: builtin/fetch.c:463

5549 msgid "[up to date]"

5550 msgstr ""

5551

5105 -#: builtin/fetch.c:476

5552 +#: builtin/fetch.c:477

5553 #, c-format

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

5555 msgstr ""

5556

5110 -#: builtin/fetch.c:477 builtin/fetch.c:563

5557 +#: builtin/fetch.c:478 builtin/fetch.c:564

5558 msgid "[rejected]"

5559 msgstr ""

5560

5114 -#: builtin/fetch.c:488

5561 +#: builtin/fetch.c:489

5562 msgid "[tag update]"

5563 msgstr ""

5564

5118 -#: builtin/fetch.c:490 builtin/fetch.c:525 builtin/fetch.c:543

5565 +#: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544

5566 msgid " (unable to update local ref)"

5567 msgstr ""

5568

5122 -#: builtin/fetch.c:508

5569 +#: builtin/fetch.c:509

5570 msgid "[new tag]"

5571 msgstr ""

5572

5126 -#: builtin/fetch.c:511

5573 +#: builtin/fetch.c:512

5574 msgid "[new branch]"

5575 msgstr ""

5576

5130 -#: builtin/fetch.c:514

5577 +#: builtin/fetch.c:515

5578 msgid "[new ref]"

5579 msgstr ""

5580

5134 -#: builtin/fetch.c:559

5581 +#: builtin/fetch.c:560

5582 msgid "unable to update local ref"

5583 msgstr ""

5584

5138 -#: builtin/fetch.c:559

5585 +#: builtin/fetch.c:560

5586 msgid "forced update"

5587 msgstr ""

5588

5142 -#: builtin/fetch.c:565

5589 +#: builtin/fetch.c:566

5590 msgid "(non-fast-forward)"

5591 msgstr ""

5592

5146 -#: builtin/fetch.c:599 builtin/fetch.c:832

5593 +#: builtin/fetch.c:600 builtin/fetch.c:842

5594 #, c-format

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

5596 msgstr ""

5597

5151 -#: builtin/fetch.c:608

5598 +#: builtin/fetch.c:609

5599 #, c-format

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

5601 msgstr ""

5602

5156 -#: builtin/fetch.c:626

5603 +#: builtin/fetch.c:627

5604 #, c-format

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

5606 msgstr ""

5607

5161 -#: builtin/fetch.c:714 builtin/fetch.c:797

5608 +#: builtin/fetch.c:715 builtin/fetch.c:807

5609 #, c-format

5610 msgid "From %.*s\n"

5611 msgstr ""

5612

5166 -#: builtin/fetch.c:725

5613 +#: builtin/fetch.c:726

5614 #, c-format

5615 msgid ""

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

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

5618 msgstr ""

5619

5173 -#: builtin/fetch.c:777

5620 +#: builtin/fetch.c:778

5621 #, c-format

5622 msgid " (%s will become dangling)"

5623 msgstr ""

5624

5178 -#: builtin/fetch.c:778

5625 +#: builtin/fetch.c:779

5626 #, c-format

5627 msgid " (%s has become dangling)"

5628 msgstr ""

5629

5183 -#: builtin/fetch.c:802

5630 +#: builtin/fetch.c:811

5631 msgid "[deleted]"

5632 msgstr ""

5633

5187 -#: builtin/fetch.c:803 builtin/remote.c:1057

5634 +#: builtin/fetch.c:812 builtin/remote.c:1034

5635 msgid "(none)"

5636 msgstr ""

5637

5191 -#: builtin/fetch.c:822

5638 +#: builtin/fetch.c:832

5639 #, c-format

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

5641 msgstr ""

5642

5196 -#: builtin/fetch.c:841

5643 +#: builtin/fetch.c:851

5644 #, c-format

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

5646 msgstr ""

5647

5201 -#: builtin/fetch.c:844

5648 +#: builtin/fetch.c:854

5649 #, c-format

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

5651 msgstr ""

5652

5206 -#: builtin/fetch.c:900

5653 +#: builtin/fetch.c:910

5654 #, c-format

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

5656 msgstr ""

5657

5211 -#: builtin/fetch.c:1063

5658 +#: builtin/fetch.c:1071

5659 #, c-format

5660 msgid "Fetching %s\n"

5661 msgstr ""

5662

5216 -#: builtin/fetch.c:1065 builtin/remote.c:90

5663 +#: builtin/fetch.c:1073 builtin/remote.c:90

5664 #, c-format

5665 msgid "Could not fetch %s"

5666 msgstr ""

5667

5221 -#: builtin/fetch.c:1083

5668 +#: builtin/fetch.c:1091

5669 msgid ""

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

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

5672 msgstr ""

5673

5227 -#: builtin/fetch.c:1106

5674 +#: builtin/fetch.c:1114

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

5676 msgstr ""

5677

5231 -#: builtin/fetch.c:1148

5678 +#: builtin/fetch.c:1156

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

5680 msgstr ""

5681

5235 -#: builtin/fetch.c:1150

5682 +#: builtin/fetch.c:1158

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

5684 msgstr ""

5685

5239 -#: builtin/fetch.c:1173

5686 +#: builtin/fetch.c:1181

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

5688 msgstr ""

5689

5243 -#: builtin/fetch.c:1175

5690 +#: builtin/fetch.c:1183

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

5692 msgstr ""

5693

5247 -#: builtin/fetch.c:1186

5694 +#: builtin/fetch.c:1194

5695 #, c-format

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

5697 msgstr ""

5698

5252 -#: builtin/fetch.c:1194

5699 +#: builtin/fetch.c:1202

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

5701 msgstr ""

5702

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

5703 +#: builtin/fmt-merge-msg.c:14

5704 msgid ""

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

5706 msgstr ""

5707

5261 -#: builtin/fmt-merge-msg.c:668 builtin/fmt-merge-msg.c:671 builtin/grep.c:698

5262 -#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182

5263 -#: builtin/show-branch.c:664 builtin/show-ref.c:180 builtin/tag.c:590

5264 -#: parse-options.h:131 parse-options.h:238

5265 -msgid "n"

5266 -msgstr ""

5267 -

5268 -#: builtin/fmt-merge-msg.c:669

5708 +#: builtin/fmt-merge-msg.c:670

5709 msgid "populate log with at most <n> entries from shortlog"

5710 msgstr ""

5711

5272 -#: builtin/fmt-merge-msg.c:672

5712 +#: builtin/fmt-merge-msg.c:673

5713 msgid "alias for --log (deprecated)"

5714 msgstr ""

5715

5276 -#: builtin/fmt-merge-msg.c:675

5716 +#: builtin/fmt-merge-msg.c:676

5717 msgid "text"

5718 msgstr ""

5719

5280 -#: builtin/fmt-merge-msg.c:676

5720 +#: builtin/fmt-merge-msg.c:677

5721 msgid "use <text> as start of message"

5722 msgstr ""

5723

5284 -#: builtin/fmt-merge-msg.c:677

5724 +#: builtin/fmt-merge-msg.c:678

5725 msgid "file to read from"

5726 msgstr ""

5727

5288 -#: builtin/for-each-ref.c:687

5289 -msgid "unable to parse format"

5290 -msgstr ""

5291 -

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

5728 +#: builtin/for-each-ref.c:9

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

5730 msgstr ""

5731

5296 -#: builtin/for-each-ref.c:1098

5732 +#: builtin/for-each-ref.c:24

5733 msgid "quote placeholders suitably for shells"

5734 msgstr ""

5735

5300 -#: builtin/for-each-ref.c:1100

5736 +#: builtin/for-each-ref.c:26

5737 msgid "quote placeholders suitably for perl"

5738 msgstr ""

5739

5304 -#: builtin/for-each-ref.c:1102

5740 +#: builtin/for-each-ref.c:28

5741 msgid "quote placeholders suitably for python"

5742 msgstr ""

5743

5308 -#: builtin/for-each-ref.c:1104

5744 +#: builtin/for-each-ref.c:30

5745 msgid "quote placeholders suitably for Tcl"

5746 msgstr ""

5747

5312 -#: builtin/for-each-ref.c:1107

5748 +#: builtin/for-each-ref.c:33

5749 msgid "show only <n> matched refs"

5750 msgstr ""

5751

5316 -#: builtin/for-each-ref.c:1108 builtin/replace.c:438

5317 -msgid "format"

5318 -msgstr ""

5319 -

5320 -#: builtin/for-each-ref.c:1108

5752 +#: builtin/for-each-ref.c:34

5753 msgid "format to use for the output"

5754 msgstr ""

5755

5324 -#: builtin/for-each-ref.c:1109

5756 +#: builtin/for-each-ref.c:35

5757 msgid "key"

5758 msgstr ""

5759

5328 -#: builtin/for-each-ref.c:1110

5760 +#: builtin/for-each-ref.c:36

5761 msgid "field name to sort on"

5762 msgstr ""

5763

5332 -#: builtin/fsck.c:147 builtin/prune.c:137

5764 +#: builtin/fsck.c:163 builtin/prune.c:137

5765 msgid "Checking connectivity"

5766 msgstr ""

5767

5336 -#: builtin/fsck.c:548

5768 +#: builtin/fsck.c:568

5769 msgid "Checking object directories"

5770 msgstr ""

5771

5340 -#: builtin/fsck.c:611

5772 +#: builtin/fsck.c:631

5773 msgid "git fsck [<options>] [<object>...]"

5774 msgstr ""

5775

5344 -#: builtin/fsck.c:617

5776 +#: builtin/fsck.c:637

5777 msgid "show unreachable objects"

5778 msgstr ""

5779

5348 -#: builtin/fsck.c:618

5780 +#: builtin/fsck.c:638

5781 msgid "show dangling objects"

5782 msgstr ""

5783

5352 -#: builtin/fsck.c:619

5784 +#: builtin/fsck.c:639

5785 msgid "report tags"

5786 msgstr ""

5787

5356 -#: builtin/fsck.c:620

5788 +#: builtin/fsck.c:640

5789 msgid "report root nodes"

5790 msgstr ""

5791

5360 -#: builtin/fsck.c:621

5792 +#: builtin/fsck.c:641

5793 msgid "make index objects head nodes"

5794 msgstr ""

5795

5364 -#: builtin/fsck.c:622

5796 +#: builtin/fsck.c:642

5797 msgid "make reflogs head nodes (default)"

5798 msgstr ""

5799

5368 -#: builtin/fsck.c:623

5800 +#: builtin/fsck.c:643

5801 msgid "also consider packs and alternate objects"

5802 msgstr ""

5803

5372 -#: builtin/fsck.c:624

5804 +#: builtin/fsck.c:644

5805 +msgid "check only connectivity"

5806 +msgstr ""

5807 +

5808 +#: builtin/fsck.c:645

5809 msgid "enable more strict checking"

5810 msgstr ""

5811

5376 -#: builtin/fsck.c:626

5812 +#: builtin/fsck.c:647

5813 msgid "write dangling objects in .git/lost-found"

5814 msgstr ""

5815

5380 -#: builtin/fsck.c:627 builtin/prune.c:107

5816 +#: builtin/fsck.c:648 builtin/prune.c:107

5817 msgid "show progress"

5818 msgstr ""

5819

5384 -#: builtin/fsck.c:677

5820 +#: builtin/fsck.c:707

5821 msgid "Checking objects"

5822 msgstr ""

5823

5388 -#: builtin/gc.c:24

5824 +#: builtin/gc.c:25

5825 msgid "git gc [<options>]"

5826 msgstr ""

5827

5392 -#: builtin/gc.c:67

5828 +#: builtin/gc.c:55

5829 #, c-format

5830 msgid "Invalid %s: '%s'"

5831 msgstr ""

5832

5397 -#: builtin/gc.c:112

5833 +#: builtin/gc.c:100

5834 #, c-format

5835 msgid "insanely long object directory %.*s"

5836 msgstr ""

5837

5402 -#: builtin/gc.c:281

5838 +#: builtin/gc.c:269

5839 msgid "prune unreferenced objects"

5840 msgstr ""

5841

5406 -#: builtin/gc.c:283

5842 +#: builtin/gc.c:271

5843 msgid "be more thorough (increased runtime)"

5844 msgstr ""

5845

5410 -#: builtin/gc.c:284

5846 +#: builtin/gc.c:272

5847 msgid "enable auto-gc mode"

5848 msgstr ""

5849

5414 -#: builtin/gc.c:285

5850 +#: builtin/gc.c:273

5851 msgid "force running gc even if there may be another gc running"

5852 msgstr ""

5853

5418 -#: builtin/gc.c:327

5854 +#: builtin/gc.c:315

5855 #, c-format

5856 msgid "Auto packing the repository in background for optimum performance.\n"

5857 msgstr ""

5858

5423 -#: builtin/gc.c:329

5859 +#: builtin/gc.c:317

5860 #, c-format

5861 msgid "Auto packing the repository for optimum performance.\n"

5862 msgstr ""

5863

5428 -#: builtin/gc.c:330

5864 +#: builtin/gc.c:318

5865 #, c-format

5866 msgid "See \"git help gc\" for manual housekeeping.\n"

5867 msgstr ""

5868

5433 -#: builtin/gc.c:348

5869 +#: builtin/gc.c:336

5870 #, c-format

5871 msgid ""

5872 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

5873 msgstr ""

5874

5439 -#: builtin/gc.c:376

5875 +#: builtin/gc.c:364

5876 msgid ""

5877 "There are too many unreachable loose objects; run 'git prune' to remove them."

5878 msgstr ""

@@ -5676,7 +6112,7 @@ msgstr ""

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

6113 msgstr ""

6114

5679 -#: builtin/hash-object.c:92 builtin/tag.c:612

6115 +#: builtin/hash-object.c:92 builtin/tag.c:614

6116 msgid "type"

6117 msgstr ""

6118

@@ -5825,129 +6261,129 @@ msgstr ""

6261 msgid "`git %s' is aliased to `%s'"

6262 msgstr ""

6263

5828 -#: builtin/index-pack.c:151

6264 +#: builtin/index-pack.c:152

6265 #, c-format

6266 msgid "unable to open %s"

6267 msgstr ""

6268

5833 -#: builtin/index-pack.c:201

6269 +#: builtin/index-pack.c:202

6270 #, c-format

6271 msgid "object type mismatch at %s"

6272 msgstr ""

6273

5838 -#: builtin/index-pack.c:221

6274 +#: builtin/index-pack.c:222

6275 #, c-format

6276 msgid "did not receive expected object %s"

6277 msgstr ""

6278

5843 -#: builtin/index-pack.c:224

6279 +#: builtin/index-pack.c:225

6280 #, c-format

6281 msgid "object %s: expected type %s, found %s"

6282 msgstr ""

6283

5848 -#: builtin/index-pack.c:266

6284 +#: builtin/index-pack.c:267

6285 #, c-format

6286 msgid "cannot fill %d byte"

6287 msgid_plural "cannot fill %d bytes"

6288 msgstr[0] ""

6289 msgstr[1] ""

6290

5855 -#: builtin/index-pack.c:276

6291 +#: builtin/index-pack.c:277

6292 msgid "early EOF"

6293 msgstr ""

6294

5859 -#: builtin/index-pack.c:277

6295 +#: builtin/index-pack.c:278

6296 msgid "read error on input"

6297 msgstr ""

6298

5863 -#: builtin/index-pack.c:289

6299 +#: builtin/index-pack.c:290

6300 msgid "used more bytes than were available"

6301 msgstr ""

6302

5867 -#: builtin/index-pack.c:296

6303 +#: builtin/index-pack.c:297

6304 msgid "pack too large for current definition of off_t"

6305 msgstr ""

6306

5871 -#: builtin/index-pack.c:312

6307 +#: builtin/index-pack.c:313

6308 #, c-format

6309 msgid "unable to create '%s'"

6310 msgstr ""

6311

5876 -#: builtin/index-pack.c:317

6312 +#: builtin/index-pack.c:318

6313 #, c-format

6314 msgid "cannot open packfile '%s'"

6315 msgstr ""

6316

5881 -#: builtin/index-pack.c:331

6317 +#: builtin/index-pack.c:332

6318 msgid "pack signature mismatch"

6319 msgstr ""

6320

5885 -#: builtin/index-pack.c:333

6321 +#: builtin/index-pack.c:334

6322 #, c-format

6323 msgid "pack version %<PRIu32> unsupported"

6324 msgstr ""

6325

5890 -#: builtin/index-pack.c:351

6326 +#: builtin/index-pack.c:352

6327 #, c-format

6328 msgid "pack has bad object at offset %lu: %s"

6329 msgstr ""

6330

5895 -#: builtin/index-pack.c:472

6331 +#: builtin/index-pack.c:473

6332 #, c-format

6333 msgid "inflate returned %d"

6334 msgstr ""

6335

5900 -#: builtin/index-pack.c:521

6336 +#: builtin/index-pack.c:522

6337 msgid "offset value overflow for delta base object"

6338 msgstr ""

6339

5904 -#: builtin/index-pack.c:529

6340 +#: builtin/index-pack.c:530

6341 msgid "delta base offset is out of bound"

6342 msgstr ""

6343

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

6344 +#: builtin/index-pack.c:538

6345 #, c-format

6346 msgid "unknown object type %d"

6347 msgstr ""

6348

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

6349 +#: builtin/index-pack.c:569

6350 msgid "cannot pread pack file"

6351 msgstr ""

6352

5917 -#: builtin/index-pack.c:570

6353 +#: builtin/index-pack.c:571

6354 #, c-format

6355 msgid "premature end of pack file, %lu byte missing"

6356 msgid_plural "premature end of pack file, %lu bytes missing"

6357 msgstr[0] ""

6358 msgstr[1] ""

6359

5924 -#: builtin/index-pack.c:596

6360 +#: builtin/index-pack.c:597

6361 msgid "serious inflate inconsistency"

6362 msgstr ""

6363

5928 -#: builtin/index-pack.c:742 builtin/index-pack.c:748 builtin/index-pack.c:771

5929 -#: builtin/index-pack.c:805 builtin/index-pack.c:814

6364 +#: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772

6365 +#: builtin/index-pack.c:806 builtin/index-pack.c:815

6366 #, c-format

6367 msgid "SHA1 COLLISION FOUND WITH %s !"

6368 msgstr ""

6369

5934 -#: builtin/index-pack.c:745 builtin/pack-objects.c:162

6370 +#: builtin/index-pack.c:746 builtin/pack-objects.c:162

6371 #: builtin/pack-objects.c:254

6372 #, c-format

6373 msgid "unable to read %s"

6374 msgstr ""

6375

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

6376 +#: builtin/index-pack.c:812

6377 #, c-format

6378 msgid "cannot read existing object %s"

6379 msgstr ""

6380

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

6381 +#: builtin/index-pack.c:826

6382 #, c-format

6383 msgid "invalid blob object %s"

6384 msgstr ""

6385

5950 -#: builtin/index-pack.c:839

6386 +#: builtin/index-pack.c:840

6387 #, c-format

6388 msgid "invalid %s"

6389 msgstr ""

@@ -6061,7 +6497,7 @@ msgstr ""

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

6498 msgstr ""

6499

6064 -#: builtin/index-pack.c:1479 builtin/index-pack.c:1658

6500 +#: builtin/index-pack.c:1479 builtin/index-pack.c:1663

6501 #, c-format

6502 msgid "no threads support, ignoring %s"

6503 msgstr ""

@@ -6090,110 +6526,110 @@ msgid_plural "chain length = %d: %lu objects"

6526 msgstr[0] ""

6527 msgstr[1] ""

6528

6093 -#: builtin/index-pack.c:1622

6529 +#: builtin/index-pack.c:1623

6530 msgid "Cannot come back to cwd"

6531 msgstr ""

6532

6097 -#: builtin/index-pack.c:1670 builtin/index-pack.c:1673

6098 -#: builtin/index-pack.c:1685 builtin/index-pack.c:1689

6533 +#: builtin/index-pack.c:1675 builtin/index-pack.c:1678

6534 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1694

6535 #, c-format

6536 msgid "bad %s"

6537 msgstr ""

6538

6103 -#: builtin/index-pack.c:1703

6539 +#: builtin/index-pack.c:1708

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

6541 msgstr ""

6542

6107 -#: builtin/index-pack.c:1707 builtin/index-pack.c:1716

6543 +#: builtin/index-pack.c:1712 builtin/index-pack.c:1721

6544 #, c-format

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

6546 msgstr ""

6547

6112 -#: builtin/index-pack.c:1724

6548 +#: builtin/index-pack.c:1729

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

6550 msgstr ""

6551

6116 -#: builtin/init-db.c:35

6552 +#: builtin/init-db.c:36

6553 #, c-format

6554 msgid "Could not make %s writable by group"

6555 msgstr ""

6556

6121 -#: builtin/init-db.c:62

6557 +#: builtin/init-db.c:63

6558 #, c-format

6559 msgid "insanely long template name %s"

6560 msgstr ""

6561

6126 -#: builtin/init-db.c:67

6562 +#: builtin/init-db.c:68

6563 #, c-format

6564 msgid "cannot stat '%s'"

6565 msgstr ""

6566

6131 -#: builtin/init-db.c:73

6567 +#: builtin/init-db.c:74

6568 #, c-format

6569 msgid "cannot stat template '%s'"

6570 msgstr ""

6571

6136 -#: builtin/init-db.c:80

6572 +#: builtin/init-db.c:81

6573 #, c-format

6574 msgid "cannot opendir '%s'"

6575 msgstr ""

6576

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

6577 +#: builtin/init-db.c:98

6578 #, c-format

6579 msgid "cannot readlink '%s'"

6580 msgstr ""

6581

6146 -#: builtin/init-db.c:99

6582 +#: builtin/init-db.c:100

6583 #, c-format

6584 msgid "insanely long symlink %s"

6585 msgstr ""

6586

6151 -#: builtin/init-db.c:102

6587 +#: builtin/init-db.c:103

6588 #, c-format

6589 msgid "cannot symlink '%s' '%s'"

6590 msgstr ""

6591

6156 -#: builtin/init-db.c:106

6592 +#: builtin/init-db.c:107

6593 #, c-format

6594 msgid "cannot copy '%s' to '%s'"

6595 msgstr ""

6596

6161 -#: builtin/init-db.c:110

6597 +#: builtin/init-db.c:111

6598 #, c-format

6599 msgid "ignoring template %s"

6600 msgstr ""

6601

6166 -#: builtin/init-db.c:136

6602 +#: builtin/init-db.c:137

6603 #, c-format

6604 msgid "insanely long template path %s"

6605 msgstr ""

6606

6171 -#: builtin/init-db.c:144

6607 +#: builtin/init-db.c:145

6608 #, c-format

6609 msgid "templates not found %s"

6610 msgstr ""

6611

6176 -#: builtin/init-db.c:157

6612 +#: builtin/init-db.c:158

6613 #, c-format

6614 msgid "not copying templates of a wrong format version %d from '%s'"

6615 msgstr ""

6616

6181 -#: builtin/init-db.c:211

6617 +#: builtin/init-db.c:212

6618 #, c-format

6619 msgid "insane git directory %s"

6620 msgstr ""

6621

6186 -#: builtin/init-db.c:343 builtin/init-db.c:346

6622 +#: builtin/init-db.c:344 builtin/init-db.c:347

6623 #, c-format

6624 msgid "%s already exists"

6625 msgstr ""

6626

6191 -#: builtin/init-db.c:374

6627 +#: builtin/init-db.c:375

6628 #, c-format

6629 msgid "unable to handle file type %d"

6630 msgstr ""

6631

6196 -#: builtin/init-db.c:377

6632 +#: builtin/init-db.c:378

6633 #, c-format

6634 msgid "unable to move %s to %s"

6635 msgstr ""

@@ -6201,59 +6637,55 @@ msgstr ""

6637 #. TRANSLATORS: The first '%s' is either "Reinitialized

6638 #. existing" or "Initialized empty", the second " shared" or

6639 #. "", and the last '%s%s' is the verbatim directory name.

6204 -#: builtin/init-db.c:433

6640 +#: builtin/init-db.c:434

6641 #, c-format

6642 msgid "%s%s Git repository in %s%s\n"

6643 msgstr ""

6644

6209 -#: builtin/init-db.c:434

6645 +#: builtin/init-db.c:435

6646 msgid "Reinitialized existing"

6647 msgstr ""

6648

6213 -#: builtin/init-db.c:434

6649 +#: builtin/init-db.c:435

6650 msgid "Initialized empty"

6651 msgstr ""

6652

6217 -#: builtin/init-db.c:435

6653 +#: builtin/init-db.c:436

6654 msgid " shared"

6655 msgstr ""

6656

6221 -#: builtin/init-db.c:482

6657 +#: builtin/init-db.c:483

6658 msgid ""

l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)