diff options
Diffstat (limited to 'po/git.pot')
| -rw-r--r-- | po/git.pot | 7395 |
1 files changed, 4074 insertions, 3321 deletions
diff --git a/po/git.pot b/po/git.pot index ff00bc201b..7dd2e2bcf3 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-10-28 13:19+0800\n" +"POT-Creation-Date: 2020-03-11 15:26+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" @@ -18,59 +18,665 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c:109 +#: add-interactive.c:368 +#, c-format +msgid "Huh (%s)?" +msgstr "" + +#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 +#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 +#: builtin/rebase.c:2086 builtin/rebase.c:2130 +msgid "could not read index" +msgstr "" + +#: add-interactive.c:576 git-add--interactive.perl:269 +#: git-add--interactive.perl:294 +msgid "binary" +msgstr "" + +#: add-interactive.c:634 git-add--interactive.perl:278 +#: git-add--interactive.perl:332 +msgid "nothing" +msgstr "" + +#: add-interactive.c:635 git-add--interactive.perl:314 +#: git-add--interactive.perl:329 +msgid "unchanged" +msgstr "" + +#: add-interactive.c:672 git-add--interactive.perl:643 +msgid "Update" +msgstr "" + +#: add-interactive.c:689 add-interactive.c:877 +#, c-format +msgid "could not stage '%s'" +msgstr "" + +#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 +#: builtin/rebase.c:899 +msgid "could not write index" +msgstr "" + +#: add-interactive.c:698 git-add--interactive.perl:628 +#, c-format, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "" +msgstr[1] "" + +#: add-interactive.c:716 git-add--interactive.perl:678 +#, c-format, perl-format +msgid "note: %s is untracked now.\n" +msgstr "" + +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 +#: builtin/reset.c:144 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "" + +#: add-interactive.c:751 git-add--interactive.perl:655 +msgid "Revert" +msgstr "" + +#: add-interactive.c:767 +msgid "Could not parse HEAD^{tree}" +msgstr "" + +#: add-interactive.c:805 git-add--interactive.perl:631 +#, c-format, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "" +msgstr[1] "" + +#: add-interactive.c:856 git-add--interactive.perl:695 +#, c-format +msgid "No untracked files.\n" +msgstr "" + +#: add-interactive.c:860 git-add--interactive.perl:689 +msgid "Add untracked" +msgstr "" + +#: add-interactive.c:887 git-add--interactive.perl:625 +#, c-format, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "" +msgstr[1] "" + +#: add-interactive.c:917 +#, c-format +msgid "ignoring unmerged: %s" +msgstr "" + +#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 +#, c-format +msgid "Only binary files changed.\n" +msgstr "" + +#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 +#, c-format +msgid "No changes.\n" +msgstr "" + +#: add-interactive.c:935 git-add--interactive.perl:1376 +msgid "Patch update" +msgstr "" + +#: add-interactive.c:974 git-add--interactive.perl:1754 +msgid "Review diff" +msgstr "" + +#: add-interactive.c:1002 +msgid "show paths with changes" +msgstr "" + +#: add-interactive.c:1004 +msgid "add working tree state to the staged set of changes" +msgstr "" + +#: add-interactive.c:1006 +msgid "revert staged set of changes back to the HEAD version" +msgstr "" + +#: add-interactive.c:1008 +msgid "pick hunks and update selectively" +msgstr "" + +#: add-interactive.c:1010 +msgid "view diff between HEAD and index" +msgstr "" + +#: add-interactive.c:1012 +msgid "add contents of untracked files to the staged set of changes" +msgstr "" + +#: add-interactive.c:1020 add-interactive.c:1069 +msgid "Prompt help:" +msgstr "" + +#: add-interactive.c:1022 +msgid "select a single item" +msgstr "" + +#: add-interactive.c:1024 +msgid "select a range of items" +msgstr "" + +#: add-interactive.c:1026 +msgid "select multiple ranges" +msgstr "" + +#: add-interactive.c:1028 add-interactive.c:1073 +msgid "select item based on unique prefix" +msgstr "" + +#: add-interactive.c:1030 +msgid "unselect specified items" +msgstr "" + +#: add-interactive.c:1032 +msgid "choose all items" +msgstr "" + +#: add-interactive.c:1034 +msgid "(empty) finish selecting" +msgstr "" + +#: add-interactive.c:1071 +msgid "select a numbered item" +msgstr "" + +#: add-interactive.c:1075 +msgid "(empty) select nothing" +msgstr "" + +#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 +msgid "*** Commands ***" +msgstr "" + +#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 +msgid "What now" +msgstr "" + +#: add-interactive.c:1136 git-add--interactive.perl:213 +msgid "staged" +msgstr "" + +#: add-interactive.c:1136 git-add--interactive.perl:213 +msgid "unstaged" +msgstr "" + +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 +#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 +#: builtin/merge.c:274 builtin/pull.c:189 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 git-add--interactive.perl:213 +msgid "path" +msgstr "" + +#: add-interactive.c:1143 +msgid "could not refresh index" +msgstr "" + +#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 +#, c-format +msgid "Bye.\n" +msgstr "" + +#: add-patch.c:33 git-add--interactive.perl:1428 +#, c-format, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:34 git-add--interactive.perl:1429 +#, c-format, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:35 git-add--interactive.perl:1430 +#, c-format, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:37 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "" + +#: add-patch.c:40 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this hunk and all later hunks in the file\n" +"d - do not stage this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:54 git-add--interactive.perl:1433 +#, c-format, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:55 git-add--interactive.perl:1434 +#, c-format, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:56 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:58 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "" + +#: add-patch.c:61 +msgid "" +"y - stash this hunk\n" +"n - do not stash this hunk\n" +"q - quit; do not stash this hunk or any of the remaining ones\n" +"a - stash this hunk and all later hunks in the file\n" +"d - do not stash this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:77 git-add--interactive.perl:1438 +#, c-format, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:78 git-add--interactive.perl:1439 +#, c-format, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:79 git-add--interactive.perl:1440 +#, c-format, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:81 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "" + +#: add-patch.c:84 +msgid "" +"y - unstage this hunk\n" +"n - do not unstage this hunk\n" +"q - quit; do not unstage this hunk or any of the remaining ones\n" +"a - unstage this hunk and all later hunks in the file\n" +"d - do not unstage this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:99 git-add--interactive.perl:1443 +#, c-format, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:100 git-add--interactive.perl:1444 +#, c-format, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:101 git-add--interactive.perl:1445 +#, c-format, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:103 add-patch.c:168 add-patch.c:211 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "" + +#: add-patch.c:106 +msgid "" +"y - apply this hunk to index\n" +"n - do not apply this hunk to index\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:121 git-add--interactive.perl:1448 +#: git-add--interactive.perl:1463 +#, c-format, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:122 git-add--interactive.perl:1449 +#: git-add--interactive.perl:1464 +#, c-format, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:123 git-add--interactive.perl:1450 +#: git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:125 add-patch.c:147 add-patch.c:190 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "" + +#: add-patch.c:128 add-patch.c:193 +msgid "" +"y - discard this hunk from worktree\n" +"n - do not discard this hunk from worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 +#, c-format, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 +#, c-format, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:150 +msgid "" +"y - discard this hunk from index and worktree\n" +"n - do not discard this hunk from index and worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 +#, c-format, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 +#, c-format, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 +#, c-format, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:171 +msgid "" +"y - apply this hunk to index and worktree\n" +"n - do not apply this hunk to index and worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:214 +msgid "" +"y - apply this hunk to worktree\n" +"n - do not apply this hunk to worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:318 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "" + +#: add-patch.c:337 add-patch.c:341 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "" + +#: add-patch.c:395 +msgid "could not parse diff" +msgstr "" + +#: add-patch.c:414 +msgid "could not parse colored diff" +msgstr "" + +#: add-patch.c:428 +#, c-format +msgid "failed to run '%s'" +msgstr "" + +#: add-patch.c:587 +msgid "mismatched output from interactive.diffFilter" +msgstr "" + +#: add-patch.c:588 +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "" + +#: add-patch.c:761 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" + +#: add-patch.c:776 +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "" + +#: add-patch.c:1052 git-add--interactive.perl:1112 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "" + +#: add-patch.c:1056 +#, c-format +msgid "" +"---\n" +"To remove '%c' lines, make them ' ' lines (context).\n" +"To remove '%c' lines, delete them.\n" +"Lines starting with %c will be removed.\n" +msgstr "" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: add-patch.c:1070 git-add--interactive.perl:1126 +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:1103 +msgid "could not parse hunk header" +msgstr "" + +#: add-patch.c:1148 +msgid "'git apply --cached' failed" +msgstr "" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#. +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. 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 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" + +#: add-patch.c:1261 +msgid "The selected hunks do not apply to the index!" +msgstr "" + +#: add-patch.c:1262 git-add--interactive.perl:1343 +msgid "Apply them to the worktree anyway? " +msgstr "" + +#: add-patch.c:1269 git-add--interactive.perl:1346 +msgid "Nothing was applied.\n" +msgstr "" + +#: add-patch.c:1326 +msgid "" +"j - leave this hunk undecided, see next undecided hunk\n" +"J - leave this hunk undecided, see next hunk\n" +"k - leave this hunk undecided, see previous undecided hunk\n" +"K - leave this hunk undecided, see previous hunk\n" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" + +#: add-patch.c:1447 add-patch.c:1457 +msgid "No previous hunk" +msgstr "" + +#: add-patch.c:1452 add-patch.c:1462 +msgid "No next hunk" +msgstr "" + +#: add-patch.c:1468 +msgid "No other hunks to goto" +msgstr "" + +#: add-patch.c:1479 git-add--interactive.perl:1577 +msgid "go to which hunk (<ret> to see more)? " +msgstr "" + +#: add-patch.c:1480 git-add--interactive.perl:1579 +msgid "go to which hunk? " +msgstr "" + +#: add-patch.c:1491 +#, c-format +msgid "Invalid number: '%s'" +msgstr "" + +#: add-patch.c:1496 +#, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "" +msgstr[1] "" + +#: add-patch.c:1505 +msgid "No other hunks to search" +msgstr "" + +#: add-patch.c:1511 git-add--interactive.perl:1623 +msgid "search for regex? " +msgstr "" + +#: add-patch.c:1526 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "" + +#: add-patch.c:1543 +msgid "No hunk matches the given pattern" +msgstr "" + +#: add-patch.c:1550 +msgid "Sorry, cannot split this hunk" +msgstr "" + +#: add-patch.c:1554 +#, c-format +msgid "Split into %d hunks." +msgstr "" + +#: add-patch.c:1558 +msgid "Sorry, cannot edit this hunk" +msgstr "" + +#: add-patch.c:1609 +msgid "'git apply' failed" +msgstr "" + +#: advice.c:115 #, c-format msgid "%shint: %.*s%s\n" msgstr "" -#: advice.c:162 +#: advice.c:168 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:164 +#: advice.c:170 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:166 +#: advice.c:172 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:168 +#: advice.c:174 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:170 +#: advice.c:176 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:172 +#: advice.c:178 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:180 +#: advice.c:186 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "" -#: advice.c:188 +#: advice.c:194 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:193 builtin/merge.c:1332 +#: advice.c:199 builtin/merge.c:1335 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:195 +#: advice.c:201 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:196 +#: advice.c:202 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:202 +#: advice.c:208 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -255,469 +861,455 @@ msgstr "" msgid "unable to open or read %s" msgstr "" -#: apply.c:2926 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3047 +#: apply.c:3057 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: apply.c:3059 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3065 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3087 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3095 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3142 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3152 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3160 +#: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3178 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3191 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3197 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3218 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3341 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3401 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3430 apply.c:3673 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3516 apply.c:3688 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3525 apply.c:3696 +#: apply.c:3537 apply.c:3708 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3560 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3563 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3579 apply.c:3583 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3595 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3609 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3614 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3640 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3713 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3715 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1325 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3924 +#: apply.c:3936 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3927 +#: apply.c:3939 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3947 +#: apply.c:3959 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3952 +#: apply.c:3964 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3972 +#: apply.c:3984 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3976 +#: apply.c:3988 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:3991 +#: apply.c:4003 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4083 +#: apply.c:4095 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4090 +#: apply.c:4102 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4093 +#: apply.c:4105 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "" - -#: apply.c:4102 +#: apply.c:4114 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4112 +#: apply.c:4124 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4250 +#: apply.c:4262 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4284 +#: apply.c:4296 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4290 +#: apply.c:4302 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4298 +#: apply.c:4310 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4304 apply.c:4449 +#: apply.c:4316 apply.c:4461 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4347 +#: apply.c:4359 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4351 +#: apply.c:4363 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4421 +#: apply.c:4433 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4519 +#: apply.c:4531 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4527 +#: apply.c:4539 msgid "internal error" msgstr "" -#: apply.c:4530 +#: apply.c:4542 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4541 +#: apply.c:4553 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 +#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4563 +#: apply.c:4575 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4567 +#: apply.c:4579 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4686 +#: apply.c:4698 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4694 +#: apply.c:4706 msgid "unrecognized input" msgstr "" -#: apply.c:4714 +#: apply.c:4726 msgid "unable to read index file" msgstr "" -#: apply.c:4871 +#: apply.c:4883 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4898 +#: apply.c:4910 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4904 apply.c:4919 +#: apply.c:4916 apply.c:4931 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4912 +#: apply.c:4924 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "" -#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200 -#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273 -#: builtin/pull.c:209 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 -msgid "path" -msgstr "" - -#: apply.c:4956 +#: apply.c:4968 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4959 +#: apply.c:4971 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4961 builtin/am.c:2206 +#: apply.c:4973 builtin/am.c:2260 msgid "num" msgstr "" -#: apply.c:4962 +#: apply.c:4974 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: apply.c:4965 +#: apply.c:4977 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4967 +#: apply.c:4979 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4971 +#: apply.c:4983 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4973 +#: apply.c:4985 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4975 +#: apply.c:4987 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4977 +#: apply.c:4989 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4979 +#: apply.c:4991 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:4981 +#: apply.c:4993 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4983 +#: apply.c:4995 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4986 +#: apply.c:4998 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:4988 +#: apply.c:5000 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:4990 +#: apply.c:5002 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:4995 +#: apply.c:5007 msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 +#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1445 +#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 msgid "action" msgstr "" -#: apply.c:4997 +#: apply.c:5009 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:5000 apply.c:5003 +#: apply.c:5012 apply.c:5015 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:5006 +#: apply.c:5018 msgid "apply the patch in reverse" msgstr "" -#: apply.c:5008 +#: apply.c:5020 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:5010 +#: apply.c:5022 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5012 +#: apply.c:5024 msgid "allow overlapping hunks" msgstr "" -#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 +#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 +#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" -#: apply.c:5015 +#: apply.c:5027 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5018 +#: apply.c:5030 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5020 builtin/am.c:2194 +#: apply.c:5032 builtin/am.c:2248 msgid "root" msgstr "" -#: apply.c:5021 +#: apply.c:5033 msgid "prepend <root> to all filenames" msgstr "" @@ -738,7 +1330,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -770,7 +1362,7 @@ msgstr "" msgid "archive format" msgstr "" -#: archive.c:458 builtin/log.c:1581 +#: archive.c:458 builtin/log.c:1653 msgid "prefix" msgstr "" @@ -778,12 +1370,12 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 +#: archive.c:460 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:887 #: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:186 +#: parse-options.h:190 msgid "file" msgstr "" @@ -815,8 +1407,8 @@ msgstr "" msgid "list supported archive formats" msgstr "" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 msgid "repo" msgstr "" @@ -855,17 +1447,17 @@ msgstr "" msgid "Argument not supported for format '%s': -%d" msgstr "" -#: archive-tar.c:125 archive-zip.c:345 +#: archive-tar.c:125 archive-zip.c:351 #, c-format msgid "cannot stream blob %s" msgstr "" -#: archive-tar.c:266 archive-zip.c:363 +#: archive-tar.c:266 archive-zip.c:369 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "" -#: archive-tar.c:293 archive-zip.c:353 +#: archive-tar.c:293 archive-zip.c:359 #, c-format msgid "cannot read %s" msgstr "" @@ -884,37 +1476,37 @@ msgstr "" msgid "'%s' filter reported error" msgstr "" -#: archive-zip.c:314 +#: archive-zip.c:319 #, c-format msgid "path is not valid UTF-8: %s" msgstr "" -#: archive-zip.c:318 +#: archive-zip.c:323 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "" -#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 +#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 #, c-format msgid "deflate error (%d)" msgstr "" -#: archive-zip.c:609 +#: archive-zip.c:615 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "" -#: attr.c:213 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "" -#: attr.c:370 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "" -#: attr.c:410 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -930,33 +1522,33 @@ msgstr "" msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:733 +#: bisect.c:745 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:758 +#: bisect.c:770 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" -#: bisect.c:763 +#: bisect.c:775 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:768 +#: bisect.c:780 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -#: bisect.c:776 +#: bisect.c:788 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -964,7 +1556,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:789 +#: bisect.c:801 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -972,43 +1564,43 @@ msgid "" "We continue anyway." msgstr "" -#: bisect.c:822 +#: bisect.c:840 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:865 +#: bisect.c:890 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:966 builtin/merge.c:149 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:958 +#: bisect.c:997 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:977 +#: bisect.c:1019 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:985 +#: bisect.c:1028 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:1004 +#: bisect.c:1057 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1018,7 +1610,7 @@ msgstr[1] "" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1063 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1037,10 +1629,10 @@ msgstr "" msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971 -#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964 -#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 -#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 +#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 +#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 +#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "" @@ -1194,8 +1786,8 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962 -#: builtin/commit.c:791 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 +#: builtin/commit.c:815 #, c-format msgid "could not open '%s'" msgstr "" @@ -1226,62 +1818,62 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:272 +#: bundle.c:273 msgid "unable to dup bundle descriptor" msgstr "" -#: bundle.c:279 +#: bundle.c:280 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:290 +#: bundle.c:291 msgid "pack-objects died" msgstr "" -#: bundle.c:332 +#: bundle.c:333 msgid "rev-list died" msgstr "" -#: bundle.c:381 +#: bundle.c:382 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306 +#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:468 +#: bundle.c:469 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:478 +#: bundle.c:479 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:503 +#: bundle.c:504 msgid "index-pack died" msgstr "" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "" -#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 +#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:52 +#: commit.c:53 #, c-format msgid "%s %s is not a commit!" msgstr "" -#: commit.c:192 +#: commit.c:193 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1293,285 +1885,280 @@ msgid "" "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1128 +#: commit.c:1153 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: commit.c:1131 +#: commit.c:1157 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: commit.c:1134 +#: commit.c:1160 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: commit.c:1137 +#: commit.c:1163 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: commit.c:1391 +#: commit.c:1417 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" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" -#: commit-graph.c:127 +#: commit-graph.c:122 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:192 +#: commit-graph.c:189 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" -#: commit-graph.c:199 +#: commit-graph.c:196 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "" -#: commit-graph.c:206 +#: commit-graph.c:203 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" -#: commit-graph.c:229 +#: commit-graph.c:226 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" -#: commit-graph.c:240 +#: commit-graph.c:237 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "" -#: commit-graph.c:283 +#: commit-graph.c:280 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "" -#: commit-graph.c:347 +#: commit-graph.c:343 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:357 +#: commit-graph.c:353 msgid "commit-graph chain does not match" msgstr "" -#: commit-graph.c:404 +#: commit-graph.c:401 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:430 +#: commit-graph.c:425 msgid "unable to find all commit-graph files" msgstr "" -#: commit-graph.c:561 commit-graph.c:621 +#: commit-graph.c:558 commit-graph.c:618 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:582 +#: commit-graph.c:579 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:855 builtin/am.c:1287 +#: commit-graph.c:852 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "" -#: commit-graph.c:859 -#, c-format -msgid "unable to get tree for %s" -msgstr "" - -#: commit-graph.c:1017 builtin/pack-objects.c:2641 +#: commit-graph.c:1011 builtin/pack-objects.c:2782 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:1049 +#: commit-graph.c:1043 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1066 +#: commit-graph.c:1060 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1085 +#: commit-graph.c:1079 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1104 +#: commit-graph.c:1098 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1179 +#: commit-graph.c:1173 #, 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:1192 +#: commit-graph.c:1186 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:1196 +#: commit-graph.c:1190 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:1220 +#: commit-graph.c:1214 #, 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:1240 +#: commit-graph.c:1234 #, c-format msgid "invalid commit object id: %s" msgstr "" -#: commit-graph.c:1255 +#: commit-graph.c:1249 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:1270 +#: commit-graph.c:1264 msgid "Counting distinct commits in commit graph" msgstr "" -#: commit-graph.c:1300 +#: commit-graph.c:1294 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1346 +#: commit-graph.c:1340 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1379 midx.c:810 +#: commit-graph.c:1373 midx.c:814 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241 +#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 #, c-format msgid "unable to create '%s'" msgstr "" -#: commit-graph.c:1451 +#: commit-graph.c:1445 #, 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:1492 +#: commit-graph.c:1486 msgid "unable to open commit-graph chain file" msgstr "" -#: commit-graph.c:1504 +#: commit-graph.c:1498 msgid "failed to rename base commit-graph file" msgstr "" -#: commit-graph.c:1524 +#: commit-graph.c:1518 msgid "failed to rename temporary commit-graph file" msgstr "" -#: commit-graph.c:1635 +#: commit-graph.c:1631 msgid "Scanning merged commits" msgstr "" -#: commit-graph.c:1646 +#: commit-graph.c:1642 #, c-format msgid "unexpected duplicate commit id %s" msgstr "" -#: commit-graph.c:1670 +#: commit-graph.c:1665 msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:1860 +#: commit-graph.c:1844 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "" -#: commit-graph.c:1871 +#: commit-graph.c:1855 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:1961 +#: commit-graph.c:1944 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:1971 +#: commit-graph.c:1954 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:1981 commit-graph.c:1996 +#: commit-graph.c:1964 commit-graph.c:1979 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:1988 +#: commit-graph.c:1971 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:2006 +#: commit-graph.c:1989 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2020 +#: commit-graph.c:2003 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2027 +#: commit-graph.c:2010 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2037 +#: commit-graph.c:2020 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2046 +#: commit-graph.c:2029 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2059 +#: commit-graph.c:2042 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2064 +#: commit-graph.c:2047 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2068 +#: commit-graph.c:2051 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2083 +#: commit-graph.c:2066 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" -#: commit-graph.c:2089 +#: commit-graph.c:2072 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -1613,7 +2200,7 @@ msgstr "" msgid "key does not contain variable name: %s" msgstr "" -#: config.c:406 sequencer.c:2401 +#: config.c:406 sequencer.c:2444 #, c-format msgid "invalid key: %s" msgstr "" @@ -1735,144 +2322,144 @@ msgstr "" msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1425 +#: config.c:1430 #, c-format msgid "malformed value for %s" msgstr "" -#: config.c:1451 +#: config.c:1456 #, c-format msgid "malformed value for %s: %s" msgstr "" -#: config.c:1452 +#: config.c:1457 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1513 builtin/pack-objects.c:3394 +#: config.c:1518 builtin/pack-objects.c:3541 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1634 +#: config.c:1639 #, c-format msgid "unable to load config blob object '%s'" msgstr "" -#: config.c:1637 +#: config.c:1642 #, c-format msgid "reference '%s' does not point to a blob" msgstr "" -#: config.c:1654 +#: config.c:1659 #, c-format msgid "unable to resolve config blob '%s'" msgstr "" -#: config.c:1684 +#: config.c:1689 #, c-format msgid "failed to parse %s" msgstr "" -#: config.c:1740 +#: config.c:1743 msgid "unable to parse command-line config" msgstr "" -#: config.c:2091 +#: config.c:2097 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2261 +#: config.c:2267 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2306 +#: config.c:2312 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2352 +#: config.c:2358 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2354 +#: config.c:2360 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2435 +#: config.c:2441 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2467 +#: config.c:2473 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2496 +#: config.c:2502 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2748 config.c:3072 +#: config.c:2754 config.c:3078 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2759 +#: config.c:2765 #, c-format msgid "opening %s" msgstr "" -#: config.c:2794 builtin/config.c:328 +#: config.c:2800 builtin/config.c:344 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:2819 +#: config.c:2825 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:2832 config.c:3085 +#: config.c:2838 config.c:3091 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2843 +#: config.c:2849 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:2852 config.c:3090 +#: config.c:2858 config.c:3096 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:2937 config.c:3187 +#: config.c:2943 config.c:3193 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:2971 +#: config.c:2977 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2973 builtin/remote.c:782 +#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 #, c-format msgid "could not unset '%s'" msgstr "" -#: config.c:3063 +#: config.c:3069 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3230 +#: config.c:3236 #, c-format msgid "missing value for '%s'" msgstr "" @@ -2028,19 +2615,19 @@ msgstr "" msgid "unable to fork" msgstr "" -#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 msgid "Checking connectivity" msgstr "" -#: connected.c:100 +#: connected.c:110 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:120 +#: connected.c:130 msgid "failed write to rev-list" msgstr "" -#: connected.c:127 +#: connected.c:137 msgid "failed to close rev-list's stdin" msgstr "" @@ -2073,90 +2660,90 @@ msgid "" "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:280 +#: convert.c:284 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" -#: convert.c:287 +#: convert.c:291 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" -"tree-encoding." +"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " +"working-tree-encoding." msgstr "" -#: convert.c:305 +#: convert.c:304 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "" -#: convert.c:307 +#: convert.c:306 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" -#: convert.c:425 convert.c:496 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "" -#: convert.c:468 +#: convert.c:462 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" -#: convert.c:674 +#: convert.c:668 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "" -#: convert.c:694 +#: convert.c:688 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "" -#: convert.c:701 +#: convert.c:695 #, c-format msgid "external filter '%s' failed %d" msgstr "" -#: convert.c:736 convert.c:739 +#: convert.c:730 convert.c:733 #, c-format msgid "read from external filter '%s' failed" msgstr "" -#: convert.c:742 convert.c:797 +#: convert.c:736 convert.c:791 #, c-format msgid "external filter '%s' failed" msgstr "" -#: convert.c:845 +#: convert.c:839 msgid "unexpected filter type" msgstr "" -#: convert.c:856 +#: convert.c:850 msgid "path name too long for external filter" msgstr "" -#: convert.c:930 +#: convert.c:924 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1229 +#: convert.c:1223 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1417 convert.c:1451 +#: convert.c:1411 convert.c:1445 #, c-format msgid "%s: clean filter '%s' failed" msgstr "" -#: convert.c:1495 +#: convert.c:1489 #, c-format msgid "%s: smudge filter %s failed" msgstr "" @@ -2313,562 +2900,581 @@ msgid "" "%s" msgstr "" -#: diff.c:4218 +#: diff.c:4202 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4563 +#: diff.c:4547 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4566 +#: diff.c:4550 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4644 +#: diff.c:4628 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4692 +#: diff.c:4676 #, c-format msgid "invalid --stat value: %s" msgstr "" -#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225 -#: parse-options.c:199 parse-options.c:203 +#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 +#: parse-options.c:197 parse-options.c:201 #, c-format msgid "%s expects a numerical value" msgstr "" -#: diff.c:4729 +#: diff.c:4713 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4814 +#: diff.c:4798 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4838 +#: diff.c:4822 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4852 +#: diff.c:4836 #, c-format msgid "unable to resolve '%s'" msgstr "" -#: diff.c:4902 diff.c:4908 +#: diff.c:4886 diff.c:4892 #, c-format msgid "%s expects <n>/<m> form" msgstr "" -#: diff.c:4920 +#: diff.c:4904 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:4941 +#: diff.c:4925 #, c-format msgid "bad --color-moved argument: %s" msgstr "" -#: diff.c:4960 +#: diff.c:4944 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: diff.c:5000 +#: diff.c:4984 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5036 diff.c:5056 +#: diff.c:5020 diff.c:5040 #, c-format msgid "invalid argument to %s" msgstr "" -#: diff.c:5194 +#: diff.c:5178 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5250 +#: diff.c:5234 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5273 +#: diff.c:5257 msgid "Diff output format options" msgstr "" -#: diff.c:5275 diff.c:5281 +#: diff.c:5259 diff.c:5265 msgid "generate patch" msgstr "" -#: diff.c:5278 builtin/log.c:172 +#: diff.c:5262 builtin/log.c:173 msgid "suppress diff output" msgstr "" -#: diff.c:5283 diff.c:5397 diff.c:5404 +#: diff.c:5267 diff.c:5381 diff.c:5388 msgid "<n>" msgstr "" -#: diff.c:5284 diff.c:5287 +#: diff.c:5268 diff.c:5271 msgid "generate diffs with <n> lines context" msgstr "" -#: diff.c:5289 +#: diff.c:5273 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5292 +#: diff.c:5276 msgid "synonym for '-p --raw'" msgstr "" -#: diff.c:5296 +#: diff.c:5280 msgid "synonym for '-p --stat'" msgstr "" -#: diff.c:5300 +#: diff.c:5284 msgid "machine friendly --stat" msgstr "" -#: diff.c:5303 +#: diff.c:5287 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5305 diff.c:5313 +#: diff.c:5289 diff.c:5297 msgid "<param1,param2>..." msgstr "" -#: diff.c:5306 +#: diff.c:5290 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5310 +#: diff.c:5294 msgid "synonym for --dirstat=cumulative" msgstr "" -#: diff.c:5314 +#: diff.c:5298 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5318 +#: diff.c:5302 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5321 +#: diff.c:5305 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5324 +#: diff.c:5308 msgid "show only names of changed files" msgstr "" -#: diff.c:5327 +#: diff.c:5311 msgid "show only names and status of changed files" msgstr "" -#: diff.c:5329 +#: diff.c:5313 msgid "<width>[,<name-width>[,<count>]]" msgstr "" -#: diff.c:5330 +#: diff.c:5314 msgid "generate diffstat" msgstr "" -#: diff.c:5332 diff.c:5335 diff.c:5338 +#: diff.c:5316 diff.c:5319 diff.c:5322 msgid "<width>" msgstr "" -#: diff.c:5333 +#: diff.c:5317 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5336 +#: diff.c:5320 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5339 +#: diff.c:5323 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5341 +#: diff.c:5325 msgid "<count>" msgstr "" -#: diff.c:5342 +#: diff.c:5326 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5345 +#: diff.c:5329 msgid "generate compact summary in diffstat" msgstr "" -#: diff.c:5348 +#: diff.c:5332 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5351 +#: diff.c:5335 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5353 +#: diff.c:5337 msgid "show colored diff" msgstr "" -#: diff.c:5354 +#: diff.c:5338 msgid "<kind>" msgstr "" -#: diff.c:5355 +#: diff.c:5339 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5358 +#: diff.c:5342 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473 +#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 msgid "<prefix>" msgstr "" -#: diff.c:5362 +#: diff.c:5346 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5365 +#: diff.c:5349 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5368 +#: diff.c:5352 msgid "prepend an additional prefix to every line of output" msgstr "" -#: diff.c:5371 +#: diff.c:5355 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5374 +#: diff.c:5358 msgid "show context between diff hunks up to the specified number of lines" msgstr "" -#: diff.c:5378 diff.c:5383 diff.c:5388 +#: diff.c:5362 diff.c:5367 diff.c:5372 msgid "<char>" msgstr "" -#: diff.c:5379 +#: diff.c:5363 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5384 +#: diff.c:5368 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5389 +#: diff.c:5373 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5392 +#: diff.c:5376 msgid "Diff rename options" msgstr "" -#: diff.c:5393 +#: diff.c:5377 msgid "<n>[/<m>]" msgstr "" -#: diff.c:5394 +#: diff.c:5378 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5398 +#: diff.c:5382 msgid "detect renames" msgstr "" -#: diff.c:5402 +#: diff.c:5386 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5405 +#: diff.c:5389 msgid "detect copies" msgstr "" -#: diff.c:5409 +#: diff.c:5393 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5411 +#: diff.c:5395 msgid "disable rename detection" msgstr "" -#: diff.c:5414 +#: diff.c:5398 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5416 +#: diff.c:5400 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5419 +#: diff.c:5403 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5421 +#: diff.c:5405 msgid "Diff algorithm options" msgstr "" -#: diff.c:5423 +#: diff.c:5407 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5426 +#: diff.c:5410 msgid "ignore whitespace when comparing lines" msgstr "" -#: diff.c:5429 +#: diff.c:5413 msgid "ignore changes in amount of whitespace" msgstr "" -#: diff.c:5432 +#: diff.c:5416 msgid "ignore changes in whitespace at EOL" msgstr "" -#: diff.c:5435 +#: diff.c:5419 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5438 +#: diff.c:5422 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5441 +#: diff.c:5425 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5444 +#: diff.c:5428 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5448 +#: diff.c:5432 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5450 +#: diff.c:5434 msgid "<algorithm>" msgstr "" -#: diff.c:5451 +#: diff.c:5435 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5453 +#: diff.c:5437 msgid "<text>" msgstr "" -#: diff.c:5454 +#: diff.c:5438 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5456 diff.c:5465 diff.c:5468 +#: diff.c:5440 diff.c:5449 diff.c:5452 msgid "<mode>" msgstr "" -#: diff.c:5457 +#: diff.c:5441 msgid "show word diff, using <mode> to delimit changed words" msgstr "" -#: diff.c:5459 diff.c:5462 diff.c:5507 +#: diff.c:5443 diff.c:5446 diff.c:5491 msgid "<regex>" msgstr "" -#: diff.c:5460 +#: diff.c:5444 msgid "use <regex> to decide what a word is" msgstr "" -#: diff.c:5463 +#: diff.c:5447 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" -#: diff.c:5466 +#: diff.c:5450 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5469 +#: diff.c:5453 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5472 +#: diff.c:5456 msgid "Other diff options" msgstr "" -#: diff.c:5474 +#: diff.c:5458 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5478 +#: diff.c:5462 msgid "treat all files as text" msgstr "" -#: diff.c:5480 +#: diff.c:5464 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5482 +#: diff.c:5466 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5484 +#: diff.c:5468 msgid "disable all output of the program" msgstr "" -#: diff.c:5486 +#: diff.c:5470 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5488 +#: diff.c:5472 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5490 +#: diff.c:5474 msgid "<when>" msgstr "" -#: diff.c:5491 +#: diff.c:5475 msgid "ignore changes to submodules in the diff generation" msgstr "" -#: diff.c:5494 +#: diff.c:5478 msgid "<format>" msgstr "" -#: diff.c:5495 +#: diff.c:5479 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5499 +#: diff.c:5483 msgid "hide 'git add -N' entries from the index" msgstr "" -#: diff.c:5502 +#: diff.c:5486 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5504 +#: diff.c:5488 msgid "<string>" msgstr "" -#: diff.c:5505 +#: diff.c:5489 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5508 +#: diff.c:5492 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5511 +#: diff.c:5495 msgid "show all changes in the changeset with -S or -G" msgstr "" -#: diff.c:5514 +#: diff.c:5498 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" -#: diff.c:5517 +#: diff.c:5501 msgid "control the order in which files appear in the output" msgstr "" -#: diff.c:5518 +#: diff.c:5502 msgid "<object-id>" msgstr "" -#: diff.c:5519 +#: diff.c:5503 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5521 +#: diff.c:5505 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5522 +#: diff.c:5506 msgid "select files by diff type" msgstr "" -#: diff.c:5524 +#: diff.c:5508 msgid "<file>" msgstr "" -#: diff.c:5525 +#: diff.c:5509 msgid "Output to a specific file" msgstr "" -#: diff.c:6180 +#: diff.c:6164 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:6183 +#: diff.c:6167 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:6186 +#: diff.c:6170 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:549 +#: dir.c:555 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" -#: dir.c:938 +#: dir.c:695 dir.c:724 dir.c:737 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "" + +#: dir.c:754 dir.c:768 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "" + +#: dir.c:786 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "" + +#: dir.c:796 +msgid "disabling cone pattern matching" +msgstr "" + +#: dir.c:1173 #, c-format msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:1877 +#: dir.c:2144 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2128 +#: dir.c:2479 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2252 +#: dir.c:2603 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3056 +#: dir.c:3407 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3101 dir.c:3106 +#: dir.c:3452 dir.c:3457 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3135 +#: dir.c:3486 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" @@ -2887,12 +3493,12 @@ msgstr "" msgid "could not stat file '%s'" msgstr "" -#: environment.c:148 +#: environment.c:149 #, c-format msgid "bad git namespace path \"%s\"" msgstr "" -#: environment.c:330 +#: environment.c:331 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "" @@ -2927,32 +3533,32 @@ msgstr "" msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:356 fetch-pack.c:1280 +#: fetch-pack.c:356 fetch-pack.c:1340 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:362 fetch-pack.c:1286 +#: fetch-pack.c:362 fetch-pack.c:1346 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:364 fetch-pack.c:1288 +#: fetch-pack.c:364 fetch-pack.c:1348 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:367 fetch-pack.c:1291 +#: fetch-pack.c:367 fetch-pack.c:1351 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:369 fetch-pack.c:1293 +#: fetch-pack.c:369 fetch-pack.c:1353 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:372 fetch-pack.c:1297 +#: fetch-pack.c:372 fetch-pack.c:1357 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" @@ -2971,7 +3577,7 @@ msgstr "" msgid "giving up" msgstr "" -#: fetch-pack.c:475 progress.c:312 +#: fetch-pack.c:475 progress.c:323 msgid "done" msgstr "" @@ -2985,162 +3591,162 @@ msgstr "" msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:742 +#: fetch-pack.c:754 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:781 +#: fetch-pack.c:818 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:789 +#: fetch-pack.c:826 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:857 +#: fetch-pack.c:900 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:873 +#: fetch-pack.c:916 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:875 +#: fetch-pack.c:918 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:907 +#: fetch-pack.c:965 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927 -#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943 -#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959 -#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981 +#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 +#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 +#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 +#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 #, c-format msgid "Server supports %s" msgstr "" -#: fetch-pack.c:914 +#: fetch-pack.c:972 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:974 +#: fetch-pack.c:1032 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:979 +#: fetch-pack.c:1037 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:983 +#: fetch-pack.c:1041 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1000 +#: fetch-pack.c:1058 msgid "no common commits" msgstr "" -#: fetch-pack.c:1012 fetch-pack.c:1468 +#: fetch-pack.c:1070 fetch-pack.c:1536 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1150 +#: fetch-pack.c:1209 msgid "Server does not support shallow requests" msgstr "" -#: fetch-pack.c:1157 +#: fetch-pack.c:1216 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:1180 +#: fetch-pack.c:1239 msgid "unable to write request to remote" msgstr "" -#: fetch-pack.c:1198 +#: fetch-pack.c:1257 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1204 +#: fetch-pack.c:1263 #, c-format msgid "expected '%s', received '%s'" msgstr "" -#: fetch-pack.c:1243 +#: fetch-pack.c:1303 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1248 +#: fetch-pack.c:1308 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1258 +#: fetch-pack.c:1318 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1260 +#: fetch-pack.c:1320 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1302 +#: fetch-pack.c:1362 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1349 +#: fetch-pack.c:1409 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" -#: fetch-pack.c:1354 +#: fetch-pack.c:1414 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" -#: fetch-pack.c:1359 +#: fetch-pack.c:1419 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1693 +#: fetch-pack.c:1762 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1716 builtin/clone.c:685 +#: fetch-pack.c:1785 builtin/clone.c:689 msgid "remote did not send all necessary objects" msgstr "" -#: fetch-pack.c:1743 +#: fetch-pack.c:1812 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1746 +#: fetch-pack.c:1815 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" -#: gpg-interface.c:321 +#: gpg-interface.c:408 msgid "gpg failed to sign the data" msgstr "" -#: gpg-interface.c:347 +#: gpg-interface.c:434 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:350 +#: gpg-interface.c:437 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" -#: graph.c:97 +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" @@ -3151,18 +3757,18 @@ msgid "" "with -P under PCRE v2" msgstr "" -#: grep.c:2124 +#: grep.c:2128 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82 +#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:2152 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "" @@ -3212,7 +3818,7 @@ msgid "Low-level Commands / Interrogators" msgstr "" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "" #: help.c:38 @@ -3356,7 +3962,7 @@ msgstr "" msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:436 builtin/commit.c:611 +#: ident.c:436 builtin/commit.c:635 #, c-format msgid "invalid date format: %s" msgstr "" @@ -3433,110 +4039,110 @@ msgstr "" msgid "failed to read the cache" msgstr "" -#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 -#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785 -#: builtin/stash.c:264 +#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 +#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 +#: builtin/stash.c:265 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:367 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:390 +#: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:399 +#: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:896 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:910 merge-recursive.c:929 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:919 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:960 builtin/cat-file.c:41 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:965 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:990 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:1001 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:1006 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1199 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "" -#: merge-recursive.c:1206 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "" -#: merge-recursive.c:1213 +#: merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" -#: merge-recursive.c:1221 merge-recursive.c:1233 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "" -#: merge-recursive.c:1224 merge-recursive.c:1236 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "" -#: merge-recursive.c:1259 +#: merge-recursive.c:1251 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1263 +#: merge-recursive.c:1255 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" -#: merge-recursive.c:1264 +#: merge-recursive.c:1256 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-recursive.c:1267 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3547,103 +4153,103 @@ msgid "" "which will accept this suggestion.\n" msgstr "" -#: merge-recursive.c:1276 +#: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" -#: merge-recursive.c:1349 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:1354 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:1386 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1410 +#: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" -#: merge-recursive.c:1482 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1487 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "" -#: merge-recursive.c:1494 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1499 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "" -#: merge-recursive.c:1534 +#: merge-recursive.c:1526 msgid "rename" msgstr "" -#: merge-recursive.c:1534 +#: merge-recursive.c:1526 msgid "renamed" msgstr "" -#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "" -#: merge-recursive.c:1624 +#: merge-recursive.c:1587 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" -#: merge-recursive.c:1682 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" -#: merge-recursive.c:1713 +#: merge-recursive.c:1676 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1718 +#: merge-recursive.c:1681 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" -#: merge-recursive.c:1737 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1742 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1851 +#: merge-recursive.c:1793 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" @@ -3715,7 +4321,7 @@ msgstr "" msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:3089 git-submodule.sh:937 +#: merge-recursive.c:3089 git-submodule.sh:1003 msgid "submodule" msgstr "" @@ -3821,7 +4427,7 @@ msgstr "" msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874 +#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 msgid "Unable to write index." msgstr "" @@ -3887,78 +4493,94 @@ msgstr "" msgid "error preparing packfile from multi-pack-index" msgstr "" -#: midx.c:469 +#: midx.c:472 #, c-format msgid "failed to add packfile '%s'" msgstr "" -#: midx.c:475 +#: midx.c:478 #, c-format msgid "failed to open pack-index '%s'" msgstr "" -#: midx.c:535 +#: midx.c:538 #, c-format msgid "failed to locate object %d in packfile" msgstr "" -#: midx.c:864 +#: midx.c:842 +msgid "Adding packfiles to multi-pack-index" +msgstr "" + +#: midx.c:875 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:1035 +#: midx.c:973 +msgid "Writing chunks to multi-pack-index" +msgstr "" + +#: midx.c:1052 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" -#: midx.c:1090 +#: midx.c:1108 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1105 +#: midx.c:1123 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -#: midx.c:1109 -msgid "Verifying OID order in MIDX" +#: midx.c:1128 +msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1118 +#: midx.c:1137 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1137 +#: midx.c:1157 msgid "Sorting objects by packfile" msgstr "" -#: midx.c:1143 +#: midx.c:1164 msgid "Verifying object offsets" msgstr "" -#: midx.c:1159 +#: midx.c:1180 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" -#: midx.c:1165 +#: midx.c:1186 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" -#: midx.c:1174 +#: midx.c:1195 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" -#: midx.c:1349 +#: midx.c:1220 +msgid "Counting referenced objects" +msgstr "" + +#: midx.c:1230 +msgid "Finding and deleting unreferenced packfiles" +msgstr "" + +#: midx.c:1388 msgid "could not start pack-objects" msgstr "" -#: midx.c:1368 +#: midx.c:1407 msgid "could not finish pack-objects" msgstr "" @@ -4033,25 +4655,30 @@ msgstr "" msgid "unable to parse object: %s" msgstr "" -#: object.c:266 object.c:277 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "" -#: packfile.c:641 +#: packfile.c:629 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1887 +#: packfile.c:1899 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1891 +#: packfile.c:1903 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" +#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 +#, c-format +msgid "unable to get size of %s" +msgstr "" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4067,7 +4694,7 @@ msgstr "" msgid "%s : incompatible with something else" msgstr "" -#: parse-options.c:92 parse-options.c:96 parse-options.c:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "" @@ -4077,41 +4704,41 @@ msgstr "" msgid "%s isn't available" msgstr "" -#: parse-options.c:219 +#: parse-options.c:217 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" -#: parse-options.c:389 +#: parse-options.c:386 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "" -#: parse-options.c:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 #, c-format -msgid "did you mean `--%s` (with two dashes ?)" +msgid "did you mean `--%s` (with two dashes)?" msgstr "" -#: parse-options.c:860 +#: parse-options.c:857 #, c-format msgid "unknown option `%s'" msgstr "" -#: parse-options.c:862 +#: parse-options.c:859 #, c-format msgid "unknown switch `%c'" msgstr "" -#: parse-options.c:864 +#: parse-options.c:861 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "" -#: parse-options.c:888 +#: parse-options.c:885 msgid "..." msgstr "" -#: parse-options.c:907 +#: parse-options.c:904 #, c-format msgid "usage: %s" msgstr "" @@ -4119,21 +4746,21 @@ msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:913 +#: parse-options.c:910 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:916 +#: parse-options.c:913 #, c-format msgid " %s" msgstr "" -#: parse-options.c:955 +#: parse-options.c:952 msgid "-NUM" msgstr "" -#: parse-options.c:969 +#: parse-options.c:966 #, c-format msgid "alias of --%s" msgstr "" @@ -4158,82 +4785,87 @@ msgstr "" msgid "malformed object name '%s'" msgstr "" -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "" -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "" -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "" -#: pathspec.c:440 +#: pathspec.c:442 #, c-format -msgid "%s: '%s' is outside repository" +msgid "%s: '%s' is outside repository at '%s'" msgstr "" -#: pathspec.c:514 +#: pathspec.c:517 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "" -#: pathspec.c:524 +#: pathspec.c:527 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:591 +#: pathspec.c:594 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" +#: pathspec.c:639 +#, c-format +msgid "line is badly quoted: %s" +msgstr "" + #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "" @@ -4294,42 +4926,42 @@ msgstr "" msgid "unable to create threaded lstat: %s" msgstr "" -#: pretty.c:966 +#: pretty.c:981 msgid "unable to parse --pretty format" msgstr "" -#: promisor-remote.c:25 +#: promisor-remote.c:23 msgid "Remote with no URL" msgstr "" -#: promisor-remote.c:61 +#: promisor-remote.c:58 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "" -#: range-diff.c:71 +#: range-diff.c:75 msgid "could not start `log`" msgstr "" -#: range-diff.c:73 +#: range-diff.c:77 msgid "could not read `log` output" msgstr "" -#: range-diff.c:92 sequencer.c:4985 +#: range-diff.c:96 sequencer.c:5020 #, c-format msgid "could not parse commit '%s'" msgstr "" -#: range-diff.c:118 +#: range-diff.c:122 #, c-format msgid "could not parse git header '%.*s'" msgstr "" -#: range-diff.c:275 +#: range-diff.c:285 msgid "failed to generate diff" msgstr "" -#: range-diff.c:507 range-diff.c:509 +#: range-diff.c:518 range-diff.c:520 #, c-format msgid "could not parse log for '%s'" msgstr "" @@ -4368,172 +5000,180 @@ msgstr "" msgid "unable to stat '%s'" msgstr "" -#: read-cache.c:1314 +#: read-cache.c:1330 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "" -#: read-cache.c:1520 +#: read-cache.c:1536 msgid "Refresh index" msgstr "" -#: read-cache.c:1635 +#: read-cache.c:1651 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1645 +#: read-cache.c:1661 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1701 +#: read-cache.c:1717 #, c-format msgid "bad signature 0x%08x" msgstr "" -#: read-cache.c:1704 +#: read-cache.c:1720 #, c-format msgid "bad index version %d" msgstr "" -#: read-cache.c:1713 +#: read-cache.c:1729 msgid "bad index file sha1 signature" msgstr "" -#: read-cache.c:1743 +#: read-cache.c:1759 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1745 +#: read-cache.c:1761 #, c-format msgid "ignoring %.4s extension" msgstr "" -#: read-cache.c:1782 +#: read-cache.c:1798 #, c-format msgid "unknown index entry format 0x%08x" msgstr "" -#: read-cache.c:1798 +#: read-cache.c:1814 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1855 +#: read-cache.c:1871 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1858 +#: read-cache.c:1874 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "" -#: read-cache.c:1861 +#: read-cache.c:1877 #, c-format msgid "unordered stage entries for '%s'" msgstr "" -#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468 -#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347 -#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 -#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 +#: 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:470 builtin/checkout.c:656 builtin/clean.c:967 +#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "" -#: read-cache.c:2108 +#: read-cache.c:2124 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2121 +#: read-cache.c:2137 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2154 +#: read-cache.c:2170 #, c-format msgid "%s: index file open failed" msgstr "" -#: read-cache.c:2158 +#: read-cache.c:2174 #, c-format msgid "%s: cannot stat the open index" msgstr "" -#: read-cache.c:2162 +#: read-cache.c:2178 #, c-format msgid "%s: index file smaller than expected" msgstr "" -#: read-cache.c:2166 +#: read-cache.c:2182 #, c-format msgid "%s: unable to map index file" msgstr "" -#: read-cache.c:2208 +#: read-cache.c:2224 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2235 +#: read-cache.c:2251 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2267 +#: read-cache.c:2283 #, c-format msgid "could not freshen shared index '%s'" msgstr "" -#: read-cache.c:2314 +#: read-cache.c:2330 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119 +#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917 +#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3126 +#: read-cache.c:3142 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3138 +#: read-cache.c:3154 #, c-format msgid "unable to unlink: %s" msgstr "" -#: read-cache.c:3163 +#: read-cache.c:3179 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" -#: read-cache.c:3312 +#: read-cache.c:3328 #, c-format msgid "%s: cannot drop to stage #0" msgstr "" -#: rebase-interactive.c:26 +#: rebase-interactive.c:11 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" + +#: rebase-interactive.c:33 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -#: rebase-interactive.c:35 +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -4555,26 +5195,26 @@ msgid "" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" -#: rebase-interactive.c:56 +#: rebase-interactive.c:63 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "" msgstr[1] "" -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" msgstr "" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4583,36 +5223,33 @@ msgid "" "\n" msgstr "" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" msgstr "" -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "" - -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388 -#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 +#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 #, c-format msgid "could not write '%s'" msgstr "" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 +#: builtin/rebase.c:234 #, c-format -msgid "could not copy '%s' to '%s'." +msgid "could not write '%s'." msgstr "" -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -4623,6 +5260,13 @@ msgid "" "\n" msgstr "" +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 +#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 +#: builtin/rebase.c:246 +#, c-format +msgid "could not read '%s'." +msgstr "" + #: refs.c:262 #, c-format msgid "%s does not point to a valid object!" @@ -4658,14 +5302,15 @@ msgstr "" msgid "unexpected object ID when writing '%s'" msgstr "" -#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851 -#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620 +#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 +#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 +#: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "" -#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714 -#: builtin/rebase.c:1004 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 +#: builtin/rebase.c:1029 #, c-format msgid "could not open '%s' for writing" msgstr "" @@ -4719,18 +5364,18 @@ msgstr "" msgid "cannot process '%s' and '%s' at the same time" msgstr "" -#: refs/files-backend.c:1234 +#: refs/files-backend.c:1233 #, c-format msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541 #: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1251 refs/packed-backend.c:1554 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "" @@ -4994,45 +5639,45 @@ msgstr "" msgid "config remote shorthand cannot begin with '/': %s" msgstr "" -#: remote.c:413 +#: remote.c:414 msgid "more than one receivepack given, using the first" msgstr "" -#: remote.c:421 +#: remote.c:422 msgid "more than one uploadpack given, using the first" msgstr "" -#: remote.c:611 +#: remote.c:612 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:615 +#: remote.c:616 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:619 +#: remote.c:620 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:687 +#: remote.c:688 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "" -#: remote.c:697 +#: remote.c:698 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "" -#: remote.c:1003 +#: remote.c:1004 #, c-format msgid "src refspec %s does not match any" msgstr "" -#: remote.c:1008 +#: remote.c:1009 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5041,7 +5686,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1023 +#: remote.c:1024 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5055,7 +5700,7 @@ msgid "" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -#: remote.c:1043 +#: remote.c:1044 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5063,7 +5708,7 @@ msgid "" "'%s:refs/heads/%s'?" msgstr "" -#: remote.c:1048 +#: remote.c:1049 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5071,7 +5716,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1053 +#: remote.c:1054 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5079,7 +5724,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1058 +#: remote.c:1059 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5087,114 +5732,114 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1094 +#: remote.c:1095 #, c-format msgid "%s cannot be resolved to branch" msgstr "" -#: remote.c:1105 +#: remote.c:1106 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "" -#: remote.c:1117 +#: remote.c:1118 #, c-format msgid "dst refspec %s matches more than one" msgstr "" -#: remote.c:1124 +#: remote.c:1125 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1627 remote.c:1728 +#: remote.c:1628 remote.c:1729 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1636 +#: remote.c:1637 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1639 +#: remote.c:1640 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1645 +#: remote.c:1646 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1660 +#: remote.c:1661 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1672 +#: remote.c:1673 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1682 +#: remote.c:1683 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1695 +#: remote.c:1696 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1717 +#: remote.c:1718 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:1843 +#: remote.c:1844 #, c-format msgid "couldn't find remote ref %s" msgstr "" -#: remote.c:1856 +#: remote.c:1857 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2019 +#: remote.c:2020 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2023 +#: remote.c:2024 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2026 +#: remote.c:2027 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2030 +#: remote.c:2031 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "" -#: remote.c:2033 +#: remote.c:2034 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2037 +#: remote.c:2038 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:2043 +#: remote.c:2044 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2046 +#: remote.c:2047 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5202,11 +5847,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2054 +#: remote.c:2055 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2057 +#: remote.c:2058 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5217,11 +5862,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2067 +#: remote.c:2068 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: remote.c:2250 +#: remote.c:2251 #, c-format msgid "cannot parse expected object name '%s'" msgstr "" @@ -5236,7 +5881,7 @@ msgstr "" msgid "duplicate replace ref: %s" msgstr "" -#: replace-object.c:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "" @@ -5299,8 +5944,8 @@ msgstr "" msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 #, c-format msgid "could not create directory '%s'" msgstr "" @@ -5334,20 +5979,20 @@ msgstr "" msgid "unable to open rr-cache directory" msgstr "" -#: revision.c:2509 +#: revision.c:2497 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2512 +#: revision.c:2500 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2720 +#: revision.c:2708 msgid "--first-parent is incompatible with --bisect" msgstr "" -#: revision.c:2724 +#: revision.c:2712 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" @@ -5367,191 +6012,191 @@ msgid "" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -#: send-pack.c:142 +#: send-pack.c:144 msgid "unexpected flush packet while reading remote unpack status" msgstr "" -#: send-pack.c:144 +#: send-pack.c:146 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:146 +#: send-pack.c:148 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:307 +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:421 +#: send-pack.c:423 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:423 +#: send-pack.c:425 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:435 +#: send-pack.c:437 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:440 +#: send-pack.c:442 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:187 +#: sequencer.c:191 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:292 +#: sequencer.c:296 #, c-format msgid "could not delete '%s'" msgstr "" -#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "" -#: sequencer.c:321 +#: sequencer.c:325 msgid "revert" msgstr "" -#: sequencer.c:323 +#: sequencer.c:327 msgid "cherry-pick" msgstr "" -#: sequencer.c:325 -msgid "rebase -i" +#: sequencer.c:329 +msgid "rebase" msgstr "" -#: sequencer.c:327 +#: sequencer.c:331 #, c-format msgid "unknown action: %d" msgstr "" -#: sequencer.c:385 +#: sequencer.c:389 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:388 +#: sequencer.c:392 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:401 sequencer.c:2847 +#: sequencer.c:405 sequencer.c:2901 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:408 +#: sequencer.c:412 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867 -#: sequencer.c:3130 +#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 +#: sequencer.c:3185 #, c-format msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112 -#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117 -#: builtin/rebase.c:568 +#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 +#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 +#: builtin/rebase.c:593 #, c-format msgid "could not read '%s'" msgstr "" -#: sequencer.c:462 +#: sequencer.c:466 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:466 +#: sequencer.c:470 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:498 +#: sequencer.c:502 #, c-format msgid "%s: fast-forward" msgstr "" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:541 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:631 +#: sequencer.c:635 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:648 +#: sequencer.c:652 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:662 +#: sequencer.c:666 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:742 +#: sequencer.c:746 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:753 +#: sequencer.c:757 #, c-format msgid "unable to dequote value of '%s'" msgstr "" -#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: sequencer.c:800 +#: sequencer.c:804 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:805 +#: sequencer.c:809 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:810 +#: sequencer.c:814 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:814 +#: sequencer.c:818 #, c-format msgid "unknown variable '%s'" msgstr "" -#: sequencer.c:819 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:821 +#: sequencer.c:825 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:823 +#: sequencer.c:827 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" -#: sequencer.c:872 +#: sequencer.c:876 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5568,11 +6213,11 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:1146 +#: sequencer.c:1148 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1153 +#: sequencer.c:1154 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5587,7 +6232,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1166 +#: sequencer.c:1167 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5601,346 +6246,345 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1208 +#: sequencer.c:1209 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1210 +#: sequencer.c:1211 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1256 +#: sequencer.c:1257 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1258 +#: sequencer.c:1259 msgid "detached HEAD" msgstr "" -#: sequencer.c:1262 +#: sequencer.c:1263 msgid " (root-commit)" msgstr "" -#: sequencer.c:1283 +#: sequencer.c:1284 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1285 +#: sequencer.c:1286 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1289 builtin/commit.c:1571 +#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1341 sequencer.c:1933 +#: sequencer.c:1342 sequencer.c:1968 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684 +#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1369 sequencer.c:1429 +#: sequencer.c:1386 sequencer.c:1447 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883 -#: builtin/merge.c:908 +#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 +#: builtin/merge.c:911 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1456 +#: sequencer.c:1474 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1461 +#: sequencer.c:1479 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1535 sequencer.c:1645 +#: sequencer.c:1562 sequencer.c:1673 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1592 sequencer.c:1617 +#: sequencer.c:1620 sequencer.c:1645 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1602 +#: sequencer.c:1630 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1604 sequencer.c:3157 +#: sequencer.c:1632 sequencer.c:3212 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1606 +#: sequencer.c:1634 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1612 +#: sequencer.c:1640 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1619 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1627 +#: sequencer.c:1655 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1634 +#: sequencer.c:1662 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1640 +#: sequencer.c:1668 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1728 +#: sequencer.c:1756 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1735 +#: sequencer.c:1763 msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:1754 +#: sequencer.c:1782 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1762 sequencer.c:1770 +#: sequencer.c:1790 sequencer.c:1798 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1776 +#: sequencer.c:1804 #, c-format msgid "cannot get commit message for %s" msgstr "" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1795 +#: sequencer.c:1823 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1860 +#: sequencer.c:1888 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1915 +#: sequencer.c:1943 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1916 +#: sequencer.c:1944 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:1983 +#: sequencer.c:1961 +#, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "" + +#: sequencer.c:2018 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:1990 +#: sequencer.c:2025 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:2066 +#: sequencer.c:2102 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:2075 +#: sequencer.c:2111 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:2112 +#: sequencer.c:2142 #, c-format -msgid "could not parse '%.*s'" +msgid "could not parse '%s'" msgstr "" -#: sequencer.c:2166 +#: sequencer.c:2203 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2177 +#: sequencer.c:2214 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178 -#: builtin/rebase.c:204 builtin/rebase.c:229 -#, c-format -msgid "could not read '%s'." -msgstr "" - -#: sequencer.c:2261 +#: sequencer.c:2298 msgid "cancelling a cherry picking in progress" msgstr "" -#: sequencer.c:2268 +#: sequencer.c:2305 msgid "cancelling a revert in progress" msgstr "" -#: sequencer.c:2302 +#: sequencer.c:2349 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2304 +#: sequencer.c:2351 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2309 +#: sequencer.c:2356 msgid "no commits parsed." msgstr "" -#: sequencer.c:2320 +#: sequencer.c:2367 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2322 +#: sequencer.c:2369 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:2404 +#: sequencer.c:2447 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2491 +#: sequencer.c:2540 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2507 +#: sequencer.c:2556 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2590 sequencer.c:4308 +#: sequencer.c:2644 sequencer.c:4361 msgid "empty commit set passed" msgstr "" -#: sequencer.c:2606 +#: sequencer.c:2660 msgid "revert is already in progress" msgstr "" -#: sequencer.c:2608 +#: sequencer.c:2662 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2611 +#: sequencer.c:2665 msgid "cherry-pick is already in progress" msgstr "" -#: sequencer.c:2613 +#: sequencer.c:2667 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2627 +#: sequencer.c:2681 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2642 +#: sequencer.c:2696 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2702 sequencer.c:4057 +#: sequencer.c:2756 sequencer.c:4099 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2704 sequencer.c:2715 +#: sequencer.c:2758 sequencer.c:2769 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2706 sequencer.c:2750 +#: sequencer.c:2760 sequencer.c:2804 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2736 builtin/grep.c:736 +#: sequencer.c:2790 builtin/grep.c:724 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2738 +#: sequencer.c:2792 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2739 +#: sequencer.c:2793 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2745 +#: sequencer.c:2799 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2756 +#: sequencer.c:2810 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:2797 +#: sequencer.c:2851 msgid "no revert in progress" msgstr "" -#: sequencer.c:2805 +#: sequencer.c:2859 msgid "no cherry-pick in progress" msgstr "" -#: sequencer.c:2815 +#: sequencer.c:2869 msgid "failed to skip the commit" msgstr "" -#: sequencer.c:2822 +#: sequencer.c:2876 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:2825 +#: sequencer.c:2879 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:2949 sequencer.c:3969 +#: sequencer.c:3003 sequencer.c:4011 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:2987 sequencer.c:3949 +#: sequencer.c:3042 sequencer.c:3991 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:3004 +#: sequencer.c:3059 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "" -#: sequencer.c:3012 +#: sequencer.c:3067 #, c-format msgid "" "You can amend the commit now, with\n" @@ -5952,27 +6596,22 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3022 +#: sequencer.c:3077 #, c-format msgid "Could not apply %s... %.*s" msgstr "" -#: sequencer.c:3029 +#: sequencer.c:3084 #, c-format msgid "Could not merge %.*s" msgstr "" -#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641 +#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613 -#: builtin/rebase.c:1987 builtin/rebase.c:2031 -msgid "could not read index" -msgstr "" - -#: sequencer.c:3074 +#: sequencer.c:3129 #, c-format msgid "" "execution failed: %s\n" @@ -5982,11 +6621,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3080 +#: sequencer.c:3135 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:3086 +#: sequencer.c:3141 #, c-format msgid "" "execution succeeded: %s\n" @@ -5997,76 +6636,72 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3147 +#: sequencer.c:3202 #, c-format msgid "illegal label name: '%.*s'" msgstr "" -#: sequencer.c:3201 +#: sequencer.c:3256 msgid "writing fake root commit" msgstr "" -#: sequencer.c:3206 +#: sequencer.c:3261 msgid "writing squash-onto" msgstr "" -#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861 +#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 #, c-format msgid "failed to find tree of %s" msgstr "" -#: sequencer.c:3262 builtin/rebase.c:874 -msgid "could not write index" -msgstr "" - -#: sequencer.c:3289 +#: sequencer.c:3344 #, c-format msgid "could not resolve '%s'" msgstr "" -#: sequencer.c:3320 +#: sequencer.c:3375 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:3342 +#: sequencer.c:3397 #, c-format msgid "unable to parse '%.*s'" msgstr "" -#: sequencer.c:3351 +#: sequencer.c:3406 #, c-format msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:3363 +#: sequencer.c:3418 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3378 +#: sequencer.c:3434 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:3538 +#: sequencer.c:3594 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:3554 +#: sequencer.c:3610 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:3623 builtin/rebase.c:712 +#: sequencer.c:3679 builtin/rebase.c:737 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3635 +#: sequencer.c:3691 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6074,31 +6709,26 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:3699 -#, c-format -msgid "could not checkout %s" -msgstr "" - -#: sequencer.c:3713 +#: sequencer.c:3755 #, c-format msgid "%s: not a valid OID" msgstr "" -#: sequencer.c:3718 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "" -#: sequencer.c:3733 +#: sequencer.c:3775 #, c-format msgid "Stopped at HEAD\n" msgstr "" -#: sequencer.c:3735 +#: sequencer.c:3777 #, c-format msgid "Stopped at %s\n" msgstr "" -#: sequencer.c:3743 +#: sequencer.c:3785 #, c-format msgid "" "Could not execute the todo command\n" @@ -6111,121 +6741,114 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3827 +#: sequencer.c:3869 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:3898 +#: sequencer.c:3940 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:3957 +#: sequencer.c:3999 msgid "could not read orig-head" msgstr "" -#: sequencer.c:3962 +#: sequencer.c:4004 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:3976 +#: sequencer.c:4018 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4069 +#: sequencer.c:4111 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4078 +#: sequencer.c:4120 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4080 +#: sequencer.c:4122 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4082 +#: sequencer.c:4124 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4085 +#: sequencer.c:4127 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: sequencer.c:4121 sequencer.c:4159 +#: sequencer.c:4163 sequencer.c:4202 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:4174 +#: sequencer.c:4217 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4181 +#: sequencer.c:4224 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4285 +#: sequencer.c:4338 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4289 +#: sequencer.c:4342 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4324 +#: sequencer.c:4377 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:4774 +#: sequencer.c:4846 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:4777 +#: sequencer.c:4849 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:4935 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" - -#: sequencer.c:5047 sequencer.c:5064 +#: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "" -#: sequencer.c:5078 +#: sequencer.c:5119 msgid "could not skip unnecessary pick commands" msgstr "" -#: sequencer.c:5166 +#: sequencer.c:5213 msgid "the script was already rearranged." msgstr "" #: setup.c:124 #, c-format -msgid "'%s' is outside repository" +msgid "'%s' is outside repository at '%s'" msgstr "" -#: setup.c:174 +#: setup.c:175 #, c-format msgid "" "%s: no such path in the working tree.\n" "Use 'git <command> -- <path>...' to specify paths that do not exist locally." msgstr "" -#: setup.c:187 +#: setup.c:188 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6233,12 +6856,12 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:236 +#: setup.c:254 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" -#: setup.c:255 +#: setup.c:273 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6246,114 +6869,114 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:391 +#: setup.c:409 msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:395 +#: setup.c:413 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:541 +#: setup.c:559 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:549 +#: setup.c:567 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:568 +#: setup.c:586 #, c-format msgid "error opening '%s'" msgstr "" -#: setup.c:570 +#: setup.c:588 #, c-format msgid "too large to be a .git file: '%s'" msgstr "" -#: setup.c:572 +#: setup.c:590 #, c-format msgid "error reading %s" msgstr "" -#: setup.c:574 +#: setup.c:592 #, c-format msgid "invalid gitfile format: %s" msgstr "" -#: setup.c:576 +#: setup.c:594 #, c-format msgid "no path in gitfile: %s" msgstr "" -#: setup.c:578 +#: setup.c:596 #, c-format msgid "not a git repository: %s" msgstr "" -#: setup.c:677 +#: setup.c:695 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:691 +#: setup.c:709 #, c-format msgid "not a git repository: '%s'" msgstr "" -#: setup.c:720 setup.c:722 setup.c:753 +#: setup.c:738 setup.c:740 setup.c:771 #, c-format msgid "cannot chdir to '%s'" msgstr "" -#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 +#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 msgid "cannot come back to cwd" msgstr "" -#: setup.c:852 +#: setup.c:870 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "" -#: setup.c:1090 +#: setup.c:1108 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1099 setup.c:1105 +#: setup.c:1117 setup.c:1123 #, c-format msgid "cannot change to '%s'" msgstr "" -#: setup.c:1110 +#: setup.c:1128 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:1116 +#: setup.c:1134 #, 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:1227 +#: setup.c:1245 #, 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:1271 +#: setup.c:1289 msgid "open /dev/null or dup failed" msgstr "" -#: setup.c:1286 +#: setup.c:1304 msgid "fork failed" msgstr "" -#: setup.c:1291 +#: setup.c:1309 msgid "setsid failed" msgstr "" @@ -6433,194 +7056,194 @@ msgstr "" msgid "object file %s is empty" msgstr "" -#: sha1-file.c:1252 sha1-file.c:2392 +#: sha1-file.c:1263 sha1-file.c:2443 #, c-format msgid "corrupt loose object '%s'" msgstr "" -#: sha1-file.c:1254 sha1-file.c:2396 +#: sha1-file.c:1265 sha1-file.c:2447 #, c-format msgid "garbage at end of loose object '%s'" msgstr "" -#: sha1-file.c:1296 +#: sha1-file.c:1307 msgid "invalid object type" msgstr "" -#: sha1-file.c:1380 +#: sha1-file.c:1391 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1383 +#: sha1-file.c:1394 #, c-format msgid "unable to unpack %s header" msgstr "" -#: sha1-file.c:1389 +#: sha1-file.c:1400 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1392 +#: sha1-file.c:1403 #, c-format msgid "unable to parse %s header" msgstr "" -#: sha1-file.c:1584 +#: sha1-file.c:1629 #, c-format msgid "failed to read object %s" msgstr "" -#: sha1-file.c:1588 +#: sha1-file.c:1633 #, c-format msgid "replacement %s not found for %s" msgstr "" -#: sha1-file.c:1592 +#: sha1-file.c:1637 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1596 +#: sha1-file.c:1641 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1699 +#: sha1-file.c:1746 #, c-format msgid "unable to write file %s" msgstr "" -#: sha1-file.c:1706 +#: sha1-file.c:1753 #, c-format msgid "unable to set permission to '%s'" msgstr "" -#: sha1-file.c:1713 +#: sha1-file.c:1760 msgid "file write error" msgstr "" -#: sha1-file.c:1732 +#: sha1-file.c:1780 msgid "error when closing loose object file" msgstr "" -#: sha1-file.c:1797 +#: sha1-file.c:1845 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: sha1-file.c:1799 +#: sha1-file.c:1847 msgid "unable to create temporary file" msgstr "" -#: sha1-file.c:1823 +#: sha1-file.c:1871 msgid "unable to write loose object file" msgstr "" -#: sha1-file.c:1829 +#: sha1-file.c:1877 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "" -#: sha1-file.c:1833 +#: sha1-file.c:1881 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "" -#: sha1-file.c:1837 +#: sha1-file.c:1885 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: sha1-file.c:1847 builtin/pack-objects.c:925 +#: sha1-file.c:1895 builtin/pack-objects.c:1054 #, c-format msgid "failed utime() on %s" msgstr "" -#: sha1-file.c:1922 +#: sha1-file.c:1972 #, c-format msgid "cannot read object for %s" msgstr "" -#: sha1-file.c:1962 +#: sha1-file.c:2011 msgid "corrupt commit" msgstr "" -#: sha1-file.c:1970 +#: sha1-file.c:2019 msgid "corrupt tag" msgstr "" -#: sha1-file.c:2069 +#: sha1-file.c:2119 #, c-format msgid "read error while indexing %s" msgstr "" -#: sha1-file.c:2072 +#: sha1-file.c:2122 #, c-format msgid "short read while indexing %s" msgstr "" -#: sha1-file.c:2145 sha1-file.c:2154 +#: sha1-file.c:2195 sha1-file.c:2205 #, c-format msgid "%s: failed to insert into database" msgstr "" -#: sha1-file.c:2160 +#: sha1-file.c:2211 #, c-format msgid "%s: unsupported file type" msgstr "" -#: sha1-file.c:2184 +#: sha1-file.c:2235 #, c-format msgid "%s is not a valid object" msgstr "" -#: sha1-file.c:2186 +#: sha1-file.c:2237 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: sha1-file.c:2213 builtin/index-pack.c:155 +#: sha1-file.c:2264 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "" -#: sha1-file.c:2403 sha1-file.c:2455 +#: sha1-file.c:2454 sha1-file.c:2507 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: sha1-file.c:2427 +#: sha1-file.c:2478 #, c-format msgid "unable to mmap %s" msgstr "" -#: sha1-file.c:2432 +#: sha1-file.c:2483 #, c-format msgid "unable to unpack header of %s" msgstr "" -#: sha1-file.c:2438 +#: sha1-file.c:2489 #, c-format msgid "unable to parse header of %s" msgstr "" -#: sha1-file.c:2449 +#: sha1-file.c:2500 #, c-format msgid "unable to unpack contents of %s" msgstr "" -#: sha1-name.c:487 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: sha1-name.c:498 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "" -#: sha1-name.c:797 +#: sha1-name.c:796 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -6633,44 +7256,104 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" +#: sha1-name.c:916 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "" + +#: sha1-name.c:924 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "" + +#: sha1-name.c:1689 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "" + +#: sha1-name.c:1695 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" + +#: sha1-name.c:1704 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "" + +#: sha1-name.c:1732 +#, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" + +#: sha1-name.c:1748 +#, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" + +#: sha1-name.c:1756 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "" + +#: sha1-name.c:1758 +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "" + +#: sha1-name.c:1771 +msgid "relative path syntax can't be used outside working tree" +msgstr "" + +#: sha1-name.c:1909 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:822 +#: strbuf.c:837 #, c-format msgid "%u.%2.2u GiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:824 +#: strbuf.c:839 #, c-format msgid "%u.%2.2u GiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:832 +#: strbuf.c:847 #, c-format msgid "%u.%2.2u MiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:834 +#: strbuf.c:849 #, c-format msgid "%u.%2.2u MiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:841 +#: strbuf.c:856 #, c-format msgid "%u.%2.2u KiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:843 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u KiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:849 +#: strbuf.c:864 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6678,13 +7361,18 @@ msgstr[0] "" msgstr[1] "" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:851 +#: strbuf.c:866 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "" msgstr[1] "" +#: strbuf.c:1164 +#, c-format +msgid "could not edit '%s'" +msgstr "" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -6713,62 +7401,137 @@ msgstr "" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" +#: submodule.c:434 +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "" + +#: submodule.c:815 +#, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "" + #: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: submodule.c:995 +#, c-format +msgid "" +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " +"submodule %s" +msgstr "" + +#: submodule.c:1118 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "" + +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:1481 +#: submodule.c:1158 #, c-format -msgid "Could not access submodule '%s'" +msgid "Pushing submodule '%s'\n" msgstr "" -#: submodule.c:1651 +#: submodule.c:1161 +#, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "" + +#: submodule.c:1453 +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "" + +#: submodule.c:1483 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "" + +#: submodule.c:1637 +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" + +#: submodule.c:1662 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1789 +#: submodule.c:1679 +#, c-format +msgid "Could not run 'git status --porcelain=2' in submodule %s" +msgstr "" + +#: submodule.c:1720 +#, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "" + +#: submodule.c:1800 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1802 +#: submodule.c:1813 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1817 +#: submodule.c:1828 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "" -#: submodule.c:1907 +#: submodule.c:1855 submodule.c:2165 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "" + +#: submodule.c:1876 +msgid "could not reset submodule index" +msgstr "" + +#: submodule.c:1918 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:1959 +#: submodule.c:1970 #, c-format msgid "Submodule '%s' could not be updated." msgstr "" -#: submodule.c:2007 +#: submodule.c:2038 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "" + +#: submodule.c:2059 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2071 submodule.c:2130 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:2026 +#: submodule.c:2075 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "" + +#: submodule.c:2082 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -6776,16 +7539,11 @@ msgid "" "'%s'\n" msgstr "" -#: submodule.c:2109 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "" - -#: submodule.c:2153 +#: submodule.c:2209 msgid "could not start ls-files in .." msgstr "" -#: submodule.c:2192 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" @@ -6804,12 +7562,12 @@ msgstr "" msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" -#: submodule-config.c:490 +#: submodule-config.c:498 #, c-format msgid "invalid value for %s" msgstr "" -#: submodule-config.c:761 +#: submodule-config.c:765 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" @@ -6825,7 +7583,7 @@ msgstr "" msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "" @@ -6944,7 +7702,7 @@ msgstr "" msgid "failed to push all needed submodules" msgstr "" -#: transport.c:1345 transport-helper.c:655 +#: transport.c:1345 transport-helper.c:657 msgid "operation not supported by protocol" msgstr "" @@ -6957,7 +7715,7 @@ msgstr "" msgid "unable to find remote helper for '%s'" msgstr "" -#: transport-helper.c:160 transport-helper.c:569 +#: transport-helper.c:160 transport-helper.c:571 msgid "can't dup helper output fd" msgstr "" @@ -6972,163 +7730,163 @@ msgstr "" msgid "this remote helper should implement refspec capability" msgstr "" -#: transport-helper.c:284 transport-helper.c:424 +#: transport-helper.c:284 transport-helper.c:425 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "" -#: transport-helper.c:413 +#: transport-helper.c:414 #, c-format msgid "%s also locked %s" msgstr "" -#: transport-helper.c:491 +#: transport-helper.c:493 msgid "couldn't run fast-import" msgstr "" -#: transport-helper.c:514 +#: transport-helper.c:516 msgid "error while running fast-import" msgstr "" -#: transport-helper.c:543 transport-helper.c:1132 +#: transport-helper.c:545 transport-helper.c:1134 #, c-format msgid "could not read ref %s" msgstr "" -#: transport-helper.c:588 +#: transport-helper.c:590 #, c-format msgid "unknown response to connect: %s" msgstr "" -#: transport-helper.c:610 +#: transport-helper.c:612 msgid "setting remote service path not supported by protocol" msgstr "" -#: transport-helper.c:612 +#: transport-helper.c:614 msgid "invalid remote service path" msgstr "" -#: transport-helper.c:658 +#: transport-helper.c:660 #, c-format msgid "can't connect to subservice %s" msgstr "" -#: transport-helper.c:734 +#: transport-helper.c:736 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "" -#: transport-helper.c:787 +#: transport-helper.c:789 #, c-format msgid "helper reported unexpected status of %s" msgstr "" -#: transport-helper.c:848 +#: transport-helper.c:850 #, c-format msgid "helper %s does not support dry-run" msgstr "" -#: transport-helper.c:851 +#: transport-helper.c:853 #, c-format msgid "helper %s does not support --signed" msgstr "" -#: transport-helper.c:854 +#: transport-helper.c:856 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" -#: transport-helper.c:859 +#: transport-helper.c:861 #, c-format msgid "helper %s does not support --atomic" msgstr "" -#: transport-helper.c:865 +#: transport-helper.c:867 #, c-format msgid "helper %s does not support 'push-option'" msgstr "" -#: transport-helper.c:963 +#: transport-helper.c:965 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:968 +#: transport-helper.c:970 #, c-format msgid "helper %s does not support 'force'" msgstr "" -#: transport-helper.c:1015 +#: transport-helper.c:1017 msgid "couldn't run fast-export" msgstr "" -#: transport-helper.c:1020 +#: transport-helper.c:1022 msgid "error while running fast-export" msgstr "" -#: transport-helper.c:1045 +#: transport-helper.c:1047 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" "Perhaps you should specify a branch such as 'master'.\n" msgstr "" -#: transport-helper.c:1118 +#: transport-helper.c:1120 #, c-format msgid "malformed response in ref list: %s" msgstr "" -#: transport-helper.c:1270 +#: transport-helper.c:1272 #, c-format msgid "read(%s) failed" msgstr "" -#: transport-helper.c:1297 +#: transport-helper.c:1299 #, c-format msgid "write(%s) failed" msgstr "" -#: transport-helper.c:1346 +#: transport-helper.c:1348 #, c-format msgid "%s thread failed" msgstr "" -#: transport-helper.c:1350 +#: transport-helper.c:1352 #, c-format msgid "%s thread failed to join: %s" msgstr "" -#: transport-helper.c:1369 transport-helper.c:1373 +#: transport-helper.c:1371 transport-helper.c:1375 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1410 +#: transport-helper.c:1412 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1414 +#: transport-helper.c:1416 #, c-format msgid "%s process failed" msgstr "" -#: transport-helper.c:1432 transport-helper.c:1441 +#: transport-helper.c:1434 transport-helper.c:1443 msgid "can't start thread for copying data" msgstr "" -#: tree-walk.c:33 +#: tree-walk.c:32 msgid "too-short tree object" msgstr "" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "" -#: tree-walk.c:118 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "" @@ -7318,6 +8076,10 @@ msgid "" "colliding group is in the working tree:\n" msgstr "" +#: unpack-trees.c:1445 +msgid "Updating index flags" +msgstr "" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "" @@ -7347,32 +8109,36 @@ msgstr "" msgid "invalid '..' path segment" msgstr "" -#: worktree.c:258 builtin/am.c:2084 +#: walker.c:170 +msgid "Fetching objects" +msgstr "" + +#: worktree.c:259 builtin/am.c:2099 #, c-format msgid "failed to read '%s'" msgstr "" -#: worktree.c:304 +#: worktree.c:305 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:315 +#: worktree.c:316 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:327 +#: worktree.c:328 #, c-format msgid "'%s' does not exist" msgstr "" -#: worktree.c:333 +#: worktree.c:334 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "" -#: worktree.c:341 +#: worktree.c:342 #, c-format msgid "'%s' does not point back to '%s'" msgstr "" @@ -7884,131 +8650,135 @@ msgstr "" msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:452 +#: compat/precompose_utf8.c:58 builtin/clone.c:455 #, c-format msgid "failed to unlink '%s'" msgstr "" -#: builtin/add.c:25 +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "" -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:288 msgid "updating files failed" msgstr "" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:174 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:234 builtin/rev-parse.c:897 +#: builtin/add.c:266 builtin/rev-parse.c:899 msgid "Could not read the index" msgstr "" -#: builtin/add.c:245 +#: builtin/add.c:277 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:249 +#: builtin/add.c:281 msgid "Could not write patch" msgstr "" -#: builtin/add.c:252 +#: builtin/add.c:284 msgid "editing patch failed" msgstr "" -#: builtin/add.c:255 +#: builtin/add.c:287 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:257 +#: builtin/add.c:289 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:262 +#: builtin/add.c:294 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:270 +#: builtin/add.c:302 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547 -#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 +#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 +#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 msgid "dry run" msgstr "" -#: builtin/add.c:293 +#: builtin/add.c:325 msgid "interactive picking" msgstr "" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:295 +#: builtin/add.c:327 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:296 +#: builtin/add.c:328 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:297 +#: builtin/add.c:329 msgid "update tracked files" msgstr "" -#: builtin/add.c:298 +#: builtin/add.c:330 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:299 +#: builtin/add.c:331 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:300 +#: builtin/add.c:332 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:303 +#: builtin/add.c:335 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:305 +#: builtin/add.c:337 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:306 +#: builtin/add.c:338 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:307 +#: builtin/add.c:339 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:309 builtin/update-index.c:1002 +#: builtin/add.c:341 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:311 +#: builtin/add.c:343 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:326 +#: builtin/add.c:345 +msgid "backend for `git stash -p`" +msgstr "" + +#: builtin/add.c:363 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8026,165 +8796,187 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:354 +#: builtin/add.c:391 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:372 -#, c-format -msgid "Use -f if you really want to add them.\n" +#: builtin/add.c:410 +msgid "" +"Use -f if you really want to add them.\n" +"Turn this message off by running\n" +"\"git config advice.addIgnoredFile false\"" msgstr "" -#: builtin/add.c:379 +#: builtin/add.c:419 msgid "adding files failed" msgstr "" -#: builtin/add.c:419 +#: builtin/add.c:447 builtin/commit.c:348 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "" + +#: builtin/add.c:464 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "" + +#: builtin/add.c:476 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:426 +#: builtin/add.c:479 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:430 +#: builtin/add.c:483 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:445 +#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 +#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "" + +#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 +#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "" + +#: builtin/add.c:512 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:446 -#, c-format -msgid "Maybe you wanted to say 'git add .'?\n" +#: builtin/add.c:514 +msgid "" +"Maybe you wanted to say 'git add .'?\n" +"Turn this message off by running\n" +"\"git config advice.addEmptyPathspec false\"" msgstr "" -#: builtin/am.c:347 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "" -#: builtin/am.c:431 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:473 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:511 +#: builtin/am.c:516 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:537 +#: builtin/am.c:542 msgid "fseek failed" msgstr "" -#: builtin/am.c:725 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:790 +#: builtin/am.c:795 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:838 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:843 builtin/am.c:855 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "" -#: builtin/am.c:850 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:943 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:948 builtin/clone.c:406 +#: builtin/am.c:953 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:953 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1084 +#: builtin/am.c:1089 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1085 +#: builtin/am.c:1090 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1086 +#: builtin/am.c:1091 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1169 +#: builtin/am.c:1174 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1197 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1262 +#: builtin/am.c:1267 #, c-format msgid "missing author line in commit %s" msgstr "" -#: builtin/am.c:1265 +#: builtin/am.c:1270 #, c-format msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1484 +#: builtin/am.c:1489 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1486 +#: builtin/am.c:1491 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1505 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1511 +#: builtin/am.c:1516 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1537 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1569 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1616 builtin/am.c:1620 +#: builtin/am.c:1621 builtin/am.c:1625 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1638 +#: builtin/am.c:1643 msgid "Commit Body is:" msgstr "" @@ -8192,46 +8984,46 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1648 +#: builtin/am.c:1653 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1695 builtin/commit.c:374 +#: builtin/am.c:1700 builtin/commit.c:398 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1699 +#: builtin/am.c:1704 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1739 builtin/am.c:1807 +#: builtin/am.c:1744 builtin/am.c:1812 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1756 +#: builtin/am.c:1761 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1762 +#: builtin/am.c:1767 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1766 -msgid "Use 'git am --show-current-patch' to see the failed patch" +#: builtin/am.c:1771 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -#: builtin/am.c:1810 +#: builtin/am.c:1815 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" -#: builtin/am.c:1817 +#: builtin/am.c:1822 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8239,185 +9031,195 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 +#: builtin/reset.c:354 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:1976 +#: builtin/am.c:1981 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2020 +#: builtin/am.c:2025 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2117 +#: builtin/am.c:2132 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2153 +#: builtin/am.c:2172 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "" + +#: builtin/am.c:2176 +#, c-format +msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" +msgstr "" + +#: builtin/am.c:2207 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/am.c:2154 +#: builtin/am.c:2208 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2160 +#: builtin/am.c:2214 msgid "run interactively" msgstr "" -#: builtin/am.c:2162 +#: builtin/am.c:2216 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2164 +#: builtin/am.c:2218 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:297 builtin/stash.c:812 +#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:304 builtin/stash.c:812 msgid "be quiet" msgstr "" -#: builtin/am.c:2167 +#: builtin/am.c:2221 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2170 +#: builtin/am.c:2224 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2172 +#: builtin/am.c:2226 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2174 +#: builtin/am.c:2228 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2176 +#: builtin/am.c:2230 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2178 +#: builtin/am.c:2232 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2181 +#: builtin/am.c:2235 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2184 +#: builtin/am.c:2238 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 -#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 -#: builtin/am.c:2213 +#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 +#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 +#: builtin/am.c:2267 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249 -#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442 -#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314 +#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 +#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 +#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:150 parse-options.h:171 parse-options.h:312 +#: parse-options.h:154 parse-options.h:175 parse-options.h:316 msgid "n" msgstr "" -#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "" -#: builtin/am.c:2210 +#: builtin/am.c:2264 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2216 +#: builtin/am.c:2270 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2218 +#: builtin/am.c:2272 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2221 +#: builtin/am.c:2275 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2224 +#: builtin/am.c:2278 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2227 +#: builtin/am.c:2281 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2230 +#: builtin/am.c:2284 msgid "abort the patching operation but keep HEAD where it is." msgstr "" -#: builtin/am.c:2233 -msgid "show the patch being applied." +#: builtin/am.c:2288 +msgid "show the patch being applied" msgstr "" -#: builtin/am.c:2237 +#: builtin/am.c:2293 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2239 +#: builtin/am.c:2295 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490 -#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 +#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 +#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "" -#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484 +#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2245 +#: builtin/am.c:2301 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2263 +#: builtin/am.c:2319 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" -#: builtin/am.c:2270 +#: builtin/am.c:2326 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2285 +#: builtin/am.c:2341 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2309 +#: builtin/am.c:2365 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2315 +#: builtin/am.c:2371 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: builtin/am.c:2325 +#: builtin/am.c:2381 msgid "interactive mode requires patches on the command line" msgstr "" @@ -8532,40 +9334,40 @@ msgstr "" msgid "'%s' is not a valid commit" msgstr "" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:172 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "" -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:216 #, c-format msgid "Bad bisect_write argument: %s" msgstr "" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:221 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "" -#: builtin/bisect--helper.c:232 +#: builtin/bisect--helper.c:233 #, c-format msgid "couldn't open the file '%s'" msgstr "" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:259 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "" -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:286 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:289 +#: builtin/bisect--helper.c:290 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -8573,7 +9375,7 @@ msgid "" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:321 +#: builtin/bisect--helper.c:310 #, c-format msgid "bisecting only with a %s commit" msgstr "" @@ -8582,133 +9384,133 @@ msgstr "" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:318 msgid "Are you sure [Y/n]? " msgstr "" -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:379 msgid "no terms defined" msgstr "" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:382 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "" -#: builtin/bisect--helper.c:389 +#: builtin/bisect--helper.c:392 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" -#: builtin/bisect--helper.c:475 +#: builtin/bisect--helper.c:478 #, c-format msgid "unrecognized option: '%s'" msgstr "" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:482 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "" -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:514 msgid "bad HEAD - I need a HEAD" msgstr "" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:529 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" -#: builtin/bisect--helper.c:547 +#: builtin/bisect--helper.c:550 msgid "won't bisect on cg-seek'ed tree" msgstr "" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:553 msgid "bad HEAD - strange symbolic ref" msgstr "" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:577 #, c-format msgid "invalid ref: '%s'" msgstr "" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:633 msgid "perform 'git bisect next'" msgstr "" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:635 msgid "write the terms to .git/BISECT_TERMS" msgstr "" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:637 msgid "cleanup the bisection state" msgstr "" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:639 msgid "check for expected revs" msgstr "" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:641 msgid "reset the bisection state" msgstr "" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:643 msgid "write out the bisection state in BISECT_LOG" msgstr "" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:645 msgid "check and set terms in a bisection state" msgstr "" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:647 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:649 msgid "print out the bisect terms" msgstr "" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:651 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:650 +#: builtin/bisect--helper.c:653 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:655 msgid "no log for BISECT_WRITE" msgstr "" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:673 msgid "--write-terms requires two arguments" msgstr "" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:677 msgid "--bisect-clean-state requires no arguments" msgstr "" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:684 msgid "--bisect-reset requires either no argument or a commit" msgstr "" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:688 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:694 msgid "--check-and-set-terms requires 3 arguments" msgstr "" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:700 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:706 msgid "--bisect-terms requires 0 or 1 argument" msgstr "" @@ -8807,7 +9609,7 @@ msgstr "" msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:860 builtin/log.c:1630 +#: builtin/blame.c:860 builtin/log.c:1702 msgid "rev" msgstr "" @@ -8827,43 +9629,39 @@ msgstr "" msgid "color lines by age" msgstr "" -#: builtin/blame.c:870 -msgid "Use an experimental heuristic to improve diffs" -msgstr "" - -#: builtin/blame.c:872 +#: builtin/blame.c:864 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:873 +#: builtin/blame.c:865 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:874 +#: builtin/blame.c:866 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:875 builtin/blame.c:876 +#: builtin/blame.c:867 builtin/blame.c:868 msgid "score" msgstr "" -#: builtin/blame.c:875 +#: builtin/blame.c:867 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:876 +#: builtin/blame.c:868 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "n,m" msgstr "" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/blame.c:929 +#: builtin/blame.c:921 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -8875,18 +9673,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:972 msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:1087 +#: builtin/blame.c:1079 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "" msgstr[1] "" -#: builtin/blame.c:1133 +#: builtin/blame.c:1125 msgid "Blaming lines" msgstr "" @@ -9086,7 +9884,7 @@ msgstr "" msgid "do not use" msgstr "" -#: builtin/branch.c:626 builtin/rebase.c:486 +#: builtin/branch.c:626 builtin/rebase.c:513 msgid "upstream" msgstr "" @@ -9095,7 +9893,7 @@ msgid "change the upstream info" msgstr "" #: builtin/branch.c:627 -msgid "Unset the upstream info" +msgid "unset the upstream info" msgstr "" #: builtin/branch.c:628 @@ -9197,7 +9995,7 @@ msgstr "" msgid "format to use for the output" msgstr "" -#: builtin/branch.c:684 builtin/clone.c:760 +#: builtin/branch.c:684 builtin/clone.c:785 msgid "HEAD not found below refs/heads!" msgstr "" @@ -9280,19 +10078,64 @@ msgid "" "'--set-upstream-to' instead." msgstr "" -#: builtin/bundle.c:45 -#, c-format -msgid "%s is okay\n" +#: builtin/bundle.c:15 builtin/bundle.c:23 +msgid "git bundle create [<options>] <file> <git-rev-list args>" +msgstr "" + +#: builtin/bundle.c:16 builtin/bundle.c:28 +msgid "git bundle verify [<options>] <file>" msgstr "" -#: builtin/bundle.c:58 +#: builtin/bundle.c:17 builtin/bundle.c:33 +msgid "git bundle list-heads <file> [<refname>...]" +msgstr "" + +#: builtin/bundle.c:18 builtin/bundle.c:38 +msgid "git bundle unbundle <file> [<refname>...]" +msgstr "" + +#: builtin/bundle.c:66 builtin/pack-objects.c:3375 +msgid "do not show progress meter" +msgstr "" + +#: builtin/bundle.c:68 builtin/pack-objects.c:3377 +msgid "show progress meter" +msgstr "" + +#: builtin/bundle.c:70 builtin/pack-objects.c:3379 +msgid "show progress meter during object writing phase" +msgstr "" + +#: builtin/bundle.c:73 builtin/pack-objects.c:3382 +msgid "similar to --all-progress when progress meter is shown" +msgstr "" + +#: builtin/bundle.c:93 msgid "Need a repository to create a bundle." msgstr "" -#: builtin/bundle.c:62 +#: builtin/bundle.c:104 +msgid "do not show bundle details" +msgstr "" + +#: builtin/bundle.c:119 +#, c-format +msgid "%s is okay\n" +msgstr "" + +#: builtin/bundle.c:160 msgid "Need a repository to unbundle." msgstr "" +#: builtin/bundle.c:168 builtin/remote.c:1686 +msgid "be verbose; must be placed before a subcommand" +msgstr "" + +#: builtin/bundle.c:190 builtin/remote.c:1717 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "" + #: builtin/cat-file.c:595 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" @@ -9337,7 +10180,7 @@ msgstr "" msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:645 git-submodule.sh:936 +#: builtin/cat-file.c:645 git-submodule.sh:1002 msgid "blob" msgstr "" @@ -9397,8 +10240,8 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537 -#: builtin/worktree.c:506 +#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 +#: builtin/worktree.c:499 msgid "suppress progress reporting" msgstr "" @@ -9410,27 +10253,27 @@ msgstr "" msgid "ignore index when checking" msgstr "" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "" -#: builtin/check-ignore.c:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "" @@ -9488,9 +10331,9 @@ msgid "write the content to temporary files" msgstr "" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:679 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 +#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 +#: builtin/worktree.c:672 msgid "string" msgstr "" @@ -9518,148 +10361,148 @@ msgstr "" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "" -#: builtin/checkout.c:173 builtin/checkout.c:212 +#: builtin/checkout.c:175 builtin/checkout.c:214 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:177 builtin/checkout.c:216 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:191 +#: builtin/checkout.c:193 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:241 +#: builtin/checkout.c:243 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:259 +#: builtin/checkout.c:261 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:275 +#: builtin/checkout.c:277 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:375 +#: builtin/checkout.c:377 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:380 +#: builtin/checkout.c:382 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:387 +#: builtin/checkout.c:389 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416 -#: builtin/checkout.c:420 +#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 +#: builtin/checkout.c:422 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:423 builtin/checkout.c:426 +#: builtin/checkout.c:425 builtin/checkout.c:428 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:430 +#: builtin/checkout.c:432 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:434 +#: builtin/checkout.c:436 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "" -#: builtin/checkout.c:438 +#: builtin/checkout.c:440 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "" -#: builtin/checkout.c:443 builtin/checkout.c:448 +#: builtin/checkout.c:445 builtin/checkout.c:450 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:507 builtin/checkout.c:514 +#: builtin/checkout.c:509 builtin/checkout.c:516 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:680 +#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:730 +#: builtin/checkout.c:734 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:833 +#: builtin/checkout.c:837 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:875 +#: builtin/checkout.c:879 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:879 builtin/clone.c:713 +#: builtin/checkout.c:883 builtin/clone.c:717 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:883 +#: builtin/checkout.c:887 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:886 +#: builtin/checkout.c:890 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:890 +#: builtin/checkout.c:894 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:896 builtin/checkout.c:1320 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:894 +#: builtin/checkout.c:898 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:945 +#: builtin/checkout.c:949 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:951 +#: builtin/checkout.c:955 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -9674,7 +10517,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:970 +#: builtin/checkout.c:974 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -9691,306 +10534,315 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1009 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1013 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1053 builtin/checkout.c:1315 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:1176 -msgid "only one reference expected" +#: builtin/checkout.c:1128 +#, 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:1135 +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" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." msgstr "" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1145 #, c-format -msgid "only one reference expected, %d given." +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "" + +#: builtin/checkout.c:1211 +msgid "only one reference expected" msgstr "" -#: builtin/checkout.c:1230 +#: builtin/checkout.c:1228 #, c-format -msgid "" -"'%s' could be both a local file and a tracking branch.\n" -"Please use -- (and optionally --no-guess) to disambiguate" +msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455 +#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1287 builtin/checkout.c:1649 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1334 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1336 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "" -#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1337 builtin/checkout.c:1345 #, c-format msgid "a branch is expected, got '%s'" msgstr "" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1340 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1356 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1360 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1333 +#: builtin/checkout.c:1364 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1368 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1341 +#: builtin/checkout.c:1372 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1376 msgid "you are switching branch while bisecting" msgstr "" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1383 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 +#: builtin/checkout.c:1409 builtin/checkout.c:1414 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1411 #, c-format msgid "'%s' cannot take <start-point>" msgstr "" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1419 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1426 msgid "missing branch or commit argument" msgstr "" -#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59 -#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285 -#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174 +#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 +#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 +#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 +#: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1469 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318 +#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 msgid "style" msgstr "" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1471 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1452 builtin/worktree.c:503 +#: builtin/checkout.c:1483 builtin/worktree.c:496 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1484 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1486 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1488 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1488 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1490 builtin/merge.c:289 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1493 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1506 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1509 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1513 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1533 +#: builtin/checkout.c:1565 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1568 msgid "-p and --overlay are mutually exclusive" msgstr "" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1605 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1578 +#: builtin/checkout.c:1610 msgid "missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1642 #, c-format msgid "could not resolve %s" msgstr "" -#: builtin/checkout.c:1623 -msgid "you must specify path(s) to restore" -msgstr "" - -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1658 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1665 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1669 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1646 +#: builtin/checkout.c:1678 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "" + +#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "" + +#: builtin/checkout.c:1692 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:1666 -#, c-format -msgid "" -"'%s' matched more than one remote tracking branch.\n" -"We found %d remotes with a reference that matched. So we fell back\n" -"on trying to resolve the argument as a path, but failed there too!\n" -"\n" -"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" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." +#: builtin/checkout.c:1697 +msgid "you must specify path(s) to restore" msgstr "" -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742 -#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 +#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 +#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 msgid "branch" msgstr "" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1724 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1726 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1727 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1729 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1730 msgid "use overlay mode (default)" msgstr "" -#: builtin/checkout.c:1743 +#: builtin/checkout.c:1775 msgid "create and switch to a new branch" msgstr "" -#: builtin/checkout.c:1745 +#: builtin/checkout.c:1777 msgid "create/reset and switch to a branch" msgstr "" -#: builtin/checkout.c:1747 +#: builtin/checkout.c:1779 msgid "second guess 'git switch <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1749 +#: builtin/checkout.c:1781 msgid "throw away local modifications" msgstr "" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1813 msgid "which tree-ish to checkout from" msgstr "" -#: builtin/checkout.c:1783 +#: builtin/checkout.c:1815 msgid "restore the index" msgstr "" -#: builtin/checkout.c:1785 +#: builtin/checkout.c:1817 msgid "restore the working tree (default)" msgstr "" -#: builtin/checkout.c:1787 +#: builtin/checkout.c:1819 msgid "ignore unmerged entries" msgstr "" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1820 msgid "use overlay mode" msgstr "" @@ -10029,7 +10881,7 @@ msgstr "" msgid "could not lstat %s\n" msgstr "" -#: builtin/clean.c:301 git-add--interactive.perl:593 +#: builtin/clean.c:301 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10038,7 +10890,7 @@ msgid "" " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:305 git-add--interactive.perl:602 +#: builtin/clean.c:305 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10051,8 +10903,8 @@ msgid "" " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:521 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" @@ -10077,11 +10929,6 @@ msgstr "" msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:787 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "" - #: builtin/clean.c:795 msgid "" "clean - start cleaning\n" @@ -10093,14 +10940,6 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:822 git-add--interactive.perl:1849 -msgid "*** Commands ***" -msgstr "" - -#: builtin/clean.c:823 git-add--interactive.perl:1846 -msgid "What now" -msgstr "" - #: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" @@ -10127,9 +10966,9 @@ msgstr "" msgid "remove whole directories" msgstr "" -#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 -#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178 -#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 +#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 +#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 +#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "" @@ -10166,327 +11005,336 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:92 +#: builtin/clone.c:93 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:97 +#: builtin/clone.c:98 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:101 +#: builtin/clone.c:102 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:103 +#: builtin/clone.c:104 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "pathspec" msgstr "" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:109 +#: builtin/clone.c:110 msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:110 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:486 msgid "template-directory" msgstr "" -#: builtin/clone.c:111 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1912 msgid "reference repository" msgstr "" -#: builtin/clone.c:117 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c:1914 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3294 builtin/repack.c:320 +#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3441 builtin/repack.c:327 msgid "name" msgstr "" -#: builtin/clone.c:119 +#: builtin/clone.c:120 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:121 +#: builtin/clone.c:122 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:123 +#: builtin/clone.c:124 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840 -#: builtin/pull.c:227 +#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 +#: builtin/pull.c:207 msgid "depth" msgstr "" -#: builtin/clone.c:125 +#: builtin/clone.c:126 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283 +#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 msgid "time" msgstr "" -#: builtin/clone.c:127 +#: builtin/clone.c:128 msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194 -#: builtin/rebase.c:1417 +#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 +#: builtin/rebase.c:1480 msgid "revision" msgstr "" -#: builtin/clone.c:129 builtin/fetch.c:172 +#: builtin/clone.c:130 builtin/fetch.c:173 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:131 +#: builtin/clone.c:132 builtin/submodule--helper.c:1419 +#: builtin/submodule--helper.c:1928 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:133 +#: builtin/clone.c:134 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" -#: builtin/clone.c:135 +#: builtin/clone.c:136 msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:136 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:495 msgid "gitdir" msgstr "" -#: builtin/clone.c:137 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:138 +#: builtin/clone.c:139 msgid "key=value" msgstr "" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 -#: builtin/push.c:572 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:172 msgid "server-specific" msgstr "" -#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 -#: builtin/push.c:572 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:173 msgid "option to transmit" msgstr "" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240 -#: builtin/push.c:573 +#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 +#: builtin/push.c:574 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243 -#: builtin/push.c:575 +#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 +#: builtin/push.c:576 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:148 +#: builtin/clone.c:149 msgid "any cloned submodules will use their remote-tracking branch" msgstr "" -#: builtin/clone.c:284 +#: builtin/clone.c:151 +msgid "initialize sparse-checkout file to include only files at root" +msgstr "" + +#: builtin/clone.c:287 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:337 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:410 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:427 +#: builtin/clone.c:430 #, c-format msgid "failed to start iterator over '%s'" msgstr "" -#: builtin/clone.c:457 +#: builtin/clone.c:460 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:461 +#: builtin/clone.c:464 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:466 +#: builtin/clone.c:469 #, c-format msgid "failed to iterate over '%s'" msgstr "" -#: builtin/clone.c:491 +#: builtin/clone.c:494 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:505 +#: builtin/clone.c:508 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry with 'git restore --source=HEAD :/'\n" msgstr "" -#: builtin/clone.c:582 +#: builtin/clone.c:585 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:701 +#: builtin/clone.c:705 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:751 +#: builtin/clone.c:753 +msgid "failed to initialize sparse-checkout" +msgstr "" + +#: builtin/clone.c:776 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:782 +#: builtin/clone.c:807 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:832 +#: builtin/clone.c:862 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:895 +#: builtin/clone.c:925 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:897 +#: builtin/clone.c:927 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:937 builtin/receive-pack.c:1948 +#: builtin/clone.c:965 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:941 +#: builtin/clone.c:969 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:954 +#: builtin/clone.c:982 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:957 +#: builtin/clone.c:985 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:970 +#: builtin/clone.c:998 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:976 builtin/fetch.c:1790 +#: builtin/clone.c:1004 builtin/fetch.c:1796 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:986 +#: builtin/clone.c:1014 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:996 +#: builtin/clone.c:1024 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271 -#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334 +#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 +#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:1016 +#: builtin/clone.c:1044 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:1036 +#: builtin/clone.c:1064 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:1038 +#: builtin/clone.c:1066 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1062 +#: builtin/clone.c:1090 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1123 +#: builtin/clone.c:1154 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1125 +#: builtin/clone.c:1156 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1127 +#: builtin/clone.c:1158 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1129 +#: builtin/clone.c:1160 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1132 +#: builtin/clone.c:1163 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1137 +#: builtin/clone.c:1168 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1212 builtin/clone.c:1220 +#: builtin/clone.c:1243 builtin/clone.c:1251 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1223 +#: builtin/clone.c:1254 msgid "You appear to have cloned an empty repository." msgstr "" @@ -10533,7 +11381,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 #, c-format msgid "not a valid object name %s" msgstr "" @@ -10561,13 +11409,13 @@ msgstr "" msgid "id of a parent commit object" msgstr "" -#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 +#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 #: builtin/tag.c:412 msgid "message" msgstr "" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1501 msgid "commit message" msgstr "" @@ -10575,8 +11423,8 @@ msgstr "" msgid "read commit log message from file" msgstr "" -#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:195 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 +#: builtin/pull.c:175 builtin/revert.c:118 msgid "GPG sign commit" msgstr "" @@ -10633,94 +11481,102 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:356 +#: builtin/commit.c:351 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "" + +#: builtin/commit.c:364 +msgid "No paths with --include/--only does not make sense." +msgstr "" + +#: builtin/commit.c:376 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:362 +#: builtin/commit.c:385 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:376 +#: builtin/commit.c:400 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:378 +#: builtin/commit.c:402 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:455 +#: builtin/commit.c:479 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:457 +#: builtin/commit.c:481 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:465 +#: builtin/commit.c:489 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:484 +#: builtin/commit.c:508 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:582 +#: builtin/commit.c:606 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:584 +#: builtin/commit.c:608 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:603 +#: builtin/commit.c:627 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:656 +#: builtin/commit.c:680 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:730 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:708 +#: builtin/commit.c:732 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:712 +#: builtin/commit.c:736 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:767 builtin/commit.c:783 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:750 +#: builtin/commit.c:774 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:810 +#: builtin/commit.c:834 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:829 +#: builtin/commit.c:853 #, c-format msgid "" "\n" @@ -10730,7 +11586,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:834 +#: builtin/commit.c:858 #, c-format msgid "" "\n" @@ -10740,14 +11596,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:847 +#: builtin/commit.c:871 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:855 +#: builtin/commit.c:879 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -10755,394 +11611,386 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:872 +#: builtin/commit.c:896 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:880 +#: builtin/commit.c:904 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:887 +#: builtin/commit.c:911 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:905 +#: builtin/commit.c:929 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:972 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1011 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1030 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1044 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1087 builtin/commit.c:1327 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1102 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1146 +#: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1155 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1158 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1160 +#: builtin/commit.c:1185 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1163 +#: builtin/commit.c:1188 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1173 +#: builtin/commit.c:1198 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1175 +#: builtin/commit.c:1200 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1183 +#: builtin/commit.c:1208 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1200 +#: builtin/commit.c:1225 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1202 -msgid "No paths with --include/--only does not make sense." -msgstr "" - -#: builtin/commit.c:1208 +#: builtin/commit.c:1231 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1362 builtin/commit.c:1524 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1364 builtin/commit.c:1526 msgid "show branch information" msgstr "" -#: builtin/commit.c:1343 +#: builtin/commit.c:1366 msgid "show stash information" msgstr "" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1368 builtin/commit.c:1528 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1347 +#: builtin/commit.c:1370 msgid "version" msgstr "" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548 -#: builtin/worktree.c:650 +#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 +#: builtin/worktree.c:643 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1373 builtin/commit.c:1532 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1376 builtin/commit.c:1535 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332 +#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 msgid "mode" msgstr "" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1379 builtin/commit.c:1538 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1360 +#: builtin/commit.c:1383 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" -#: builtin/commit.c:1362 parse-options.h:188 +#: builtin/commit.c:1385 parse-options.h:192 msgid "when" msgstr "" -#: builtin/commit.c:1363 +#: builtin/commit.c:1386 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1365 +#: builtin/commit.c:1388 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1366 +#: builtin/commit.c:1389 msgid "do not detect renames" msgstr "" -#: builtin/commit.c:1368 +#: builtin/commit.c:1391 msgid "detect renames, optionally set similarity index" msgstr "" -#: builtin/commit.c:1388 +#: builtin/commit.c:1411 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1493 +#: builtin/commit.c:1494 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1494 +#: builtin/commit.c:1495 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1496 +#: builtin/commit.c:1497 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 msgid "read message from file" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1499 msgid "author" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1499 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1499 builtin/gc.c:538 +#: builtin/commit.c:1500 builtin/gc.c:538 msgid "date" msgstr "" -#: builtin/commit.c:1499 +#: builtin/commit.c:1500 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 +#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "" -#: builtin/commit.c:1501 +#: builtin/commit.c:1502 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1502 +#: builtin/commit.c:1503 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1503 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1504 +#: builtin/commit.c:1505 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1505 +#: builtin/commit.c:1506 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289 -#: builtin/pull.c:164 builtin/revert.c:110 +#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 +#: builtin/pull.c:144 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1507 +#: builtin/commit.c:1508 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1508 +#: builtin/commit.c:1509 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1510 +#: builtin/commit.c:1511 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1515 +#: builtin/commit.c:1516 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1516 +#: builtin/commit.c:1517 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1517 +#: builtin/commit.c:1518 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1518 +#: builtin/commit.c:1519 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1519 +#: builtin/commit.c:1520 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1520 +#: builtin/commit.c:1521 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1521 +#: builtin/commit.c:1522 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1522 +#: builtin/commit.c:1523 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1535 +#: builtin/commit.c:1536 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1536 +#: builtin/commit.c:1537 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1541 +#: builtin/commit.c:1544 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1543 +#: builtin/commit.c:1546 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1616 +#: builtin/commit.c:1619 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1623 +#: builtin/commit.c:1626 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1642 +#: builtin/commit.c:1645 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1649 +#: builtin/commit.c:1652 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1654 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1688 +#: builtin/commit.c:1691 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" -#: builtin/commit-graph.c:11 -msgid "git commit-graph [--object-dir <objdir>]" -msgstr "" - -#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 -msgid "git commit-graph read [--object-dir <objdir>]" -msgstr "" - -#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 msgid "" "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" msgstr "" -#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" msgstr "" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:107 -#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178 -#: builtin/log.c:1585 +#: builtin/commit-graph.c:52 +#, c-format +msgid "could not find object directory matching %s" +msgstr "" + +#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 +#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 msgid "dir" msgstr "" -#: builtin/commit-graph.c:56 builtin/commit-graph.c:108 -#: builtin/commit-graph.c:171 builtin/commit-graph.c:255 +#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 +#: builtin/commit-graph.c:211 msgid "The object directory to store the graph" msgstr "" -#: builtin/commit-graph.c:58 +#: builtin/commit-graph.c:71 msgid "if the commit-graph is split, only verify the tip file" msgstr "" -#: builtin/commit-graph.c:80 builtin/commit-graph.c:125 +#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 #, c-format msgid "Could not open commit-graph '%s'" msgstr "" -#: builtin/commit-graph.c:173 +#: builtin/commit-graph.c:128 msgid "start walk at all refs" msgstr "" -#: builtin/commit-graph.c:175 +#: builtin/commit-graph.c:130 msgid "scan pack-indexes listed by stdin for commits" msgstr "" -#: builtin/commit-graph.c:177 +#: builtin/commit-graph.c:132 msgid "start walk at commits listed by stdin" msgstr "" -#: builtin/commit-graph.c:179 +#: builtin/commit-graph.c:134 msgid "include all commits already in the commit-graph file" msgstr "" -#: builtin/commit-graph.c:182 +#: builtin/commit-graph.c:137 msgid "allow writing an incremental commit-graph file" msgstr "" -#: builtin/commit-graph.c:184 builtin/commit-graph.c:188 +#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" -#: builtin/commit-graph.c:186 +#: builtin/commit-graph.c:141 msgid "maximum ratio between two levels of a split commit-graph" msgstr "" -#: builtin/commit-graph.c:204 +#: builtin/commit-graph.c:159 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" @@ -11150,205 +11998,209 @@ msgstr "" msgid "git config [<options>]" msgstr "" -#: builtin/config.c:103 builtin/env--helper.c:23 +#: builtin/config.c:104 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "" -#: builtin/config.c:115 +#: builtin/config.c:116 msgid "only one type at a time" msgstr "" -#: builtin/config.c:124 +#: builtin/config.c:125 msgid "Config file location" msgstr "" -#: builtin/config.c:125 +#: builtin/config.c:126 msgid "use global config file" msgstr "" -#: builtin/config.c:126 +#: builtin/config.c:127 msgid "use system config file" msgstr "" -#: builtin/config.c:127 +#: builtin/config.c:128 msgid "use repository config file" msgstr "" -#: builtin/config.c:128 +#: builtin/config.c:129 msgid "use per-worktree config file" msgstr "" -#: builtin/config.c:129 +#: builtin/config.c:130 msgid "use given config file" msgstr "" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "blob-id" msgstr "" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:131 +#: builtin/config.c:132 msgid "Action" msgstr "" -#: builtin/config.c:132 +#: builtin/config.c:133 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:133 +#: builtin/config.c:134 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:134 +#: builtin/config.c:135 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:135 +#: builtin/config.c:136 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:136 +#: builtin/config.c:137 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:137 +#: builtin/config.c:138 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:138 +#: builtin/config.c:139 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:139 +#: builtin/config.c:140 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:140 +#: builtin/config.c:141 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:141 +#: builtin/config.c:142 msgid "remove a section: name" msgstr "" -#: builtin/config.c:142 +#: builtin/config.c:143 msgid "list all" msgstr "" -#: builtin/config.c:143 +#: builtin/config.c:144 msgid "open an editor" msgstr "" -#: builtin/config.c:144 +#: builtin/config.c:145 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:145 +#: builtin/config.c:146 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:146 +#: builtin/config.c:147 msgid "Type" msgstr "" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:148 builtin/env--helper.c:38 msgid "value is given this type" msgstr "" -#: builtin/config.c:148 +#: builtin/config.c:149 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:149 +#: builtin/config.c:150 msgid "value is decimal number" msgstr "" -#: builtin/config.c:150 +#: builtin/config.c:151 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:151 +#: builtin/config.c:152 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:152 +#: builtin/config.c:153 msgid "value is an expiry date" msgstr "" -#: builtin/config.c:153 +#: builtin/config.c:154 msgid "Other" msgstr "" -#: builtin/config.c:154 +#: builtin/config.c:155 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:155 +#: builtin/config.c:156 msgid "show variable names only" msgstr "" -#: builtin/config.c:156 +#: builtin/config.c:157 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:157 +#: builtin/config.c:158 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" -#: builtin/config.c:158 builtin/env--helper.c:40 +#: builtin/config.c:159 +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" + +#: builtin/config.c:160 builtin/env--helper.c:40 msgid "value" msgstr "" -#: builtin/config.c:158 +#: builtin/config.c:160 msgid "with --get, use default value when missing entry" msgstr "" -#: builtin/config.c:172 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be %d" msgstr "" -#: builtin/config.c:174 +#: builtin/config.c:176 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "" -#: builtin/config.c:308 +#: builtin/config.c:324 #, c-format msgid "invalid key pattern: %s" msgstr "" -#: builtin/config.c:344 +#: builtin/config.c:360 #, c-format msgid "failed to format default config value: %s" msgstr "" -#: builtin/config.c:401 +#: builtin/config.c:417 #, c-format msgid "cannot parse color '%s'" msgstr "" -#: builtin/config.c:443 +#: builtin/config.c:459 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:512 builtin/config.c:768 msgid "not in a git directory" msgstr "" -#: builtin/config.c:499 +#: builtin/config.c:515 msgid "writing to stdin is not supported" msgstr "" -#: builtin/config.c:502 +#: builtin/config.c:518 msgid "writing config blobs is not supported" msgstr "" -#: builtin/config.c:587 +#: builtin/config.c:603 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -11358,81 +12210,81 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:611 +#: builtin/config.c:627 msgid "only one config file at a time" msgstr "" -#: builtin/config.c:616 +#: builtin/config.c:632 msgid "--local can only be used inside a git repository" msgstr "" -#: builtin/config.c:619 +#: builtin/config.c:635 msgid "--blob can only be used inside a git repository" msgstr "" -#: builtin/config.c:638 +#: builtin/config.c:655 msgid "$HOME not set" msgstr "" -#: builtin/config.c:658 +#: builtin/config.c:679 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" "section in \"git help worktree\" for details" msgstr "" -#: builtin/config.c:688 +#: builtin/config.c:714 msgid "--get-color and variable type are incoherent" msgstr "" -#: builtin/config.c:693 +#: builtin/config.c:719 msgid "only one action at a time" msgstr "" -#: builtin/config.c:706 +#: builtin/config.c:732 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "" -#: builtin/config.c:712 +#: builtin/config.c:738 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" -#: builtin/config.c:718 +#: builtin/config.c:744 msgid "--default is only applicable to --get" msgstr "" -#: builtin/config.c:731 +#: builtin/config.c:757 #, c-format msgid "unable to read config file '%s'" msgstr "" -#: builtin/config.c:734 +#: builtin/config.c:760 msgid "error processing config file(s)" msgstr "" -#: builtin/config.c:744 +#: builtin/config.c:770 msgid "editing stdin is not supported" msgstr "" -#: builtin/config.c:746 +#: builtin/config.c:772 msgid "editing blobs is not supported" msgstr "" -#: builtin/config.c:760 +#: builtin/config.c:786 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:773 +#: builtin/config.c:799 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "" -#: builtin/config.c:847 builtin/config.c:858 +#: builtin/config.c:873 builtin/config.c:884 #, c-format msgid "no such section: %s" msgstr "" @@ -11490,121 +12342,121 @@ msgstr "" msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:381 +#: builtin/describe.c:394 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:407 +#: builtin/describe.c:421 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:411 +#: builtin/describe.c:425 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:441 +#: builtin/describe.c:455 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:444 +#: builtin/describe.c:458 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:512 +#: builtin/describe.c:526 #, c-format msgid "describe %s\n" msgstr "" -#: builtin/describe.c:515 +#: builtin/describe.c:529 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:523 +#: builtin/describe.c:537 #, c-format msgid "%s is neither a commit nor blob" msgstr "" -#: builtin/describe.c:537 +#: builtin/describe.c:551 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:538 +#: builtin/describe.c:552 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:539 +#: builtin/describe.c:553 msgid "use any ref" msgstr "" -#: builtin/describe.c:540 +#: builtin/describe.c:554 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:541 +#: builtin/describe.c:555 msgid "always use long format" msgstr "" -#: builtin/describe.c:542 +#: builtin/describe.c:556 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:545 +#: builtin/describe.c:559 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:547 +#: builtin/describe.c:561 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:549 +#: builtin/describe.c:563 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:551 +#: builtin/describe.c:565 msgid "do not consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:553 builtin/name-rev.c:426 +#: builtin/describe.c:567 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:554 builtin/describe.c:557 +#: builtin/describe.c:568 builtin/describe.c:571 msgid "mark" msgstr "" -#: builtin/describe.c:555 +#: builtin/describe.c:569 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:558 +#: builtin/describe.c:572 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" -#: builtin/describe.c:576 +#: builtin/describe.c:590 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:605 +#: builtin/describe.c:619 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:656 +#: builtin/describe.c:670 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/describe.c:658 +#: builtin/describe.c:672 msgid "--broken is incompatible with commit-ishes" msgstr "" @@ -11779,7 +12631,7 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:852 +#: builtin/fast-export.c:853 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" @@ -11827,7 +12679,7 @@ msgstr "" msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1177 builtin/log.c:1633 +#: builtin/fast-export.c:1177 builtin/log.c:1705 msgid "refspec" msgstr "" @@ -11871,183 +12723,187 @@ msgstr "" msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:115 +#: builtin/fetch.c:116 msgid "fetch.parallel cannot be negative" msgstr "" -#: builtin/fetch.c:138 builtin/pull.c:204 +#: builtin/fetch.c:139 builtin/pull.c:184 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:140 builtin/pull.c:248 +#: builtin/fetch.c:141 builtin/pull.c:228 msgid "set upstream for git pull/fetch" msgstr "" -#: builtin/fetch.c:142 builtin/pull.c:207 +#: builtin/fetch.c:143 builtin/pull.c:187 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:144 builtin/pull.c:210 +#: builtin/fetch.c:145 builtin/pull.c:190 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:145 +#: builtin/fetch.c:146 msgid "force overwrite of local reference" msgstr "" -#: builtin/fetch.c:147 +#: builtin/fetch.c:148 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:149 builtin/pull.c:214 +#: builtin/fetch.c:150 builtin/pull.c:194 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:151 +#: builtin/fetch.c:152 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:153 +#: builtin/fetch.c:154 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:155 builtin/pull.c:217 +#: builtin/fetch.c:156 builtin/pull.c:197 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:157 +#: builtin/fetch.c:158 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141 +#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 msgid "on-demand" msgstr "" -#: builtin/fetch.c:159 +#: builtin/fetch.c:160 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:163 builtin/pull.c:225 +#: builtin/fetch.c:164 builtin/pull.c:205 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:165 +#: builtin/fetch.c:166 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228 +#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:170 +#: builtin/fetch.c:171 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:176 builtin/pull.c:231 +#: builtin/fetch.c:177 builtin/pull.c:211 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:179 +#: builtin/fetch.c:180 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:182 +#: builtin/fetch.c:183 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:186 builtin/pull.c:234 +#: builtin/fetch.c:187 builtin/pull.c:214 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:187 builtin/pull.c:236 +#: builtin/fetch.c:188 builtin/pull.c:216 msgid "refmap" msgstr "" -#: builtin/fetch.c:188 builtin/pull.c:237 +#: builtin/fetch.c:189 builtin/pull.c:217 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:195 +#: builtin/fetch.c:196 msgid "report that we have only objects reachable from this object" msgstr "" -#: builtin/fetch.c:198 +#: builtin/fetch.c:199 msgid "run 'gc --auto' after fetching" msgstr "" -#: builtin/fetch.c:200 builtin/pull.c:246 +#: builtin/fetch.c:201 builtin/pull.c:226 msgid "check for forced-updates on all updated branches" msgstr "" -#: builtin/fetch.c:510 +#: builtin/fetch.c:203 +msgid "write the commit-graph after fetching" +msgstr "" + +#: builtin/fetch.c:513 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:650 +#: builtin/fetch.c:653 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:748 +#: builtin/fetch.c:751 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:752 +#: builtin/fetch.c:755 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853 +#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:766 +#: builtin/fetch.c:769 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:776 +#: builtin/fetch.c:779 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836 -#: builtin/fetch.c:848 +#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 +#: builtin/fetch.c:851 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:781 +#: builtin/fetch.c:784 msgid "would clobber existing tag" msgstr "" -#: builtin/fetch.c:803 +#: builtin/fetch.c:806 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:806 +#: builtin/fetch.c:809 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:809 +#: builtin/fetch.c:812 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:848 +#: builtin/fetch.c:851 msgid "forced update" msgstr "" -#: builtin/fetch.c:853 +#: builtin/fetch.c:856 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:874 +#: builtin/fetch.c:877 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" "flag or run 'git config fetch.showForcedUpdates true'." msgstr "" -#: builtin/fetch.c:878 +#: builtin/fetch.c:881 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -12056,142 +12912,142 @@ msgid "" " to avoid this check.\n" msgstr "" -#: builtin/fetch.c:908 +#: builtin/fetch.c:920 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:929 +#: builtin/fetch.c:941 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:1020 builtin/fetch.c:1157 +#: builtin/fetch.c:1026 builtin/fetch.c:1164 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:1031 +#: builtin/fetch.c:1037 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:1127 +#: builtin/fetch.c:1134 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:1128 +#: builtin/fetch.c:1135 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:1160 +#: builtin/fetch.c:1167 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:1161 builtin/remote.c:1036 +#: builtin/fetch.c:1168 builtin/remote.c:1112 msgid "(none)" msgstr "" -#: builtin/fetch.c:1184 +#: builtin/fetch.c:1191 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1203 +#: builtin/fetch.c:1210 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1206 +#: builtin/fetch.c:1213 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1414 -msgid "multiple branch detected, incompatible with --set-upstream" +#: builtin/fetch.c:1421 +msgid "multiple branches detected, incompatible with --set-upstream" msgstr "" -#: builtin/fetch.c:1429 +#: builtin/fetch.c:1436 msgid "not setting upstream for a remote remote-tracking branch" msgstr "" -#: builtin/fetch.c:1431 +#: builtin/fetch.c:1438 msgid "not setting upstream for a remote tag" msgstr "" -#: builtin/fetch.c:1433 +#: builtin/fetch.c:1440 msgid "unknown branch type" msgstr "" -#: builtin/fetch.c:1435 +#: builtin/fetch.c:1442 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." msgstr "" -#: builtin/fetch.c:1561 builtin/fetch.c:1623 +#: builtin/fetch.c:1568 builtin/fetch.c:1631 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100 +#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1583 +#: builtin/fetch.c:1590 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "" -#: builtin/fetch.c:1685 +#: builtin/fetch.c:1693 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1722 +#: builtin/fetch.c:1730 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1774 +#: builtin/fetch.c:1780 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1776 +#: builtin/fetch.c:1782 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1781 +#: builtin/fetch.c:1787 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1783 +#: builtin/fetch.c:1789 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1799 +#: builtin/fetch.c:1805 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1801 +#: builtin/fetch.c:1807 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1810 +#: builtin/fetch.c:1816 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1817 +#: builtin/fetch.c:1823 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fetch.c:1835 +#: builtin/fetch.c:1841 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -12202,23 +13058,23 @@ msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:671 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:674 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:677 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:678 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:679 msgid "file to read from" msgstr "" @@ -12282,243 +13138,243 @@ msgstr "" msgid "print only refs which don't contain the commit" msgstr "" -#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 msgid "unknown" msgstr "" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:100 builtin/fsck.c:120 #, c-format msgid "error in %s %s: %s" msgstr "" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:131 +#: builtin/fsck.c:114 #, c-format msgid "warning in %s %s: %s" msgstr "" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:143 builtin/fsck.c:146 #, c-format msgid "broken link from %7s %s" msgstr "" -#: builtin/fsck.c:168 +#: builtin/fsck.c:155 msgid "wrong object type in link" msgstr "" -#: builtin/fsck.c:184 +#: builtin/fsck.c:171 #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -#: builtin/fsck.c:295 +#: builtin/fsck.c:282 #, c-format msgid "missing %s %s" msgstr "" -#: builtin/fsck.c:321 +#: builtin/fsck.c:309 #, c-format msgid "unreachable %s %s" msgstr "" -#: builtin/fsck.c:340 +#: builtin/fsck.c:329 #, c-format msgid "dangling %s %s" msgstr "" -#: builtin/fsck.c:349 +#: builtin/fsck.c:339 msgid "could not create lost-found" msgstr "" -#: builtin/fsck.c:360 +#: builtin/fsck.c:350 #, c-format msgid "could not finish '%s'" msgstr "" -#: builtin/fsck.c:377 +#: builtin/fsck.c:367 #, c-format msgid "Checking %s" msgstr "" -#: builtin/fsck.c:415 +#: builtin/fsck.c:405 #, c-format msgid "Checking connectivity (%d objects)" msgstr "" -#: builtin/fsck.c:434 +#: builtin/fsck.c:424 #, c-format msgid "Checking %s %s" msgstr "" -#: builtin/fsck.c:438 +#: builtin/fsck.c:429 msgid "broken links" msgstr "" -#: builtin/fsck.c:447 +#: builtin/fsck.c:438 #, c-format msgid "root %s" msgstr "" -#: builtin/fsck.c:455 +#: builtin/fsck.c:446 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "" -#: builtin/fsck.c:484 +#: builtin/fsck.c:475 #, c-format msgid "%s: object corrupt or missing" msgstr "" -#: builtin/fsck.c:509 +#: builtin/fsck.c:500 #, c-format msgid "%s: invalid reflog entry %s" msgstr "" -#: builtin/fsck.c:523 +#: builtin/fsck.c:514 #, c-format msgid "Checking reflog %s->%s" msgstr "" -#: builtin/fsck.c:557 +#: builtin/fsck.c:548 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "" -#: builtin/fsck.c:564 +#: builtin/fsck.c:555 #, c-format msgid "%s: not a commit" msgstr "" -#: builtin/fsck.c:619 +#: builtin/fsck.c:609 msgid "notice: No default references" msgstr "" -#: builtin/fsck.c:634 +#: builtin/fsck.c:624 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "" -#: builtin/fsck.c:647 +#: builtin/fsck.c:637 #, c-format msgid "%s: object could not be parsed: %s" msgstr "" -#: builtin/fsck.c:667 +#: builtin/fsck.c:657 #, c-format msgid "bad sha1 file: %s" msgstr "" -#: builtin/fsck.c:682 +#: builtin/fsck.c:672 msgid "Checking object directory" msgstr "" -#: builtin/fsck.c:685 +#: builtin/fsck.c:675 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:700 +#: builtin/fsck.c:690 #, c-format msgid "Checking %s link" msgstr "" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:695 builtin/index-pack.c:843 #, c-format msgid "invalid %s" msgstr "" -#: builtin/fsck.c:712 +#: builtin/fsck.c:702 #, c-format msgid "%s points to something strange (%s)" msgstr "" -#: builtin/fsck.c:718 +#: builtin/fsck.c:708 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "" -#: builtin/fsck.c:722 +#: builtin/fsck.c:712 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "" -#: builtin/fsck.c:734 +#: builtin/fsck.c:724 msgid "Checking cache tree" msgstr "" -#: builtin/fsck.c:739 +#: builtin/fsck.c:729 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "" -#: builtin/fsck.c:750 +#: builtin/fsck.c:738 msgid "non-tree in cache-tree" msgstr "" -#: builtin/fsck.c:781 +#: builtin/fsck.c:769 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:787 +#: builtin/fsck.c:775 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:788 +#: builtin/fsck.c:776 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:789 +#: builtin/fsck.c:777 msgid "report tags" msgstr "" -#: builtin/fsck.c:790 +#: builtin/fsck.c:778 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:791 +#: builtin/fsck.c:779 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:792 +#: builtin/fsck.c:780 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:793 +#: builtin/fsck.c:781 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:794 +#: builtin/fsck.c:782 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:795 +#: builtin/fsck.c:783 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:797 +#: builtin/fsck.c:785 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:786 builtin/prune.c:132 msgid "show progress" msgstr "" -#: builtin/fsck.c:799 +#: builtin/fsck.c:787 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:846 builtin/index-pack.c:225 msgid "Checking objects" msgstr "" -#: builtin/fsck.c:887 +#: builtin/fsck.c:874 #, c-format msgid "%s: object missing" msgstr "" -#: builtin/fsck.c:899 +#: builtin/fsck.c:885 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "" @@ -12613,7 +13469,7 @@ msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:29 +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" @@ -12631,258 +13487,258 @@ msgstr "" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2708 +#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 +#: builtin/pack-objects.c:2854 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 +#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:650 +#: builtin/grep.c:633 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:716 +#: builtin/grep.c:704 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:815 +#: builtin/grep.c:803 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:817 +#: builtin/grep.c:805 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:819 +#: builtin/grep.c:807 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:821 +#: builtin/grep.c:809 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:823 +#: builtin/grep.c:811 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:826 +#: builtin/grep.c:814 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:828 +#: builtin/grep.c:816 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:830 +#: builtin/grep.c:818 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:832 +#: builtin/grep.c:820 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:834 +#: builtin/grep.c:822 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:837 +#: builtin/grep.c:825 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:839 +#: builtin/grep.c:827 msgid "search in subdirectories (default)" msgstr "" -#: builtin/grep.c:841 +#: builtin/grep.c:829 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:845 +#: builtin/grep.c:833 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:848 +#: builtin/grep.c:836 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:851 +#: builtin/grep.c:839 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:854 +#: builtin/grep.c:842 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:845 msgid "show line numbers" msgstr "" -#: builtin/grep.c:858 +#: builtin/grep.c:846 msgid "show column number of first match" msgstr "" -#: builtin/grep.c:859 +#: builtin/grep.c:847 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:860 +#: builtin/grep.c:848 msgid "show filenames" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:850 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:864 +#: builtin/grep.c:852 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:866 +#: builtin/grep.c:854 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:869 +#: builtin/grep.c:857 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:871 +#: builtin/grep.c:859 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:874 +#: builtin/grep.c:862 msgid "show only matching parts of a line" msgstr "" -#: builtin/grep.c:876 +#: builtin/grep.c:864 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:877 +#: builtin/grep.c:865 msgid "highlight matches" msgstr "" -#: builtin/grep.c:879 +#: builtin/grep.c:867 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:881 +#: builtin/grep.c:869 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:884 +#: builtin/grep.c:872 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:887 +#: builtin/grep.c:875 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:889 +#: builtin/grep.c:877 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:891 +#: builtin/grep.c:879 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:892 +#: builtin/grep.c:880 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:895 +#: builtin/grep.c:883 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:897 +#: builtin/grep.c:885 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:888 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:902 +#: builtin/grep.c:890 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:904 +#: builtin/grep.c:892 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:916 +#: builtin/grep.c:904 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:918 +#: builtin/grep.c:906 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:920 +#: builtin/grep.c:908 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:924 +#: builtin/grep.c:912 msgid "pager" msgstr "" -#: builtin/grep.c:924 +#: builtin/grep.c:912 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:928 +#: builtin/grep.c:916 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:992 +#: builtin/grep.c:983 msgid "no pattern given" msgstr "" -#: builtin/grep.c:1028 +#: builtin/grep.c:1019 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1036 +#: builtin/grep.c:1027 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1067 +#: builtin/grep.c:1057 +msgid "--untracked not supported with --recurse-submodules" +msgstr "" + +#: builtin/grep.c:1061 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1070 builtin/pack-objects.c:3400 +#: builtin/grep.c:1064 builtin/pack-objects.c:3547 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 +#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1096 +#: builtin/grep.c:1101 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1119 -msgid "option not supported with --recurse-submodules" -msgstr "" - -#: builtin/grep.c:1125 +#: builtin/grep.c:1127 msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1131 +#: builtin/grep.c:1133 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1139 +#: builtin/grep.c:1141 msgid "both --cached and trees are given" msgstr "" @@ -13060,11 +13916,11 @@ msgstr "" msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:288 builtin/pack-objects.c:606 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "" @@ -13120,191 +13976,191 @@ msgstr[1] "" msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 -#: builtin/index-pack.c:803 builtin/index-pack.c:812 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 +#: builtin/index-pack.c:804 builtin/index-pack.c:813 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:738 builtin/pack-objects.c:157 -#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 +#: builtin/index-pack.c:738 builtin/pack-objects.c:158 +#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:802 #, c-format msgid "cannot read existing object info %s" msgstr "" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:810 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:824 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:827 builtin/index-pack.c:846 msgid "fsck error in packed object" msgstr "" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:848 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:920 builtin/index-pack.c:951 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1198 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1249 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1255 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1264 +#: builtin/index-pack.c:1267 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1271 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1295 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1392 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1406 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1431 #, c-format msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1439 #, c-format msgid "cannot close written %s file '%s'" msgstr "" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1463 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1477 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1485 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 +#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1597 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1599 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1643 +#: builtin/index-pack.c:1647 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1654 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1689 +#: builtin/index-pack.c:1693 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 +#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1781 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1783 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1789 msgid "--verify with no packfile name given" msgstr "" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "" @@ -13481,388 +14337,401 @@ msgstr "" msgid "no input file given for in-place editing" msgstr "" -#: builtin/log.c:55 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "" -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:173 +#: builtin/log.c:174 msgid "show source" msgstr "" -#: builtin/log.c:174 +#: builtin/log.c:175 msgid "Use mail map file" msgstr "" -#: builtin/log.c:176 +#: builtin/log.c:177 msgid "only decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:178 +#: builtin/log.c:179 msgid "do not decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:179 +#: builtin/log.c:180 msgid "decorate options" msgstr "" -#: builtin/log.c:182 +#: builtin/log.c:183 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:280 +#: builtin/log.c:281 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:534 +#: builtin/log.c:535 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:549 builtin/log.c:644 +#: builtin/log.c:550 builtin/log.c:645 #, c-format msgid "could not read object %s" msgstr "" -#: builtin/log.c:669 +#: builtin/log.c:670 #, c-format msgid "unknown type: %d" msgstr "" -#: builtin/log.c:792 +#: builtin/log.c:814 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "" + +#: builtin/log.c:821 msgid "format.headers without value" msgstr "" -#: builtin/log.c:909 +#: builtin/log.c:936 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:925 +#: builtin/log.c:952 #, c-format msgid "cannot open patch file %s" msgstr "" -#: builtin/log.c:942 +#: builtin/log.c:969 msgid "need exactly one range" msgstr "" -#: builtin/log.c:952 +#: builtin/log.c:979 msgid "not a range" msgstr "" -#: builtin/log.c:1075 +#: builtin/log.c:1143 msgid "cover letter needs email format" msgstr "" -#: builtin/log.c:1081 +#: builtin/log.c:1149 msgid "failed to create cover-letter file" msgstr "" -#: builtin/log.c:1160 +#: builtin/log.c:1228 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1187 +#: builtin/log.c:1255 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1245 +#: builtin/log.c:1313 msgid "two output directories?" msgstr "" -#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 +#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 #, c-format msgid "unknown commit %s" msgstr "" -#: builtin/log.c:1366 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "" -#: builtin/log.c:1371 +#: builtin/log.c:1439 msgid "could not find exact merge base" msgstr "" -#: builtin/log.c:1375 +#: builtin/log.c:1443 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" -#: builtin/log.c:1395 +#: builtin/log.c:1463 msgid "failed to find exact merge base" msgstr "" -#: builtin/log.c:1406 +#: builtin/log.c:1474 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1410 +#: builtin/log.c:1478 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1463 +#: builtin/log.c:1531 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1515 +#: builtin/log.c:1583 msgid "failed to infer range-diff ranges" msgstr "" -#: builtin/log.c:1560 +#: builtin/log.c:1629 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1563 +#: builtin/log.c:1632 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1567 +#: builtin/log.c:1636 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1569 +#: builtin/log.c:1638 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1571 +#: builtin/log.c:1640 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1572 +#: builtin/log.c:1641 msgid "sfx" msgstr "" -#: builtin/log.c:1573 +#: builtin/log.c:1642 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1575 +#: builtin/log.c:1644 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1577 +#: builtin/log.c:1646 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1579 +#: builtin/log.c:1648 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1582 +#: builtin/log.c:1651 +msgid "cover-from-description-mode" +msgstr "" + +#: builtin/log.c:1652 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "" + +#: builtin/log.c:1654 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1585 +#: builtin/log.c:1657 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1588 +#: builtin/log.c:1660 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1591 +#: builtin/log.c:1663 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1593 +#: builtin/log.c:1665 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1595 +#: builtin/log.c:1667 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1597 +#: builtin/log.c:1669 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1599 +#: builtin/log.c:1671 msgid "Messaging" msgstr "" -#: builtin/log.c:1600 +#: builtin/log.c:1672 msgid "header" msgstr "" -#: builtin/log.c:1601 +#: builtin/log.c:1673 msgid "add email header" msgstr "" -#: builtin/log.c:1602 builtin/log.c:1604 +#: builtin/log.c:1674 builtin/log.c:1676 msgid "email" msgstr "" -#: builtin/log.c:1602 +#: builtin/log.c:1674 msgid "add To: header" msgstr "" -#: builtin/log.c:1604 +#: builtin/log.c:1676 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1606 +#: builtin/log.c:1678 msgid "ident" msgstr "" -#: builtin/log.c:1607 +#: builtin/log.c:1679 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1609 +#: builtin/log.c:1681 msgid "message-id" msgstr "" -#: builtin/log.c:1610 +#: builtin/log.c:1682 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1611 builtin/log.c:1614 +#: builtin/log.c:1683 builtin/log.c:1686 msgid "boundary" msgstr "" -#: builtin/log.c:1612 +#: builtin/log.c:1684 msgid "attach the patch" msgstr "" -#: builtin/log.c:1615 +#: builtin/log.c:1687 msgid "inline the patch" msgstr "" -#: builtin/log.c:1619 +#: builtin/log.c:1691 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1621 +#: builtin/log.c:1693 msgid "signature" msgstr "" -#: builtin/log.c:1622 +#: builtin/log.c:1694 msgid "add a signature" msgstr "" -#: builtin/log.c:1623 +#: builtin/log.c:1695 msgid "base-commit" msgstr "" -#: builtin/log.c:1624 +#: builtin/log.c:1696 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1626 +#: builtin/log.c:1698 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1627 +#: builtin/log.c:1699 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1629 +#: builtin/log.c:1701 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1631 +#: builtin/log.c:1703 msgid "show changes against <rev> in cover letter or single patch" msgstr "" -#: builtin/log.c:1634 +#: builtin/log.c:1706 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" -#: builtin/log.c:1636 +#: builtin/log.c:1708 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1711 +#: builtin/log.c:1792 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1726 +#: builtin/log.c:1807 msgid "-n and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1728 +#: builtin/log.c:1809 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1736 +#: builtin/log.c:1817 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1738 +#: builtin/log.c:1819 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1740 +#: builtin/log.c:1821 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1773 +#: builtin/log.c:1854 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1877 +#: builtin/log.c:1958 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1881 +#: builtin/log.c:1962 msgid "Interdiff:" msgstr "" -#: builtin/log.c:1882 +#: builtin/log.c:1963 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:1888 +#: builtin/log.c:1969 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:1892 +#: builtin/log.c:1973 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1900 +#: builtin/log.c:1981 msgid "Range-diff:" msgstr "" -#: builtin/log.c:1901 +#: builtin/log.c:1982 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:1912 +#: builtin/log.c:1993 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1948 +#: builtin/log.c:2029 msgid "Generating patches" msgstr "" -#: builtin/log.c:1992 +#: builtin/log.c:2073 msgid "failed to create output files" msgstr "" -#: builtin/log.c:2051 +#: builtin/log.c:2132 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:2105 +#: builtin/log.c:2186 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -13983,7 +14852,7 @@ msgstr "" msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 msgid "exec" msgstr "" @@ -14068,361 +14937,361 @@ msgstr "" msgid "git merge --continue" msgstr "" -#: builtin/merge.c:118 +#: builtin/merge.c:119 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "option `%s' requires a value" msgstr "" -#: builtin/merge.c:187 +#: builtin/merge.c:188 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:188 +#: builtin/merge.c:189 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:193 +#: builtin/merge.c:194 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:244 builtin/pull.c:152 +#: builtin/merge.c:245 builtin/pull.c:132 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:247 builtin/pull.c:155 +#: builtin/merge.c:248 builtin/pull.c:135 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:248 builtin/pull.c:158 +#: builtin/merge.c:249 builtin/pull.c:138 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:250 builtin/pull.c:161 +#: builtin/merge.c:251 builtin/pull.c:141 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:253 builtin/pull.c:167 +#: builtin/merge.c:254 builtin/pull.c:147 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:255 builtin/pull.c:170 +#: builtin/merge.c:256 builtin/pull.c:150 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:257 builtin/pull.c:173 +#: builtin/merge.c:258 builtin/pull.c:153 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:259 +#: builtin/merge.c:260 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:261 builtin/pull.c:180 +#: builtin/merge.c:262 builtin/pull.c:160 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:265 builtin/pull.c:183 +#: builtin/merge.c:266 builtin/pull.c:163 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 -#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114 +#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 +#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 msgid "strategy" msgstr "" -#: builtin/merge.c:267 builtin/pull.c:188 +#: builtin/merge.c:268 builtin/pull.c:168 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:268 builtin/pull.c:191 +#: builtin/merge.c:269 builtin/pull.c:171 msgid "option=value" msgstr "" -#: builtin/merge.c:269 builtin/pull.c:192 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:271 +#: builtin/merge.c:272 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:278 +#: builtin/merge.c:279 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:280 +#: builtin/merge.c:281 msgid "--abort but leave index and working tree alone" msgstr "" -#: builtin/merge.c:282 +#: builtin/merge.c:283 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:284 builtin/pull.c:199 +#: builtin/merge.c:285 builtin/pull.c:179 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:290 +#: builtin/merge.c:291 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" -#: builtin/merge.c:307 +#: builtin/merge.c:308 msgid "could not run stash." msgstr "" -#: builtin/merge.c:312 +#: builtin/merge.c:313 msgid "stash failed" msgstr "" -#: builtin/merge.c:317 +#: builtin/merge.c:318 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:340 builtin/merge.c:357 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:386 +#: builtin/merge.c:387 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:397 +#: builtin/merge.c:398 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:447 +#: builtin/merge.c:448 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:498 +#: builtin/merge.c:499 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:585 +#: builtin/merge.c:586 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:705 +#: builtin/merge.c:708 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:719 +#: builtin/merge.c:722 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:734 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:786 +#: builtin/merge.c:789 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:795 +#: builtin/merge.c:798 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:801 +#: builtin/merge.c:804 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" msgstr "" -#: builtin/merge.c:806 +#: builtin/merge.c:809 msgid "An empty message aborts the commit.\n" msgstr "" -#: builtin/merge.c:809 +#: builtin/merge.c:812 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -#: builtin/merge.c:862 +#: builtin/merge.c:865 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:877 +#: builtin/merge.c:880 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:938 +#: builtin/merge.c:941 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:977 +#: builtin/merge.c:980 msgid "No current branch." msgstr "" -#: builtin/merge.c:979 +#: builtin/merge.c:982 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:981 +#: builtin/merge.c:984 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:986 +#: builtin/merge.c:989 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1043 +#: builtin/merge.c:1046 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1146 +#: builtin/merge.c:1149 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1180 +#: builtin/merge.c:1183 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1283 +#: builtin/merge.c:1286 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1287 +#: builtin/merge.c:1290 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1296 +#: builtin/merge.c:1299 msgid "--quit expects no arguments" msgstr "" -#: builtin/merge.c:1309 +#: builtin/merge.c:1312 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1313 +#: builtin/merge.c:1316 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1329 +#: builtin/merge.c:1332 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1336 +#: builtin/merge.c:1339 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1339 +#: builtin/merge.c:1342 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1353 +#: builtin/merge.c:1356 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1355 +#: builtin/merge.c:1358 msgid "You cannot combine --squash with --commit." msgstr "" -#: builtin/merge.c:1371 +#: builtin/merge.c:1374 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1388 +#: builtin/merge.c:1391 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1390 +#: builtin/merge.c:1393 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1395 +#: builtin/merge.c:1398 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1397 +#: builtin/merge.c:1400 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1476 +#: builtin/merge.c:1481 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1485 +#: builtin/merge.c:1490 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1495 +#: builtin/merge.c:1500 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1537 +#: builtin/merge.c:1542 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1544 +#: builtin/merge.c:1549 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1569 +#: builtin/merge.c:1574 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1575 +#: builtin/merge.c:1580 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1598 builtin/merge.c:1663 +#: builtin/merge.c:1603 builtin/merge.c:1668 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1602 +#: builtin/merge.c:1607 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1654 +#: builtin/merge.c:1659 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1656 +#: builtin/merge.c:1661 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1665 +#: builtin/merge.c:1670 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1677 +#: builtin/merge.c:1682 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -14554,29 +15423,29 @@ msgstr "" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<size>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" -#: builtin/multi-pack-index.c:25 +#: builtin/multi-pack-index.c:29 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "" -#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 msgid "--batch-size option is only for 'repack' subcommand" msgstr "" -#: builtin/multi-pack-index.c:61 +#: builtin/multi-pack-index.c:69 #, c-format msgid "unrecognized subcommand: %s" msgstr "" @@ -14668,52 +15537,52 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511 +#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:356 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "" -#: builtin/name-rev.c:357 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "" -#: builtin/name-rev.c:358 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "" -#: builtin/name-rev.c:415 +#: builtin/name-rev.c:524 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:423 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:424 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:430 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "" @@ -15108,7 +15977,7 @@ msgstr "" msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1034 builtin/stash.c:1607 +#: builtin/notes.c:1034 builtin/stash.c:1643 #, c-format msgid "unknown subcommand: %s" msgstr "" @@ -15123,375 +15992,338 @@ msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:428 +#: builtin/pack-objects.c:430 #, c-format msgid "bad packed object CRC for %s" msgstr "" -#: builtin/pack-objects.c:439 +#: builtin/pack-objects.c:441 #, c-format msgid "corrupt packed object for %s" msgstr "" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:572 #, c-format msgid "recursive delta detected for object %s" msgstr "" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:783 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:794 -#, c-format -msgid "packfile is invalid: %s" -msgstr "" - -#: builtin/pack-objects.c:798 -#, c-format -msgid "unable to open packfile for reuse: %s" -msgstr "" - -#: builtin/pack-objects.c:802 -msgid "unable to seek in reused packfile" -msgstr "" - -#: builtin/pack-objects.c:813 -msgid "unable to read from reused packfile" -msgstr "" - -#: builtin/pack-objects.c:841 +#: builtin/pack-objects.c:972 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:854 +#: builtin/pack-objects.c:985 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:917 builtin/update-index.c:89 +#: builtin/pack-objects.c:1046 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "" -#: builtin/pack-objects.c:970 +#: builtin/pack-objects.c:1099 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1164 +#: builtin/pack-objects.c:1297 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:1592 +#: builtin/pack-objects.c:1724 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "" -#: builtin/pack-objects.c:1601 +#: builtin/pack-objects.c:1733 #, c-format msgid "delta base offset out of bound for %s" msgstr "" -#: builtin/pack-objects.c:1870 +#: builtin/pack-objects.c:2004 msgid "Counting objects" msgstr "" -#: builtin/pack-objects.c:2000 -#, c-format -msgid "unable to get size of %s" -msgstr "" - -#: builtin/pack-objects.c:2015 +#: builtin/pack-objects.c:2149 #, c-format msgid "unable to parse object header of %s" msgstr "" -#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101 -#: builtin/pack-objects.c:2111 +#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 +#: builtin/pack-objects.c:2245 #, c-format msgid "object %s cannot be read" msgstr "" -#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115 +#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" -#: builtin/pack-objects.c:2125 +#: builtin/pack-objects.c:2259 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2440 +#: builtin/pack-objects.c:2574 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2713 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2801 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2807 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:2742 +#: builtin/pack-objects.c:2888 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2748 +#: builtin/pack-objects.c:2894 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2846 +#: builtin/pack-objects.c:2992 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013 +#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 msgid "cannot open pack index" msgstr "" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:3082 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3021 +#: builtin/pack-objects.c:3167 msgid "unable to force loose object" msgstr "" -#: builtin/pack-objects.c:3113 +#: builtin/pack-objects.c:3260 #, c-format msgid "not a rev '%s'" msgstr "" -#: builtin/pack-objects.c:3116 +#: builtin/pack-objects.c:3263 #, c-format msgid "bad revision '%s'" msgstr "" -#: builtin/pack-objects.c:3141 +#: builtin/pack-objects.c:3288 msgid "unable to add recent objects" msgstr "" -#: builtin/pack-objects.c:3194 +#: builtin/pack-objects.c:3341 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3198 +#: builtin/pack-objects.c:3345 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:3228 -msgid "do not show progress meter" -msgstr "" - -#: builtin/pack-objects.c:3230 -msgid "show progress meter" -msgstr "" - -#: builtin/pack-objects.c:3232 -msgid "show progress meter during object writing phase" -msgstr "" - -#: builtin/pack-objects.c:3235 -msgid "similar to --all-progress when progress meter is shown" -msgstr "" - -#: builtin/pack-objects.c:3236 +#: builtin/pack-objects.c:3383 msgid "<version>[,<offset>]" msgstr "" -#: builtin/pack-objects.c:3237 +#: builtin/pack-objects.c:3384 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3387 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3242 +#: builtin/pack-objects.c:3389 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3391 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3393 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3395 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3250 +#: builtin/pack-objects.c:3397 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3399 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3401 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3403 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3405 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3407 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3409 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3411 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3267 +#: builtin/pack-objects.c:3414 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3417 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3273 +#: builtin/pack-objects.c:3420 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3423 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3425 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3427 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3429 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3431 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3434 msgid "use the sparse reachability algorithm" msgstr "" -#: builtin/pack-objects.c:3289 +#: builtin/pack-objects.c:3436 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:3291 +#: builtin/pack-objects.c:3438 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3440 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:3295 +#: builtin/pack-objects.c:3442 msgid "ignore this pack" msgstr "" -#: builtin/pack-objects.c:3297 +#: builtin/pack-objects.c:3444 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:3299 +#: builtin/pack-objects.c:3446 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:3301 +#: builtin/pack-objects.c:3448 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:3303 +#: builtin/pack-objects.c:3450 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3454 msgid "write a bitmap index if possible" msgstr "" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3458 msgid "handling for missing objects" msgstr "" -#: builtin/pack-objects.c:3314 +#: builtin/pack-objects.c:3461 msgid "do not pack objects in promisor packfiles" msgstr "" -#: builtin/pack-objects.c:3316 +#: builtin/pack-objects.c:3463 msgid "respect islands during delta compression" msgstr "" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3492 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" -#: builtin/pack-objects.c:3350 +#: builtin/pack-objects.c:3497 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" -#: builtin/pack-objects.c:3404 +#: builtin/pack-objects.c:3551 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" -#: builtin/pack-objects.c:3406 +#: builtin/pack-objects.c:3553 msgid "minimum pack size limit is 1 MiB" msgstr "" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3558 msgid "--thin cannot be used to build an indexable pack" msgstr "" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3561 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3567 msgid "cannot use --filter without --stdout" msgstr "" -#: builtin/pack-objects.c:3481 +#: builtin/pack-objects.c:3627 msgid "Enumerating objects" msgstr "" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3657 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" msgstr "" #: builtin/pack-refs.c:8 @@ -15534,70 +16366,70 @@ msgstr "" msgid "cannot prune in a precious-objects repo" msgstr "" -#: builtin/pull.c:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/pull.c:142 +#: builtin/pull.c:122 msgid "control for recursive fetching of submodules" msgstr "" -#: builtin/pull.c:146 +#: builtin/pull.c:126 msgid "Options related to merging" msgstr "" -#: builtin/pull.c:149 +#: builtin/pull.c:129 msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126 +#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 msgid "allow fast-forward" msgstr "" -#: builtin/pull.c:186 +#: builtin/pull.c:166 msgid "automatically stash/stash pop before and after rebase" msgstr "" -#: builtin/pull.c:202 +#: builtin/pull.c:182 msgid "Options related to fetching" msgstr "" -#: builtin/pull.c:212 +#: builtin/pull.c:192 msgid "force overwrite of local branch" msgstr "" -#: builtin/pull.c:220 +#: builtin/pull.c:200 msgid "number of submodules pulled in parallel" msgstr "" -#: builtin/pull.c:320 +#: builtin/pull.c:300 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "" -#: builtin/pull.c:437 +#: builtin/pull.c:426 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:439 +#: builtin/pull.c:428 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:440 +#: builtin/pull.c:429 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:443 +#: builtin/pull.c:432 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -15605,74 +16437,74 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73 +#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "" -#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79 +#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" -#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82 +#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:453 builtin/pull.c:468 +#: builtin/pull.c:442 builtin/pull.c:457 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470 -#: builtin/rebase.c:1353 git-parse-remote.sh:64 +#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 +#: builtin/rebase.c:1415 git-parse-remote.sh:64 msgid "<remote>" msgstr "" -#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475 +#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "" -#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75 +#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:472 git-parse-remote.sh:95 +#: builtin/pull.c:461 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" -#: builtin/pull.c:477 +#: builtin/pull.c:466 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" -#: builtin/pull.c:587 +#: builtin/pull.c:576 #, c-format msgid "unable to access commit %s" msgstr "" -#: builtin/pull.c:867 +#: builtin/pull.c:857 msgid "ignoring --verify-signatures for rebase" msgstr "" -#: builtin/pull.c:922 +#: builtin/pull.c:912 msgid "--[no-]autostash option is only valid with --rebase." msgstr "" -#: builtin/pull.c:930 +#: builtin/pull.c:920 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:934 +#: builtin/pull.c:924 msgid "pull with rebase" msgstr "" -#: builtin/pull.c:935 +#: builtin/pull.c:925 msgid "please commit or stash them." msgstr "" -#: builtin/pull.c:960 +#: builtin/pull.c:950 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -15680,7 +16512,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:966 +#: builtin/pull.c:956 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -15691,15 +16523,15 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:981 +#: builtin/pull.c:971 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:985 +#: builtin/pull.c:975 msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/pull.c:992 +#: builtin/pull.c:982 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -15707,21 +16539,21 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/push.c:111 +#: builtin/push.c:112 msgid "tag shorthand without <tag>" msgstr "" -#: builtin/push.c:121 +#: builtin/push.c:122 msgid "--delete only accepts plain target ref names" msgstr "" -#: builtin/push.c:167 +#: builtin/push.c:168 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:170 +#: builtin/push.c:171 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -15736,7 +16568,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:185 +#: builtin/push.c:186 #, c-format msgid "" "You are not currently on a branch.\n" @@ -15746,7 +16578,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:199 +#: builtin/push.c:200 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -15755,12 +16587,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:207 +#: builtin/push.c:208 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:210 +#: builtin/push.c:211 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -15768,12 +16600,12 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:269 +#: builtin/push.c:270 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:276 +#: builtin/push.c:277 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -15781,7 +16613,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:282 +#: builtin/push.c:283 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -15789,7 +16621,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:288 +#: builtin/push.c:289 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -15798,110 +16630,110 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:295 +#: builtin/push.c:296 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:298 +#: builtin/push.c:299 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" -#: builtin/push.c:359 +#: builtin/push.c:360 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:366 +#: builtin/push.c:367 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:541 +#: builtin/push.c:542 msgid "repository" msgstr "" -#: builtin/push.c:542 builtin/send-pack.c:164 +#: builtin/push.c:543 builtin/send-pack.c:164 msgid "push all refs" msgstr "" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:544 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "" -#: builtin/push.c:545 +#: builtin/push.c:546 msgid "delete refs" msgstr "" -#: builtin/push.c:546 +#: builtin/push.c:547 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:549 builtin/send-pack.c:167 +#: builtin/push.c:550 builtin/send-pack.c:167 msgid "force updates" msgstr "" -#: builtin/push.c:551 builtin/send-pack.c:181 +#: builtin/push.c:552 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "" -#: builtin/push.c:552 builtin/send-pack.c:182 +#: builtin/push.c:553 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:555 +#: builtin/push.c:556 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:557 builtin/send-pack.c:175 +#: builtin/push.c:558 builtin/send-pack.c:175 msgid "use thin pack" msgstr "" -#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161 +#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "" -#: builtin/push.c:560 +#: builtin/push.c:561 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:563 +#: builtin/push.c:564 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:565 +#: builtin/push.c:566 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:566 +#: builtin/push.c:567 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:569 builtin/send-pack.c:169 +#: builtin/push.c:570 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:571 builtin/send-pack.c:176 +#: builtin/push.c:572 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "" -#: builtin/push.c:589 +#: builtin/push.c:590 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:591 +#: builtin/push.c:592 msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/push.c:611 +#: builtin/push.c:612 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:612 +#: builtin/push.c:613 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -15914,27 +16746,27 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:627 +#: builtin/push.c:628 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:629 +#: builtin/push.c:630 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:633 +#: builtin/push.c:634 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:635 +#: builtin/push.c:636 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:638 +#: builtin/push.c:639 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:642 +#: builtin/push.c:643 msgid "push options must not have new line characters" msgstr "" @@ -15950,24 +16782,32 @@ msgstr "" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "" -#: builtin/range-diff.c:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: builtin/range-diff.c:26 +msgid "notes" +msgstr "" + +#: builtin/range-diff.c:26 +msgid "passed to 'git log'" +msgstr "" + +#: builtin/range-diff.c:50 builtin/range-diff.c:54 #, c-format msgid "no .. in range: '%s'" msgstr "" -#: builtin/range-diff.c:60 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "" @@ -16046,6 +16886,10 @@ msgstr "" msgid "suppress feedback messages" msgstr "" +#: builtin/read-tree.c:188 +msgid "You need to resolve your current index first" +msgstr "" + #: builtin/rebase.c:32 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " @@ -16061,216 +16905,207 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 #, c-format msgid "unusable todo list: '%s'" msgstr "" -#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 -#, c-format -msgid "could not write '%s'." -msgstr "" - -#: builtin/rebase.c:252 -msgid "no HEAD?" -msgstr "" - -#: builtin/rebase.c:279 +#: builtin/rebase.c:292 #, c-format msgid "could not create temporary %s" msgstr "" -#: builtin/rebase.c:285 +#: builtin/rebase.c:298 msgid "could not mark as interactive" msgstr "" -#: builtin/rebase.c:343 +#: builtin/rebase.c:352 msgid "could not generate todo list" msgstr "" -#: builtin/rebase.c:383 +#: builtin/rebase.c:391 msgid "a base commit must be provided with --upstream or --onto" msgstr "" -#: builtin/rebase.c:438 +#: builtin/rebase.c:461 msgid "git rebase--interactive [<options>]" msgstr "" -#: builtin/rebase.c:450 -msgid "keep empty commits" +#: builtin/rebase.c:474 builtin/rebase.c:1550 +msgid "(DEPRECATED) keep empty commits" msgstr "" -#: builtin/rebase.c:452 builtin/revert.c:128 +#: builtin/rebase.c:478 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "" -#: builtin/rebase.c:453 +#: builtin/rebase.c:480 msgid "rebase merge commits" msgstr "" -#: builtin/rebase.c:455 +#: builtin/rebase.c:482 msgid "keep original branch points of cousins" msgstr "" -#: builtin/rebase.c:457 +#: builtin/rebase.c:484 msgid "move commits that begin with squash!/fixup!" msgstr "" -#: builtin/rebase.c:458 +#: builtin/rebase.c:485 msgid "sign commits" msgstr "" -#: builtin/rebase.c:460 builtin/rebase.c:1427 +#: builtin/rebase.c:487 builtin/rebase.c:1490 msgid "display a diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:462 +#: builtin/rebase.c:489 msgid "continue rebase" msgstr "" -#: builtin/rebase.c:464 +#: builtin/rebase.c:491 msgid "skip commit" msgstr "" -#: builtin/rebase.c:465 +#: builtin/rebase.c:492 msgid "edit the todo list" msgstr "" -#: builtin/rebase.c:467 +#: builtin/rebase.c:494 msgid "show the current patch" msgstr "" -#: builtin/rebase.c:470 +#: builtin/rebase.c:497 msgid "shorten commit ids in the todo list" msgstr "" -#: builtin/rebase.c:472 +#: builtin/rebase.c:499 msgid "expand commit ids in the todo list" msgstr "" -#: builtin/rebase.c:474 +#: builtin/rebase.c:501 msgid "check the todo list" msgstr "" -#: builtin/rebase.c:476 +#: builtin/rebase.c:503 msgid "rearrange fixup/squash lines" msgstr "" -#: builtin/rebase.c:478 +#: builtin/rebase.c:505 msgid "insert exec commands in todo list" msgstr "" -#: builtin/rebase.c:479 +#: builtin/rebase.c:506 msgid "onto" msgstr "" -#: builtin/rebase.c:482 +#: builtin/rebase.c:509 msgid "restrict-revision" msgstr "" -#: builtin/rebase.c:482 +#: builtin/rebase.c:509 msgid "restrict revision" msgstr "" -#: builtin/rebase.c:484 +#: builtin/rebase.c:511 msgid "squash-onto" msgstr "" -#: builtin/rebase.c:485 +#: builtin/rebase.c:512 msgid "squash onto" msgstr "" -#: builtin/rebase.c:487 +#: builtin/rebase.c:514 msgid "the upstream commit" msgstr "" -#: builtin/rebase.c:489 +#: builtin/rebase.c:516 msgid "head-name" msgstr "" -#: builtin/rebase.c:489 +#: builtin/rebase.c:516 msgid "head name" msgstr "" -#: builtin/rebase.c:494 +#: builtin/rebase.c:521 msgid "rebase strategy" msgstr "" -#: builtin/rebase.c:495 +#: builtin/rebase.c:522 msgid "strategy-opts" msgstr "" -#: builtin/rebase.c:496 +#: builtin/rebase.c:523 msgid "strategy options" msgstr "" -#: builtin/rebase.c:497 +#: builtin/rebase.c:524 msgid "switch-to" msgstr "" -#: builtin/rebase.c:498 +#: builtin/rebase.c:525 msgid "the branch or commit to checkout" msgstr "" -#: builtin/rebase.c:499 +#: builtin/rebase.c:526 msgid "onto-name" msgstr "" -#: builtin/rebase.c:499 +#: builtin/rebase.c:526 msgid "onto name" msgstr "" -#: builtin/rebase.c:500 +#: builtin/rebase.c:527 msgid "cmd" msgstr "" -#: builtin/rebase.c:500 +#: builtin/rebase.c:527 msgid "the command to run" msgstr "" -#: builtin/rebase.c:503 builtin/rebase.c:1510 +#: builtin/rebase.c:530 builtin/rebase.c:1584 msgid "automatically re-schedule any `exec` that fails" msgstr "" -#: builtin/rebase.c:519 +#: builtin/rebase.c:546 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "" -#: builtin/rebase.c:535 +#: builtin/rebase.c:562 #, c-format msgid "%s requires an interactive rebase" msgstr "" -#: builtin/rebase.c:587 +#: builtin/rebase.c:612 #, c-format msgid "could not get 'onto': '%s'" msgstr "" -#: builtin/rebase.c:602 +#: builtin/rebase.c:627 #, c-format msgid "invalid orig-head: '%s'" msgstr "" -#: builtin/rebase.c:627 +#: builtin/rebase.c:652 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "" -#: builtin/rebase.c:703 +#: builtin/rebase.c:728 #, c-format msgid "Could not read '%s'" msgstr "" -#: builtin/rebase.c:721 +#: builtin/rebase.c:746 #, c-format msgid "Cannot store %s" msgstr "" -#: builtin/rebase.c:828 +#: builtin/rebase.c:853 msgid "could not determine HEAD revision" msgstr "" -#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -16279,7 +17114,7 @@ msgid "" "abort\"." msgstr "" -#: builtin/rebase.c:1032 +#: builtin/rebase.c:1058 #, c-format msgid "" "\n" @@ -16291,7 +17126,14 @@ msgid "" "As a result, git cannot rebase them." msgstr "" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1383 +#, c-format +msgid "" +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" +"\"." +msgstr "" + +#: builtin/rebase.c:1401 #, c-format msgid "" "%s\n" @@ -16302,7 +17144,7 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1355 +#: builtin/rebase.c:1417 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -16311,181 +17153,185 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1385 +#: builtin/rebase.c:1447 msgid "exec commands cannot contain newlines" msgstr "" -#: builtin/rebase.c:1389 +#: builtin/rebase.c:1451 msgid "empty exec command" msgstr "" -#: builtin/rebase.c:1418 +#: builtin/rebase.c:1481 msgid "rebase onto given branch instead of upstream" msgstr "" -#: builtin/rebase.c:1420 +#: builtin/rebase.c:1483 msgid "use the merge-base of upstream and branch as the current base" msgstr "" -#: builtin/rebase.c:1422 +#: builtin/rebase.c:1485 msgid "allow pre-rebase hook to run" msgstr "" -#: builtin/rebase.c:1424 +#: builtin/rebase.c:1487 msgid "be quiet. implies --no-stat" msgstr "" -#: builtin/rebase.c:1430 +#: builtin/rebase.c:1493 msgid "do not show diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1496 msgid "add a Signed-off-by: line to each commit" msgstr "" -#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441 +#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 msgid "passed to 'git am'" msgstr "" -#: builtin/rebase.c:1443 builtin/rebase.c:1445 +#: builtin/rebase.c:1506 builtin/rebase.c:1508 msgid "passed to 'git apply'" msgstr "" -#: builtin/rebase.c:1447 builtin/rebase.c:1450 +#: builtin/rebase.c:1510 builtin/rebase.c:1513 msgid "cherry-pick all commits, even if unchanged" msgstr "" -#: builtin/rebase.c:1452 +#: builtin/rebase.c:1515 msgid "continue" msgstr "" -#: builtin/rebase.c:1455 +#: builtin/rebase.c:1518 msgid "skip current patch and continue" msgstr "" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1520 msgid "abort and check out the original branch" msgstr "" -#: builtin/rebase.c:1460 +#: builtin/rebase.c:1523 msgid "abort but keep HEAD where it is" msgstr "" -#: builtin/rebase.c:1461 +#: builtin/rebase.c:1524 msgid "edit the todo list during an interactive rebase" msgstr "" -#: builtin/rebase.c:1464 +#: builtin/rebase.c:1527 msgid "show the patch file being applied or merged" msgstr "" -#: builtin/rebase.c:1467 +#: builtin/rebase.c:1530 +msgid "use apply strategies to rebase" +msgstr "" + +#: builtin/rebase.c:1534 msgid "use merging strategies to rebase" msgstr "" -#: builtin/rebase.c:1471 +#: builtin/rebase.c:1538 msgid "let the user edit the list of commits to rebase" msgstr "" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1542 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" -#: builtin/rebase.c:1479 -msgid "preserve empty commits during rebase" +#: builtin/rebase.c:1547 +msgid "how to handle commits that become empty" msgstr "" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1554 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1560 msgid "automatically stash/stash pop before and after" msgstr "" -#: builtin/rebase.c:1489 +#: builtin/rebase.c:1562 msgid "add exec lines after each commit of the editable list" msgstr "" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1566 msgid "allow rebasing commits with empty messages" msgstr "" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1570 msgid "try to rebase merges instead of skipping them" msgstr "" -#: builtin/rebase.c:1499 +#: builtin/rebase.c:1573 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" -#: builtin/rebase.c:1501 +#: builtin/rebase.c:1575 msgid "use the given merge strategy" msgstr "" -#: builtin/rebase.c:1503 builtin/revert.c:115 +#: builtin/rebase.c:1577 builtin/revert.c:115 msgid "option" msgstr "" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1578 msgid "pass the argument through to the merge strategy" msgstr "" -#: builtin/rebase.c:1507 +#: builtin/rebase.c:1581 msgid "rebase all reachable commits up to the root(s)" msgstr "" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1598 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" -#: builtin/rebase.c:1530 +#: builtin/rebase.c:1604 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" -#: builtin/rebase.c:1571 +#: builtin/rebase.c:1645 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" -#: builtin/rebase.c:1576 +#: builtin/rebase.c:1650 msgid "cannot combine '--keep-base' with '--onto'" msgstr "" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1652 msgid "cannot combine '--keep-base' with '--root'" msgstr "" -#: builtin/rebase.c:1582 +#: builtin/rebase.c:1656 msgid "No rebase in progress?" msgstr "" -#: builtin/rebase.c:1586 +#: builtin/rebase.c:1660 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1683 msgid "Cannot read HEAD" msgstr "" -#: builtin/rebase.c:1621 +#: builtin/rebase.c:1695 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: builtin/rebase.c:1640 +#: builtin/rebase.c:1714 msgid "could not discard worktree changes" msgstr "" -#: builtin/rebase.c:1659 +#: builtin/rebase.c:1733 #, c-format msgid "could not move back to %s" msgstr "" -#: builtin/rebase.c:1704 +#: builtin/rebase.c:1778 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -16498,163 +17344,163 @@ msgid "" "valuable there.\n" msgstr "" -#: builtin/rebase.c:1725 +#: builtin/rebase.c:1806 msgid "switch `C' expects a numerical value" msgstr "" -#: builtin/rebase.c:1766 +#: builtin/rebase.c:1847 #, c-format msgid "Unknown mode: %s" msgstr "" -#: builtin/rebase.c:1788 +#: builtin/rebase.c:1869 msgid "--strategy requires --merge or --interactive" msgstr "" -#: builtin/rebase.c:1828 -msgid "--reschedule-failed-exec requires --exec or --interactive" +#: builtin/rebase.c:1899 +msgid "cannot combine apply options with merge options" msgstr "" -#: builtin/rebase.c:1840 -msgid "cannot combine am options with either interactive or merge options" +#: builtin/rebase.c:1912 +#, c-format +msgid "Unknown rebase backend: %s" +msgstr "" + +#: builtin/rebase.c:1937 +msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "" -#: builtin/rebase.c:1859 +#: builtin/rebase.c:1957 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "" -#: builtin/rebase.c:1863 +#: builtin/rebase.c:1961 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" -#: builtin/rebase.c:1887 +#: builtin/rebase.c:1985 #, c-format msgid "invalid upstream '%s'" msgstr "" -#: builtin/rebase.c:1893 +#: builtin/rebase.c:1991 msgid "Could not create new root commit" msgstr "" -#: builtin/rebase.c:1919 +#: builtin/rebase.c:2017 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "" -#: builtin/rebase.c:1922 +#: builtin/rebase.c:2020 #, c-format msgid "'%s': need exactly one merge base" msgstr "" -#: builtin/rebase.c:1930 +#: builtin/rebase.c:2028 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "" -#: builtin/rebase.c:1955 +#: builtin/rebase.c:2054 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "" -#: builtin/rebase.c:1963 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:1990 #, c-format msgid "No such ref: %s" msgstr "" -#: builtin/rebase.c:1974 +#: builtin/rebase.c:2073 msgid "Could not resolve HEAD to a revision" msgstr "" -#: builtin/rebase.c:2012 +#: builtin/rebase.c:2111 msgid "Cannot autostash" msgstr "" -#: builtin/rebase.c:2015 +#: builtin/rebase.c:2114 #, c-format msgid "Unexpected stash response: '%s'" msgstr "" -#: builtin/rebase.c:2021 +#: builtin/rebase.c:2120 #, c-format msgid "Could not create directory for '%s'" msgstr "" -#: builtin/rebase.c:2024 +#: builtin/rebase.c:2123 #, c-format msgid "Created autostash: %s\n" msgstr "" -#: builtin/rebase.c:2027 +#: builtin/rebase.c:2126 msgid "could not reset --hard" msgstr "" -#: builtin/rebase.c:2036 +#: builtin/rebase.c:2135 msgid "Please commit or stash them." msgstr "" -#: builtin/rebase.c:2063 -#, c-format -msgid "could not parse '%s'" -msgstr "" - -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2169 #, c-format msgid "could not switch to %s" msgstr "" -#: builtin/rebase.c:2087 +#: builtin/rebase.c:2180 msgid "HEAD is up to date." msgstr "" -#: builtin/rebase.c:2089 +#: builtin/rebase.c:2182 #, c-format msgid "Current branch %s is up to date.\n" msgstr "" -#: builtin/rebase.c:2097 +#: builtin/rebase.c:2190 msgid "HEAD is up to date, rebase forced." msgstr "" -#: builtin/rebase.c:2099 +#: builtin/rebase.c:2192 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "" -#: builtin/rebase.c:2107 +#: builtin/rebase.c:2200 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: builtin/rebase.c:2114 +#: builtin/rebase.c:2207 #, c-format msgid "Changes to %s:\n" msgstr "" -#: builtin/rebase.c:2117 +#: builtin/rebase.c:2210 #, c-format msgid "Changes from %s to %s:\n" msgstr "" -#: builtin/rebase.c:2142 +#: builtin/rebase.c:2235 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" -#: builtin/rebase.c:2151 +#: builtin/rebase.c:2244 msgid "Could not detach HEAD" msgstr "" -#: builtin/rebase.c:2160 +#: builtin/rebase.c:2253 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:33 msgid "git receive-pack <git-dir>" msgstr "" -#: builtin/receive-pack.c:830 +#: builtin/receive-pack.c:821 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" @@ -16671,7 +17517,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -#: builtin/receive-pack.c:850 +#: builtin/receive-pack.c:841 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" @@ -16683,11 +17529,11 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" -#: builtin/receive-pack.c:1936 +#: builtin/receive-pack.c:1938 msgid "quiet" msgstr "" -#: builtin/receive-pack.c:1950 +#: builtin/receive-pack.c:1952 msgid "You must specify a directory." msgstr "" @@ -16708,210 +17554,223 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "" -#: builtin/reflog.c:605 +#: builtin/reflog.c:606 #, c-format msgid "Marking reachable objects..." msgstr "" -#: builtin/reflog.c:643 +#: builtin/reflog.c:644 #, c-format msgid "%s points nowhere!" msgstr "" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 msgid "no reflog specified to delete" msgstr "" -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, c-format msgid "not a reflog: %s" msgstr "" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, c-format msgid "no reflog for '%s'" msgstr "" -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" msgstr "" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "" -#: builtin/remote.c:20 builtin/remote.c:48 +#: builtin/remote.c:21 builtin/remote.c:49 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "" -#: builtin/remote.c:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "" -#: builtin/remote.c:23 +#: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" -#: builtin/remote.c:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "" -#: builtin/remote.c:25 builtin/remote.c:74 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "" -#: builtin/remote.c:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "" -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "" -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "" -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" msgstr "" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "" -#: builtin/remote.c:173 +#: builtin/remote.c:174 msgid "set up remote as a mirror to push to or fetch from" msgstr "" -#: builtin/remote.c:185 +#: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "" -#: builtin/remote.c:187 +#: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:696 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:700 #, c-format msgid "'%s' is not a valid remote name" msgstr "" -#: builtin/remote.c:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" -#: builtin/remote.c:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:653 +#, c-format +msgid "could not set '%s'" +msgstr "" + +#: builtin/remote.c:658 +#, c-format +msgid "" +"The %s configuration remote.pushDefault in:\n" +"\t%s:%d\n" +"now names the non-existent remote '%s'" +msgstr "" + +#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 #, c-format msgid "No such remote: '%s'" msgstr "" -#: builtin/remote.c:646 +#: builtin/remote.c:706 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:666 +#: builtin/remote.c:726 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -16919,17 +17778,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:702 +#: builtin/remote.c:766 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:736 +#: builtin/remote.c:800 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:802 +#: builtin/remote.c:876 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -16939,118 +17798,118 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:816 +#: builtin/remote.c:890 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:917 +#: builtin/remote.c:993 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:920 +#: builtin/remote.c:996 msgid " tracked" msgstr "" -#: builtin/remote.c:922 +#: builtin/remote.c:998 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:924 +#: builtin/remote.c:1000 msgid " ???" msgstr "" -#: builtin/remote.c:965 +#: builtin/remote.c:1041 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:974 +#: builtin/remote.c:1050 #, c-format msgid "rebases interactively onto remote %s" msgstr "" -#: builtin/remote.c:976 +#: builtin/remote.c:1052 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "" -#: builtin/remote.c:979 +#: builtin/remote.c:1055 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:983 +#: builtin/remote.c:1059 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:986 +#: builtin/remote.c:1062 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:989 +#: builtin/remote.c:1065 #, c-format msgid "%-*s and with remote %s\n" msgstr "" -#: builtin/remote.c:1032 +#: builtin/remote.c:1108 msgid "create" msgstr "" -#: builtin/remote.c:1035 +#: builtin/remote.c:1111 msgid "delete" msgstr "" -#: builtin/remote.c:1039 +#: builtin/remote.c:1115 msgid "up to date" msgstr "" -#: builtin/remote.c:1042 +#: builtin/remote.c:1118 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1045 +#: builtin/remote.c:1121 msgid "local out of date" msgstr "" -#: builtin/remote.c:1052 +#: builtin/remote.c:1128 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1055 +#: builtin/remote.c:1131 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1059 +#: builtin/remote.c:1135 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1062 +#: builtin/remote.c:1138 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1130 +#: builtin/remote.c:1206 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1157 +#: builtin/remote.c:1233 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1158 +#: builtin/remote.c:1234 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 msgid "(no URL)" msgstr "" @@ -17058,188 +17917,179 @@ msgstr "" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1249 builtin/remote.c:1251 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1177 +#: builtin/remote.c:1253 msgid "(not queried)" msgstr "" -#: builtin/remote.c:1179 +#: builtin/remote.c:1255 msgid "(unknown)" msgstr "" -#: builtin/remote.c:1183 +#: builtin/remote.c:1259 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1195 +#: builtin/remote.c:1271 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1274 builtin/remote.c:1300 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1207 +#: builtin/remote.c:1283 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1215 +#: builtin/remote.c:1291 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1221 +#: builtin/remote.c:1297 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1242 +#: builtin/remote.c:1318 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1244 +#: builtin/remote.c:1320 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1259 +#: builtin/remote.c:1335 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1261 +#: builtin/remote.c:1337 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1271 +#: builtin/remote.c:1347 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1279 +#: builtin/remote.c:1355 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1281 +#: builtin/remote.c:1357 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1299 +#: builtin/remote.c:1375 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1300 +#: builtin/remote.c:1376 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1310 +#: builtin/remote.c:1386 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1311 +#: builtin/remote.c:1387 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1327 +#: builtin/remote.c:1403 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1330 +#: builtin/remote.c:1406 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1375 +#: builtin/remote.c:1451 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1454 +#: builtin/remote.c:1530 msgid "add branch" msgstr "" -#: builtin/remote.c:1461 +#: builtin/remote.c:1537 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1478 +#: builtin/remote.c:1554 msgid "query push URLs rather than fetch URLs" msgstr "" -#: builtin/remote.c:1480 +#: builtin/remote.c:1556 msgid "return all URLs" msgstr "" -#: builtin/remote.c:1508 +#: builtin/remote.c:1584 #, c-format msgid "no URLs configured for remote '%s'" msgstr "" -#: builtin/remote.c:1534 +#: builtin/remote.c:1610 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1536 +#: builtin/remote.c:1612 msgid "add URL" msgstr "" -#: builtin/remote.c:1538 +#: builtin/remote.c:1614 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1545 +#: builtin/remote.c:1621 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1584 +#: builtin/remote.c:1660 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1592 +#: builtin/remote.c:1668 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1594 +#: builtin/remote.c:1670 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/remote.c:1610 -msgid "be verbose; must be placed before a subcommand" -msgstr "" - -#: builtin/remote.c:1641 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "" - #: builtin/repack.c:23 msgid "git repack [<options>]" msgstr "" @@ -17254,107 +18104,107 @@ msgstr "" msgid "could not start pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:230 builtin/repack.c:409 +#: builtin/repack.c:230 builtin/repack.c:416 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -#: builtin/repack.c:247 +#: builtin/repack.c:254 msgid "could not finish pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:285 +#: builtin/repack.c:292 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:287 +#: builtin/repack.c:294 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:290 +#: builtin/repack.c:297 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:292 +#: builtin/repack.c:299 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:294 +#: builtin/repack.c:301 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:296 +#: builtin/repack.c:303 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:299 +#: builtin/repack.c:306 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:301 +#: builtin/repack.c:308 msgid "write bitmap index" msgstr "" -#: builtin/repack.c:303 +#: builtin/repack.c:310 msgid "pass --delta-islands to git-pack-objects" msgstr "" -#: builtin/repack.c:304 +#: builtin/repack.c:311 msgid "approxidate" msgstr "" -#: builtin/repack.c:305 +#: builtin/repack.c:312 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:307 +#: builtin/repack.c:314 msgid "with -a, repack unreachable objects" msgstr "" -#: builtin/repack.c:309 +#: builtin/repack.c:316 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:310 builtin/repack.c:316 +#: builtin/repack.c:317 builtin/repack.c:323 msgid "bytes" msgstr "" -#: builtin/repack.c:311 +#: builtin/repack.c:318 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:313 +#: builtin/repack.c:320 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:315 +#: builtin/repack.c:322 msgid "limits the maximum number of threads" msgstr "" -#: builtin/repack.c:317 +#: builtin/repack.c:324 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:319 +#: builtin/repack.c:326 msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:321 +#: builtin/repack.c:328 msgid "do not repack this pack" msgstr "" -#: builtin/repack.c:331 +#: builtin/repack.c:338 msgid "cannot delete packs in a precious-objects repo" msgstr "" -#: builtin/repack.c:335 +#: builtin/repack.c:342 msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:418 +#: builtin/repack.c:425 msgid "Nothing new to pack." msgstr "" -#: builtin/repack.c:479 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -17366,7 +18216,7 @@ msgid "" "WARNING: Please rename them in %s manually:\n" msgstr "" -#: builtin/repack.c:527 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "" @@ -17469,8 +18319,8 @@ msgstr "" msgid "unable to write object to database" msgstr "" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423 -#: builtin/replace.c:453 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 +#: builtin/replace.c:454 #, c-format msgid "not a valid object name: '%s'" msgstr "" @@ -17494,119 +18344,119 @@ msgstr "" msgid "could not parse %s as a commit" msgstr "" -#: builtin/replace.c:415 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:417 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:429 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "" -#: builtin/replace.c:468 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "" -#: builtin/replace.c:469 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "" -#: builtin/replace.c:479 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "" -#: builtin/replace.c:487 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "" -#: builtin/replace.c:491 +#: builtin/replace.c:492 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "" -#: builtin/replace.c:526 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" "%s" msgstr "" -#: builtin/replace.c:547 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "" -#: builtin/replace.c:548 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "" -#: builtin/replace.c:549 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "" -#: builtin/replace.c:550 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "" -#: builtin/replace.c:551 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "" -#: builtin/replace.c:552 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "" -#: builtin/replace.c:554 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "" -#: builtin/replace.c:555 +#: builtin/replace.c:556 msgid "use this format" msgstr "" -#: builtin/replace.c:568 +#: builtin/replace.c:569 msgid "--format cannot be used when not listing" msgstr "" -#: builtin/replace.c:576 +#: builtin/replace.c:577 msgid "-f only makes sense when writing a replacement" msgstr "" -#: builtin/replace.c:580 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "" -#: builtin/replace.c:586 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "" -#: builtin/replace.c:592 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "" -#: builtin/replace.c:598 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "" -#: builtin/replace.c:604 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "" -#: builtin/replace.c:610 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "" -#: builtin/replace.c:616 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "" @@ -17633,118 +18483,123 @@ msgid "" msgstr "" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." msgstr "" #: builtin/reset.c:34 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgid "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" +msgstr "" + +#: builtin/reset.c:35 +msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" msgstr "" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "mixed" msgstr "" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "" -#: builtin/reset.c:81 +#: builtin/reset.c:82 msgid "You do not have a valid HEAD." msgstr "" -#: builtin/reset.c:83 +#: builtin/reset.c:84 msgid "Failed to find tree of HEAD." msgstr "" -#: builtin/reset.c:89 +#: builtin/reset.c:90 #, c-format msgid "Failed to find tree of %s." msgstr "" -#: builtin/reset.c:114 +#: builtin/reset.c:115 #, c-format msgid "HEAD is now at %s" msgstr "" -#: builtin/reset.c:193 +#: builtin/reset.c:194 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 #: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:295 +#: builtin/reset.c:296 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:296 +#: builtin/reset.c:297 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:299 builtin/reset.c:301 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:302 +#: builtin/reset.c:303 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:308 +#: builtin/reset.c:309 msgid "record only the fact that removed paths will be added later" msgstr "" -#: builtin/reset.c:326 +#: builtin/reset.c:343 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "" -#: builtin/reset.c:334 +#: builtin/reset.c:351 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "" -#: builtin/reset.c:343 +#: builtin/reset.c:360 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:353 +#: builtin/reset.c:370 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:355 +#: builtin/reset.c:372 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:370 +#: builtin/reset.c:387 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:374 +#: builtin/reset.c:391 msgid "-N can only be used with --mixed" msgstr "" -#: builtin/reset.c:395 +#: builtin/reset.c:412 msgid "Unstaged changes after reset:" msgstr "" -#: builtin/reset.c:398 +#: builtin/reset.c:415 #, c-format msgid "" "\n" @@ -17753,29 +18608,29 @@ msgid "" "to make this the default.\n" msgstr "" -#: builtin/reset.c:408 +#: builtin/reset.c:425 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/reset.c:412 +#: builtin/reset.c:429 msgid "Could not write new index file." msgstr "" -#: builtin/rev-list.c:411 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" -#: builtin/rev-list.c:472 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "" -#: builtin/rev-list.c:522 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "" -#: builtin/rev-list.c:525 -msgid "cannot combine --use-bitmap-index with object filtering" +#: builtin/rev-list.c:615 +msgid "marked counting is incompatible with --objects" msgstr "" #: builtin/rev-parse.c:408 @@ -17927,36 +18782,40 @@ msgid_plural "the following files have local modifications:" msgstr[0] "" msgstr[1] "" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:289 +#: builtin/rm.c:282 +msgid "No pathspec was given. Which files should I remove?" +msgstr "" + +#: builtin/rm.c:305 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" -#: builtin/rm.c:307 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" msgstr "" -#: builtin/rm.c:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "" @@ -18193,15 +19052,82 @@ msgstr "" msgid "show refs from stdin that aren't in local repository" msgstr "" -#: builtin/stash.c:22 builtin/stash.c:37 +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|disable) <options>" +msgstr "" + +#: builtin/sparse-checkout.c:64 +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "" + +#: builtin/sparse-checkout.c:225 +msgid "failed to create directory for sparse-checkout file" +msgstr "" + +#: builtin/sparse-checkout.c:266 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "" + +#: builtin/sparse-checkout.c:283 +msgid "git sparse-checkout init [--cone]" +msgstr "" + +#: builtin/sparse-checkout.c:302 +msgid "initialize the sparse-checkout in cone mode" +msgstr "" + +#: builtin/sparse-checkout.c:308 +msgid "initialize sparse-checkout" +msgstr "" + +#: builtin/sparse-checkout.c:341 +#, c-format +msgid "failed to open '%s'" +msgstr "" + +#: builtin/sparse-checkout.c:398 +#, c-format +msgid "could not normalize path %s" +msgstr "" + +#: builtin/sparse-checkout.c:410 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "" + +#: builtin/sparse-checkout.c:435 +#, c-format +msgid "unable to unquote C-style string '%s'" +msgstr "" + +#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 +msgid "unable to load existing sparse-checkout patterns" +msgstr "" + +#: builtin/sparse-checkout.c:558 +msgid "read patterns from standard in" +msgstr "" + +#: builtin/sparse-checkout.c:564 +msgid "set sparse-checkout patterns" +msgstr "" + +#: builtin/sparse-checkout.c:581 +msgid "disable sparse-checkout" +msgstr "" + +#: builtin/sparse-checkout.c:593 +msgid "error while refreshing working directory" +msgstr "" + +#: builtin/stash.c:22 builtin/stash.c:38 msgid "git stash list [<options>]" msgstr "" -#: builtin/stash.c:23 builtin/stash.c:42 +#: builtin/stash.c:23 builtin/stash.c:43 msgid "git stash show [<options>] [<stash>]" msgstr "" -#: builtin/stash.c:24 builtin/stash.c:47 +#: builtin/stash.c:24 builtin/stash.c:48 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "" @@ -18209,89 +19135,97 @@ msgstr "" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "" -#: builtin/stash.c:26 builtin/stash.c:62 +#: builtin/stash.c:26 builtin/stash.c:63 msgid "git stash branch <branchname> [<stash>]" msgstr "" -#: builtin/stash.c:27 builtin/stash.c:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" msgstr "" -#: builtin/stash.c:28 builtin/stash.c:77 +#: builtin/stash.c:28 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" -#: builtin/stash.c:31 builtin/stash.c:84 +#: builtin/stash.c:32 builtin/stash.c:85 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" msgstr "" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "" -#: builtin/stash.c:72 +#: builtin/stash.c:73 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "" -#: builtin/stash.c:127 +#: builtin/stash.c:78 +msgid "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--] [<pathspec>...]]" +msgstr "" + +#: builtin/stash.c:128 #, c-format msgid "'%s' is not a stash-like commit" msgstr "" -#: builtin/stash.c:147 +#: builtin/stash.c:148 #, c-format msgid "Too many revisions specified:%s" msgstr "" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:162 git-legacy-stash.sh:549 msgid "No stash entries found." msgstr "" -#: builtin/stash.c:175 +#: builtin/stash.c:176 #, c-format msgid "%s is not a valid reference" msgstr "" -#: builtin/stash.c:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 git-legacy-stash.sh:75 msgid "git stash clear with parameters is unimplemented" msgstr "" -#: builtin/stash.c:403 +#: builtin/stash.c:404 msgid "cannot apply a stash in the middle of a merge" msgstr "" -#: builtin/stash.c:414 +#: builtin/stash.c:415 #, c-format msgid "could not generate diff %s^!." msgstr "" -#: builtin/stash.c:421 +#: builtin/stash.c:422 msgid "conflicts in index.Try without --index." msgstr "" -#: builtin/stash.c:427 +#: builtin/stash.c:428 msgid "could not save index tree" msgstr "" -#: builtin/stash.c:436 +#: builtin/stash.c:437 msgid "could not restore untracked files from stash" msgstr "" -#: builtin/stash.c:450 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "" -#: builtin/stash.c:460 git-legacy-stash.sh:680 +#: builtin/stash.c:461 git-legacy-stash.sh:681 msgid "Index was not unstashed." msgstr "" @@ -18314,11 +19248,11 @@ msgstr "" msgid "'%s' is not a stash reference" msgstr "" -#: builtin/stash.c:633 git-legacy-stash.sh:694 +#: builtin/stash.c:633 git-legacy-stash.sh:695 msgid "The stash entry is kept in case you need it again." msgstr "" -#: builtin/stash.c:656 git-legacy-stash.sh:712 +#: builtin/stash.c:656 git-legacy-stash.sh:713 msgid "No branch name specified" msgstr "" @@ -18327,7 +19261,7 @@ msgstr "" msgid "Cannot update %s with %s" msgstr "" -#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506 +#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 msgid "stash message" msgstr "" @@ -18335,81 +19269,81 @@ msgstr "" msgid "\"git stash store\" requires one <commit> argument" msgstr "" -#: builtin/stash.c:1046 git-legacy-stash.sh:217 +#: builtin/stash.c:1049 git-legacy-stash.sh:218 msgid "No changes selected" msgstr "" -#: builtin/stash.c:1145 git-legacy-stash.sh:150 +#: builtin/stash.c:1149 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "" -#: builtin/stash.c:1172 git-legacy-stash.sh:165 +#: builtin/stash.c:1176 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "" -#: builtin/stash.c:1181 git-legacy-stash.sh:180 +#: builtin/stash.c:1185 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "" -#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 +#: git-legacy-stash.sh:214 msgid "Cannot save the current worktree state" msgstr "" -#: builtin/stash.c:1229 git-legacy-stash.sh:233 +#: builtin/stash.c:1233 git-legacy-stash.sh:234 msgid "Cannot record working tree state" msgstr "" -#: builtin/stash.c:1278 git-legacy-stash.sh:337 +#: builtin/stash.c:1282 git-legacy-stash.sh:338 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" -#: builtin/stash.c:1294 +#: builtin/stash.c:1298 msgid "Did you forget to 'git add'?" msgstr "" -#: builtin/stash.c:1309 git-legacy-stash.sh:345 +#: builtin/stash.c:1313 git-legacy-stash.sh:346 msgid "No local changes to save" msgstr "" -#: builtin/stash.c:1316 git-legacy-stash.sh:350 +#: builtin/stash.c:1320 git-legacy-stash.sh:351 msgid "Cannot initialize stash" msgstr "" -#: builtin/stash.c:1331 git-legacy-stash.sh:354 +#: builtin/stash.c:1335 git-legacy-stash.sh:355 msgid "Cannot save the current status" msgstr "" -#: builtin/stash.c:1336 +#: builtin/stash.c:1340 #, c-format msgid "Saved working directory and index state %s" msgstr "" -#: builtin/stash.c:1426 git-legacy-stash.sh:384 +#: builtin/stash.c:1430 git-legacy-stash.sh:385 msgid "Cannot remove worktree changes" msgstr "" -#: builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "keep index" msgstr "" -#: builtin/stash.c:1463 builtin/stash.c:1499 +#: builtin/stash.c:1471 builtin/stash.c:1536 msgid "stash in patch mode" msgstr "" -#: builtin/stash.c:1464 builtin/stash.c:1500 +#: builtin/stash.c:1472 builtin/stash.c:1537 msgid "quiet mode" msgstr "" -#: builtin/stash.c:1466 builtin/stash.c:1502 +#: builtin/stash.c:1474 builtin/stash.c:1539 msgid "include untracked files in stash" msgstr "" -#: builtin/stash.c:1468 builtin/stash.c:1504 +#: builtin/stash.c:1476 builtin/stash.c:1541 msgid "include ignore files" msgstr "" -#: builtin/stash.c:1564 +#: builtin/stash.c:1600 #, c-format msgid "could not exec %s" msgstr "" @@ -18430,47 +19364,47 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 #, c-format msgid "Expecting a full ref name, got %s" msgstr "" -#: builtin/submodule--helper.c:62 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "" -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "" -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 msgid "alternative anchor for relative paths" msgstr "" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:653 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "" -#: builtin/submodule--helper.c:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" "." msgstr "" -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -18478,346 +19412,369 @@ msgid "" "." msgstr "" -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 msgid "Recurse into nested submodules" msgstr "" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "" -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:667 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:669 +#: builtin/submodule--helper.c:671 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:679 +#: builtin/submodule--helper.c:681 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" -#: builtin/submodule--helper.c:686 +#: builtin/submodule--helper.c:688 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:708 +#: builtin/submodule--helper.c:710 msgid "Suppress output for initializing a submodule" msgstr "" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:715 msgid "git submodule--helper init [<options>] [<path>]" msgstr "" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" -#: builtin/submodule--helper.c:824 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 msgid "Suppress submodule status output" msgstr "" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:889 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" -#: builtin/submodule--helper.c:877 +#: builtin/submodule--helper.c:890 msgid "recurse into nested submodules" msgstr "" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:983 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:989 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:1003 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:1014 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1048 +#: builtin/submodule--helper.c:1061 msgid "Suppress output of synchronizing submodule url" msgstr "" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1068 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1122 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " "really want to remove it including all of its history)" msgstr "" -#: builtin/submodule--helper.c:1121 +#: builtin/submodule--helper.c:1134 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1142 #, c-format msgid "Cleared directory '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1144 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1155 #, c-format msgid "could not create empty submodule directory %s" msgstr "" -#: builtin/submodule--helper.c:1158 +#: builtin/submodule--helper.c:1171 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1187 +#: builtin/submodule--helper.c:1200 msgid "Remove submodule working trees even if they contain local changes" msgstr "" -#: builtin/submodule--helper.c:1188 +#: builtin/submodule--helper.c:1201 msgid "Unregister all submodules" msgstr "" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1206 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1220 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" -#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1289 +msgid "" +"An alternate computed from a superproject's alternate is invalid.\n" +"To allow Git to clone without an alternate in such a case, set\n" +"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" +"'--reference-if-able' instead of '--reference'." +msgstr "" + +#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1367 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" -#: builtin/submodule--helper.c:1348 +#: builtin/submodule--helper.c:1374 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "" -#: builtin/submodule--helper.c:1371 +#: builtin/submodule--helper.c:1398 msgid "where the new submodule will be cloned to" msgstr "" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1401 msgid "name of the new submodule" msgstr "" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1404 msgid "url where to clone the submodule from" msgstr "" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1412 msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 msgid "force cloning progress" msgstr "" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 +msgid "disallow cloning into non-empty directory" +msgstr "" + +#: builtin/submodule--helper.c:1424 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1449 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "" + +#: builtin/submodule--helper.c:1460 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1464 +#, c-format +msgid "directory not empty: '%s'" +msgstr "" + +#: builtin/submodule--helper.c:1476 #, c-format msgid "could not get submodule directory for '%s'" msgstr "" -#: builtin/submodule--helper.c:1474 +#: builtin/submodule--helper.c:1512 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:1478 +#: builtin/submodule--helper.c:1516 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:1571 +#: builtin/submodule--helper.c:1617 #, c-format msgid "Submodule path '%s' not initialized" msgstr "" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:1621 msgid "Maybe you want to use 'update --init'?" msgstr "" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:1651 #, c-format msgid "Skipping unmerged submodule %s" msgstr "" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:1680 #, c-format msgid "Skipping submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:1830 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:1841 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" -#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 msgid "path into the working tree" msgstr "" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:1906 msgid "path into the working tree, across nested submodule boundaries" msgstr "" -#: builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:1910 msgid "rebase, merge, checkout or none" msgstr "" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1916 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:1919 msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:1921 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" -#: builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:1922 msgid "don't print cloning progress" msgstr "" -#: builtin/submodule--helper.c:1877 +#: builtin/submodule--helper.c:1933 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1946 msgid "bad value for update parameter" msgstr "" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:1994 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "" -#: builtin/submodule--helper.c:2061 +#: builtin/submodule--helper.c:2117 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:2094 +#: builtin/submodule--helper.c:2150 msgid "recurse into submodules" msgstr "" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2156 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2212 msgid "check if it is safe to write to the .gitmodules file" msgstr "" -#: builtin/submodule--helper.c:2159 +#: builtin/submodule--helper.c:2215 msgid "unset the config in the .gitmodules file" msgstr "" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2220 msgid "git submodule--helper config <name> [<value>]" msgstr "" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2221 msgid "git submodule--helper config --unset <name>" msgstr "" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2222 msgid "git submodule--helper config --check-writeable" msgstr "" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2241 git-submodule.sh:174 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" -#: builtin/submodule--helper.c:2235 git.c:433 git.c:683 +#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2297 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" @@ -19053,246 +20010,250 @@ msgstr "" msgid "Updated tag '%s' (was %s)\n" msgstr "" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "" -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 msgid "directory stat info does not change after adding a new file" msgstr "" -#: builtin/update-index.c:166 +#: builtin/update-index.c:167 msgid "directory stat info does not change after adding a new directory" msgstr "" -#: builtin/update-index.c:179 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "" -#: builtin/update-index.c:190 +#: builtin/update-index.c:191 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" -#: builtin/update-index.c:201 +#: builtin/update-index.c:202 msgid "directory stat info does not change after deleting a file" msgstr "" -#: builtin/update-index.c:214 +#: builtin/update-index.c:215 msgid "directory stat info does not change after deleting a directory" msgstr "" -#: builtin/update-index.c:221 +#: builtin/update-index.c:222 msgid " OK" msgstr "" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:972 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:975 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:978 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:980 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:982 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:984 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:987 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:991 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:995 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:996 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:1009 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:1015 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:1018 +#: builtin/update-index.c:1020 +msgid "do not touch index-only entries" +msgstr "" + +#: builtin/update-index.c:1022 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1024 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1028 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1036 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:1043 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:1045 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:1051 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1063 msgid "write out the index even if is not flagged as changed" msgstr "" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "" -#: builtin/update-index.c:1066 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "" -#: builtin/update-index.c:1169 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" -#: builtin/update-index.c:1178 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" -#: builtin/update-index.c:1190 +#: builtin/update-index.c:1194 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "" -#: builtin/update-index.c:1202 +#: builtin/update-index.c:1206 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" msgstr "" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "" -#: builtin/update-index.c:1214 +#: builtin/update-index.c:1218 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "" -#: builtin/update-index.c:1221 +#: builtin/update-index.c:1225 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "" @@ -19412,7 +20373,7 @@ msgstr "" msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:60 builtin/worktree.c:898 +#: builtin/worktree.c:60 builtin/worktree.c:891 #, c-format msgid "failed to delete '%s'" msgstr "" @@ -19462,194 +20423,194 @@ msgstr "" msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:251 +#: builtin/worktree.c:244 #, c-format msgid "unable to re-add worktree '%s'" msgstr "" -#: builtin/worktree.c:256 +#: builtin/worktree.c:249 #, 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" msgstr "" -#: builtin/worktree.c:258 +#: builtin/worktree.c:251 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" "use 'add -f' to override, or 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:308 +#: builtin/worktree.c:301 #, c-format msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:439 builtin/worktree.c:445 +#: builtin/worktree.c:432 builtin/worktree.c:438 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "" -#: builtin/worktree.c:441 +#: builtin/worktree.c:434 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" -#: builtin/worktree.c:450 +#: builtin/worktree.c:443 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "" -#: builtin/worktree.c:456 +#: builtin/worktree.c:449 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "" -#: builtin/worktree.c:497 +#: builtin/worktree.c:490 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:500 +#: builtin/worktree.c:493 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:502 +#: builtin/worktree.c:495 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:504 +#: builtin/worktree.c:497 msgid "populate the new working tree" msgstr "" -#: builtin/worktree.c:505 +#: builtin/worktree.c:498 msgid "keep the new working tree locked" msgstr "" -#: builtin/worktree.c:508 +#: builtin/worktree.c:501 msgid "set up tracking mode (see git-branch(1))" msgstr "" -#: builtin/worktree.c:511 +#: builtin/worktree.c:504 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" -#: builtin/worktree.c:519 +#: builtin/worktree.c:512 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: builtin/worktree.c:580 +#: builtin/worktree.c:573 msgid "--[no-]track can only be used if a new branch is created" msgstr "" -#: builtin/worktree.c:680 +#: builtin/worktree.c:673 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799 -#: builtin/worktree.c:926 +#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 +#: builtin/worktree.c:919 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:694 builtin/worktree.c:727 +#: builtin/worktree.c:687 builtin/worktree.c:720 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:699 +#: builtin/worktree.c:692 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:701 +#: builtin/worktree.c:694 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:729 +#: builtin/worktree.c:722 #, c-format msgid "'%s' is not locked" msgstr "" -#: builtin/worktree.c:770 +#: builtin/worktree.c:763 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:778 +#: builtin/worktree.c:771 msgid "force move even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:801 builtin/worktree.c:928 +#: builtin/worktree.c:794 builtin/worktree.c:921 #, c-format msgid "'%s' is a main working tree" msgstr "" -#: builtin/worktree.c:806 +#: builtin/worktree.c:799 #, c-format msgid "could not figure out destination name from '%s'" msgstr "" -#: builtin/worktree.c:812 +#: builtin/worktree.c:805 #, c-format msgid "target '%s' already exists" msgstr "" -#: builtin/worktree.c:820 +#: builtin/worktree.c:813 #, 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:822 +#: builtin/worktree.c:815 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:825 +#: builtin/worktree.c:818 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:830 +#: builtin/worktree.c:823 #, c-format msgid "failed to move '%s' to '%s'" msgstr "" -#: builtin/worktree.c:878 +#: builtin/worktree.c:871 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "" -#: builtin/worktree.c:882 +#: builtin/worktree.c:875 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -#: builtin/worktree.c:887 +#: builtin/worktree.c:880 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" -#: builtin/worktree.c:910 +#: builtin/worktree.c:903 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:933 +#: builtin/worktree.c:926 #, 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:935 +#: builtin/worktree.c:928 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:938 +#: builtin/worktree.c:931 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" @@ -19670,16 +20631,21 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: fast-import.c:3118 +#: fast-import.c:3125 #, c-format msgid "Expected 'mark' command, got %s" msgstr "" -#: fast-import.c:3123 +#: fast-import.c:3130 #, c-format msgid "Expected 'to' command, got %s" msgstr "" +#: fast-import.c:3254 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "" + #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -19797,29 +20763,29 @@ msgstr "" msgid "close failed on standard output" msgstr "" -#: git.c:792 +#: git.c:793 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" -#: git.c:842 +#: git.c:843 #, c-format msgid "cannot handle %s as a builtin" msgstr "" -#: git.c:855 +#: git.c:856 #, c-format msgid "" "usage: %s\n" "\n" msgstr "" -#: git.c:875 +#: git.c:876 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:887 +#: git.c:888 #, c-format msgid "failed to run command '%s': %s\n" msgstr "" @@ -19837,30 +20803,30 @@ msgstr "" msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" -#: http.c:878 +#: http.c:876 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "" -#: http.c:951 +#: http.c:949 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "" -#: http.c:1088 +#: http.c:1086 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "" -#: http.c:1095 +#: http.c:1093 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" -#: http.c:1099 +#: http.c:1097 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "" -#: http.c:1968 +#: http.c:1966 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -19938,41 +20904,41 @@ msgstr "" msgid "dumb http transport does not support shallow capabilities" msgstr "" -#: remote-curl.c:1037 +#: remote-curl.c:1038 msgid "fetch failed." msgstr "" -#: remote-curl.c:1085 +#: remote-curl.c:1086 msgid "cannot fetch by sha1 over smart http" msgstr "" -#: remote-curl.c:1129 remote-curl.c:1135 +#: remote-curl.c:1130 remote-curl.c:1136 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "" -#: remote-curl.c:1147 remote-curl.c:1261 +#: remote-curl.c:1148 remote-curl.c:1263 #, c-format msgid "http transport does not support %s" msgstr "" -#: remote-curl.c:1183 +#: remote-curl.c:1184 msgid "git-http-push failed" msgstr "" -#: remote-curl.c:1367 +#: remote-curl.c:1369 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "" -#: remote-curl.c:1399 +#: remote-curl.c:1401 msgid "remote-curl: error reading command stream from git" msgstr "" -#: remote-curl.c:1406 +#: remote-curl.c:1408 msgid "remote-curl: fetch attempted without a local repo" msgstr "" -#: remote-curl.c:1446 +#: remote-curl.c:1448 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "" @@ -19985,30 +20951,39 @@ msgstr "" msgid "object filtering" msgstr "" -#: parse-options.h:179 +#: parse-options.h:183 msgid "expiry-date" msgstr "" -#: parse-options.h:193 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" msgstr "" -#: parse-options.h:313 +#: parse-options.h:317 msgid "use <n> digits to display SHA-1s" msgstr "" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "" +#: parse-options.h:337 +msgid "read pathspec from file" +msgstr "" + +#: parse-options.h:338 +msgid "" +"with --pathspec-from-file, pathspec elements are separated with NUL character" +msgstr "" + #: ref-filter.h:101 msgid "key" msgstr "" @@ -20514,162 +21489,170 @@ msgid "Common Git shell script setup code" msgstr "" #: command-list.h:171 -msgid "Stash the changes in a dirty working directory away" +msgid "Initialize and modify the sparse-checkout" msgstr "" #: command-list.h:172 -msgid "Add file contents to the staging area" +msgid "Stash the changes in a dirty working directory away" msgstr "" #: command-list.h:173 -msgid "Show the working tree status" +msgid "Add file contents to the staging area" msgstr "" #: command-list.h:174 -msgid "Remove unnecessary whitespace" +msgid "Show the working tree status" msgstr "" #: command-list.h:175 -msgid "Initialize, update or inspect submodules" +msgid "Remove unnecessary whitespace" msgstr "" #: command-list.h:176 -msgid "Bidirectional operation between a Subversion repository and Git" +msgid "Initialize, update or inspect submodules" msgstr "" #: command-list.h:177 -msgid "Switch branches" +msgid "Bidirectional operation between a Subversion repository and Git" msgstr "" #: command-list.h:178 -msgid "Read, modify and delete symbolic refs" +msgid "Switch branches" msgstr "" #: command-list.h:179 -msgid "Create, list, delete or verify a tag object signed with GPG" +msgid "Read, modify and delete symbolic refs" msgstr "" #: command-list.h:180 -msgid "Creates a temporary file with a blob's contents" +msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" #: command-list.h:181 -msgid "Unpack objects from a packed archive" +msgid "Creates a temporary file with a blob's contents" msgstr "" #: command-list.h:182 -msgid "Register file contents in the working tree to the index" +msgid "Unpack objects from a packed archive" msgstr "" #: command-list.h:183 -msgid "Update the object name stored in a ref safely" +msgid "Register file contents in the working tree to the index" msgstr "" #: command-list.h:184 -msgid "Update auxiliary info file to help dumb servers" +msgid "Update the object name stored in a ref safely" msgstr "" #: command-list.h:185 -msgid "Send archive back to git-archive" +msgid "Update auxiliary info file to help dumb servers" msgstr "" #: command-list.h:186 -msgid "Send objects packed back to git-fetch-pack" +msgid "Send archive back to git-archive" msgstr "" #: command-list.h:187 -msgid "Show a Git logical variable" +msgid "Send objects packed back to git-fetch-pack" msgstr "" #: command-list.h:188 -msgid "Check the GPG signature of commits" +msgid "Show a Git logical variable" msgstr "" #: command-list.h:189 -msgid "Validate packed Git archive files" +msgid "Check the GPG signature of commits" msgstr "" #: command-list.h:190 -msgid "Check the GPG signature of tags" +msgid "Validate packed Git archive files" msgstr "" #: command-list.h:191 -msgid "Git web interface (web frontend to Git repositories)" +msgid "Check the GPG signature of tags" msgstr "" #: command-list.h:192 -msgid "Show logs with difference each commit introduces" +msgid "Git web interface (web frontend to Git repositories)" msgstr "" #: command-list.h:193 -msgid "Manage multiple working trees" +msgid "Show logs with difference each commit introduces" msgstr "" #: command-list.h:194 -msgid "Create a tree object from the current index" +msgid "Manage multiple working trees" msgstr "" #: command-list.h:195 -msgid "Defining attributes per path" +msgid "Create a tree object from the current index" msgstr "" #: command-list.h:196 -msgid "Git command-line interface and conventions" +msgid "Defining attributes per path" msgstr "" #: command-list.h:197 -msgid "A Git core tutorial for developers" +msgid "Git command-line interface and conventions" msgstr "" #: command-list.h:198 -msgid "Git for CVS users" +msgid "A Git core tutorial for developers" msgstr "" #: command-list.h:199 -msgid "Tweaking diff output" +msgid "Git for CVS users" msgstr "" #: command-list.h:200 -msgid "A useful minimum set of commands for Everyday Git" +msgid "Tweaking diff output" msgstr "" #: command-list.h:201 -msgid "A Git Glossary" +msgid "A useful minimum set of commands for Everyday Git" msgstr "" #: command-list.h:202 -msgid "Hooks used by Git" +msgid "A Git Glossary" msgstr "" #: command-list.h:203 -msgid "Specifies intentionally untracked files to ignore" +msgid "Hooks used by Git" msgstr "" #: command-list.h:204 -msgid "Defining submodule properties" +msgid "Specifies intentionally untracked files to ignore" msgstr "" #: command-list.h:205 -msgid "Git namespaces" +msgid "Defining submodule properties" msgstr "" #: command-list.h:206 -msgid "Git Repository Layout" +msgid "Git namespaces" msgstr "" #: command-list.h:207 -msgid "Specifying revisions and ranges for Git" +msgid "Git Repository Layout" msgstr "" #: command-list.h:208 -msgid "A tutorial introduction to Git: part two" +msgid "Specifying revisions and ranges for Git" msgstr "" #: command-list.h:209 -msgid "A tutorial introduction to Git" +msgid "Mounting one repository inside another" msgstr "" #: command-list.h:210 +msgid "A tutorial introduction to Git: part two" +msgstr "" + +#: command-list.h:211 +msgid "A tutorial introduction to Git" +msgstr "" + +#: command-list.h:212 msgid "An overview of recommended workflows with Git" msgstr "" @@ -20790,136 +21773,128 @@ msgstr "" msgid "Simple merge did not work, trying automatic merge." msgstr "" -#: git-legacy-stash.sh:220 +#: git-legacy-stash.sh:221 msgid "Cannot remove temporary index (can't happen)" msgstr "" -#: git-legacy-stash.sh:271 +#: git-legacy-stash.sh:272 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" -#: git-legacy-stash.sh:323 +#: git-legacy-stash.sh:324 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "" -#: git-legacy-stash.sh:355 +#: git-legacy-stash.sh:356 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "" -#: git-legacy-stash.sh:535 +#: git-legacy-stash.sh:536 #, sh-format msgid "unknown option: $opt" msgstr "" -#: git-legacy-stash.sh:555 +#: git-legacy-stash.sh:556 #, sh-format msgid "Too many revisions specified: $REV" msgstr "" -#: git-legacy-stash.sh:570 +#: git-legacy-stash.sh:571 #, sh-format msgid "$reference is not a valid reference" msgstr "" -#: git-legacy-stash.sh:598 +#: git-legacy-stash.sh:599 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "" -#: git-legacy-stash.sh:609 +#: git-legacy-stash.sh:610 #, sh-format msgid "'$args' is not a stash reference" msgstr "" -#: git-legacy-stash.sh:617 +#: git-legacy-stash.sh:618 msgid "unable to refresh index" msgstr "" -#: git-legacy-stash.sh:621 +#: git-legacy-stash.sh:622 msgid "Cannot apply a stash in the middle of a merge" msgstr "" -#: git-legacy-stash.sh:629 +#: git-legacy-stash.sh:630 msgid "Conflicts in index. Try without --index." msgstr "" -#: git-legacy-stash.sh:631 +#: git-legacy-stash.sh:632 msgid "Could not save index tree" msgstr "" -#: git-legacy-stash.sh:640 +#: git-legacy-stash.sh:641 msgid "Could not restore untracked files from stash entry" msgstr "" -#: git-legacy-stash.sh:665 +#: git-legacy-stash.sh:666 msgid "Cannot unstage modified files" msgstr "" -#: git-legacy-stash.sh:703 +#: git-legacy-stash.sh:704 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:705 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-legacy-stash.sh:791 +#: git-legacy-stash.sh:792 msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:200 +#: git-submodule.sh:203 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:210 +#: git-submodule.sh:213 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:229 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:232 +#: git-submodule.sh:235 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "" -#: git-submodule.sh:239 +#: git-submodule.sh:242 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "" -#: git-submodule.sh:245 -#, sh-format -msgid "" -"The following path is ignored by one of your .gitignore files:\n" -"$sm_path\n" -"Use -f if you really want to add it." -msgstr "" - -#: git-submodule.sh:268 +#: git-submodule.sh:273 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:270 +#: git-submodule.sh:275 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:278 +#: git-submodule.sh:283 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:280 +#: git-submodule.sh:285 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -20930,122 +21905,122 @@ msgid "" "option." msgstr "" -#: git-submodule.sh:286 +#: git-submodule.sh:291 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:298 +#: git-submodule.sh:303 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:303 +#: git-submodule.sh:308 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:312 +#: git-submodule.sh:317 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:573 +#: git-submodule.sh:590 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:583 +#: git-submodule.sh:600 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:588 +#: git-submodule.sh:605 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" -#: git-submodule.sh:606 +#: git-submodule.sh:623 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "" -#: git-submodule.sh:612 +#: git-submodule.sh:629 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -#: git-submodule.sh:619 +#: git-submodule.sh:636 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:620 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:624 +#: git-submodule.sh:641 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:625 +#: git-submodule.sh:642 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:630 +#: git-submodule.sh:647 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:631 +#: git-submodule.sh:648 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:636 +#: git-submodule.sh:653 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:637 +#: git-submodule.sh:654 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:668 +#: git-submodule.sh:685 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:830 +#: git-submodule.sh:896 msgid "The --cached option cannot be used with the --files option" msgstr "" -#: git-submodule.sh:882 +#: git-submodule.sh:948 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:902 +#: git-submodule.sh:968 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:905 +#: git-submodule.sh:971 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:908 +#: git-submodule.sh:974 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -21309,6 +22284,10 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "" msgstr[1] "" +#: git-rebase--preserve-merges.sh:955 +msgid "Note that empty commits are commented out" +msgstr "" + #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "" @@ -21371,122 +22350,56 @@ msgid "Unable to determine absolute path of git directory" msgstr "" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "" -#: git-add--interactive.perl:211 -msgid "staged" -msgstr "" - -#: git-add--interactive.perl:211 -msgid "unstaged" -msgstr "" - -#: git-add--interactive.perl:267 git-add--interactive.perl:292 -msgid "binary" -msgstr "" - -#: git-add--interactive.perl:276 git-add--interactive.perl:330 -msgid "nothing" -msgstr "" - -#: git-add--interactive.perl:312 git-add--interactive.perl:327 -msgid "unchanged" -msgstr "" - -#: git-add--interactive.perl:623 -#, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "" -msgstr[1] "" - -#: git-add--interactive.perl:626 -#, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "" -msgstr[1] "" - -#: git-add--interactive.perl:629 -#, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "" -msgstr[1] "" - -#: git-add--interactive.perl:632 +#: git-add--interactive.perl:634 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:641 -msgid "Update" -msgstr "" - -#: git-add--interactive.perl:653 -msgid "Revert" -msgstr "" - -#: git-add--interactive.perl:676 -#, perl-format -msgid "note: %s is untracked now.\n" -msgstr "" - -#: git-add--interactive.perl:687 -msgid "Add untracked" -msgstr "" - -#: git-add--interactive.perl:693 -msgid "No untracked files.\n" -msgstr "" - -#: git-add--interactive.perl:1051 +#: git-add--interactive.perl:1053 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "" -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "" -#: git-add--interactive.perl:1057 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "" -#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "" -#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 +#: git-add--interactive.perl:1074 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "" -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1111 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "" -#: git-add--interactive.perl:1110 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "" - -#: git-add--interactive.perl:1116 +#: git-add--interactive.perl:1118 #, perl-format msgid "" "---\n" @@ -21495,31 +22408,12 @@ msgid "" "Lines starting with %s will be removed.\n" msgstr "" -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1124 -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 "" - -#: git-add--interactive.perl:1138 +#: git-add--interactive.perl:1140 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "" -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: git-add--interactive.perl:1237 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" - -#: git-add--interactive.perl:1246 +#: git-add--interactive.perl:1248 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -21528,7 +22422,7 @@ msgid "" "d - do not stage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1254 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -21537,7 +22431,7 @@ msgid "" "d - do not stash this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1258 +#: git-add--interactive.perl:1260 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -21546,7 +22440,7 @@ msgid "" "d - do not unstage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1264 +#: git-add--interactive.perl:1266 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -21555,7 +22449,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -21564,7 +22458,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1276 +#: git-add--interactive.perl:1278 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -21573,7 +22467,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1282 +#: git-add--interactive.perl:1284 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -21582,7 +22476,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1294 +#: git-add--interactive.perl:1296 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -21591,7 +22485,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1309 +#: git-add--interactive.perl:1311 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -21604,226 +22498,85 @@ msgid "" "? - print help\n" msgstr "" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1342 msgid "The selected hunks do not apply to the index!\n" msgstr "" -#: git-add--interactive.perl:1341 -msgid "Apply them to the worktree anyway? " -msgstr "" - -#: git-add--interactive.perl:1344 -msgid "Nothing was applied.\n" -msgstr "" - -#: git-add--interactive.perl:1355 +#: git-add--interactive.perl:1357 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "" -#: git-add--interactive.perl:1364 -msgid "Only binary files changed.\n" -msgstr "" - -#: git-add--interactive.perl:1366 -msgid "No changes.\n" -msgstr "" - -#: git-add--interactive.perl:1374 -msgid "Patch update" -msgstr "" - -#: git-add--interactive.perl:1426 -#, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1427 -#, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1428 -#, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1431 -#, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1432 -#, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1433 -#, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1436 -#, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1437 -#, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1438 -#, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1441 -#, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1442 -#, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1443 -#, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 -#, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 -#, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 -#, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1451 -#, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1452 -#, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1453 -#, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1456 -#, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1457 -#, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1458 -#, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" - -#: git-add--interactive.perl:1466 +#: git-add--interactive.perl:1468 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1467 +#: git-add--interactive.perl:1469 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1470 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1568 +#: git-add--interactive.perl:1570 msgid "No other hunks to goto\n" msgstr "" -#: git-add--interactive.perl:1575 -msgid "go to which hunk (<ret> to see more)? " -msgstr "" - -#: git-add--interactive.perl:1577 -msgid "go to which hunk? " -msgstr "" - -#: git-add--interactive.perl:1586 +#: git-add--interactive.perl:1588 #, perl-format msgid "Invalid number: '%s'\n" msgstr "" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1593 #, 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:1617 +#: git-add--interactive.perl:1619 msgid "No other hunks to search\n" msgstr "" -#: git-add--interactive.perl:1621 -msgid "search for regex? " -msgstr "" - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1636 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1646 msgid "No hunk matches the given pattern\n" msgstr "" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 msgid "No previous hunk\n" msgstr "" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 msgid "No next hunk\n" msgstr "" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1692 msgid "Sorry, cannot split this hunk\n" msgstr "" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1698 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:1706 +#: git-add--interactive.perl:1708 msgid "Sorry, cannot edit this hunk\n" msgstr "" -#: git-add--interactive.perl:1752 -msgid "Review diff" -msgstr "" - #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1771 +#: git-add--interactive.perl:1773 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -21834,19 +22587,19 @@ msgid "" "changes\n" msgstr "" -#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 -#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 -#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 -#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 +#: 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 msgid "missing --" msgstr "" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1821 #, perl-format msgid "unknown --patch mode: %s" msgstr "" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 #, perl-format msgid "invalid argument %s, expecting --" msgstr "" |