msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-05-27 07:23+0800\n"
+"POT-Creation-Date: 2020-07-10 09:53+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgid "ignoring unmerged: %s"
msgstr ""
-#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368
#, c-format
msgid "Only binary files changed.\n"
msgstr ""
-#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370
#, c-format
msgid "No changes.\n"
msgstr ""
-#: add-interactive.c:935 git-add--interactive.perl:1376
+#: add-interactive.c:935 git-add--interactive.perl:1378
msgid "Patch update"
msgstr ""
-#: add-interactive.c:974 git-add--interactive.perl:1754
+#: add-interactive.c:974 git-add--interactive.perl:1771
msgid "Review diff"
msgstr ""
msgid "(empty) select nothing"
msgstr ""
-#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851
+#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868
msgid "*** Commands ***"
msgstr ""
-#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848
+#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865
msgid "What now"
msgstr ""
#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 bugreport.c:129
+#: builtin/submodule--helper.c:2148 bugreport.c:135
#: git-add--interactive.perl:213
msgid "path"
msgstr ""
msgid "could not refresh index"
msgstr ""
-#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765
+#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782
#, c-format
msgid "Bye.\n"
msgstr ""
-#: add-patch.c:34 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1430
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:35 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1431
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:36 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1432
+#, c-format, perl-format
+msgid "Stage addition [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:37 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:38
+#: add-patch.c:39
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
msgstr ""
-#: add-patch.c:41
+#: add-patch.c:42
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"d - do not stage this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:55 git-add--interactive.perl:1433
+#: add-patch.c:56 git-add--interactive.perl:1436
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:56 git-add--interactive.perl:1434
+#: add-patch.c:57 git-add--interactive.perl:1437
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:57 git-add--interactive.perl:1435
+#: add-patch.c:58 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Stash addition [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:59 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:59
+#: add-patch.c:61
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
msgstr ""
-#: add-patch.c:62
+#: add-patch.c:64
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"d - do not stash this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:78 git-add--interactive.perl:1438
+#: add-patch.c:80 git-add--interactive.perl:1442
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:79 git-add--interactive.perl:1439
+#: add-patch.c:81 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:80 git-add--interactive.perl:1440
+#: add-patch.c:82 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Unstage addition [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:83 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:82
+#: add-patch.c:85
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
msgstr ""
-#: add-patch.c:85
+#: add-patch.c:88
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"d - do not unstage this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:100 git-add--interactive.perl:1443
+#: add-patch.c:103 git-add--interactive.perl:1448
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:101 git-add--interactive.perl:1444
+#: add-patch.c:104 git-add--interactive.perl:1449
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:102 git-add--interactive.perl:1445
+#: add-patch.c:105 git-add--interactive.perl:1450
+#, c-format, perl-format
+msgid "Apply addition to index [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:106 git-add--interactive.perl:1451
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:104 add-patch.c:169 add-patch.c:212
+#: add-patch.c:108 add-patch.c:176 add-patch.c:221
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
msgstr ""
-#: add-patch.c:107
+#: add-patch.c:111
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:122 git-add--interactive.perl:1448
-#: git-add--interactive.perl:1463
+#: add-patch.c:126 git-add--interactive.perl:1454
+#: git-add--interactive.perl:1472
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:123 git-add--interactive.perl:1449
-#: git-add--interactive.perl:1464
+#: add-patch.c:127 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:124 git-add--interactive.perl:1450
-#: git-add--interactive.perl:1465
+#: add-patch.c:128 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
+#, c-format, perl-format
+msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:129 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:126 add-patch.c:148 add-patch.c:191
+#: add-patch.c:131 add-patch.c:154 add-patch.c:199
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
msgstr ""
-#: add-patch.c:129 add-patch.c:194
+#: add-patch.c:134 add-patch.c:202
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462
+#, c-format, perl-format
+msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:151
+#: add-patch.c:157
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468
+#, c-format, perl-format
+msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:172
+#: add-patch.c:179
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:215
+#: add-patch.c:224
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:319
+#: add-patch.c:328
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr ""
-#: add-patch.c:338 add-patch.c:342
+#: add-patch.c:347 add-patch.c:351
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr ""
-#: add-patch.c:396
+#: add-patch.c:405
msgid "could not parse diff"
msgstr ""
-#: add-patch.c:415
+#: add-patch.c:424
msgid "could not parse colored diff"
msgstr ""
-#: add-patch.c:429
+#: add-patch.c:438
#, c-format
msgid "failed to run '%s'"
msgstr ""
-#: add-patch.c:588
+#: add-patch.c:602
msgid "mismatched output from interactive.diffFilter"
msgstr ""
-#: add-patch.c:589
+#: add-patch.c:603
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
msgstr ""
-#: add-patch.c:762
+#: add-patch.c:776
#, c-format
msgid ""
"expected context line #%d in\n"
"%.*s"
msgstr ""
-#: add-patch.c:777
+#: add-patch.c:791
#, c-format
msgid ""
"hunks do not overlap:\n"
"%.*s"
msgstr ""
-#: add-patch.c:1053 git-add--interactive.perl:1112
+#: add-patch.c:1067 git-add--interactive.perl:1114
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
-#: add-patch.c:1057
+#: add-patch.c:1071
#, c-format
msgid ""
"---\n"
msgstr ""
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1071 git-add--interactive.perl:1126
+#: add-patch.c:1085 git-add--interactive.perl:1128
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
-#: add-patch.c:1104
+#: add-patch.c:1118
msgid "could not parse hunk header"
msgstr ""
-#: add-patch.c:1149
+#: add-patch.c:1163
msgid "'git apply --cached' failed"
msgstr ""
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1218 git-add--interactive.perl:1239
+#: add-patch.c:1232 git-add--interactive.perl:1241
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
-#: add-patch.c:1261
+#: add-patch.c:1275
msgid "The selected hunks do not apply to the index!"
msgstr ""
-#: add-patch.c:1262 git-add--interactive.perl:1343
+#: add-patch.c:1276 git-add--interactive.perl:1345
msgid "Apply them to the worktree anyway? "
msgstr ""
-#: add-patch.c:1269 git-add--interactive.perl:1346
+#: add-patch.c:1283 git-add--interactive.perl:1348
msgid "Nothing was applied.\n"
msgstr ""
-#: add-patch.c:1326
+#: add-patch.c:1340
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
"? - print help\n"
msgstr ""
-#: add-patch.c:1447 add-patch.c:1457
+#: add-patch.c:1463 add-patch.c:1473
msgid "No previous hunk"
msgstr ""
-#: add-patch.c:1452 add-patch.c:1462
+#: add-patch.c:1468 add-patch.c:1478
msgid "No next hunk"
msgstr ""
-#: add-patch.c:1468
+#: add-patch.c:1484
msgid "No other hunks to goto"
msgstr ""
-#: add-patch.c:1479 git-add--interactive.perl:1577
+#: add-patch.c:1495 git-add--interactive.perl:1594
msgid "go to which hunk (<ret> to see more)? "
msgstr ""
-#: add-patch.c:1480 git-add--interactive.perl:1579
+#: add-patch.c:1496 git-add--interactive.perl:1596
msgid "go to which hunk? "
msgstr ""
-#: add-patch.c:1491
+#: add-patch.c:1507
#, c-format
msgid "Invalid number: '%s'"
msgstr ""
-#: add-patch.c:1496
+#: add-patch.c:1512
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] ""
msgstr[1] ""
-#: add-patch.c:1505
+#: add-patch.c:1521
msgid "No other hunks to search"
msgstr ""
-#: add-patch.c:1511 git-add--interactive.perl:1623
+#: add-patch.c:1527 git-add--interactive.perl:1640
msgid "search for regex? "
msgstr ""
-#: add-patch.c:1526
+#: add-patch.c:1542
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr ""
-#: add-patch.c:1543
+#: add-patch.c:1559
msgid "No hunk matches the given pattern"
msgstr ""
-#: add-patch.c:1550
+#: add-patch.c:1566
msgid "Sorry, cannot split this hunk"
msgstr ""
-#: add-patch.c:1554
+#: add-patch.c:1570
#, c-format
msgid "Split into %d hunks."
msgstr ""
-#: add-patch.c:1558
+#: add-patch.c:1574
msgid "Sorry, cannot edit this hunk"
msgstr ""
-#: add-patch.c:1609
+#: add-patch.c:1625
msgid "'git apply' failed"
msgstr ""
#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3458 builtin/rebase.c:1332
+#: builtin/pack-objects.c:3530 builtin/rebase.c:1332
msgid "action"
msgstr ""
msgid "path too long (%d chars, SHA1: %s): %s"
msgstr ""
-#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235
+#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246
#, c-format
msgid "deflate error (%d)"
msgstr ""
msgstr ""
#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208
+#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907
#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
#: parse-options.h:190
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
+#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235
-#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291
+#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363
#: builtin/shortlog.c:192
msgid "revision walk setup failed"
msgstr ""
msgid "HEAD of working tree %s is not updated"
msgstr ""
-#: bundle.c:36
+#: bundle.c:47
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr ""
-#: bundle.c:64
+#: bundle.c:69
+msgid "unknown hash algorithm length"
+msgstr ""
+
+#: bundle.c:84
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
+#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
#: builtin/commit.c:814
#, c-format
msgid "could not open '%s'"
msgstr ""
-#: bundle.c:143
+#: bundle.c:163
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:146
+#: bundle.c:166
msgid "need a repository to verify a bundle"
msgstr ""
-#: bundle.c:197
+#: bundle.c:217
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:204
+#: bundle.c:224
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:206
+#: bundle.c:226
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:273
+#: bundle.c:293
msgid "unable to dup bundle descriptor"
msgstr ""
-#: bundle.c:280
+#: bundle.c:300
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:291
+#: bundle.c:311
msgid "pack-objects died"
msgstr ""
-#: bundle.c:333
+#: bundle.c:353
msgid "rev-list died"
msgstr ""
-#: bundle.c:382
+#: bundle.c:402
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
+#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:469
+#: bundle.c:489
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:479
+#: bundle.c:499
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:504
+#: bundle.c:524
msgid "index-pack died"
msgstr ""
msgid "invalid color value: %.*s"
msgstr ""
-#: commit-graph.c:183
+#: commit-graph.c:238
msgid "commit-graph file is too small"
msgstr ""
-#: commit-graph.c:248
+#: commit-graph.c:303
#, c-format
msgid "commit-graph signature %X does not match signature %X"
msgstr ""
-#: commit-graph.c:255
+#: commit-graph.c:310
#, c-format
msgid "commit-graph version %X does not match version %X"
msgstr ""
-#: commit-graph.c:262
+#: commit-graph.c:317
#, c-format
msgid "commit-graph hash version %X does not match version %X"
msgstr ""
-#: commit-graph.c:284
+#: commit-graph.c:339
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
msgstr ""
-#: commit-graph.c:294
+#: commit-graph.c:349
#, c-format
msgid "commit-graph improper chunk offset %08x%08x"
msgstr ""
-#: commit-graph.c:362
+#: commit-graph.c:417
#, c-format
msgid "commit-graph chunk id %08x appears multiple times"
msgstr ""
-#: commit-graph.c:436
+#: commit-graph.c:491
msgid "commit-graph has no base graphs chunk"
msgstr ""
-#: commit-graph.c:446
+#: commit-graph.c:501
msgid "commit-graph chain does not match"
msgstr ""
-#: commit-graph.c:494
+#: commit-graph.c:549
#, c-format
msgid "invalid commit-graph chain: line '%s' not a hash"
msgstr ""
-#: commit-graph.c:518
+#: commit-graph.c:573
msgid "unable to find all commit-graph files"
msgstr ""
-#: commit-graph.c:651 commit-graph.c:711
+#: commit-graph.c:706 commit-graph.c:770
msgid "invalid commit position. commit-graph is likely corrupt"
msgstr ""
-#: commit-graph.c:672
+#: commit-graph.c:727
#, c-format
msgid "could not find commit %s"
msgstr ""
-#: commit-graph.c:948 builtin/am.c:1292
+#: commit-graph.c:1009 builtin/am.c:1292
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: commit-graph.c:1096
+#: commit-graph.c:1157
msgid "Writing changed paths Bloom filters index"
msgstr ""
-#: commit-graph.c:1121
+#: commit-graph.c:1182
msgid "Writing changed paths Bloom filters data"
msgstr ""
-#: commit-graph.c:1160 builtin/pack-objects.c:2783
+#: commit-graph.c:1221 builtin/pack-objects.c:2832
#, c-format
msgid "unable to get type of object %s"
msgstr ""
-#: commit-graph.c:1196
+#: commit-graph.c:1257
msgid "Loading known commits in commit graph"
msgstr ""
-#: commit-graph.c:1213
+#: commit-graph.c:1274
msgid "Expanding reachable commits in commit graph"
msgstr ""
-#: commit-graph.c:1233
+#: commit-graph.c:1294
msgid "Clearing commit marks in commit graph"
msgstr ""
-#: commit-graph.c:1252
+#: commit-graph.c:1313
msgid "Computing commit graph generation numbers"
msgstr ""
-#: commit-graph.c:1300
+#: commit-graph.c:1367
msgid "Computing commit changed paths Bloom filters"
msgstr ""
-#: commit-graph.c:1359
+#: commit-graph.c:1423
+msgid "Collecting referenced commits"
+msgstr ""
+
+#: commit-graph.c:1447
#, c-format
msgid "Finding commits for commit graph in %d pack"
msgid_plural "Finding commits for commit graph in %d packs"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1372
+#: commit-graph.c:1460
#, c-format
msgid "error adding pack %s"
msgstr ""
-#: commit-graph.c:1376
+#: commit-graph.c:1464
#, c-format
msgid "error opening index for %s"
msgstr ""
-#: commit-graph.c:1405
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] ""
-msgstr[1] ""
-
-#: commit-graph.c:1426
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr ""
-
-#: commit-graph.c:1442
+#: commit-graph.c:1503
msgid "Finding commits for commit graph among packed objects"
msgstr ""
-#: commit-graph.c:1457
+#: commit-graph.c:1518
msgid "Counting distinct commits in commit graph"
msgstr ""
-#: commit-graph.c:1489
+#: commit-graph.c:1550
msgid "Finding extra edges in commit graph"
msgstr ""
-#: commit-graph.c:1538
+#: commit-graph.c:1599
msgid "failed to write correct number of base graph ids"
msgstr ""
-#: commit-graph.c:1572 midx.c:812
+#: commit-graph.c:1633 midx.c:812
#, c-format
msgid "unable to create leading directories of %s"
msgstr ""
-#: commit-graph.c:1585
+#: commit-graph.c:1646
msgid "unable to create temporary graph layer"
msgstr ""
-#: commit-graph.c:1590
+#: commit-graph.c:1651
#, c-format
msgid "unable to adjust shared permissions for '%s'"
msgstr ""
-#: commit-graph.c:1667
+#: commit-graph.c:1728
#, c-format
msgid "Writing out commit graph in %d pass"
msgid_plural "Writing out commit graph in %d passes"
msgstr[0] ""
msgstr[1] ""
-#: commit-graph.c:1712
+#: commit-graph.c:1773
msgid "unable to open commit-graph chain file"
msgstr ""
-#: commit-graph.c:1728
+#: commit-graph.c:1789
msgid "failed to rename base commit-graph file"
msgstr ""
-#: commit-graph.c:1748
+#: commit-graph.c:1809
msgid "failed to rename temporary commit-graph file"
msgstr ""
-#: commit-graph.c:1874
+#: commit-graph.c:1935
msgid "Scanning merged commits"
msgstr ""
-#: commit-graph.c:1885
+#: commit-graph.c:1946
#, c-format
msgid "unexpected duplicate commit id %s"
msgstr ""
-#: commit-graph.c:1908
+#: commit-graph.c:1969
msgid "Merging commit-graph"
msgstr ""
-#: commit-graph.c:2096
+#: commit-graph.c:2156
#, c-format
msgid "the commit graph format cannot write %d commits"
msgstr ""
-#: commit-graph.c:2107
+#: commit-graph.c:2167
msgid "too many commits to write graph"
msgstr ""
-#: commit-graph.c:2200
+#: commit-graph.c:2260
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
msgstr ""
-#: commit-graph.c:2210
+#: commit-graph.c:2270
#, c-format
msgid "commit-graph has incorrect OID order: %s then %s"
msgstr ""
-#: commit-graph.c:2220 commit-graph.c:2235
+#: commit-graph.c:2280 commit-graph.c:2295
#, c-format
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
msgstr ""
-#: commit-graph.c:2227
+#: commit-graph.c:2287
#, c-format
msgid "failed to parse commit %s from commit-graph"
msgstr ""
-#: commit-graph.c:2245
+#: commit-graph.c:2305
msgid "Verifying commits in commit graph"
msgstr ""
-#: commit-graph.c:2259
+#: commit-graph.c:2320
#, c-format
msgid "failed to parse commit %s from object database for commit-graph"
msgstr ""
-#: commit-graph.c:2266
+#: commit-graph.c:2327
#, c-format
msgid "root tree OID for commit %s in commit-graph is %s != %s"
msgstr ""
-#: commit-graph.c:2276
+#: commit-graph.c:2337
#, c-format
msgid "commit-graph parent list for commit %s is too long"
msgstr ""
-#: commit-graph.c:2285
+#: commit-graph.c:2346
#, c-format
msgid "commit-graph parent for %s is %s != %s"
msgstr ""
-#: commit-graph.c:2298
+#: commit-graph.c:2360
#, c-format
msgid "commit-graph parent list for commit %s terminates early"
msgstr ""
-#: commit-graph.c:2303
+#: commit-graph.c:2365
#, c-format
msgid ""
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
msgstr ""
-#: commit-graph.c:2307
+#: commit-graph.c:2369
#, c-format
msgid ""
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
msgstr ""
-#: commit-graph.c:2322
+#: commit-graph.c:2385
#, c-format
msgid "commit-graph generation for commit %s is %u != %u"
msgstr ""
-#: commit-graph.c:2328
+#: commit-graph.c:2391
#, c-format
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
msgstr ""
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1168
+#: commit.c:1172
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: commit.c:1172
+#: commit.c:1176
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: commit.c:1175
+#: commit.c:1179
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: commit.c:1178
+#: commit.c:1182
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: commit.c:1432
+#: commit.c:1436
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1533 builtin/pack-objects.c:3542
+#: config.c:1533 builtin/pack-objects.c:3617
#, c-format
msgid "bad pack compression level %d"
msgstr ""
msgid "server doesn't support '%s'"
msgstr ""
-#: connect.c:103
+#: connect.c:118
#, c-format
msgid "server doesn't support feature '%s'"
msgstr ""
-#: connect.c:114
+#: connect.c:129
msgid "expected flush after capabilities"
msgstr ""
-#: connect.c:233
+#: connect.c:263
#, c-format
msgid "ignoring capabilities after first line '%s'"
msgstr ""
-#: connect.c:252
+#: connect.c:284
msgid "protocol error: unexpected capabilities^{}"
msgstr ""
-#: connect.c:273
+#: connect.c:306
#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
-#: connect.c:275
+#: connect.c:308
msgid "repository on the other end cannot be shallow"
msgstr ""
-#: connect.c:313
+#: connect.c:347
msgid "invalid packet"
msgstr ""
-#: connect.c:333
+#: connect.c:367
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr ""
-#: connect.c:441
+#: connect.c:473
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr ""
+
+#: connect.c:500
#, c-format
msgid "invalid ls-refs response: %s"
msgstr ""
-#: connect.c:445
+#: connect.c:504
msgid "expected flush after ref listing"
msgstr ""
-#: connect.c:544
+#: connect.c:507
+msgid "expected response end packet after ref listing"
+msgstr ""
+
+#: connect.c:640
#, c-format
msgid "protocol '%s' is not supported"
msgstr ""
-#: connect.c:595
+#: connect.c:691
msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: connect.c:635 connect.c:698
+#: connect.c:731 connect.c:794
#, c-format
msgid "Looking up %s ... "
msgstr ""
-#: connect.c:639
+#: connect.c:735
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr ""
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:643 connect.c:714
+#: connect.c:739 connect.c:810
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
-#: connect.c:665 connect.c:742
+#: connect.c:761 connect.c:838
#, c-format
msgid ""
"unable to connect to %s:\n"
msgstr ""
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:767 connect.c:844
msgid "done."
msgstr ""
-#: connect.c:702
+#: connect.c:798
#, c-format
msgid "unable to look up %s (%s)"
msgstr ""
-#: connect.c:708
+#: connect.c:804
#, c-format
msgid "unknown port %s"
msgstr ""
-#: connect.c:845 connect.c:1175
+#: connect.c:941 connect.c:1271
#, c-format
msgid "strange hostname '%s' blocked"
msgstr ""
-#: connect.c:847
+#: connect.c:943
#, c-format
msgid "strange port '%s' blocked"
msgstr ""
-#: connect.c:857
+#: connect.c:953
#, c-format
msgid "cannot start proxy %s"
msgstr ""
-#: connect.c:928
+#: connect.c:1024
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-#: connect.c:1123
+#: connect.c:1219
msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: connect.c:1135
+#: connect.c:1231
msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: connect.c:1152
+#: connect.c:1248
msgid "ssh variant 'simple' does not support setting port"
msgstr ""
-#: connect.c:1264
+#: connect.c:1360
#, c-format
msgid "strange pathname '%s' blocked"
msgstr ""
-#: connect.c:1311
+#: connect.c:1407
msgid "unable to fork"
msgstr ""
-#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45
+#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45
msgid "Checking connectivity"
msgstr ""
-#: connected.c:119
+#: connected.c:121
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:139
+#: connected.c:141
msgid "failed write to rev-list"
msgstr ""
-#: connected.c:146
+#: connected.c:148
msgid "failed to close rev-list's stdin"
msgstr ""
"tree"
msgstr ""
-#: diff.c:155
+#: diff.c:156
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:160
+#: diff.c:161
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:296
+#: diff.c:297
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
msgstr ""
-#: diff.c:324
+#: diff.c:325
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
msgstr ""
-#: diff.c:332
+#: diff.c:333
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
msgstr ""
-#: diff.c:405
+#: diff.c:410
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:465
+#: diff.c:470
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:4238
+#: diff.c:4243
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:4583
+#: diff.c:4589
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:4586
+#: diff.c:4592
msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: diff.c:4664
+#: diff.c:4670
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:4712
+#: diff.c:4718
#, c-format
msgid "invalid --stat value: %s"
msgstr ""
-#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245
+#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250
#: parse-options.c:197 parse-options.c:201
#, c-format
msgid "%s expects a numerical value"
msgstr ""
-#: diff.c:4749
+#: diff.c:4755
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:4834
+#: diff.c:4840
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: diff.c:4858
+#: diff.c:4864
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: diff.c:4872
+#: diff.c:4878
#, c-format
msgid "unable to resolve '%s'"
msgstr ""
-#: diff.c:4922 diff.c:4928
+#: diff.c:4928 diff.c:4934
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
-#: diff.c:4940
+#: diff.c:4946
#, c-format
msgid "%s expects a character, got '%s'"
msgstr ""
-#: diff.c:4961
+#: diff.c:4967
#, c-format
msgid "bad --color-moved argument: %s"
msgstr ""
-#: diff.c:4980
+#: diff.c:4986
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr ""
-#: diff.c:5020
+#: diff.c:5026
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
-#: diff.c:5056 diff.c:5076
+#: diff.c:5062 diff.c:5082
#, c-format
msgid "invalid argument to %s"
msgstr ""
-#: diff.c:5214
+#: diff.c:5219
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:5270
+#: diff.c:5275
#, c-format
msgid "bad --word-diff argument: %s"
msgstr ""
-#: diff.c:5293
+#: diff.c:5298
msgid "Diff output format options"
msgstr ""
-#: diff.c:5295 diff.c:5301
+#: diff.c:5300 diff.c:5306
msgid "generate patch"
msgstr ""
-#: diff.c:5298 builtin/log.c:177
+#: diff.c:5303 builtin/log.c:177
msgid "suppress diff output"
msgstr ""
-#: diff.c:5303 diff.c:5417 diff.c:5424
+#: diff.c:5308 diff.c:5422 diff.c:5429
msgid "<n>"
msgstr ""
-#: diff.c:5304 diff.c:5307
+#: diff.c:5309 diff.c:5312
msgid "generate diffs with <n> lines context"
msgstr ""
-#: diff.c:5309
+#: diff.c:5314
msgid "generate the diff in raw format"
msgstr ""
-#: diff.c:5312
+#: diff.c:5317
msgid "synonym for '-p --raw'"
msgstr ""
-#: diff.c:5316
+#: diff.c:5321
msgid "synonym for '-p --stat'"
msgstr ""
-#: diff.c:5320
+#: diff.c:5325
msgid "machine friendly --stat"
msgstr ""
-#: diff.c:5323
+#: diff.c:5328
msgid "output only the last line of --stat"
msgstr ""
-#: diff.c:5325 diff.c:5333
+#: diff.c:5330 diff.c:5338
msgid "<param1,param2>..."
msgstr ""
-#: diff.c:5326
+#: diff.c:5331
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: diff.c:5330
+#: diff.c:5335
msgid "synonym for --dirstat=cumulative"
msgstr ""
-#: diff.c:5334
+#: diff.c:5339
msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: diff.c:5338
+#: diff.c:5343
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#: diff.c:5341
+#: diff.c:5346
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: diff.c:5344
+#: diff.c:5349
msgid "show only names of changed files"
msgstr ""
-#: diff.c:5347
+#: diff.c:5352
msgid "show only names and status of changed files"
msgstr ""
-#: diff.c:5349
+#: diff.c:5354
msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: diff.c:5350
+#: diff.c:5355
msgid "generate diffstat"
msgstr ""
-#: diff.c:5352 diff.c:5355 diff.c:5358
+#: diff.c:5357 diff.c:5360 diff.c:5363
msgid "<width>"
msgstr ""
-#: diff.c:5353
+#: diff.c:5358
msgid "generate diffstat with a given width"
msgstr ""
-#: diff.c:5356
+#: diff.c:5361
msgid "generate diffstat with a given name width"
msgstr ""
-#: diff.c:5359
+#: diff.c:5364
msgid "generate diffstat with a given graph width"
msgstr ""
-#: diff.c:5361
+#: diff.c:5366
msgid "<count>"
msgstr ""
-#: diff.c:5362
+#: diff.c:5367
msgid "generate diffstat with limited lines"
msgstr ""
-#: diff.c:5365
+#: diff.c:5370
msgid "generate compact summary in diffstat"
msgstr ""
-#: diff.c:5368
+#: diff.c:5373
msgid "output a binary diff that can be applied"
msgstr ""
-#: diff.c:5371
+#: diff.c:5376
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: diff.c:5373
+#: diff.c:5378
msgid "show colored diff"
msgstr ""
-#: diff.c:5374
+#: diff.c:5379
msgid "<kind>"
msgstr ""
-#: diff.c:5375
+#: diff.c:5380
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
-#: diff.c:5378
+#: diff.c:5383
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
-#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493
+#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498
msgid "<prefix>"
msgstr ""
-#: diff.c:5382
+#: diff.c:5387
msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: diff.c:5385
+#: diff.c:5390
msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: diff.c:5388
+#: diff.c:5393
msgid "prepend an additional prefix to every line of output"
msgstr ""
-#: diff.c:5391
+#: diff.c:5396
msgid "do not show any source or destination prefix"
msgstr ""
-#: diff.c:5394
+#: diff.c:5399
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-#: diff.c:5398 diff.c:5403 diff.c:5408
+#: diff.c:5403 diff.c:5408 diff.c:5413
msgid "<char>"
msgstr ""
-#: diff.c:5399
+#: diff.c:5404
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: diff.c:5404
+#: diff.c:5409
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: diff.c:5409
+#: diff.c:5414
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: diff.c:5412
+#: diff.c:5417
msgid "Diff rename options"
msgstr ""
-#: diff.c:5413
+#: diff.c:5418
msgid "<n>[/<m>]"
msgstr ""
-#: diff.c:5414
+#: diff.c:5419
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: diff.c:5418
+#: diff.c:5423
msgid "detect renames"
msgstr ""
-#: diff.c:5422
+#: diff.c:5427
msgid "omit the preimage for deletes"
msgstr ""
-#: diff.c:5425
+#: diff.c:5430
msgid "detect copies"
msgstr ""
-#: diff.c:5429
+#: diff.c:5434
msgid "use unmodified files as source to find copies"
msgstr ""
-#: diff.c:5431
+#: diff.c:5436
msgid "disable rename detection"
msgstr ""
-#: diff.c:5434
+#: diff.c:5439
msgid "use empty blobs as rename source"
msgstr ""
-#: diff.c:5436
+#: diff.c:5441
msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: diff.c:5439
+#: diff.c:5444
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-#: diff.c:5441
+#: diff.c:5446
msgid "Diff algorithm options"
msgstr ""
-#: diff.c:5443
+#: diff.c:5448
msgid "produce the smallest possible diff"
msgstr ""
-#: diff.c:5446
+#: diff.c:5451
msgid "ignore whitespace when comparing lines"
msgstr ""
-#: diff.c:5449
+#: diff.c:5454
msgid "ignore changes in amount of whitespace"
msgstr ""
-#: diff.c:5452
+#: diff.c:5457
msgid "ignore changes in whitespace at EOL"
msgstr ""
-#: diff.c:5455
+#: diff.c:5460
msgid "ignore carrier-return at the end of line"
msgstr ""
-#: diff.c:5458
+#: diff.c:5463
msgid "ignore changes whose lines are all blank"
msgstr ""
-#: diff.c:5461
+#: diff.c:5466
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
-#: diff.c:5464
+#: diff.c:5469
msgid "generate diff using the \"patience diff\" algorithm"
msgstr ""
-#: diff.c:5468
+#: diff.c:5473
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
-#: diff.c:5470
+#: diff.c:5475
msgid "<algorithm>"
msgstr ""
-#: diff.c:5471
+#: diff.c:5476
msgid "choose a diff algorithm"
msgstr ""
-#: diff.c:5473
+#: diff.c:5478
msgid "<text>"
msgstr ""
-#: diff.c:5474
+#: diff.c:5479
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr ""
-#: diff.c:5476 diff.c:5485 diff.c:5488
+#: diff.c:5481 diff.c:5490 diff.c:5493
msgid "<mode>"
msgstr ""
-#: diff.c:5477
+#: diff.c:5482
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
-#: diff.c:5479 diff.c:5482 diff.c:5527
+#: diff.c:5484 diff.c:5487 diff.c:5532
msgid "<regex>"
msgstr ""
-#: diff.c:5480
+#: diff.c:5485
msgid "use <regex> to decide what a word is"
msgstr ""
-#: diff.c:5483
+#: diff.c:5488
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: diff.c:5486
+#: diff.c:5491
msgid "moved lines of code are colored differently"
msgstr ""
-#: diff.c:5489
+#: diff.c:5494
msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: diff.c:5492
+#: diff.c:5497
msgid "Other diff options"
msgstr ""
-#: diff.c:5494
+#: diff.c:5499
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: diff.c:5498
+#: diff.c:5503
msgid "treat all files as text"
msgstr ""
-#: diff.c:5500
+#: diff.c:5505
msgid "swap two inputs, reverse the diff"
msgstr ""
-#: diff.c:5502
+#: diff.c:5507
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: diff.c:5504
+#: diff.c:5509
msgid "disable all output of the program"
msgstr ""
-#: diff.c:5506
+#: diff.c:5511
msgid "allow an external diff helper to be executed"
msgstr ""
-#: diff.c:5508
+#: diff.c:5513
msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: diff.c:5510
+#: diff.c:5515
msgid "<when>"
msgstr ""
-#: diff.c:5511
+#: diff.c:5516
msgid "ignore changes to submodules in the diff generation"
msgstr ""
-#: diff.c:5514
+#: diff.c:5519
msgid "<format>"
msgstr ""
-#: diff.c:5515
+#: diff.c:5520
msgid "specify how differences in submodules are shown"
msgstr ""
-#: diff.c:5519
+#: diff.c:5524
msgid "hide 'git add -N' entries from the index"
msgstr ""
-#: diff.c:5522
+#: diff.c:5527
msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: diff.c:5524
+#: diff.c:5529
msgid "<string>"
msgstr ""
-#: diff.c:5525
+#: diff.c:5530
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-#: diff.c:5528
+#: diff.c:5533
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-#: diff.c:5531
+#: diff.c:5536
msgid "show all changes in the changeset with -S or -G"
msgstr ""
-#: diff.c:5534
+#: diff.c:5539
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
-#: diff.c:5537
+#: diff.c:5542
msgid "control the order in which files appear in the output"
msgstr ""
-#: diff.c:5538
+#: diff.c:5543
msgid "<object-id>"
msgstr ""
-#: diff.c:5539
+#: diff.c:5544
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-#: diff.c:5541
+#: diff.c:5546
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: diff.c:5542
+#: diff.c:5547
msgid "select files by diff type"
msgstr ""
-#: diff.c:5544
+#: diff.c:5549
msgid "<file>"
msgstr ""
-#: diff.c:5545
+#: diff.c:5550
msgid "Output to a specific file"
msgstr ""
-#: diff.c:6200
+#: diff.c:6205
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:6203
+#: diff.c:6208
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:6206
+#: diff.c:6211
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgid "Performing inexact rename detection"
msgstr ""
-#: dir.c:555
+#: dir.c:573
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
-#: dir.c:695 dir.c:724 dir.c:737
+#: dir.c:713 dir.c:742 dir.c:755
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr ""
-#: dir.c:754 dir.c:768
+#: dir.c:772 dir.c:786
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr ""
-#: dir.c:786
+#: dir.c:804
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
-#: dir.c:796
+#: dir.c:814
msgid "disabling cone pattern matching"
msgstr ""
-#: dir.c:1173
+#: dir.c:1191
#, c-format
msgid "cannot use %s as an exclude file"
msgstr ""
-#: dir.c:2275
+#: dir.c:2296
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2575
+#: dir.c:2596
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2699
+#: dir.c:2720
msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: dir.c:3481
+#: dir.c:3502
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3526 dir.c:3531
+#: dir.c:3547 dir.c:3552
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3560
+#: dir.c:3581
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
msgid "hint: Waiting for your editor to close the file...%c"
msgstr ""
-#: entry.c:178
+#: entry.c:177
msgid "Filtering content"
msgstr ""
-#: entry.c:479
+#: entry.c:478
#, c-format
msgid "could not stat file '%s'"
msgstr ""
msgid "too many args to run %s"
msgstr ""
-#: fetch-pack.c:151
+#: fetch-pack.c:152
msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: fetch-pack.c:154
+#: fetch-pack.c:155
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-#: fetch-pack.c:165
+#: fetch-pack.c:166
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: fetch-pack.c:185
+#: fetch-pack.c:186
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:196
+#: fetch-pack.c:197
msgid "unable to write to remote"
msgstr ""
-#: fetch-pack.c:258
+#: fetch-pack.c:259
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:357 fetch-pack.c:1364
+#: fetch-pack.c:358 fetch-pack.c:1408
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:363 fetch-pack.c:1370
+#: fetch-pack.c:364 fetch-pack.c:1414
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:365 fetch-pack.c:1372
+#: fetch-pack.c:366 fetch-pack.c:1416
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:368 fetch-pack.c:1375
+#: fetch-pack.c:369 fetch-pack.c:1419
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:370 fetch-pack.c:1377
+#: fetch-pack.c:371 fetch-pack.c:1421
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:373 fetch-pack.c:1381
+#: fetch-pack.c:374 fetch-pack.c:1425
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:415
+#: fetch-pack.c:416
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:463
+#: fetch-pack.c:464
msgid "giving up"
msgstr ""
-#: fetch-pack.c:476 progress.c:336
+#: fetch-pack.c:477 progress.c:336
msgid "done"
msgstr ""
-#: fetch-pack.c:488
+#: fetch-pack.c:489
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:534
+#: fetch-pack.c:535
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:755
+#: fetch-pack.c:756
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:819
+#: fetch-pack.c:821
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:827
+#: fetch-pack.c:829
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:901
+#: fetch-pack.c:910
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:917
+#: fetch-pack.c:927
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:919
+#: fetch-pack.c:929
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:966
+#: fetch-pack.c:976
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986
-#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002
-#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018
-#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040
+#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996
+#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012
+#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028
+#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050
#, c-format
msgid "Server supports %s"
msgstr ""
-#: fetch-pack.c:973
+#: fetch-pack.c:983
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:1033
+#: fetch-pack.c:1043
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:1038
+#: fetch-pack.c:1048
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:1042
+#: fetch-pack.c:1052
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:1059
+#: fetch-pack.c:1054
+msgid "Server does not support this repository's object format"
+msgstr ""
+
+#: fetch-pack.c:1071
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1071 fetch-pack.c:1563
+#: fetch-pack.c:1083 fetch-pack.c:1639
msgid "git fetch-pack: fetch failed."
msgstr ""
#: fetch-pack.c:1211
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr ""
+
+#: fetch-pack.c:1215
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr ""
+
+#: fetch-pack.c:1235
msgid "Server does not support shallow requests"
msgstr ""
-#: fetch-pack.c:1218
+#: fetch-pack.c:1242
msgid "Server supports filter"
msgstr ""
-#: fetch-pack.c:1242
+#: fetch-pack.c:1286
msgid "unable to write request to remote"
msgstr ""
-#: fetch-pack.c:1260
+#: fetch-pack.c:1304
#, c-format
msgid "error reading section header '%s'"
msgstr ""
-#: fetch-pack.c:1266
+#: fetch-pack.c:1310
#, c-format
msgid "expected '%s', received '%s'"
msgstr ""
-#: fetch-pack.c:1327
+#: fetch-pack.c:1371
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: fetch-pack.c:1332
+#: fetch-pack.c:1376
#, c-format
msgid "error processing acks: %d"
msgstr ""
-#: fetch-pack.c:1342
+#: fetch-pack.c:1386
msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: fetch-pack.c:1344
+#: fetch-pack.c:1388
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: fetch-pack.c:1386
+#: fetch-pack.c:1430
#, c-format
msgid "error processing shallow info: %d"
msgstr ""
-#: fetch-pack.c:1433
+#: fetch-pack.c:1477
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: fetch-pack.c:1438
+#: fetch-pack.c:1482
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: fetch-pack.c:1443
+#: fetch-pack.c:1487
#, c-format
msgid "error processing wanted refs: %d"
msgstr ""
-#: fetch-pack.c:1789
+#: fetch-pack.c:1517
+msgid "git fetch-pack: expected response end packet"
+msgstr ""
+
+#: fetch-pack.c:1921
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1812 builtin/clone.c:692
+#: fetch-pack.c:1944 builtin/clone.c:692
msgid "remote did not send all necessary objects"
msgstr ""
-#: fetch-pack.c:1839
+#: fetch-pack.c:1971
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:1842
+#: fetch-pack.c:1974
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr[0] ""
msgstr[1] ""
-#: help.c:653
+#: help.c:654
msgid "git version [<options>]"
msgstr ""
-#: help.c:708
+#: help.c:709
#, c-format
msgid "%s: %s - %s"
msgstr ""
-#: help.c:712
+#: help.c:713
msgid ""
"\n"
"Did you mean this?"
msgid "multiple filter-specs cannot be combined"
msgstr ""
+#: list-objects-filter-options.c:330
+msgid "unable to upgrade repository format to support partial clone"
+msgstr ""
+
#: list-objects-filter.c:492
#, c-format
msgid "unable to access sparse blob in '%s'"
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:3101 git-submodule.sh:985
+#: merge-recursive.c:3101 git-submodule.sh:959
msgid "submodule"
msgstr ""
msgstr ""
#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912
-#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816
+#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816
#: builtin/stash.c:265
msgid "unable to write new index file"
msgstr ""
msgid "hash mismatch %s"
msgstr ""
-#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135
+#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184
#, c-format
msgid "unable to get size of %s"
msgstr ""
-#: packfile.c:629
+#: packfile.c:630
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: packfile.c:1899
+#: packfile.c:1900
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: packfile.c:1903
+#: packfile.c:1904
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
msgstr ""
#: pkt-line.c:106
+msgid "unable to write stateless separator packet"
+msgstr ""
+
+#: pkt-line.c:113
msgid "flush packet write failed"
msgstr ""
-#: pkt-line.c:146 pkt-line.c:232
+#: pkt-line.c:153 pkt-line.c:239
msgid "protocol error: impossibly long line"
msgstr ""
-#: pkt-line.c:162 pkt-line.c:164
+#: pkt-line.c:169 pkt-line.c:171
msgid "packet write with format failed"
msgstr ""
-#: pkt-line.c:196
+#: pkt-line.c:203
msgid "packet write failed - data exceeds max packet size"
msgstr ""
-#: pkt-line.c:203 pkt-line.c:210
+#: pkt-line.c:210 pkt-line.c:217
msgid "packet write failed"
msgstr ""
-#: pkt-line.c:295
+#: pkt-line.c:302
msgid "read error"
msgstr ""
-#: pkt-line.c:303
+#: pkt-line.c:310
msgid "the remote end hung up unexpectedly"
msgstr ""
-#: pkt-line.c:331
+#: pkt-line.c:338
#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr ""
-#: pkt-line.c:341 pkt-line.c:346
+#: pkt-line.c:352 pkt-line.c:357
#, c-format
msgid "protocol error: bad line length %d"
msgstr ""
-#: pkt-line.c:362
+#: pkt-line.c:373
#, c-format
msgid "remote error: %s"
msgstr ""
#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961
+#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991
#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290
#: builtin/submodule--helper.c:332
msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130
+#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130
#, c-format
msgid "could not close '%s'"
msgstr ""
msgid "could not read '%s'."
msgstr ""
-#: ref-filter.c:42 wt-status.c:1936
+#: ref-filter.c:42 wt-status.c:1977
msgid "gone"
msgstr ""
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:2095 refs.c:625
+#: ref-filter.c:2095 refs.c:657
#, c-format
msgid "ignoring broken ref %s"
msgstr ""
msgid "option `%s' must point to a commit"
msgstr ""
-#: refs.c:262
+#: refs.c:264
#, c-format
msgid "%s does not point to a valid object!"
msgstr ""
-#: refs.c:623
+#: refs.c:572
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr ""
+
+#: refs.c:579
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr ""
+
+#: refs.c:655
#, c-format
msgid "ignoring dangling symref %s"
msgstr ""
-#: refs.c:760
+#: refs.c:792
#, c-format
msgid "could not open '%s' for writing: %s"
msgstr ""
-#: refs.c:770 refs.c:821
+#: refs.c:802 refs.c:853
#, c-format
msgid "could not read ref '%s'"
msgstr ""
-#: refs.c:776
+#: refs.c:808
#, c-format
msgid "ref '%s' already exists"
msgstr ""
-#: refs.c:781
+#: refs.c:813
#, c-format
msgid "unexpected object ID when writing '%s'"
msgstr ""
-#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
-#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173
-#: wrapper.c:620
+#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
+#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168
+#: wrapper.c:628
#, c-format
msgid "could not write to '%s'"
msgstr ""
-#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719
#: builtin/rebase.c:852
#, c-format
msgid "could not open '%s' for writing"
msgstr ""
-#: refs.c:823
+#: refs.c:855
#, c-format
msgid "unexpected object ID when deleting '%s'"
msgstr ""
-#: refs.c:954
+#: refs.c:986
#, c-format
msgid "log for ref %s has gap after %s"
msgstr ""
-#: refs.c:960
+#: refs.c:992
#, c-format
msgid "log for ref %s unexpectedly ended on %s"
msgstr ""
-#: refs.c:1019
+#: refs.c:1051
#, c-format
msgid "log for %s is empty"
msgstr ""
-#: refs.c:1111
+#: refs.c:1143
#, c-format
msgid "refusing to update ref with bad name '%s'"
msgstr ""
-#: refs.c:1187
+#: refs.c:1219
#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr ""
-#: refs.c:1979
+#: refs.c:2011
#, c-format
msgid "multiple updates for ref '%s' not allowed"
msgstr ""
-#: refs.c:2011
+#: refs.c:2098
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: refs.c:2107 refs.c:2137
+#: refs.c:2109
+msgid "ref updates aborted by hook"
+msgstr ""
+
+#: refs.c:2209 refs.c:2239
#, c-format
msgid "'%s' exists; cannot create '%s'"
msgstr ""
-#: refs.c:2113 refs.c:2148
+#: refs.c:2215 refs.c:2250
#, c-format
msgid "cannot process '%s' and '%s' at the same time"
msgstr ""
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: remote.c:2233
+#: remote.c:2241
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr ""
msgid "failed to find tree of %s"
msgstr ""
-#: revision.c:2655
+#: revision.c:2661
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2658
+#: revision.c:2664
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2866
+#: revision.c:2873
msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: revision.c:2870
+#: revision.c:2877
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
msgid "failed to sign the push certificate"
msgstr ""
-#: send-pack.c:399
+#: send-pack.c:394
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr ""
+
+#: send-pack.c:403
msgid "the receiving end does not support --signed push"
msgstr ""
-#: send-pack.c:401
+#: send-pack.c:405
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-#: send-pack.c:413
+#: send-pack.c:417
msgid "the receiving end does not support --atomic push"
msgstr ""
-#: send-pack.c:418
+#: send-pack.c:422
msgid "the receiving end does not support push options"
msgstr ""
msgid "unable to dequote value of '%s'"
msgstr ""
-#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710
#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896
#, c-format
msgid "could not open '%s' for reading"
msgid "this operation must be run in a work tree"
msgstr ""
-#: setup.c:569
+#: setup.c:604
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: setup.c:577
+#: setup.c:612
msgid "unknown repository extensions found:"
msgstr ""
-#: setup.c:596
+#: setup.c:631
#, c-format
msgid "error opening '%s'"
msgstr ""
-#: setup.c:598
+#: setup.c:633
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr ""
-#: setup.c:600
+#: setup.c:635
#, c-format
msgid "error reading %s"
msgstr ""
-#: setup.c:602
+#: setup.c:637
#, c-format
msgid "invalid gitfile format: %s"
msgstr ""
-#: setup.c:604
+#: setup.c:639
#, c-format
msgid "no path in gitfile: %s"
msgstr ""
-#: setup.c:606
+#: setup.c:641
#, c-format
msgid "not a git repository: %s"
msgstr ""
-#: setup.c:708
+#: setup.c:743
#, c-format
msgid "'$%s' too big"
msgstr ""
-#: setup.c:722
+#: setup.c:757
#, c-format
msgid "not a git repository: '%s'"
msgstr ""
-#: setup.c:751 setup.c:753 setup.c:784
+#: setup.c:786 setup.c:788 setup.c:819
#, c-format
msgid "cannot chdir to '%s'"
msgstr ""
-#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869
+#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904
msgid "cannot come back to cwd"
msgstr ""
-#: setup.c:883
+#: setup.c:918
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: setup.c:1121
+#: setup.c:1156
msgid "Unable to read current working directory"
msgstr ""
-#: setup.c:1130 setup.c:1136
+#: setup.c:1165 setup.c:1171
#, c-format
msgid "cannot change to '%s'"
msgstr ""
-#: setup.c:1141
+#: setup.c:1176
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: setup.c:1147
+#: setup.c:1182
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr ""
-#: setup.c:1258
+#: setup.c:1293
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
-#: setup.c:1304
+#: setup.c:1340
msgid "open /dev/null or dup failed"
msgstr ""
-#: setup.c:1319
+#: setup.c:1355
msgid "fork failed"
msgstr ""
-#: setup.c:1324
+#: setup.c:1360
msgid "setsid failed"
msgstr ""
msgid "confused by unstable object source data for %s"
msgstr ""
-#: sha1-file.c:1906 builtin/pack-objects.c:1055
+#: sha1-file.c:1906 builtin/pack-objects.c:1085
#, c-format
msgid "failed utime() on %s"
msgstr ""
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:853
+#: strbuf.c:848
#, c-format
msgid "%u.%2.2u GiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:855
+#: strbuf.c:850
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:863
+#: strbuf.c:858
#, c-format
msgid "%u.%2.2u MiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:865
+#: strbuf.c:860
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:872
+#: strbuf.c:867
#, c-format
msgid "%u.%2.2u KiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:874
+#: strbuf.c:869
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:880
+#: strbuf.c:875
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[1] ""
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:882
+#: strbuf.c:877
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] ""
msgstr[1] ""
-#: strbuf.c:1180
+#: strbuf.c:1175
#, c-format
msgid "could not edit '%s'"
msgstr ""
msgid "could not read from stdin"
msgstr ""
-#: trailer.c:1011 wrapper.c:665
+#: trailer.c:1011 wrapper.c:673
#, c-format
msgid "could not stat %s"
msgstr ""
msgid "could not rename temporary file to %s"
msgstr ""
-#: transport-helper.c:61 transport-helper.c:90
+#: transport-helper.c:62 transport-helper.c:91
msgid "full write to remote helper failed"
msgstr ""
-#: transport-helper.c:144
+#: transport-helper.c:145
#, c-format
msgid "unable to find remote helper for '%s'"
msgstr ""
-#: transport-helper.c:160 transport-helper.c:571
+#: transport-helper.c:161 transport-helper.c:575
msgid "can't dup helper output fd"
msgstr ""
-#: transport-helper.c:211
+#: transport-helper.c:214
#, c-format
msgid ""
"unknown mandatory capability %s; this remote helper probably needs newer "
"version of Git"
msgstr ""
-#: transport-helper.c:217
+#: transport-helper.c:220
msgid "this remote helper should implement refspec capability"
msgstr ""
-#: transport-helper.c:284 transport-helper.c:425
+#: transport-helper.c:287 transport-helper.c:429
#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr ""
-#: transport-helper.c:414
+#: transport-helper.c:417
#, c-format
msgid "%s also locked %s"
msgstr ""
-#: transport-helper.c:493
+#: transport-helper.c:497
msgid "couldn't run fast-import"
msgstr ""
-#: transport-helper.c:516
+#: transport-helper.c:520
msgid "error while running fast-import"
msgstr ""
-#: transport-helper.c:545 transport-helper.c:1135
+#: transport-helper.c:549 transport-helper.c:1156
#, c-format
msgid "could not read ref %s"
msgstr ""
-#: transport-helper.c:590
+#: transport-helper.c:594
#, c-format
msgid "unknown response to connect: %s"
msgstr ""
-#: transport-helper.c:612
+#: transport-helper.c:616
msgid "setting remote service path not supported by protocol"
msgstr ""
-#: transport-helper.c:614
+#: transport-helper.c:618
msgid "invalid remote service path"
msgstr ""
-#: transport-helper.c:657 transport.c:1339
+#: transport-helper.c:661 transport.c:1347
msgid "operation not supported by protocol"
msgstr ""
-#: transport-helper.c:660
+#: transport-helper.c:664
#, c-format
msgid "can't connect to subservice %s"
msgstr ""
-#: transport-helper.c:736
+#: transport-helper.c:740
#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr ""
-#: transport-helper.c:789
+#: transport-helper.c:793
#, c-format
msgid "helper reported unexpected status of %s"
msgstr ""
-#: transport-helper.c:850
+#: transport-helper.c:854
#, c-format
msgid "helper %s does not support dry-run"
msgstr ""
-#: transport-helper.c:853
+#: transport-helper.c:857
#, c-format
msgid "helper %s does not support --signed"
msgstr ""
-#: transport-helper.c:856
+#: transport-helper.c:860
#, c-format
msgid "helper %s does not support --signed=if-asked"
msgstr ""
-#: transport-helper.c:861
+#: transport-helper.c:865
#, c-format
msgid "helper %s does not support --atomic"
msgstr ""
-#: transport-helper.c:867
+#: transport-helper.c:871
#, c-format
msgid "helper %s does not support 'push-option'"
msgstr ""
-#: transport-helper.c:966
+#: transport-helper.c:970
msgid "remote-helper doesn't support push; refspec needed"
msgstr ""
-#: transport-helper.c:971
+#: transport-helper.c:975
#, c-format
msgid "helper %s does not support 'force'"
msgstr ""
-#: transport-helper.c:1018
+#: transport-helper.c:1022
msgid "couldn't run fast-export"
msgstr ""
-#: transport-helper.c:1023
+#: transport-helper.c:1027
msgid "error while running fast-export"
msgstr ""
-#: transport-helper.c:1048
+#: transport-helper.c:1052
#, c-format
msgid ""
"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
msgstr ""
-#: transport-helper.c:1121
+#: transport-helper.c:1133
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr ""
+
+#: transport-helper.c:1142
#, c-format
msgid "malformed response in ref list: %s"
msgstr ""
-#: transport-helper.c:1273
+#: transport-helper.c:1294
#, c-format
msgid "read(%s) failed"
msgstr ""
-#: transport-helper.c:1300
+#: transport-helper.c:1321
#, c-format
msgid "write(%s) failed"
msgstr ""
-#: transport-helper.c:1349
+#: transport-helper.c:1370
#, c-format
msgid "%s thread failed"
msgstr ""
-#: transport-helper.c:1353
+#: transport-helper.c:1374
#, c-format
msgid "%s thread failed to join: %s"
msgstr ""
-#: transport-helper.c:1372 transport-helper.c:1376
+#: transport-helper.c:1393 transport-helper.c:1397
#, c-format
msgid "can't start thread for copying data: %s"
msgstr ""
-#: transport-helper.c:1413
+#: transport-helper.c:1434
#, c-format
msgid "%s process failed to wait"
msgstr ""
-#: transport-helper.c:1417
+#: transport-helper.c:1438
#, c-format
msgid "%s process failed"
msgstr ""
-#: transport-helper.c:1435 transport-helper.c:1444
+#: transport-helper.c:1456 transport-helper.c:1465
msgid "can't start thread for copying data"
msgstr ""
msgid "could not read bundle '%s'"
msgstr ""
-#: transport.c:214
+#: transport.c:220
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr ""
-#: transport.c:266
+#: transport.c:272
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
-#: transport.c:267
+#: transport.c:273
msgid "server options require protocol version 2 or later"
msgstr ""
-#: transport.c:632
+#: transport.c:631
msgid "could not parse transport.color.* config"
msgstr ""
-#: transport.c:705
+#: transport.c:704
msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: transport.c:839
+#: transport.c:838
#, c-format
msgid "unknown value for config '%s': %s"
msgstr ""
-#: transport.c:905
+#: transport.c:904
#, c-format
msgid "transport '%s' not allowed"
msgstr ""
msgid "git-over-rsync is no longer supported"
msgstr ""
-#: transport.c:1052
+#: transport.c:1059
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-#: transport.c:1056
+#: transport.c:1063
#, c-format
msgid ""
"\n"
"\n"
msgstr ""
-#: transport.c:1064
+#: transport.c:1071
msgid "Aborting."
msgstr ""
-#: transport.c:1209
+#: transport.c:1216
msgid "failed to push all needed submodules"
msgstr ""
msgid "Updating index flags"
msgstr ""
-#: upload-pack.c:1337
+#: upload-pack.c:1415
msgid "expected flush after fetch arguments"
msgstr ""
msgid "Fetching objects"
msgstr ""
-#: worktree.c:262 builtin/am.c:2098
+#: worktree.c:248 builtin/am.c:2098
#, c-format
msgid "failed to read '%s'"
msgstr ""
-#: worktree.c:309
+#: worktree.c:295
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: worktree.c:320
+#: worktree.c:306
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: worktree.c:332
+#: worktree.c:318
#, c-format
msgid "'%s' does not exist"
msgstr ""
-#: worktree.c:338
+#: worktree.c:324
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: worktree.c:347
+#: worktree.c:333
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr ""
-#: wrapper.c:186 wrapper.c:356
+#: wrapper.c:194 wrapper.c:364
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr ""
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:395 wrapper.c:596
#, c-format
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:596
+#: wrapper.c:604
msgid "unable to get current working directory"
msgstr ""
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1692
+#: wt-status.c:1494
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+
+#: wt-status.c:1733
msgid "On branch "
msgstr ""
-#: wt-status.c:1699
+#: wt-status.c:1740
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1701
+#: wt-status.c:1742
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1711
+#: wt-status.c:1752
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1728
+#: wt-status.c:1769
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1729
+#: wt-status.c:1770
msgid "No commits yet"
msgstr ""
-#: wt-status.c:1743
+#: wt-status.c:1784
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1745
+#: wt-status.c:1786
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1749
+#: wt-status.c:1790
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1755
+#: wt-status.c:1796
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1757
+#: wt-status.c:1798
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1763
+#: wt-status.c:1804
msgid "No changes"
msgstr ""
-#: wt-status.c:1768
+#: wt-status.c:1809
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1771
+#: wt-status.c:1812
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1774
+#: wt-status.c:1815
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1777
+#: wt-status.c:1818
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1780
+#: wt-status.c:1821
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1783 wt-status.c:1788
+#: wt-status.c:1824 wt-status.c:1829
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1786
+#: wt-status.c:1827
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1790
+#: wt-status.c:1831
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: wt-status.c:1903
+#: wt-status.c:1944
msgid "No commits yet on "
msgstr ""
-#: wt-status.c:1907
+#: wt-status.c:1948
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1938
+#: wt-status.c:1979
msgid "different"
msgstr ""
-#: wt-status.c:1940 wt-status.c:1948
+#: wt-status.c:1981 wt-status.c:1989
msgid "behind "
msgstr ""
-#: wt-status.c:1943 wt-status.c:1946
+#: wt-status.c:1984 wt-status.c:1987
msgid "ahead "
msgstr ""
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2468
+#: wt-status.c:2509
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: wt-status.c:2474
+#: wt-status.c:2515
msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: wt-status.c:2476
+#: wt-status.c:2517
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308
+#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308
msgid "select hunks interactively"
msgstr ""
msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/add.c:501 builtin/checkout.c:1703 builtin/commit.c:351
+#: builtin/add.c:501 builtin/checkout.c:1701 builtin/commit.c:351
#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr ""
-#: builtin/add.c:508 builtin/checkout.c:1715 builtin/commit.c:357
+#: builtin/add.c:508 builtin/checkout.c:1713 builtin/commit.c:357
#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr ""
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16
+#: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16
#: builtin/repack.c:306 builtin/stash.c:816
msgid "be quiet"
msgstr ""
#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38
#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38
-#: bugreport.c:131
+#: bugreport.c:137
msgid "format"
msgstr ""
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
-#: builtin/bisect--helper.c:478
+#: builtin/bisect--helper.c:460 builtin/bisect--helper.c:473
+msgid "'' is not a valid term"
+msgstr ""
+
+#: builtin/bisect--helper.c:483
#, c-format
msgid "unrecognized option: '%s'"
msgstr ""
-#: builtin/bisect--helper.c:482
+#: builtin/bisect--helper.c:487
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr ""
-#: builtin/bisect--helper.c:514
+#: builtin/bisect--helper.c:519
msgid "bad HEAD - I need a HEAD"
msgstr ""
-#: builtin/bisect--helper.c:529
+#: builtin/bisect--helper.c:534
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:555
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
-#: builtin/bisect--helper.c:553
+#: builtin/bisect--helper.c:558
msgid "bad HEAD - strange symbolic ref"
msgstr ""
-#: builtin/bisect--helper.c:577
+#: builtin/bisect--helper.c:582
#, c-format
msgid "invalid ref: '%s'"
msgstr ""
-#: builtin/bisect--helper.c:633
+#: builtin/bisect--helper.c:638
msgid "perform 'git bisect next'"
msgstr ""
-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:640
msgid "write the terms to .git/BISECT_TERMS"
msgstr ""
-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:642
msgid "cleanup the bisection state"
msgstr ""
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:644
msgid "check for expected revs"
msgstr ""
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:646
msgid "reset the bisection state"
msgstr ""
-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:648
msgid "write out the bisection state in BISECT_LOG"
msgstr ""
-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:650
msgid "check and set terms in a bisection state"
msgstr ""
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:652
msgid "check whether bad or good terms exist"
msgstr ""
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:654
msgid "print out the bisect terms"
msgstr ""
-#: builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:656
msgid "start the bisect session"
msgstr ""
-#: builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:658
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
-#: builtin/bisect--helper.c:655
+#: builtin/bisect--helper.c:660
msgid "no log for BISECT_WRITE"
msgstr ""
-#: builtin/bisect--helper.c:673
+#: builtin/bisect--helper.c:678
msgid "--write-terms requires two arguments"
msgstr ""
-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:682
msgid "--bisect-clean-state requires no arguments"
msgstr ""
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:689
msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
-#: builtin/bisect--helper.c:688
+#: builtin/bisect--helper.c:693
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr ""
-#: builtin/bisect--helper.c:694
+#: builtin/bisect--helper.c:699
msgid "--check-and-set-terms requires 3 arguments"
msgstr ""
-#: builtin/bisect--helper.c:700
+#: builtin/bisect--helper.c:705
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr ""
-#: builtin/bisect--helper.c:706
+#: builtin/bisect--helper.c:711
msgid "--bisect-terms requires 0 or 1 argument"
msgstr ""
msgid "git bundle unbundle <file> [<refname>...]"
msgstr ""
-#: builtin/bundle.c:66 builtin/pack-objects.c:3376
+#: builtin/bundle.c:66 builtin/pack-objects.c:3448
msgid "do not show progress meter"
msgstr ""
-#: builtin/bundle.c:68 builtin/pack-objects.c:3378
+#: builtin/bundle.c:68 builtin/pack-objects.c:3450
msgid "show progress meter"
msgstr ""
-#: builtin/bundle.c:70 builtin/pack-objects.c:3380
+#: builtin/bundle.c:70 builtin/pack-objects.c:3452
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/bundle.c:73 builtin/pack-objects.c:3383
+#: builtin/bundle.c:73 builtin/pack-objects.c:3455
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
#: builtin/cat-file.c:599
msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"
msgstr ""
#: builtin/cat-file.c:620
msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/cat-file.c:648 git-submodule.sh:984
+#: builtin/cat-file.c:648 git-submodule.sh:958
msgid "blob"
msgstr ""
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537
-#: builtin/worktree.c:502
+#: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537
+#: builtin/worktree.c:561
msgid "suppress progress reporting"
msgstr ""
#: builtin/checkout-index.c:178 builtin/column.c:31
#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
-#: builtin/worktree.c:675
+#: builtin/worktree.c:754
msgid "string"
msgstr ""
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:704
+#: builtin/checkout.c:702
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:758
+#: builtin/checkout.c:756
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-#: builtin/checkout.c:861
+#: builtin/checkout.c:859
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:903
+#: builtin/checkout.c:901
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:907 builtin/clone.c:720
+#: builtin/checkout.c:905 builtin/clone.c:720
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:911
+#: builtin/checkout.c:909
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:914
+#: builtin/checkout.c:912
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:918
+#: builtin/checkout.c:916
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:920 builtin/checkout.c:1344
+#: builtin/checkout.c:918 builtin/checkout.c:1342
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:922
+#: builtin/checkout.c:920
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:973
+#: builtin/checkout.c:971
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:979
+#: builtin/checkout.c:977
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:998
+#: builtin/checkout.c:996
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:1033
+#: builtin/checkout.c:1031
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:1037
+#: builtin/checkout.c:1035
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:1077 builtin/checkout.c:1339
+#: builtin/checkout.c:1075 builtin/checkout.c:1337
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1150
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-#: builtin/checkout.c:1159
+#: builtin/checkout.c:1157
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/checkout.c:1169
+#: builtin/checkout.c:1167
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr ""
-#: builtin/checkout.c:1235
+#: builtin/checkout.c:1233
msgid "only one reference expected"
msgstr ""
-#: builtin/checkout.c:1252
+#: builtin/checkout.c:1250
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451
+#: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1311 builtin/checkout.c:1677
+#: builtin/checkout.c:1309 builtin/checkout.c:1675
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1358
+#: builtin/checkout.c:1356
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr ""
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1358
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr ""
-#: builtin/checkout.c:1361 builtin/checkout.c:1369
+#: builtin/checkout.c:1359 builtin/checkout.c:1367
#, c-format
msgid "a branch is expected, got '%s'"
msgstr ""
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1362
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr ""
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1378
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1384
+#: builtin/checkout.c:1382
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1386
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1390
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1396
+#: builtin/checkout.c:1394
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1400
+#: builtin/checkout.c:1398
msgid "you are switching branch while bisecting"
msgstr ""
-#: builtin/checkout.c:1407
+#: builtin/checkout.c:1405
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418
+#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428
-#: builtin/checkout.c:1433 builtin/checkout.c:1438
+#: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426
+#: builtin/checkout.c:1431 builtin/checkout.c:1436
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1435
+#: builtin/checkout.c:1433
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr ""
-#: builtin/checkout.c:1443
+#: builtin/checkout.c:1441
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1450
+#: builtin/checkout.c:1448
msgid "missing branch or commit argument"
msgstr ""
-#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80
-#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288
+#: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82
+#: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288
#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr ""
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1491
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322
+#: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322
msgid "style"
msgstr ""
-#: builtin/checkout.c:1495
+#: builtin/checkout.c:1493
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1507 builtin/worktree.c:499
+#: builtin/checkout.c:1505 builtin/worktree.c:558
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1508
+#: builtin/checkout.c:1506
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1510
+#: builtin/checkout.c:1508
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1512
+#: builtin/checkout.c:1510
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1512
+#: builtin/checkout.c:1510
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1514 builtin/merge.c:292
+#: builtin/checkout.c:1512 builtin/merge.c:292
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1517
+#: builtin/checkout.c:1515
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1530
+#: builtin/checkout.c:1528
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1533
+#: builtin/checkout.c:1531
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1537
+#: builtin/checkout.c:1535
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1592
+#: builtin/checkout.c:1590
#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1596
+#: builtin/checkout.c:1594
msgid "-p and --overlay are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1633
+#: builtin/checkout.c:1631
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1636
#, c-format
msgid "missing branch name; try -%c"
msgstr ""
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1668
#, c-format
msgid "could not resolve %s"
msgstr ""
-#: builtin/checkout.c:1686
+#: builtin/checkout.c:1684
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1693
+#: builtin/checkout.c:1691
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1695
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1706
+#: builtin/checkout.c:1704
msgid "--pathspec-from-file is incompatible with --detach"
msgstr ""
-#: builtin/checkout.c:1709 builtin/reset.c:325 builtin/stash.c:1503
+#: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503
msgid "--pathspec-from-file is incompatible with --patch"
msgstr ""
-#: builtin/checkout.c:1720
+#: builtin/checkout.c:1718
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1723
msgid "you must specify path(s) to restore"
msgstr ""
-#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802
-#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497
+#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800
+#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554
+#: builtin/worktree.c:556
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1752
+#: builtin/checkout.c:1750
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1752
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1755
+#: builtin/checkout.c:1753
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1757
+#: builtin/checkout.c:1755
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
-#: builtin/checkout.c:1758
+#: builtin/checkout.c:1756
msgid "use overlay mode (default)"
msgstr ""
-#: builtin/checkout.c:1803
+#: builtin/checkout.c:1801
msgid "create and switch to a new branch"
msgstr ""
-#: builtin/checkout.c:1805
+#: builtin/checkout.c:1803
msgid "create/reset and switch to a branch"
msgstr ""
-#: builtin/checkout.c:1807
+#: builtin/checkout.c:1805
msgid "second guess 'git switch <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1809
+#: builtin/checkout.c:1807
msgid "throw away local modifications"
msgstr ""
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1841
msgid "which tree-ish to checkout from"
msgstr ""
-#: builtin/checkout.c:1845
+#: builtin/checkout.c:1843
msgid "restore the index"
msgstr ""
-#: builtin/checkout.c:1847
+#: builtin/checkout.c:1845
msgid "restore the working tree (default)"
msgstr ""
-#: builtin/checkout.c:1849
+#: builtin/checkout.c:1847
msgid "ignore unmerged entries"
msgstr ""
-#: builtin/checkout.c:1850
+#: builtin/checkout.c:1848
msgid "use overlay mode"
msgstr ""
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:931
-msgid "-x and -X cannot be used together"
-msgstr ""
-
-#: builtin/clean.c:935
+#: builtin/clean.c:929
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:938
+#: builtin/clean.c:932
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
+#: builtin/clean.c:944
+msgid "-x and -X cannot be used together"
+msgstr ""
+
#: builtin/clone.c:45
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554
msgid "create a bare repository"
msgstr ""
msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/clone.c:111 builtin/init-db.c:533
+#: builtin/clone.c:111 builtin/init-db.c:551
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:112 builtin/init-db.c:534
+#: builtin/clone.c:112 builtin/init-db.c:552
msgid "directory from which templates will be used"
msgstr ""
msgid "use --reference only while cloning"
msgstr ""
-#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3442 builtin/repack.c:329
+#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329
msgid "name"
msgstr ""
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431
+#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503
#: builtin/pull.c:211
msgid "time"
msgstr ""
msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/clone.c:137 builtin/init-db.c:542
+#: builtin/clone.c:137 builtin/init-db.c:560
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:138 builtin/init-db.c:543
+#: builtin/clone.c:138 builtin/init-db.c:561
msgid "separate git dir from working tree"
msgstr ""
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:971 builtin/receive-pack.c:1972
+#: builtin/clone.c:971 builtin/receive-pack.c:1982
msgid "Too many arguments."
msgstr ""
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:1004
+#: builtin/clone.c:1007
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:1010 builtin/fetch.c:1789
+#: builtin/clone.c:1011 builtin/fetch.c:1794
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:1020
+#: builtin/clone.c:1021
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:1030
+#: builtin/clone.c:1033
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271
-#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327
+#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271
+#: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:1050
+#: builtin/clone.c:1053
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:1070
+#: builtin/clone.c:1073
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:1072
+#: builtin/clone.c:1075
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:1096
+#: builtin/clone.c:1099
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
-#: builtin/clone.c:1160
+#: builtin/clone.c:1164
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1162
+#: builtin/clone.c:1166
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1164
+#: builtin/clone.c:1168
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1166
+#: builtin/clone.c:1170
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1169
+#: builtin/clone.c:1173
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1174
+#: builtin/clone.c:1178
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1249 builtin/clone.c:1257
+#: builtin/clone.c:1262 builtin/clone.c:1270
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1260
+#: builtin/clone.c:1273
msgid "You appear to have cloned an empty repository."
msgstr ""
msgid "--command must be the first argument"
msgstr ""
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:19
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:21
msgid ""
"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
msgstr ""
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:26
msgid ""
"git commit-graph write [--object-dir <objdir>] [--append] [--"
"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
"paths] [--[no-]progress] <split options>"
msgstr ""
-#: builtin/commit-graph.c:60
+#: builtin/commit-graph.c:62
#, c-format
msgid "could not find object directory matching %s"
msgstr ""
-#: builtin/commit-graph.c:76 builtin/commit-graph.c:152
-#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678
+#: builtin/commit-graph.c:78 builtin/commit-graph.c:177
+#: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678
msgid "dir"
msgstr ""
-#: builtin/commit-graph.c:77 builtin/commit-graph.c:153
-#: builtin/commit-graph.c:258
+#: builtin/commit-graph.c:79 builtin/commit-graph.c:178
+#: builtin/commit-graph.c:277
msgid "The object directory to store the graph"
msgstr ""
-#: builtin/commit-graph.c:79
+#: builtin/commit-graph.c:81
msgid "if the commit-graph is split, only verify the tip file"
msgstr ""
-#: builtin/commit-graph.c:102
+#: builtin/commit-graph.c:104
#, c-format
msgid "Could not open commit-graph '%s'"
msgstr ""
-#: builtin/commit-graph.c:136
+#: builtin/commit-graph.c:138
#, c-format
msgid "unrecognized --split argument, %s"
msgstr ""
-#: builtin/commit-graph.c:155
+#: builtin/commit-graph.c:151
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr ""
+
+#: builtin/commit-graph.c:156
+#, c-format
+msgid "invalid object: %s"
+msgstr ""
+
+#: builtin/commit-graph.c:180
msgid "start walk at all refs"
msgstr ""
-#: builtin/commit-graph.c:157
+#: builtin/commit-graph.c:182
msgid "scan pack-indexes listed by stdin for commits"
msgstr ""
-#: builtin/commit-graph.c:159
+#: builtin/commit-graph.c:184
msgid "start walk at commits listed by stdin"
msgstr ""
-#: builtin/commit-graph.c:161
+#: builtin/commit-graph.c:186
msgid "include all commits already in the commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:163
+#: builtin/commit-graph.c:188
msgid "enable computation for changed paths"
msgstr ""
-#: builtin/commit-graph.c:166
+#: builtin/commit-graph.c:191
msgid "allow writing an incremental commit-graph file"
msgstr ""
-#: builtin/commit-graph.c:170
+#: builtin/commit-graph.c:195
msgid "maximum number of commits in a non-base split commit-graph"
msgstr ""
-#: builtin/commit-graph.c:172
+#: builtin/commit-graph.c:197
msgid "maximum ratio between two levels of a split commit-graph"
msgstr ""
-#: builtin/commit-graph.c:174
+#: builtin/commit-graph.c:199
msgid "only expire files older than a given date-time"
msgstr ""
-#: builtin/commit-graph.c:190
+#: builtin/commit-graph.c:215
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
msgstr ""
-#: builtin/commit-graph.c:229
-#, c-format
-msgid "unexpected non-hex object ID: %s"
+#: builtin/commit-graph.c:245
+msgid "Collecting commits from input"
msgstr ""
#: builtin/commit-tree.c:18
msgstr ""
#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549
-#: builtin/worktree.c:646
+#: builtin/worktree.c:722
msgid "machine-readable output"
msgstr ""
msgstr ""
#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336
+#: builtin/fast-export.c:1199 builtin/fast-export.c:1202
+#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336
msgid "mode"
msgstr ""
msgid "--broken is incompatible with commit-ishes"
msgstr ""
-#: builtin/diff.c:84
+#: builtin/diff.c:91
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/diff.c:235
+#: builtin/diff.c:242
#, c-format
msgid "invalid option: %s"
msgstr ""
-#: builtin/diff.c:350
+#: builtin/diff.c:359
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr ""
+
+#: builtin/diff.c:469
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:394
+#: builtin/diff.c:514
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:403
+#: builtin/diff.c:525
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:408
+#: builtin/diff.c:530
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
+#: builtin/diff.c:564
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr ""
+
#: builtin/difftool.c:30
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/fast-export.c:853
+#: builtin/fast-export.c:868
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
-#: builtin/fast-export.c:1152
+#: builtin/fast-export.c:1178
+msgid "--anonymize-map token cannot be empty"
+msgstr ""
+
+#: builtin/fast-export.c:1198
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1203
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1206
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
-#: builtin/fast-export.c:1163
+#: builtin/fast-export.c:1209
msgid "Dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:1165
+#: builtin/fast-export.c:1211
msgid "Import marks from this file"
msgstr ""
-#: builtin/fast-export.c:1169
+#: builtin/fast-export.c:1215
msgid "Import marks from this file if it exists"
msgstr ""
-#: builtin/fast-export.c:1171
+#: builtin/fast-export.c:1217
msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:1173
+#: builtin/fast-export.c:1219
msgid "Output full tree for each commit"
msgstr ""
-#: builtin/fast-export.c:1175
+#: builtin/fast-export.c:1221
msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/fast-export.c:1176
+#: builtin/fast-export.c:1222
msgid "Skip output of blob data"
msgstr ""
-#: builtin/fast-export.c:1177 builtin/log.c:1724
+#: builtin/fast-export.c:1223 builtin/log.c:1724
msgid "refspec"
msgstr ""
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1224
msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr ""
-#: builtin/fast-export.c:1181
+#: builtin/fast-export.c:1226
+msgid "from:to"
+msgstr ""
+
+#: builtin/fast-export.c:1227
+msgid "convert <from> to <to> in anonymized output"
+msgstr ""
+
+#: builtin/fast-export.c:1230
msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/fast-export.c:1183
+#: builtin/fast-export.c:1232
msgid "Show original object ids of blobs/commits"
msgstr ""
-#: builtin/fast-export.c:1185
+#: builtin/fast-export.c:1234
msgid "Label tags with mark ids"
msgstr ""
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1257
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr ""
+
+#: builtin/fast-export.c:1272
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr ""
+#: builtin/fetch-pack.c:245
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr ""
+
#: builtin/fetch.c:35
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1773
+#: builtin/fetch.c:1778
msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/fetch.c:1775
+#: builtin/fetch.c:1780
msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1785
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1787
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1798
+#: builtin/fetch.c:1800
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1800
+#: builtin/fetch.c:1802
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1809
+#: builtin/fetch.c:1811
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1818
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/fetch.c:1834
+#: builtin/fetch.c:1836
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730
-#: builtin/pack-objects.c:2855
+#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727
+#: builtin/pack-objects.c:2904
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1084 builtin/pack-objects.c:3548
+#: builtin/grep.c:1084 builtin/pack-objects.c:3623
msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852
+#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:288 builtin/pack-objects.c:607
+#: builtin/index-pack.c:288 builtin/pack-objects.c:618
msgid "pack too large for current definition of off_t"
msgstr ""
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:738 builtin/pack-objects.c:159
-#: builtin/pack-objects.c:219 builtin/pack-objects.c:314
+#: builtin/index-pack.c:738 builtin/pack-objects.c:170
+#: builtin/pack-objects.c:230 builtin/pack-objects.c:325
#, c-format
msgid "unable to read %s"
msgstr ""
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2665
#, c-format
msgid "unable to create thread: %s"
msgstr ""
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863
+#: builtin/index-pack.c:1528 builtin/pack-objects.c:2912
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1596
+#: builtin/index-pack.c:1592
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1598
+#: builtin/index-pack.c:1594
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1646
+#: builtin/index-pack.c:1642
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1653
+#: builtin/index-pack.c:1649
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1692
+#: builtin/index-pack.c:1689
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1741 builtin/index-pack.c:1744
-#: builtin/index-pack.c:1760 builtin/index-pack.c:1764
+#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
+#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1780
-msgid "--fix-thin cannot be used without --stdin"
+#: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621
+#, c-format
+msgid "unknown hash algorithm '%s'"
msgstr ""
#: builtin/index-pack.c:1782
+msgid "--fix-thin cannot be used without --stdin"
+msgstr ""
+
+#: builtin/index-pack.c:1784
msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/index-pack.c:1788
+#: builtin/index-pack.c:1786
+msgid "--object-format cannot be used with --stdin"
+msgstr ""
+
+#: builtin/index-pack.c:1792
msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/index-pack.c:1836 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1840 builtin/unpack-objects.c:582
msgid "fsck error in pack objects"
msgstr ""
msgid "not copying templates from '%s': %s"
msgstr ""
-#: builtin/init-db.c:356
+#: builtin/init-db.c:276
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr ""
+
+#: builtin/init-db.c:368
#, c-format
msgid "unable to handle file type %d"
msgstr ""
-#: builtin/init-db.c:359
+#: builtin/init-db.c:371
#, c-format
msgid "unable to move %s to %s"
msgstr ""
-#: builtin/init-db.c:374
+#: builtin/init-db.c:386
msgid "attempt to reinitialize repository with different hash"
msgstr ""
-#: builtin/init-db.c:380 builtin/init-db.c:601
+#: builtin/init-db.c:410 builtin/init-db.c:413
#, c-format
-msgid "unknown hash algorithm '%s'"
+msgid "%s already exists"
msgstr ""
-#: builtin/init-db.c:397 builtin/init-db.c:400
+#: builtin/init-db.c:444
#, c-format
-msgid "%s already exists"
+msgid "re-init: ignored --initial-branch=%s"
msgstr ""
-#: builtin/init-db.c:458
+#: builtin/init-db.c:475
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:459
+#: builtin/init-db.c:476
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:463
+#: builtin/init-db.c:480
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:464
+#: builtin/init-db.c:481
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:513
+#: builtin/init-db.c:530
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/init-db.c:538
+#: builtin/init-db.c:556
msgid "permissions"
msgstr ""
-#: builtin/init-db.c:539
+#: builtin/init-db.c:557
msgid "specify that the git repository is to be shared amongst several users"
msgstr ""
-#: builtin/init-db.c:544
+#: builtin/init-db.c:563
+msgid "override the name of the initial branch"
+msgstr ""
+
+#: builtin/init-db.c:564
msgid "hash"
msgstr ""
-#: builtin/init-db.c:545
+#: builtin/init-db.c:565 builtin/show-index.c:22
msgid "specify the hash algorithm to use"
msgstr ""
-#: builtin/init-db.c:578 builtin/init-db.c:583
+#: builtin/init-db.c:598 builtin/init-db.c:603
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:587
+#: builtin/init-db.c:607
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:614
+#: builtin/init-db.c:634
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
"dir=<directory>)"
msgstr ""
-#: builtin/init-db.c:642
+#: builtin/init-db.c:662
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220
msgid "do not remove, show only"
msgstr ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:431
+#: builtin/pack-objects.c:442
#, c-format
msgid "bad packed object CRC for %s"
msgstr ""
-#: builtin/pack-objects.c:442
+#: builtin/pack-objects.c:453
#, c-format
msgid "corrupt packed object for %s"
msgstr ""
-#: builtin/pack-objects.c:573
+#: builtin/pack-objects.c:584
#, c-format
msgid "recursive delta detected for object %s"
msgstr ""
-#: builtin/pack-objects.c:784
+#: builtin/pack-objects.c:795
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:973
+#: builtin/pack-objects.c:1003
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:986
+#: builtin/pack-objects.c:1016
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1047 builtin/update-index.c:90
+#: builtin/pack-objects.c:1077 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr ""
-#: builtin/pack-objects.c:1100
+#: builtin/pack-objects.c:1130
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1298
+#: builtin/pack-objects.c:1347
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:1725
+#: builtin/pack-objects.c:1774
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/pack-objects.c:1734
+#: builtin/pack-objects.c:1783
#, c-format
msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/pack-objects.c:2005
+#: builtin/pack-objects.c:2054
msgid "Counting objects"
msgstr ""
-#: builtin/pack-objects.c:2150
+#: builtin/pack-objects.c:2199
#, c-format
msgid "unable to parse object header of %s"
msgstr ""
-#: builtin/pack-objects.c:2220 builtin/pack-objects.c:2236
-#: builtin/pack-objects.c:2246
+#: builtin/pack-objects.c:2269 builtin/pack-objects.c:2285
+#: builtin/pack-objects.c:2295
#, c-format
msgid "object %s cannot be read"
msgstr ""
-#: builtin/pack-objects.c:2223 builtin/pack-objects.c:2250
+#: builtin/pack-objects.c:2272 builtin/pack-objects.c:2299
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2260
+#: builtin/pack-objects.c:2309
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2575
+#: builtin/pack-objects.c:2624
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/pack-objects.c:2714
+#: builtin/pack-objects.c:2763
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/pack-objects.c:2802
+#: builtin/pack-objects.c:2851
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2808
+#: builtin/pack-objects.c:2857
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2929
+#, c-format
+msgid ""
+"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
+"hash> <uri>' (got '%s')"
+msgstr ""
+
+#: builtin/pack-objects.c:2932
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+
+#: builtin/pack-objects.c:2961
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2967
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2993
+#: builtin/pack-objects.c:3065
msgid "invalid value for --missing"
msgstr ""
-#: builtin/pack-objects.c:3052 builtin/pack-objects.c:3160
+#: builtin/pack-objects.c:3124 builtin/pack-objects.c:3232
msgid "cannot open pack index"
msgstr ""
-#: builtin/pack-objects.c:3083
+#: builtin/pack-objects.c:3155
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3168
+#: builtin/pack-objects.c:3240
msgid "unable to force loose object"
msgstr ""
-#: builtin/pack-objects.c:3261
+#: builtin/pack-objects.c:3333
#, c-format
msgid "not a rev '%s'"
msgstr ""
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3336
#, c-format
msgid "bad revision '%s'"
msgstr ""
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3361
msgid "unable to add recent objects"
msgstr ""
-#: builtin/pack-objects.c:3342
+#: builtin/pack-objects.c:3414
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:3346
+#: builtin/pack-objects.c:3418
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3456
msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/pack-objects.c:3385
+#: builtin/pack-objects.c:3457
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:3388
+#: builtin/pack-objects.c:3460
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:3390
+#: builtin/pack-objects.c:3462
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:3392
+#: builtin/pack-objects.c:3464
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:3394
+#: builtin/pack-objects.c:3466
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:3396
+#: builtin/pack-objects.c:3468
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:3398
+#: builtin/pack-objects.c:3470
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:3400
+#: builtin/pack-objects.c:3472
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:3402
+#: builtin/pack-objects.c:3474
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:3404
+#: builtin/pack-objects.c:3476
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:3406
+#: builtin/pack-objects.c:3478
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:3408
+#: builtin/pack-objects.c:3480
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:3410
+#: builtin/pack-objects.c:3482
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:3412
+#: builtin/pack-objects.c:3484
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:3415
+#: builtin/pack-objects.c:3487
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:3418
+#: builtin/pack-objects.c:3490
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:3421
+#: builtin/pack-objects.c:3493
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:3424
+#: builtin/pack-objects.c:3496
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:3426
+#: builtin/pack-objects.c:3498
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:3428
+#: builtin/pack-objects.c:3500
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3430
+#: builtin/pack-objects.c:3502
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3432
+#: builtin/pack-objects.c:3504
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:3435
+#: builtin/pack-objects.c:3507
msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/pack-objects.c:3437
+#: builtin/pack-objects.c:3509
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:3439
+#: builtin/pack-objects.c:3511
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:3441
+#: builtin/pack-objects.c:3513
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:3443
+#: builtin/pack-objects.c:3515
msgid "ignore this pack"
msgstr ""
-#: builtin/pack-objects.c:3445
+#: builtin/pack-objects.c:3517
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:3447
+#: builtin/pack-objects.c:3519
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:3449
+#: builtin/pack-objects.c:3521
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:3451
+#: builtin/pack-objects.c:3523
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:3455
+#: builtin/pack-objects.c:3527
msgid "write a bitmap index if possible"
msgstr ""
-#: builtin/pack-objects.c:3459
+#: builtin/pack-objects.c:3531
msgid "handling for missing objects"
msgstr ""
-#: builtin/pack-objects.c:3462
+#: builtin/pack-objects.c:3534
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3464
+#: builtin/pack-objects.c:3536
msgid "respect islands during delta compression"
msgstr ""
-#: builtin/pack-objects.c:3493
+#: builtin/pack-objects.c:3538
+msgid "protocol"
+msgstr ""
+
+#: builtin/pack-objects.c:3539
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+
+#: builtin/pack-objects.c:3568
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3498
+#: builtin/pack-objects.c:3573
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3552
+#: builtin/pack-objects.c:3627
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:3554
+#: builtin/pack-objects.c:3629
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:3559
+#: builtin/pack-objects.c:3634
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/pack-objects.c:3562
+#: builtin/pack-objects.c:3637
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3568
+#: builtin/pack-objects.c:3643
msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/pack-objects.c:3628
+#: builtin/pack-objects.c:3703
msgid "Enumerating objects"
msgstr ""
-#: builtin/pack-objects.c:3658
+#: builtin/pack-objects.c:3734
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:843
+#: builtin/receive-pack.c:844
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:863
+#: builtin/receive-pack.c:864
msgid ""
"By default, deleting the current branch is denied, because the next\n"
"'git clone' won't result in any file checked out, causing confusion.\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:1960
+#: builtin/receive-pack.c:1970
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:1974
+#: builtin/receive-pack.c:1984
msgid "You must specify a directory."
msgstr ""
msgid "cannot find commit %s (%s)"
msgstr ""
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr ""
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr ""
+
#: builtin/show-ref.c:12
msgid ""
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
-#: builtin/sparse-checkout.c:212
+#: builtin/sparse-checkout.c:216
msgid "failed to create directory for sparse-checkout file"
msgstr ""
-#: builtin/sparse-checkout.c:253
+#: builtin/sparse-checkout.c:257
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr ""
+
+#: builtin/sparse-checkout.c:259
msgid "failed to set extensions.worktreeConfig setting"
msgstr ""
-#: builtin/sparse-checkout.c:270
+#: builtin/sparse-checkout.c:276
msgid "git sparse-checkout init [--cone]"
msgstr ""
-#: builtin/sparse-checkout.c:289
+#: builtin/sparse-checkout.c:295
msgid "initialize the sparse-checkout in cone mode"
msgstr ""
-#: builtin/sparse-checkout.c:326
+#: builtin/sparse-checkout.c:332
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:383
+#: builtin/sparse-checkout.c:389
#, c-format
msgid "could not normalize path %s"
msgstr ""
-#: builtin/sparse-checkout.c:395
+#: builtin/sparse-checkout.c:401
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr ""
-#: builtin/sparse-checkout.c:420
+#: builtin/sparse-checkout.c:426
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:474 builtin/sparse-checkout.c:498
+#: builtin/sparse-checkout.c:480 builtin/sparse-checkout.c:504
msgid "unable to load existing sparse-checkout patterns"
msgstr ""
-#: builtin/sparse-checkout.c:543
+#: builtin/sparse-checkout.c:549
msgid "read patterns from standard in"
msgstr ""
-#: builtin/sparse-checkout.c:580
+#: builtin/sparse-checkout.c:586
msgid "error while refreshing working directory"
msgstr ""
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr ""
-#: builtin/submodule--helper.c:2323 git.c:436 git.c:683
+#: builtin/submodule--helper.c:2294
+msgid "set the default tracking branch to master"
+msgstr ""
+
+#: builtin/submodule--helper.c:2296
+msgid "set the default tracking branch"
+msgstr ""
+
+#: builtin/submodule--helper.c:2300
+msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2301
+msgid ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2308
+msgid "--branch or --default required"
+msgstr ""
+
+#: builtin/submodule--helper.c:2311
+msgid "--branch and --default are mutually exclusive"
+msgstr ""
+
+#: builtin/submodule--helper.c:2367 git.c:436 git.c:683
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/submodule--helper.c:2329
+#: builtin/submodule--helper.c:2373
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/worktree.c:60 builtin/worktree.c:894
+#: builtin/worktree.c:60 builtin/worktree.c:972
#, c-format
msgid "failed to delete '%s'"
msgstr ""
-#: builtin/worktree.c:79
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
+#: builtin/worktree.c:85
+msgid "not a valid directory"
msgstr ""
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
+#: builtin/worktree.c:91
+msgid "gitdir file does not exist"
msgstr ""
-#: builtin/worktree.c:90 builtin/worktree.c:99
+#: builtin/worktree.c:96 builtin/worktree.c:105
#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+msgid "unable to read gitdir file (%s)"
msgstr ""
-#: builtin/worktree.c:109
+#: builtin/worktree.c:115
#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
msgstr ""
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
+#: builtin/worktree.c:123
+msgid "invalid gitdir file"
+msgstr ""
+
+#: builtin/worktree.c:131
+msgid "gitdir file points to non-existent location"
msgstr ""
-#: builtin/worktree.c:126
+#: builtin/worktree.c:146
#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+msgid "Removing %s/%s: %s"
msgstr ""
-#: builtin/worktree.c:165
+#: builtin/worktree.c:221
msgid "report pruned working trees"
msgstr ""
-#: builtin/worktree.c:167
+#: builtin/worktree.c:223
msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/worktree.c:234
+#: builtin/worktree.c:293
#, c-format
msgid "'%s' already exists"
msgstr ""
-#: builtin/worktree.c:244
+#: builtin/worktree.c:302
#, c-format
-msgid "unable to re-add worktree '%s'"
+msgid "unusable worktree destination '%s'"
msgstr ""
-#: builtin/worktree.c:249
+#: builtin/worktree.c:307
#, c-format
msgid ""
"'%s' is a missing but locked worktree;\n"
-"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/worktree.c:251
+#: builtin/worktree.c:309
#, c-format
msgid ""
"'%s' is a missing but already registered worktree;\n"
-"use 'add -f' to override, or 'prune' or 'remove' to clear"
+"use '%s -f' to override, or 'prune' or 'remove' to clear"
msgstr ""
-#: builtin/worktree.c:301
+#: builtin/worktree.c:360
#, c-format
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:435 builtin/worktree.c:441
+#: builtin/worktree.c:494 builtin/worktree.c:500
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:437
+#: builtin/worktree.c:496
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:446
+#: builtin/worktree.c:505
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:452
+#: builtin/worktree.c:511
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:493
+#: builtin/worktree.c:552
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:496
+#: builtin/worktree.c:555
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:498
+#: builtin/worktree.c:557
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:500
+#: builtin/worktree.c:559
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:501
+#: builtin/worktree.c:560
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:504
+#: builtin/worktree.c:563
msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/worktree.c:507
+#: builtin/worktree.c:566
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/worktree.c:515
+#: builtin/worktree.c:574
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:576
+#: builtin/worktree.c:635
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/worktree.c:676
+#: builtin/worktree.c:755
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:688 builtin/worktree.c:721 builtin/worktree.c:795
-#: builtin/worktree.c:922
+#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874
+#: builtin/worktree.c:1000
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:690 builtin/worktree.c:723
+#: builtin/worktree.c:769 builtin/worktree.c:802
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:695
+#: builtin/worktree.c:774
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:697
+#: builtin/worktree.c:776
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:725
+#: builtin/worktree.c:804
#, c-format
msgid "'%s' is not locked"
msgstr ""
-#: builtin/worktree.c:766
+#: builtin/worktree.c:845
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:774
+#: builtin/worktree.c:853
msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:797 builtin/worktree.c:924
+#: builtin/worktree.c:876 builtin/worktree.c:1002
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:802
+#: builtin/worktree.c:881
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:808
-#, c-format
-msgid "target '%s' already exists"
-msgstr ""
-
-#: builtin/worktree.c:816
+#: builtin/worktree.c:894
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:818
+#: builtin/worktree.c:896
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:821
+#: builtin/worktree.c:899
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:826
+#: builtin/worktree.c:904
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:874
+#: builtin/worktree.c:952
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:878
+#: builtin/worktree.c:956
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:883
+#: builtin/worktree.c:961
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:906
+#: builtin/worktree.c:984
msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:929
+#: builtin/worktree.c:1007
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:931
+#: builtin/worktree.c:1009
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:934
+#: builtin/worktree.c:1012
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
msgid "only useful for debugging"
msgstr ""
-#: bugreport.c:14
+#: bugreport.c:15
msgid "git version:\n"
msgstr ""
-#: bugreport.c:20
+#: bugreport.c:21
#, c-format
msgid "uname() failed with error '%s' (%d)\n"
msgstr ""
-#: bugreport.c:30
+#: bugreport.c:31
msgid "compiler info: "
msgstr ""
-#: bugreport.c:32
+#: bugreport.c:34
msgid "libc info: "
msgstr ""
-#: bugreport.c:74
+#: bugreport.c:80
msgid "not run from a git repository - no hooks to show\n"
msgstr ""
-#: bugreport.c:84
+#: bugreport.c:90
msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
msgstr ""
-#: bugreport.c:91
+#: bugreport.c:97
msgid ""
"Thank you for filling out a Git bug report!\n"
"Please answer the following questions to help us understand your issue.\n"
"You can delete any lines you don't wish to share.\n"
msgstr ""
-#: bugreport.c:130
+#: bugreport.c:136
msgid "specify a destination for the bugreport file"
msgstr ""
-#: bugreport.c:132
+#: bugreport.c:138
msgid "specify a strftime format suffix for the filename"
msgstr ""
-#: bugreport.c:156
+#: bugreport.c:162
#, c-format
msgid "could not create leading directories for '%s'"
msgstr ""
-#: bugreport.c:163
+#: bugreport.c:169
msgid "System Info"
msgstr ""
-#: bugreport.c:166
+#: bugreport.c:172
msgid "Enabled Hooks"
msgstr ""
-#: bugreport.c:174
+#: bugreport.c:180
#, c-format
msgid "couldn't create a new file at '%s'"
msgstr ""
-#: bugreport.c:186
+#: bugreport.c:184
+#, c-format
+msgid "unable to write to %s"
+msgstr ""
+
+#: bugreport.c:194
#, c-format
msgid "Created new report at '%s'.\n"
msgstr ""
-#: fast-import.c:3085
+#: fast-import.c:3100
#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr ""
-#: fast-import.c:3087
+#: fast-import.c:3102
#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr ""
-#: fast-import.c:3222
+#: fast-import.c:3237
#, c-format
msgid "Expected 'mark' command, got %s"
msgstr ""
-#: fast-import.c:3227
+#: fast-import.c:3242
#, c-format
msgid "Expected 'to' command, got %s"
msgstr ""
-#: fast-import.c:3317
+#: fast-import.c:3334
msgid "Expected format name:filename for submodule rewrite option"
msgstr ""
-#: fast-import.c:3371
+#: fast-import.c:3388
#, c-format
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
msgstr ""
+#: http-fetch.c:111
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr ""
+
#: credential-cache--daemon.c:223
#, c-format
msgid ""
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
-#: http.c:914
+#: http.c:910
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
msgstr ""
-#: http.c:993
+#: http.c:989
msgid "Protocol restrictions not supported with cURL < 7.19.4"
msgstr ""
-#: http.c:1139
+#: http.c:1132
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-#: http.c:1146
+#: http.c:1139
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: http.c:1150
+#: http.c:1143
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr ""
-#: http.c:2032
+#: http.c:2025
#, c-format
msgid ""
"unable to update url base from redirection:\n"
" redirect: %s"
msgstr ""
-#: remote-curl.c:166
+#: remote-curl.c:168
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr ""
-#: remote-curl.c:263
+#: remote-curl.c:295
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr ""
-#: remote-curl.c:364
+#: remote-curl.c:396
msgid "invalid server response; expected service, got flush packet"
msgstr ""
-#: remote-curl.c:395
+#: remote-curl.c:427
#, c-format
msgid "invalid server response; got '%s'"
msgstr ""
-#: remote-curl.c:455
+#: remote-curl.c:487
#, c-format
msgid "repository '%s' not found"
msgstr ""
-#: remote-curl.c:459
+#: remote-curl.c:491
#, c-format
msgid "Authentication failed for '%s'"
msgstr ""
-#: remote-curl.c:463
+#: remote-curl.c:495
#, c-format
msgid "unable to access '%s': %s"
msgstr ""
-#: remote-curl.c:469
+#: remote-curl.c:501
#, c-format
msgid "redirecting to %s"
msgstr ""
-#: remote-curl.c:593
+#: remote-curl.c:630
msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
-#: remote-curl.c:673
+#: remote-curl.c:642
+msgid "remote server sent stateless separator"
+msgstr ""
+
+#: remote-curl.c:712
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
-#: remote-curl.c:733
+#: remote-curl.c:742
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr ""
+
+#: remote-curl.c:744
+msgid "remote-curl: unexpected response end packet"
+msgstr ""
+
+#: remote-curl.c:820
#, c-format
msgid "RPC failed; %s"
msgstr ""
-#: remote-curl.c:773
+#: remote-curl.c:860
msgid "cannot handle pushes this big"
msgstr ""
-#: remote-curl.c:888
+#: remote-curl.c:975
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
-#: remote-curl.c:892
+#: remote-curl.c:979
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr ""
-#: remote-curl.c:1023
+#: remote-curl.c:1029
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr ""
+
+#: remote-curl.c:1031
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr ""
+
+#: remote-curl.c:1120
msgid "dumb http transport does not support shallow capabilities"
msgstr ""
-#: remote-curl.c:1038
+#: remote-curl.c:1135
msgid "fetch failed."
msgstr ""
-#: remote-curl.c:1086
+#: remote-curl.c:1183
msgid "cannot fetch by sha1 over smart http"
msgstr ""
-#: remote-curl.c:1130 remote-curl.c:1136
+#: remote-curl.c:1227 remote-curl.c:1233
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr ""
-#: remote-curl.c:1148 remote-curl.c:1263
+#: remote-curl.c:1245 remote-curl.c:1360
#, c-format
msgid "http transport does not support %s"
msgstr ""
-#: remote-curl.c:1184
+#: remote-curl.c:1281
msgid "git-http-push failed"
msgstr ""
-#: remote-curl.c:1369
+#: remote-curl.c:1466
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr ""
-#: remote-curl.c:1401
+#: remote-curl.c:1498
msgid "remote-curl: error reading command stream from git"
msgstr ""
-#: remote-curl.c:1408
+#: remote-curl.c:1505
msgid "remote-curl: fetch attempted without a local repo"
msgstr ""
-#: remote-curl.c:1448
+#: remote-curl.c:1546
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr ""
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:878
+#: git-submodule.sh:852
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:930
+#: git-submodule.sh:904
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:950
+#: git-submodule.sh:924
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:953
+#: git-submodule.sh:927
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:956
+#: git-submodule.sh:930
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1053
+#: git-add--interactive.perl:1055
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl:1058
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1061
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
-#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl:1064 git-add--interactive.perl:1073
+#: git-add--interactive.perl:1079
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1067 git-add--interactive.perl:1070
+#: git-add--interactive.perl:1076
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
-#: git-add--interactive.perl:1111
+#: git-add--interactive.perl:1113
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr ""
-#: git-add--interactive.perl:1118
+#: git-add--interactive.perl:1120
#, perl-format
msgid ""
"---\n"
"Lines starting with %s will be removed.\n"
msgstr ""
-#: git-add--interactive.perl:1140
+#: git-add--interactive.perl:1142
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr ""
-#: git-add--interactive.perl:1248
+#: git-add--interactive.perl:1250
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1254
+#: git-add--interactive.perl:1256
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1260
+#: git-add--interactive.perl:1262
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1268
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+#: git-add--interactive.perl:1274 git-add--interactive.perl:1292
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1280
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1284
+#: git-add--interactive.perl:1286
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1298
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1313
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"? - print help\n"
msgstr ""
-#: git-add--interactive.perl:1342
+#: git-add--interactive.perl:1344
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-add--interactive.perl:1357
+#: git-add--interactive.perl:1359
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1478
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1469
+#: git-add--interactive.perl:1479
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1470
+#: git-add--interactive.perl:1480
+#, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1481
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1570
+#: git-add--interactive.perl:1587
msgid "No other hunks to goto\n"
msgstr ""
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1605
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-add--interactive.perl:1593
+#: git-add--interactive.perl:1610
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl:1636
msgid "No other hunks to search\n"
msgstr ""
-#: git-add--interactive.perl:1636
+#: git-add--interactive.perl:1653
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-add--interactive.perl:1646
+#: git-add--interactive.perl:1663
msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+#: git-add--interactive.perl:1675 git-add--interactive.perl:1697
msgid "No previous hunk\n"
msgstr ""
-#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+#: git-add--interactive.perl:1684 git-add--interactive.perl:1703
msgid "No next hunk\n"
msgstr ""
-#: git-add--interactive.perl:1692
+#: git-add--interactive.perl:1709
msgid "Sorry, cannot split this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1698
+#: git-add--interactive.perl:1715
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1708
+#: git-add--interactive.perl:1725
msgid "Sorry, cannot edit this hunk\n"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1773
+#: git-add--interactive.perl:1790
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
"changes\n"
msgstr ""
-#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
-#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
-#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
-#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+#: git-add--interactive.perl:1807 git-add--interactive.perl:1812
+#: git-add--interactive.perl:1815 git-add--interactive.perl:1822
+#: git-add--interactive.perl:1825 git-add--interactive.perl:1832
+#: git-add--interactive.perl:1836 git-add--interactive.perl:1842
msgid "missing --"
msgstr ""
-#: git-add--interactive.perl:1821
+#: git-add--interactive.perl:1838
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
-#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#: git-add--interactive.perl:1844 git-add--interactive.perl:1850
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1718
+#: git-send-email.perl:1722
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1753
+#: git-send-email.perl:1757
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1864
+#: git-send-email.perl:1868
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1871
+#: git-send-email.perl:1875
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1875
+#: git-send-email.perl:1879
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1905
+#: git-send-email.perl:1909
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1913
+#: git-send-email.perl:1917
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#: git-send-email.perl:1958 git-send-email.perl:2010 git-send-email.perl:2020
#, perl-format
msgid "unable to open %s: %s\n"
msgstr ""
-#: git-send-email.perl:1957
+#: git-send-email.perl:1961
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
-#: git-send-email.perl:1974
+#: git-send-email.perl:1978
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1978
+#: git-send-email.perl:1982
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""
projects / thirdparty / git.git / commitdiff
