diff options
| author | Vincent Ambo <mail@tazj.in> | 2020-11-21T18·20+0100 |
|---|---|---|
| committer | Vincent Ambo <mail@tazj.in> | 2020-11-21T18·45+0100 |
| commit | f4609b896fac842433bd495c166d5987852a6a73 (patch) | |
| tree | 95511c465c54c4f5d27e5d39ce187e2a1dd82bd3 /third_party/git/po/git.pot | |
| parent | 082c006c04343a78d87b6c6ab3608c25d6213c3f (diff) | |
merge(3p/git): Merge git subtree at v2.29.2 r/1890
This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb
Diffstat (limited to 'third_party/git/po/git.pot')
| -rw-r--r-- | third_party/git/po/git.pot | 11992 |
1 files changed, 6815 insertions, 5177 deletions
diff --git a/third_party/git/po/git.pot b/third_party/git/po/git.pot index d799696ad09a..68c84144e930 100644 --- a/third_party/git/po/git.pot +++ b/third_party/git/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-08-10 20:12+0800\n" +"POT-Creation-Date: 2020-10-10 09:32+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,708 @@ 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 reset.c:65 sequencer.c:3250 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 +#: builtin/rebase.c:1944 +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 reset.c:89 sequencer.c:3444 +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:4127 builtin/checkout.c:295 +#: builtin/reset.c:145 +#, 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:1738 git-add--interactive.perl:1371 +#, c-format +msgid "Only binary files changed.\n" +msgstr "" + +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#, c-format +msgid "No changes.\n" +msgstr "" + +#: add-interactive.c:935 git-add--interactive.perl:1381 +msgid "Patch update" +msgstr "" + +#: add-interactive.c:974 git-add--interactive.perl:1794 +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:816 git-add--interactive.perl:1891 +msgid "*** Commands ***" +msgstr "" + +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +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:4984 apply.c:4987 builtin/am.c:2270 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: 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:781 git-add--interactive.perl:1805 +#, c-format +msgid "Bye.\n" +msgstr "" + +#: add-patch.c:34 git-add--interactive.perl:1433 +#, c-format, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:35 git-add--interactive.perl:1434 +#, c-format, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:36 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:37 git-add--interactive.perl:1436 +#, c-format, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:39 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "" + +#: add-patch.c:42 +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:56 git-add--interactive.perl:1439 +#, c-format, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:57 git-add--interactive.perl:1440 +#, c-format, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:58 git-add--interactive.perl:1441 +#, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:59 git-add--interactive.perl:1442 +#, c-format, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:61 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "" + +#: add-patch.c:64 +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:80 git-add--interactive.perl:1445 +#, c-format, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:81 git-add--interactive.perl:1446 +#, c-format, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:82 git-add--interactive.perl:1447 +#, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:83 git-add--interactive.perl:1448 +#, c-format, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:85 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "" + +#: add-patch.c:88 +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:103 git-add--interactive.perl:1451 +#, c-format, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:104 git-add--interactive.perl:1452 +#, c-format, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:105 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:106 git-add--interactive.perl:1454 +#, c-format, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:108 add-patch.c:176 add-patch.c:221 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "" + +#: add-patch.c:111 +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:126 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, c-format, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 +#, c-format, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 +#, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 +#, c-format, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:131 add-patch.c:154 add-patch.c:199 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "" + +#: add-patch.c:134 add-patch.c:202 +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:149 add-patch.c:194 git-add--interactive.perl:1463 +#, c-format, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 +#, c-format, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#, c-format, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:157 +msgid "" +"y - discard this hunk from index and worktree\n" +"n - do not discard this hunk from index and worktree\n" +"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:171 add-patch.c:216 git-add--interactive.perl:1469 +#, c-format, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 +#, c-format, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 +#, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#, c-format, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:179 +msgid "" +"y - apply this hunk to index and worktree\n" +"n - do not apply this hunk to index and worktree\n" +"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:224 +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:342 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "" + +#: add-patch.c:361 add-patch.c:365 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "" + +#: add-patch.c:419 +msgid "could not parse diff" +msgstr "" + +#: add-patch.c:438 +msgid "could not parse colored diff" +msgstr "" + +#: add-patch.c:452 +#, c-format +msgid "failed to run '%s'" +msgstr "" + +#: add-patch.c:611 +msgid "mismatched output from interactive.diffFilter" +msgstr "" + +#: add-patch.c:612 +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "" + +#: add-patch.c:785 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" + +#: add-patch.c:800 +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "" + +#: add-patch.c:1076 git-add--interactive.perl:1117 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "" + +#: add-patch.c:1080 +#, 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:1094 git-add--interactive.perl:1131 +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:1127 +msgid "could not parse hunk header" +msgstr "" + +#: add-patch.c:1172 +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:1241 git-add--interactive.perl:1244 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" + +#: add-patch.c:1284 +msgid "The selected hunks do not apply to the index!" +msgstr "" + +#: add-patch.c:1285 git-add--interactive.perl:1348 +msgid "Apply them to the worktree anyway? " +msgstr "" + +#: add-patch.c:1292 git-add--interactive.perl:1351 +msgid "Nothing was applied.\n" +msgstr "" + +#: add-patch.c:1349 +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:1511 add-patch.c:1521 +msgid "No previous hunk" +msgstr "" + +#: add-patch.c:1516 add-patch.c:1526 +msgid "No next hunk" +msgstr "" + +#: add-patch.c:1532 +msgid "No other hunks to goto" +msgstr "" + +#: add-patch.c:1543 git-add--interactive.perl:1608 +msgid "go to which hunk (<ret> to see more)? " +msgstr "" + +#: add-patch.c:1544 git-add--interactive.perl:1610 +msgid "go to which hunk? " +msgstr "" + +#: add-patch.c:1555 +#, c-format +msgid "Invalid number: '%s'" +msgstr "" + +#: add-patch.c:1560 +#, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "" +msgstr[1] "" + +#: add-patch.c:1569 +msgid "No other hunks to search" +msgstr "" + +#: add-patch.c:1575 git-add--interactive.perl:1663 +msgid "search for regex? " +msgstr "" + +#: add-patch.c:1590 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "" + +#: add-patch.c:1607 +msgid "No hunk matches the given pattern" +msgstr "" + +#: add-patch.c:1614 +msgid "Sorry, cannot split this hunk" +msgstr "" + +#: add-patch.c:1618 +#, c-format +msgid "Split into %d hunks." +msgstr "" + +#: add-patch.c:1622 +msgid "Sorry, cannot edit this hunk" +msgstr "" + +#: add-patch.c:1674 +msgid "'git apply' failed" +msgstr "" + +#: advice.c:140 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" + +#: advice.c:156 #, c-format msgid "%shint: %.*s%s\n" msgstr "" -#: advice.c:162 +#: advice.c:247 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:164 +#: advice.c:249 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:166 +#: advice.c:251 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:168 +#: advice.c:253 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:170 +#: advice.c:255 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:172 +#: advice.c:257 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:180 +#: advice.c:265 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:273 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:278 builtin/merge.c:1349 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:195 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:196 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:202 +#: advice.c:287 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -176,17 +825,7 @@ msgstr "" msgid "inconsistent header lines %d and %d" msgstr "" -#: apply.c:1460 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "" - -#: apply.c:1529 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "" - -#: apply.c:1551 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -197,530 +836,570 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apply.c:1564 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1752 +#: apply.c:1481 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "" + +#: apply.c:1550 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "" + +#: apply.c:1753 msgid "new file depends on old contents" msgstr "" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1830 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: apply.c:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "" -#: apply.c:2925 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3046 +#: 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:3058 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3064 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3086 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3094 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3141 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3151 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3159 +#: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3177 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3190 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3196 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3217 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3340 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3400 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3429 apply.c:3672 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3515 apply.c:3687 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3524 apply.c:3695 +#: apply.c:3537 apply.c:3708 apply.c:3953 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3559 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3562 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3578 apply.c:3582 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3594 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3608 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3613 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3639 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3712 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3714 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3923 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3926 +#: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3946 +#: apply.c:3976 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3951 +#: apply.c:3981 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3971 +#: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3975 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:3990 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4082 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4089 +#: apply.c:4119 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4092 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "" - -#: apply.c:4101 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4111 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4249 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4283 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4289 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4297 +#: apply.c:4327 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4303 apply.c:4448 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4346 +#: apply.c:4376 builtin/bisect--helper.c:537 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4350 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4420 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4518 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4526 +#: apply.c:4556 msgid "internal error" msgstr "" -#: apply.c:4529 +#: apply.c:4559 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4540 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4562 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4566 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4676 +#: apply.c:4715 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4684 +#: apply.c:4723 msgid "unrecognized input" msgstr "" -#: apply.c:4704 +#: apply.c:4743 msgid "unable to read index file" msgstr "" -#: apply.c:4859 +#: apply.c:4900 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4886 +#: apply.c:4927 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4892 apply.c:4907 +#: apply.c:4933 apply.c:4948 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4900 +#: apply.c:4941 #, 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:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "" -#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 -#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 -#: builtin/pull.c:208 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:4944 +#: apply.c:4985 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4947 +#: apply.c:4988 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4990 builtin/am.c:2279 msgid "num" msgstr "" -#: apply.c:4950 +#: apply.c:4991 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: apply.c:4953 +#: apply.c:4994 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4955 +#: apply.c:4996 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4959 +#: apply.c:5000 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4961 +#: apply.c:5002 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4963 +#: apply.c:5004 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4965 +#: apply.c:5006 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4967 +#: apply.c:5008 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:4969 +#: apply.c:5010 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4971 +#: apply.c:5012 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4974 +#: apply.c:5015 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:4976 +#: apply.c:5017 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:4978 +#: apply.c:5019 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:4983 +#: apply.c:5024 msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 msgid "action" msgstr "" -#: apply.c:4985 +#: apply.c:5026 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:4988 apply.c:4991 +#: apply.c:5029 apply.c:5032 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:4994 +#: apply.c:5035 msgid "apply the patch in reverse" msgstr "" -#: apply.c:4996 +#: apply.c:5037 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:4998 +#: apply.c:5039 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5000 +#: apply.c:5041 msgid "allow overlapping hunks" msgstr "" -#: apply.c:5001 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:2068 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" -#: apply.c:5003 +#: apply.c:5044 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5006 +#: apply.c:5047 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5008 builtin/am.c:2205 +#: apply.c:5049 builtin/am.c:2267 msgid "root" msgstr "" -#: apply.c:5009 +#: apply.c:5050 msgid "prepend <root> to all filenames" msgstr "" +#: archive-tar.c:125 archive-zip.c:345 +#, c-format +msgid "cannot stream blob %s" +msgstr "" + +#: archive-tar.c:265 archive-zip.c:358 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "" + +#: archive-tar.c:449 +#, c-format +msgid "unable to start '%s' filter" +msgstr "" + +#: archive-tar.c:452 +msgid "unable to redirect descriptor" +msgstr "" + +#: archive-tar.c:459 +#, c-format +msgid "'%s' filter reported error" +msgstr "" + +#: archive-zip.c:318 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "" + +#: archive-zip.c:322 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "" + +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#, c-format +msgid "deflate error (%d)" +msgstr "" + +#: archive-zip.c:603 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "" + #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "" @@ -738,224 +1417,206 @@ 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:192 +#, c-format +msgid "cannot read %s" +msgstr "" + +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 +#: builtin/merge.c:1124 +#, c-format +msgid "could not read '%s'" +msgstr "" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:396 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "" -#: archive.c:401 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "" -#: archive.c:414 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "" -#: archive.c:426 +#: archive.c:485 msgid "current working directory is untracked" msgstr "" -#: archive.c:457 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "" + +#: archive.c:553 msgid "fmt" msgstr "" -#: archive.c:457 +#: archive.c:553 msgid "archive format" msgstr "" -#: archive.c:458 builtin/log.c:1580 +#: archive.c:554 builtin/log.c:1760 msgid "prefix" msgstr "" -#: archive.c:459 +#: archive.c:555 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 -#: builtin/fast-export.c:1136 builtin/grep.c:897 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:177 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "" -#: archive.c:461 builtin/archive.c:90 +#: archive.c:557 +msgid "add untracked file to archive" +msgstr "" + +#: archive.c:560 builtin/archive.c:90 msgid "write the archive to this file" msgstr "" -#: archive.c:463 +#: archive.c:562 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:464 +#: archive.c:563 msgid "report archived files on stderr" msgstr "" -#: archive.c:465 +#: archive.c:564 msgid "store only" msgstr "" -#: archive.c:466 +#: archive.c:565 msgid "compress faster" msgstr "" -#: archive.c:474 +#: archive.c:573 msgid "compress better" msgstr "" -#: archive.c:477 +#: archive.c:576 msgid "list supported archive formats" msgstr "" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:579 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:581 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:489 +#: archive.c:588 msgid "Unexpected option --remote" msgstr "" -#: archive.c:491 +#: archive.c:590 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:493 +#: archive.c:592 msgid "Unexpected option --output" msgstr "" -#: archive.c:515 -#, c-format -msgid "Unknown archive format '%s'" -msgstr "" - -#: archive.c:522 -#, c-format -msgid "Argument not supported for format '%s': -%d" -msgstr "" - -#: archive-tar.c:125 archive-zip.c:345 -#, c-format -msgid "cannot stream blob %s" -msgstr "" - -#: archive-tar.c:260 archive-zip.c:363 -#, c-format -msgid "unsupported file mode: 0%o (SHA1: %s)" -msgstr "" - -#: archive-tar.c:287 archive-zip.c:353 -#, c-format -msgid "cannot read %s" -msgstr "" - -#: archive-tar.c:459 -#, c-format -msgid "unable to start '%s' filter" -msgstr "" - -#: archive-tar.c:462 -msgid "unable to redirect descriptor" -msgstr "" - -#: archive-tar.c:469 -#, c-format -msgid "'%s' filter reported error" -msgstr "" - -#: archive-zip.c:314 -#, c-format -msgid "path is not valid UTF-8: %s" +#: archive.c:594 +msgid "Options --add-file and --remote cannot be used together" msgstr "" -#: archive-zip.c:318 +#: archive.c:616 #, 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 -#, c-format -msgid "deflate error (%d)" +msgid "Unknown archive format '%s'" msgstr "" -#: archive-zip.c:609 +#: archive.c:623 #, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" +msgid "Argument not supported for format '%s': -%d" msgstr "" -#: attr.c:211 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "" -#: attr.c:368 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "" -#: attr.c:408 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -#: bisect.c:468 +#: bisect.c:476 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" -#: bisect.c:678 +#: bisect.c:686 #, c-format msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:733 +#: bisect.c:753 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:758 +#: bisect.c:778 #, 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:783 #, 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:788 #, 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:796 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -963,7 +1624,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:789 +#: bisect.c:809 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -971,43 +1632,43 @@ msgid "" "We continue anyway." msgstr "" -#: bisect.c:822 +#: bisect.c:848 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:865 +#: bisect.c:898 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:974 builtin/merge.c:150 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:958 +#: bisect.c:1014 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:977 +#: bisect.c:1044 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:985 +#: bisect.c:1053 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:1004 +#: bisect.c:1082 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1017,44 +1678,44 @@ msgstr[1] "" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1088 #, 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" msgstr[0] "" msgstr[1] "" -#: blame.c:2697 +#: blame.c:2778 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:2711 +#: blame.c:2792 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:2732 +#: blame.c:2813 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 -#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 -#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 -#: builtin/shortlog.c:192 +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:320 msgid "revision walk setup failed" msgstr "" -#: blame.c:2759 +#: blame.c:2840 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:2770 +#: blame.c:2851 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:2781 +#: blame.c:2862 #, c-format msgid "cannot read blob %s for path %s" msgstr "" @@ -1173,398 +1834,433 @@ msgstr "" msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "" -#: bundle.c:36 +#: bundle.c:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "" + +#: bundle.c:45 +#, c-format +msgid "unknown capability '%s'" +msgstr "" + +#: bundle.c:71 #, c-format -msgid "'%s' does not look like a v2 bundle file" +msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "" -#: bundle.c:64 +#: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 -#: builtin/commit.c:791 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "" -#: bundle.c:143 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:146 +#: bundle.c:192 msgid "need a repository to verify a bundle" msgstr "" -#: bundle.c:197 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:204 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "" -#: bundle.c:206 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:272 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "" -#: bundle.c:279 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:290 +#: bundle.c:337 msgid "pack-objects died" msgstr "" -#: bundle.c:332 +#: bundle.c:379 msgid "rev-list died" msgstr "" -#: bundle.c:381 +#: bundle.c:428 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 +#: bundle.c:498 #, c-format -msgid "unrecognized argument: %s" -msgstr "" - -#: bundle.c:468 -msgid "Refusing to create empty bundle." +msgid "unsupported bundle version %d" msgstr "" -#: bundle.c:478 +#: bundle.c:500 #, c-format -msgid "cannot create '%s'" +msgid "cannot write bundle version %d with algorithm %s" msgstr "" -#: bundle.c:503 -msgid "index-pack died" -msgstr "" - -#: color.c:296 -#, c-format -msgid "invalid color value: %.*s" -msgstr "" - -#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 #, c-format -msgid "could not parse %s" -msgstr "" - -#: commit.c:52 -#, c-format -msgid "%s %s is not a commit!" -msgstr "" - -#: commit.c:192 -msgid "" -"Support for <GIT_DIR>/info/grafts is deprecated\n" -"and will be removed in a future Git version.\n" -"\n" -"Please use \"git replace --convert-graft-file\"\n" -"to convert the grafts into replace refs.\n" -"\n" -"Turn this message off by running\n" -"\"git config advice.graftFileDeprecated false\"" +msgid "unrecognized argument: %s" msgstr "" -#: commit.c:1127 -#, c-format -msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +#: bundle.c:530 +msgid "Refusing to create empty bundle." msgstr "" -#: commit.c:1130 +#: bundle.c:540 #, c-format -msgid "Commit %s has a bad GPG signature allegedly by %s." +msgid "cannot create '%s'" msgstr "" -#: commit.c:1133 -#, c-format -msgid "Commit %s does not have a GPG signature." +#: bundle.c:565 +msgid "index-pack died" msgstr "" -#: commit.c:1136 +#: color.c:329 #, c-format -msgid "Commit %s has a good GPG signature by %s\n" +msgid "invalid color value: %.*s" msgstr "" -#: commit.c:1390 -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" +#: commit-graph.c:188 midx.c:46 +msgid "invalid hash version" msgstr "" -#: commit-graph.c:127 +#: commit-graph.c:246 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:192 +#: commit-graph.c:311 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" -#: commit-graph.c:199 +#: commit-graph.c:318 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "" -#: commit-graph.c:206 +#: commit-graph.c:325 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" -#: commit-graph.c:229 -msgid "commit-graph chunk lookup table entry missing; file may be incomplete" +#: commit-graph.c:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" msgstr "" -#: commit-graph.c:240 +#: commit-graph.c:361 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "" -#: commit-graph.c:283 +#: commit-graph.c:433 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "" -#: commit-graph.c:347 +#: commit-graph.c:499 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:357 +#: commit-graph.c:509 msgid "commit-graph chain does not match" msgstr "" -#: commit-graph.c:404 +#: commit-graph.c:557 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:430 +#: commit-graph.c:581 msgid "unable to find all commit-graph files" msgstr "" -#: commit-graph.c:554 commit-graph.c:614 +#: commit-graph.c:721 commit-graph.c:785 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:575 +#: commit-graph.c:742 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:1002 builtin/pack-objects.c:2657 +#: commit-graph.c:1042 builtin/am.c:1306 +#, c-format +msgid "unable to parse commit %s" +msgstr "" + +#: commit-graph.c:1265 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:1034 +#: commit-graph.c:1301 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1051 +#: commit-graph.c:1318 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1070 +#: commit-graph.c:1338 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1089 +#: commit-graph.c:1357 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1163 +#: commit-graph.c:1424 +msgid "Computing commit changed paths Bloom filters" +msgstr "" + +#: commit-graph.c:1501 +msgid "Collecting referenced commits" +msgstr "" + +#: commit-graph.c:1526 #, 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:1176 +#: commit-graph.c:1539 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:1180 +#: commit-graph.c:1543 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:1204 -#, 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:1238 +#: commit-graph.c:1582 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:1253 +#: commit-graph.c:1597 msgid "Counting distinct commits in commit graph" msgstr "" -#: commit-graph.c:1284 +#: commit-graph.c:1629 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1332 +#: commit-graph.c:1678 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1365 midx.c:811 +#: commit-graph.c:1720 midx.c:826 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#: commit-graph.c:1733 +msgid "unable to create temporary graph layer" +msgstr "" + +#: commit-graph.c:1738 #, c-format -msgid "unable to create '%s'" +msgid "unable to adjust shared permissions for '%s'" msgstr "" -#: commit-graph.c:1437 +#: commit-graph.c:1808 #, 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:1478 +#: commit-graph.c:1853 msgid "unable to open commit-graph chain file" msgstr "" -#: commit-graph.c:1490 +#: commit-graph.c:1869 msgid "failed to rename base commit-graph file" msgstr "" -#: commit-graph.c:1510 +#: commit-graph.c:1889 msgid "failed to rename temporary commit-graph file" msgstr "" -#: commit-graph.c:1621 +#: commit-graph.c:2015 msgid "Scanning merged commits" msgstr "" -#: commit-graph.c:1632 +#: commit-graph.c:2026 #, c-format msgid "unexpected duplicate commit id %s" msgstr "" -#: commit-graph.c:1657 +#: commit-graph.c:2049 msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:1844 +#: commit-graph.c:2259 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "" -#: commit-graph.c:1855 +#: commit-graph.c:2270 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:1945 +#: commit-graph.c:2363 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:1955 +#: commit-graph.c:2373 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:1965 commit-graph.c:1980 +#: commit-graph.c:2383 commit-graph.c:2398 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:1972 +#: commit-graph.c:2390 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:1989 +#: commit-graph.c:2408 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2002 +#: commit-graph.c:2423 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2009 +#: commit-graph.c:2430 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2019 +#: commit-graph.c:2440 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2028 +#: commit-graph.c:2449 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2041 +#: commit-graph.c:2463 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2046 +#: commit-graph.c:2468 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2050 +#: commit-graph.c:2472 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2065 +#: commit-graph.c:2488 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" -#: commit-graph.c:2071 +#: commit-graph.c:2494 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "" + +#: commit.c:194 +msgid "" +"Support for <GIT_DIR>/info/grafts is deprecated\n" +"and will be removed in a future Git version.\n" +"\n" +"Please use \"git replace --convert-graft-file\"\n" +"to convert the grafts into replace refs.\n" +"\n" +"Turn this message off by running\n" +"\"git config advice.graftFileDeprecated false\"" +msgstr "" + +#: commit.c:1172 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "" + +#: commit.c:1176 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "" + +#: commit.c:1179 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "" + +#: commit.c:1182 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "" + +#: commit.c:1436 +msgid "" +"Warning: commit message did not conform to UTF-8.\n" +"You may want to amend it after fixing the message, or set the config\n" +"variable i18n.commitencoding to the encoding your project uses.\n" +msgstr "" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "" -#: config.c:124 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1574,294 +2270,289 @@ msgid "" "This might be due to circular includes." msgstr "" -#: config.c:140 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "" -#: config.c:151 +#: config.c:152 msgid "relative config includes must come from files" msgstr "" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:376 +#: config.c:378 #, c-format msgid "key does not contain a section: %s" msgstr "" -#: config.c:382 +#: config.c:384 #, c-format msgid "key does not contain variable name: %s" msgstr "" -#: config.c:406 sequencer.c:2463 +#: config.c:408 sequencer.c:2547 #, c-format msgid "invalid key: %s" msgstr "" -#: config.c:412 +#: config.c:414 #, c-format msgid "invalid key (newline): %s" msgstr "" -#: config.c:448 config.c:460 +#: config.c:450 config.c:462 #, c-format msgid "bogus config parameter: %s" msgstr "" -#: config.c:495 +#: config.c:497 #, c-format msgid "bogus format in %s" msgstr "" -#: config.c:821 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:825 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:829 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:833 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:837 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:841 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:978 +#: config.c:993 msgid "out of range" msgstr "" -#: config.c:978 +#: config.c:993 msgid "invalid unit" msgstr "" -#: config.c:979 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:998 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:1001 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:1004 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:1007 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:1010 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:1013 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:1108 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:1117 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "" -#: config.c:1208 +#: config.c:1223 #, c-format msgid "abbrev length out of range: %d" msgstr "" -#: config.c:1222 config.c:1233 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1325 +#: config.c:1340 msgid "core.commentChar should only be one character" msgstr "" -#: config.c:1358 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1430 +#: config.c:1445 #, c-format msgid "malformed value for %s" msgstr "" -#: config.c:1456 +#: config.c:1471 #, c-format msgid "malformed value for %s: %s" msgstr "" -#: config.c:1457 +#: config.c:1472 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1518 builtin/pack-objects.c:3410 +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1639 +#: config.c:1655 #, c-format msgid "unable to load config blob object '%s'" msgstr "" -#: config.c:1642 +#: config.c:1658 #, c-format msgid "reference '%s' does not point to a blob" msgstr "" -#: config.c:1659 +#: config.c:1675 #, c-format msgid "unable to resolve config blob '%s'" msgstr "" -#: config.c:1689 +#: config.c:1705 #, c-format msgid "failed to parse %s" msgstr "" -#: config.c:1745 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "" -#: config.c:2094 +#: config.c:2122 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2264 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2307 -#, c-format -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "" - -#: config.c:2333 +#: config.c:2341 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2379 +#: config.c:2387 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2381 +#: config.c:2389 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2462 +#: config.c:2470 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2494 +#: config.c:2502 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2523 +#: config.c:2531 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2775 config.c:3099 +#: config.c:2783 config.c:3107 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2786 +#: config.c:2794 #, c-format msgid "opening %s" msgstr "" -#: config.c:2821 builtin/config.c:328 +#: config.c:2829 builtin/config.c:354 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:2846 +#: config.c:2854 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:2859 config.c:3112 +#: config.c:2867 config.c:3120 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2870 +#: config.c:2878 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:2879 config.c:3117 +#: config.c:2887 config.c:3125 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:2964 config.c:3214 +#: config.c:2972 config.c:3222 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:2998 +#: config.c:3006 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:3000 builtin/remote.c:782 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 #, c-format msgid "could not unset '%s'" msgstr "" -#: config.c:3090 +#: config.c:3098 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3257 +#: config.c:3265 #, c-format msgid "missing value for '%s'" msgstr "" @@ -1883,79 +2574,88 @@ msgstr "" msgid "server doesn't support '%s'" msgstr "" -#: connect.c:103 +#: connect.c:118 #, c-format msgid "server doesn't support feature '%s'" msgstr "" -#: connect.c:114 +#: connect.c:129 msgid "expected flush after capabilities" msgstr "" -#: connect.c:233 +#: connect.c:263 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "" -#: connect.c:252 +#: connect.c:284 msgid "protocol error: unexpected capabilities^{}" msgstr "" -#: connect.c:273 +#: connect.c:306 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "" -#: connect.c:275 +#: connect.c:308 msgid "repository on the other end cannot be shallow" msgstr "" -#: connect.c:313 +#: connect.c:347 msgid "invalid packet" msgstr "" -#: connect.c:333 +#: connect.c:367 #, c-format msgid "protocol error: unexpected '%s'" msgstr "" -#: connect.c:441 +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "" + +#: connect.c:500 #, c-format msgid "invalid ls-refs response: %s" msgstr "" -#: connect.c:445 +#: connect.c:504 msgid "expected flush after ref listing" msgstr "" -#: connect.c:544 +#: connect.c:507 +msgid "expected response end packet after ref listing" +msgstr "" + +#: connect.c:640 #, c-format msgid "protocol '%s' is not supported" msgstr "" -#: connect.c:595 +#: connect.c:691 msgid "unable to set SO_KEEPALIVE on socket" msgstr "" -#: connect.c:635 connect.c:698 +#: connect.c:731 connect.c:794 #, c-format msgid "Looking up %s ... " msgstr "" -#: connect.c:639 +#: connect.c:735 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:643 connect.c:714 +#: connect.c:739 connect.c:810 #, c-format msgid "" "done.\n" "Connecting to %s (port %s) ... " msgstr "" -#: connect.c:665 connect.c:742 +#: connect.c:761 connect.c:838 #, c-format msgid "" "unable to connect to %s:\n" @@ -1963,115 +2663,115 @@ msgid "" msgstr "" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:671 connect.c:748 +#: connect.c:767 connect.c:844 msgid "done." msgstr "" -#: connect.c:702 +#: connect.c:798 #, c-format msgid "unable to look up %s (%s)" msgstr "" -#: connect.c:708 +#: connect.c:804 #, c-format msgid "unknown port %s" msgstr "" -#: connect.c:845 connect.c:1171 +#: connect.c:941 connect.c:1271 #, c-format msgid "strange hostname '%s' blocked" msgstr "" -#: connect.c:847 +#: connect.c:943 #, c-format msgid "strange port '%s' blocked" msgstr "" -#: connect.c:857 +#: connect.c:953 #, c-format msgid "cannot start proxy %s" msgstr "" -#: connect.c:924 +#: connect.c:1024 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" -#: connect.c:1119 +#: connect.c:1219 msgid "ssh variant 'simple' does not support -4" msgstr "" -#: connect.c:1131 +#: connect.c:1231 msgid "ssh variant 'simple' does not support -6" msgstr "" -#: connect.c:1148 +#: connect.c:1248 msgid "ssh variant 'simple' does not support setting port" msgstr "" -#: connect.c:1260 +#: connect.c:1360 #, c-format msgid "strange pathname '%s' blocked" msgstr "" -#: connect.c:1307 +#: connect.c:1408 msgid "unable to fork" msgstr "" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "" -#: connected.c:98 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:118 +#: connected.c:144 msgid "failed write to rev-list" msgstr "" -#: connected.c:125 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "" -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:279 +#: convert.c:284 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" -#: convert.c:286 +#: 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:304 @@ -2086,117 +2786,145 @@ msgid "" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" -#: convert.c:424 convert.c:495 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "" -#: convert.c:467 +#: convert.c:462 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" -#: convert.c:673 +#: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "" -#: convert.c:693 +#: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "" -#: convert.c:700 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "" -#: convert.c:735 convert.c:738 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "" -#: convert.c:741 convert.c:796 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "" -#: convert.c:844 +#: convert.c:837 msgid "unexpected filter type" msgstr "" -#: convert.c:855 +#: convert.c:848 msgid "path name too long for external filter" msgstr "" -#: convert.c:929 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1228 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1398 convert.c:1432 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "" -#: convert.c:1476 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "" -#: date.c:137 +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "" + +#: credential.c:394 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "" + +#: credential.c:438 +#, c-format +msgid "url has no scheme: %s" +msgstr "" + +#: credential.c:511 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "" + +#: date.c:138 msgid "in the future" msgstr "" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "" msgstr[1] "" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "" msgstr[1] "" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "" msgstr[1] "" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "" msgstr[1] "" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "" msgstr[1] "" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "" msgstr[1] "" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2204,14 +2932,14 @@ msgstr[0] "" msgstr[1] "" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "" msgstr[1] "" -#: date.c:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2242,15 +2970,6 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "" - -#: diffcore-rename.c:544 -msgid "Performing inexact rename detection" -msgstr "" - #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "" @@ -2261,617 +2980,645 @@ msgid "" "tree" msgstr "" -#: diff.c:155 +#: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:160 +#: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:296 +#: diff.c:297 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" -#: diff.c:324 +#: diff.c:325 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" msgstr "" -#: diff.c:332 +#: diff.c:333 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "" -#: diff.c:405 +#: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:465 +#: diff.c:470 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:4215 +#: diff.c:4269 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4560 +#: diff.c:4618 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4563 +#: diff.c:4621 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4641 +#: diff.c:4699 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4689 +#: diff.c:4747 #, c-format msgid "invalid --stat value: %s" msgstr "" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 -#: parse-options.c:199 parse-options.c:203 +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "" -#: diff.c:4726 +#: diff.c:4784 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4811 +#: diff.c:4869 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4835 +#: diff.c:4893 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4849 +#: diff.c:4907 #, c-format msgid "unable to resolve '%s'" msgstr "" -#: diff.c:4899 diff.c:4905 +#: diff.c:4957 diff.c:4963 #, c-format msgid "%s expects <n>/<m> form" msgstr "" -#: diff.c:4917 +#: diff.c:4975 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:4938 +#: diff.c:4996 #, c-format msgid "bad --color-moved argument: %s" msgstr "" -#: diff.c:4957 +#: diff.c:5015 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: diff.c:4997 +#: diff.c:5055 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5033 diff.c:5053 +#: diff.c:5091 diff.c:5111 #, c-format msgid "invalid argument to %s" msgstr "" -#: diff.c:5191 +#: diff.c:5248 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5247 +#: diff.c:5304 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5270 +#: diff.c:5327 msgid "Diff output format options" msgstr "" -#: diff.c:5272 diff.c:5278 +#: diff.c:5329 diff.c:5335 msgid "generate patch" msgstr "" -#: diff.c:5275 builtin/log.c:172 +#: diff.c:5332 builtin/log.c:176 msgid "suppress diff output" msgstr "" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5337 diff.c:5451 diff.c:5458 msgid "<n>" msgstr "" -#: diff.c:5281 diff.c:5284 +#: diff.c:5338 diff.c:5341 msgid "generate diffs with <n> lines context" msgstr "" -#: diff.c:5286 +#: diff.c:5343 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5289 +#: diff.c:5346 msgid "synonym for '-p --raw'" msgstr "" -#: diff.c:5293 +#: diff.c:5350 msgid "synonym for '-p --stat'" msgstr "" -#: diff.c:5297 +#: diff.c:5354 msgid "machine friendly --stat" msgstr "" -#: diff.c:5300 +#: diff.c:5357 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5302 diff.c:5310 +#: diff.c:5359 diff.c:5367 msgid "<param1,param2>..." msgstr "" -#: diff.c:5303 +#: diff.c:5360 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5307 +#: diff.c:5364 msgid "synonym for --dirstat=cumulative" msgstr "" -#: diff.c:5311 +#: diff.c:5368 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5315 +#: diff.c:5372 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5318 +#: diff.c:5375 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5321 +#: diff.c:5378 msgid "show only names of changed files" msgstr "" -#: diff.c:5324 +#: diff.c:5381 msgid "show only names and status of changed files" msgstr "" -#: diff.c:5326 +#: diff.c:5383 msgid "<width>[,<name-width>[,<count>]]" msgstr "" -#: diff.c:5327 +#: diff.c:5384 msgid "generate diffstat" msgstr "" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5386 diff.c:5389 diff.c:5392 msgid "<width>" msgstr "" -#: diff.c:5330 +#: diff.c:5387 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5333 +#: diff.c:5390 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5336 +#: diff.c:5393 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5338 +#: diff.c:5395 msgid "<count>" msgstr "" -#: diff.c:5339 +#: diff.c:5396 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5342 +#: diff.c:5399 msgid "generate compact summary in diffstat" msgstr "" -#: diff.c:5345 +#: diff.c:5402 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5348 +#: diff.c:5405 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5350 +#: diff.c:5407 msgid "show colored diff" msgstr "" -#: diff.c:5351 +#: diff.c:5408 msgid "<kind>" msgstr "" -#: diff.c:5352 +#: diff.c:5409 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5355 +#: diff.c:5412 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 msgid "<prefix>" msgstr "" -#: diff.c:5359 +#: diff.c:5416 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5362 +#: diff.c:5419 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5365 +#: diff.c:5422 msgid "prepend an additional prefix to every line of output" msgstr "" -#: diff.c:5368 +#: diff.c:5425 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5371 +#: diff.c:5428 msgid "show context between diff hunks up to the specified number of lines" msgstr "" -#: diff.c:5375 diff.c:5380 diff.c:5385 +#: diff.c:5432 diff.c:5437 diff.c:5442 msgid "<char>" msgstr "" -#: diff.c:5376 +#: diff.c:5433 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5381 +#: diff.c:5438 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5386 +#: diff.c:5443 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5389 +#: diff.c:5446 msgid "Diff rename options" msgstr "" -#: diff.c:5390 +#: diff.c:5447 msgid "<n>[/<m>]" msgstr "" -#: diff.c:5391 +#: diff.c:5448 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5395 +#: diff.c:5452 msgid "detect renames" msgstr "" -#: diff.c:5399 +#: diff.c:5456 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5402 +#: diff.c:5459 msgid "detect copies" msgstr "" -#: diff.c:5406 +#: diff.c:5463 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5408 +#: diff.c:5465 msgid "disable rename detection" msgstr "" -#: diff.c:5411 +#: diff.c:5468 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5413 +#: diff.c:5470 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5416 +#: diff.c:5473 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5418 +#: diff.c:5475 msgid "Diff algorithm options" msgstr "" -#: diff.c:5420 +#: diff.c:5477 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5423 +#: diff.c:5480 msgid "ignore whitespace when comparing lines" msgstr "" -#: diff.c:5426 +#: diff.c:5483 msgid "ignore changes in amount of whitespace" msgstr "" -#: diff.c:5429 +#: diff.c:5486 msgid "ignore changes in whitespace at EOL" msgstr "" -#: diff.c:5432 +#: diff.c:5489 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5435 +#: diff.c:5492 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5438 +#: diff.c:5495 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5441 +#: diff.c:5498 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5445 +#: diff.c:5502 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5447 +#: diff.c:5504 msgid "<algorithm>" msgstr "" -#: diff.c:5448 +#: diff.c:5505 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5450 +#: diff.c:5507 msgid "<text>" msgstr "" -#: diff.c:5451 +#: diff.c:5508 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5510 diff.c:5519 diff.c:5522 msgid "<mode>" msgstr "" -#: diff.c:5454 +#: diff.c:5511 msgid "show word diff, using <mode> to delimit changed words" msgstr "" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5513 diff.c:5516 diff.c:5561 msgid "<regex>" msgstr "" -#: diff.c:5457 +#: diff.c:5514 msgid "use <regex> to decide what a word is" msgstr "" -#: diff.c:5460 +#: diff.c:5517 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" -#: diff.c:5463 +#: diff.c:5520 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5466 +#: diff.c:5523 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5469 +#: diff.c:5526 msgid "Other diff options" msgstr "" -#: diff.c:5471 +#: diff.c:5528 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5475 +#: diff.c:5532 msgid "treat all files as text" msgstr "" -#: diff.c:5477 +#: diff.c:5534 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5479 +#: diff.c:5536 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5481 +#: diff.c:5538 msgid "disable all output of the program" msgstr "" -#: diff.c:5483 +#: diff.c:5540 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5485 +#: diff.c:5542 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5487 +#: diff.c:5544 msgid "<when>" msgstr "" -#: diff.c:5488 +#: diff.c:5545 msgid "ignore changes to submodules in the diff generation" msgstr "" -#: diff.c:5491 +#: diff.c:5548 msgid "<format>" msgstr "" -#: diff.c:5492 +#: diff.c:5549 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5496 +#: diff.c:5553 msgid "hide 'git add -N' entries from the index" msgstr "" -#: diff.c:5499 +#: diff.c:5556 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5501 +#: diff.c:5558 msgid "<string>" msgstr "" -#: diff.c:5502 +#: diff.c:5559 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5505 +#: diff.c:5562 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5508 +#: diff.c:5565 msgid "show all changes in the changeset with -S or -G" msgstr "" -#: diff.c:5511 +#: diff.c:5568 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" -#: diff.c:5514 +#: diff.c:5571 msgid "control the order in which files appear in the output" msgstr "" -#: diff.c:5515 +#: diff.c:5572 msgid "<object-id>" msgstr "" -#: diff.c:5516 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5518 +#: diff.c:5575 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5519 +#: diff.c:5576 msgid "select files by diff type" msgstr "" -#: diff.c:5521 +#: diff.c:5578 msgid "<file>" msgstr "" -#: diff.c:5522 +#: diff.c:5579 msgid "Output to a specific file" msgstr "" -#: diff.c:6177 +#: diff.c:6236 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:6180 +#: diff.c:6239 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:6183 +#: diff.c:6242 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:537 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "" + +#: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" -#: dir.c:926 +#: dir.c:718 dir.c:747 dir.c:760 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "" + +#: dir.c:777 dir.c:791 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "" + +#: dir.c:809 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "" + +#: dir.c:819 +msgid "disabling cone pattern matching" +msgstr "" + +#: dir.c:1198 #, c-format msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:1843 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2085 +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2209 +#: dir.c:2729 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3013 +#: dir.c:3520 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3058 dir.c:3063 +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3092 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "" -#: entry.c:178 +#: entry.c:177 msgid "Filtering content" msgstr "" -#: entry.c:476 +#: entry.c:478 #, c-format msgid "could not stat file '%s'" msgstr "" @@ -2881,7 +3628,7 @@ msgstr "" msgid "bad git namespace path \"%s\"" msgstr "" -#: environment.c:332 +#: environment.c:337 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "" @@ -2891,265 +3638,285 @@ msgstr "" msgid "too many args to run %s" msgstr "" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "" - -#: fetch-pack.c:151 +#: fetch-pack.c:176 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:154 +#: fetch-pack.c:179 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" -#: fetch-pack.c:165 +#: fetch-pack.c:190 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" -#: fetch-pack.c:185 +#: fetch-pack.c:210 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:196 +#: fetch-pack.c:221 msgid "unable to write to remote" msgstr "" -#: fetch-pack.c:258 +#: fetch-pack.c:282 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:375 fetch-pack.c:1397 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:381 fetch-pack.c:1403 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:383 fetch-pack.c:1405 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:386 fetch-pack.c:1408 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:388 fetch-pack.c:1410 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:391 fetch-pack.c:1414 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:417 +#: fetch-pack.c:431 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:434 +#: fetch-pack.c:448 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:465 +#: fetch-pack.c:479 msgid "giving up" msgstr "" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:492 progress.c:339 msgid "done" msgstr "" -#: fetch-pack.c:489 +#: fetch-pack.c:504 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:535 +#: fetch-pack.c:540 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:744 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:783 +#: fetch-pack.c:824 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:791 +#: fetch-pack.c:832 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:859 +#: fetch-pack.c:916 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:875 +#: fetch-pack.c:933 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:877 +#: fetch-pack.c:935 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:908 +#: fetch-pack.c:978 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 -#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 -#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 -#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 #, c-format msgid "Server supports %s" msgstr "" -#: fetch-pack.c:915 +#: fetch-pack.c:985 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:975 +#: fetch-pack.c:1045 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:980 +#: fetch-pack.c:1050 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:984 +#: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1001 +#: fetch-pack.c:1056 +msgid "Server does not support this repository's object format" +msgstr "" + +#: fetch-pack.c:1069 msgid "no common commits" msgstr "" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1081 fetch-pack.c:1619 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1151 +#: fetch-pack.c:1205 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "" + +#: fetch-pack.c:1209 +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "" + +#: fetch-pack.c:1229 msgid "Server does not support shallow requests" msgstr "" -#: fetch-pack.c:1157 +#: fetch-pack.c:1236 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:1184 +#: fetch-pack.c:1275 msgid "unable to write request to remote" msgstr "" -#: fetch-pack.c:1202 +#: fetch-pack.c:1293 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1208 +#: fetch-pack.c:1299 #, c-format msgid "expected '%s', received '%s'" msgstr "" -#: fetch-pack.c:1247 +#: fetch-pack.c:1360 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1252 +#: fetch-pack.c:1365 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1262 +#: fetch-pack.c:1375 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1264 +#: fetch-pack.c:1377 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1306 +#: fetch-pack.c:1419 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1353 +#: fetch-pack.c:1466 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" -#: fetch-pack.c:1358 +#: fetch-pack.c:1471 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" -#: fetch-pack.c:1363 +#: fetch-pack.c:1476 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1689 +#: fetch-pack.c:1506 +msgid "git fetch-pack: expected response end packet" +msgstr "" + +#: fetch-pack.c:1887 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1910 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "" -#: fetch-pack.c:1739 +#: fetch-pack.c:1937 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1742 +#: fetch-pack.c:1940 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" -#: gpg-interface.c:321 -msgid "gpg failed to sign the data" -msgstr "" - -#: gpg-interface.c:347 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:350 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" -#: graph.c:97 +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "" + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:2117 +#: grep.c:668 +msgid "" +"given pattern contains NULL byte (via -f <file>). This is only supported " +"with -P under PCRE v2" +msgstr "" + +#: grep.c:2128 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:2145 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "" @@ -3199,79 +3966,79 @@ 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 msgid "Low-level Commands / Internal Helpers" msgstr "" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:363 git.c:98 +#: help.c:365 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "" -#: help.c:403 -msgid "The common Git guides are:" +#: help.c:405 +msgid "The Git concept guides are:" msgstr "" -#: help.c:512 +#: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "" -#: help.c:517 +#: help.c:434 msgid "External commands" msgstr "" -#: help.c:532 +#: help.c:449 msgid "Command aliases" msgstr "" -#: help.c:596 +#: help.c:513 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" -#: help.c:655 +#: help.c:572 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:677 +#: help.c:594 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -#: help.c:682 +#: help.c:599 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:687 +#: help.c:604 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:695 +#: help.c:612 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:699 +#: help.c:616 msgid "" "\n" "The most similar command is" @@ -3281,16 +4048,16 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: help.c:714 +#: help.c:656 msgid "git version [<options>]" msgstr "" -#: help.c:782 +#: help.c:711 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:786 +#: help.c:715 msgid "" "\n" "Did you mean this?" @@ -3300,7 +4067,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -3315,76 +4090,95 @@ msgid "" "\n" msgstr "" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "" -#: ident.c:421 +#: ident.c:439 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:436 builtin/commit.c:611 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "" -#: list-objects.c:129 -#, c-format -msgid "entry '%s' in tree %s has tree mode, but is not a tree" +#: list-objects-filter-options.c:81 +msgid "expected 'tree:<depth>'" msgstr "" -#: list-objects.c:142 +#: list-objects-filter-options.c:96 +msgid "sparse:path filters support has been dropped" +msgstr "" + +#: list-objects-filter-options.c:109 #, c-format -msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgid "invalid filter-spec '%s'" msgstr "" -#: list-objects.c:378 +#: list-objects-filter-options.c:125 #, c-format -msgid "unable to load root tree for commit %s" +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "" + +#: list-objects-filter-options.c:167 +msgid "expected something after combine:" msgstr "" -#: list-objects-filter-options.c:36 +#: list-objects-filter-options.c:249 msgid "multiple filter-specs cannot be combined" msgstr "" -#: list-objects-filter-options.c:58 -msgid "expected 'tree:<depth>'" +#: list-objects-filter-options.c:361 +msgid "unable to upgrade repository format to support partial clone" msgstr "" -#: list-objects-filter-options.c:84 -msgid "sparse:path filters support has been dropped" +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" msgstr "" -#: list-objects-filter-options.c:94 +#: list-objects-filter.c:495 #, c-format -msgid "invalid filter-spec '%s'" +msgid "unable to parse sparse filter data in %s" +msgstr "" + +#: list-objects.c:127 +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" +#: list-objects.c:140 +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "" -#: lockfile.c:151 +#: list-objects.c:375 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "" + +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -3396,123 +4190,113 @@ msgid "" "remove the file manually to continue." msgstr "" -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "" -#: merge.c:41 -msgid "failed to read the cache" +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" msgstr "" -#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 -#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 -#: builtin/stash.c:264 -msgid "unable to write new index file" -msgstr "" - -#: merge-recursive.c:322 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:345 +#: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:354 +#: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:437 -msgid "error building trees" -msgstr "" - -#: merge-recursive.c:863 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:874 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:888 merge-recursive.c:907 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:897 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:941 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:965 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:976 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:981 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1177 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "" -#: merge-recursive.c:1184 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "" -#: merge-recursive.c:1191 +#: merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" -#: merge-recursive.c:1199 merge-recursive.c:1211 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "" -#: merge-recursive.c:1202 merge-recursive.c:1214 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "" -#: merge-recursive.c:1237 +#: merge-recursive.c:1251 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1241 +#: merge-recursive.c:1255 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" -#: merge-recursive.c:1242 +#: merge-recursive.c:1256 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-recursive.c:1245 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3523,108 +4307,108 @@ msgid "" "which will accept this suggestion.\n" msgstr "" -#: merge-recursive.c:1254 +#: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" -#: merge-recursive.c:1327 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:1332 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:1364 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1387 +#: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" -#: merge-recursive.c:1459 +#: 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:1464 +#: 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:1471 +#: 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:1476 +#: 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:1511 +#: merge-recursive.c:1526 msgid "rename" msgstr "" -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "renamed" msgstr "" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "" -#: merge-recursive.c:1601 +#: 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:1659 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" -#: merge-recursive.c:1690 +#: merge-recursive.c:1676 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1695 +#: merge-recursive.c:1681 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" -#: merge-recursive.c:1714 +#: 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:1719 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1828 +#: merge-recursive.c:1805 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:2035 +#: merge-recursive.c:2068 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3632,323 +4416,361 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:2067 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -#: merge-recursive.c:2077 +#: merge-recursive.c:2110 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -#: merge-recursive.c:2169 +#: merge-recursive.c:2202 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" -#: merge-recursive.c:2413 +#: merge-recursive.c:2447 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -#: merge-recursive.c:2938 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:2941 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modify" msgstr "" -#: merge-recursive.c:3005 +#: merge-recursive.c:3040 msgid "modified" msgstr "" -#: merge-recursive.c:3017 +#: merge-recursive.c:3052 msgid "content" msgstr "" -#: merge-recursive.c:3021 +#: merge-recursive.c:3056 msgid "add/add" msgstr "" -#: merge-recursive.c:3044 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:3066 git-submodule.sh:937 +#: merge-recursive.c:3101 msgid "submodule" msgstr "" -#: merge-recursive.c:3067 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3097 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:3179 +#: merge-recursive.c:3215 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" -#: merge-recursive.c:3182 +#: merge-recursive.c:3218 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " "in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3186 +#: merge-recursive.c:3222 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" -#: merge-recursive.c:3189 +#: merge-recursive.c:3225 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3303 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:3326 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "" -#: merge-recursive.c:3331 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "" -#: merge-recursive.c:3338 +#: merge-recursive.c:3374 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:3347 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:3356 +#: merge-recursive.c:3392 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3394 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" - -#: merge-recursive.c:3405 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "" -#: merge-recursive.c:3414 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3513 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "" -#: merge-recursive.c:3526 +#: merge-recursive.c:3563 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3565 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:3631 +#: merge-recursive.c:3672 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" + +#: merge-recursive.c:3769 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 msgid "Unable to write index." msgstr "" -#: midx.c:69 +#: merge.c:41 +msgid "failed to read the cache" +msgstr "" + +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "" + +#: midx.c:79 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:85 +#: midx.c:95 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:90 +#: midx.c:100 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" -#: midx.c:95 +#: midx.c:105 #, c-format -msgid "hash version %u does not match" +msgid "multi-pack-index hash version %u does not match version %u" msgstr "" -#: midx.c:109 +#: midx.c:122 msgid "invalid chunk offset (too large)" msgstr "" -#: midx.c:133 +#: midx.c:146 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" -#: midx.c:146 +#: midx.c:159 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:148 +#: midx.c:161 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:150 +#: midx.c:163 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:152 +#: midx.c:165 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:166 +#: midx.c:179 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:211 +#: midx.c:222 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:261 +#: midx.c:272 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -#: midx.c:289 +#: midx.c:300 msgid "error preparing packfile from multi-pack-index" msgstr "" -#: midx.c:470 +#: midx.c:485 #, c-format msgid "failed to add packfile '%s'" msgstr "" -#: midx.c:476 +#: midx.c:491 #, c-format msgid "failed to open pack-index '%s'" msgstr "" -#: midx.c:536 +#: midx.c:551 #, c-format msgid "failed to locate object %d in packfile" msgstr "" -#: midx.c:865 +#: midx.c:853 +msgid "Adding packfiles to multi-pack-index" +msgstr "" + +#: midx.c:886 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:1036 +#: midx.c:938 +msgid "no pack files to index." +msgstr "" + +#: midx.c:990 +msgid "Writing chunks to multi-pack-index" +msgstr "" + +#: midx.c:1068 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" -#: midx.c:1091 +#: midx.c:1124 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "" + +#: midx.c:1132 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1106 +#: midx.c:1147 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -#: midx.c:1110 -msgid "Verifying OID order in MIDX" +#: midx.c:1152 +msgid "the midx contains no oid" +msgstr "" + +#: midx.c:1161 +msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1119 +#: midx.c:1170 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1138 +#: midx.c:1190 msgid "Sorting objects by packfile" msgstr "" -#: midx.c:1144 +#: midx.c:1197 msgid "Verifying object offsets" msgstr "" -#: midx.c:1160 +#: midx.c:1213 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" -#: midx.c:1166 +#: midx.c:1219 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" -#: midx.c:1175 +#: midx.c:1228 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" -#: midx.c:1350 +#: midx.c:1253 +msgid "Counting referenced objects" +msgstr "" + +#: midx.c:1263 +msgid "Finding and deleting unreferenced packfiles" +msgstr "" + +#: midx.c:1454 msgid "could not start pack-objects" msgstr "" -#: midx.c:1369 +#: midx.c:1474 msgid "could not finish pack-objects" msgstr "" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "" @@ -3989,45 +4811,70 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "" -#: object.c:267 object.c:278 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "" -#: packfile.c:648 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#, c-format +msgid "unable to get size of %s" +msgstr "" + +#: packfile.c:630 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1899 +#: packfile.c:1922 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1903 +#: packfile.c:1926 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" +#: parse-options-cb.c:20 parse-options-cb.c:24 +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "" + +#: parse-options-cb.c:41 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "" + +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "" + +#: parse-options-cb.c:132 parse-options-cb.c:149 +#, c-format +msgid "malformed object name '%s'" +msgstr "" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4043,7 +4890,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 "" @@ -4053,41 +4900,46 @@ 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:859 +#: parse-options.c:666 parse-options.c:971 +#, c-format +msgid "alias of --%s" +msgstr "" + +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "" -#: parse-options.c:861 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "" -#: parse-options.c:863 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "" -#: parse-options.c:887 +#: parse-options.c:890 msgid "..." msgstr "" -#: parse-options.c:906 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "" @@ -4095,121 +4947,101 @@ msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:915 +#: parse-options.c:918 #, c-format msgid " %s" msgstr "" -#: parse-options.c:954 +#: parse-options.c:957 msgid "-NUM" msgstr "" -#: parse-options.c:968 -#, c-format -msgid "alias of --%s" -msgstr "" - -#: parse-options-cb.c:20 parse-options-cb.c:24 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "" - -#: parse-options-cb.c:41 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "" - -#: parse-options-cb.c:54 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "" - -#: parse-options-cb.c:130 parse-options-cb.c:147 -#, c-format -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:445 #, c-format -msgid "%s: '%s' is outside repository" +msgid "%s: '%s' is outside repository at '%s'" msgstr "" -#: pathspec.c:514 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "" -#: pathspec.c:524 +#: pathspec.c:531 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:591 +#: pathspec.c:598 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" +#: pathspec.c:643 +#, c-format +msgid "line is badly quoted: %s" +msgstr "" + #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "" @@ -4219,44 +5051,48 @@ msgid "unable to write delim packet" msgstr "" #: pkt-line.c:106 +msgid "unable to write stateless separator packet" +msgstr "" + +#: pkt-line.c:113 msgid "flush packet write failed" msgstr "" -#: pkt-line.c:146 pkt-line.c:232 +#: pkt-line.c:153 pkt-line.c:239 msgid "protocol error: impossibly long line" msgstr "" -#: pkt-line.c:162 pkt-line.c:164 +#: pkt-line.c:169 pkt-line.c:171 msgid "packet write with format failed" msgstr "" -#: pkt-line.c:196 +#: pkt-line.c:203 msgid "packet write failed - data exceeds max packet size" msgstr "" -#: pkt-line.c:203 pkt-line.c:210 +#: pkt-line.c:210 pkt-line.c:217 msgid "packet write failed" msgstr "" -#: pkt-line.c:295 +#: pkt-line.c:302 msgid "read error" msgstr "" -#: pkt-line.c:303 +#: pkt-line.c:310 msgid "the remote end hung up unexpectedly" msgstr "" -#: pkt-line.c:331 +#: pkt-line.c:338 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "" -#: pkt-line.c:341 pkt-line.c:346 +#: pkt-line.c:352 pkt-line.c:357 #, c-format msgid "protocol error: bad line length %d" msgstr "" -#: pkt-line.c:362 +#: pkt-line.c:373 sideband.c:150 #, c-format msgid "remote error: %s" msgstr "" @@ -4270,237 +5106,273 @@ msgstr "" msgid "unable to create threaded lstat: %s" msgstr "" -#: pretty.c:966 +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "" -#: range-diff.c:70 +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "" + +#: promisor-remote.c:53 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "" + +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "" + +#: range-diff.c:77 msgid "could not start `log`" msgstr "" -#: range-diff.c:72 +#: range-diff.c:79 msgid "could not read `log` output" msgstr "" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:98 sequencer.c:5283 #, c-format msgid "could not parse commit '%s'" msgstr "" -#: range-diff.c:117 +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" + +#: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "" -#: range-diff.c:274 +#: range-diff.c:301 msgid "failed to generate diff" msgstr "" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:534 range-diff.c:536 #, c-format msgid "could not parse log for '%s'" msgstr "" -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "" -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" -#: read-cache.c:723 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "" -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "" -#: read-cache.c:1314 +#: read-cache.c:1318 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "" -#: read-cache.c:1499 +#: read-cache.c:1524 msgid "Refresh index" msgstr "" -#: read-cache.c:1613 +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1623 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1679 +#: read-cache.c:1705 #, c-format msgid "bad signature 0x%08x" msgstr "" -#: read-cache.c:1682 +#: read-cache.c:1708 #, c-format msgid "bad index version %d" msgstr "" -#: read-cache.c:1691 +#: read-cache.c:1717 msgid "bad index file sha1 signature" msgstr "" -#: read-cache.c:1721 +#: read-cache.c:1747 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1723 +#: read-cache.c:1749 #, c-format msgid "ignoring %.4s extension" msgstr "" -#: read-cache.c:1760 +#: read-cache.c:1786 #, c-format msgid "unknown index entry format 0x%08x" msgstr "" -#: read-cache.c:1776 +#: read-cache.c:1802 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1833 +#: read-cache.c:1859 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1836 +#: read-cache.c:1862 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "" -#: read-cache.c:1839 +#: read-cache.c:1865 #, c-format msgid "unordered stage entries for '%s'" msgstr "" -#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 -#: builtin/checkout.c:651 builtin/clean.c:956 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:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "" -#: read-cache.c:2087 +#: read-cache.c:2115 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2100 +#: read-cache.c:2128 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2133 +#: read-cache.c:2161 #, c-format msgid "%s: index file open failed" msgstr "" -#: read-cache.c:2137 +#: read-cache.c:2165 #, c-format msgid "%s: cannot stat the open index" msgstr "" -#: read-cache.c:2141 +#: read-cache.c:2169 #, c-format msgid "%s: index file smaller than expected" msgstr "" -#: read-cache.c:2145 +#: read-cache.c:2173 #, c-format msgid "%s: unable to map index file" msgstr "" -#: read-cache.c:2187 +#: read-cache.c:2215 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2214 +#: read-cache.c:2242 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2246 +#: read-cache.c:2274 #, c-format msgid "could not freshen shared index '%s'" msgstr "" -#: read-cache.c:2293 +#: read-cache.c:2321 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3105 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3117 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "" -#: read-cache.c:3142 +#: read-cache.c:3170 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" -#: read-cache.c:3291 +#: read-cache.c:3319 #, 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" @@ -4522,26 +5394,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:218 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:222 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:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4550,36 +5422,33 @@ msgid "" "\n" msgstr "" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 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:3447 -#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 #, c-format msgid "could not write '%s'" msgstr "" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 +#: builtin/rebase.c:246 #, 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" @@ -4590,416 +5459,395 @@ msgid "" "\n" msgstr "" -#: refs.c:262 -#, c-format -msgid "%s does not point to a valid object!" -msgstr "" - -#: refs.c:667 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 +#: builtin/rebase.c:258 #, c-format -msgid "ignoring dangling symref %s" +msgid "could not read '%s'." msgstr "" -#: refs.c:669 ref-filter.c:2092 -#, c-format -msgid "ignoring broken ref %s" +#: ref-filter.c:42 wt-status.c:1973 +msgid "gone" msgstr "" -#: refs.c:804 +#: ref-filter.c:43 #, c-format -msgid "could not open '%s' for writing: %s" +msgid "ahead %d" msgstr "" -#: refs.c:814 refs.c:865 +#: ref-filter.c:44 #, c-format -msgid "could not read ref '%s'" +msgid "behind %d" msgstr "" -#: refs.c:820 +#: ref-filter.c:45 #, c-format -msgid "ref '%s' already exists" +msgid "ahead %d, behind %d" msgstr "" -#: refs.c:825 +#: ref-filter.c:169 #, c-format -msgid "unexpected object ID when writing '%s'" +msgid "expected format: %%(color:<color>)" msgstr "" -#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 -#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 +#: ref-filter.c:171 #, c-format -msgid "could not write to '%s'" +msgid "unrecognized color: %%(color:%s)" msgstr "" -#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 -#: builtin/rebase.c:1003 +#: ref-filter.c:193 #, c-format -msgid "could not open '%s' for writing" +msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: refs.c:867 +#: ref-filter.c:197 #, c-format -msgid "unexpected object ID when deleting '%s'" +msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: refs.c:998 +#: ref-filter.c:199 #, c-format -msgid "log for ref %s has gap after %s" +msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: refs.c:1004 +#: ref-filter.c:254 #, c-format -msgid "log for ref %s unexpectedly ended on %s" +msgid "%%(objecttype) does not take arguments" msgstr "" -#: refs.c:1063 +#: ref-filter.c:276 #, c-format -msgid "log for %s is empty" +msgid "unrecognized %%(objectsize) argument: %s" msgstr "" -#: refs.c:1155 +#: ref-filter.c:284 #, c-format -msgid "refusing to update ref with bad name '%s'" +msgid "%%(deltabase) does not take arguments" msgstr "" -#: refs.c:1231 +#: ref-filter.c:296 #, c-format -msgid "update_ref failed for ref '%s': %s" +msgid "%%(body) does not take arguments" msgstr "" -#: refs.c:2012 +#: ref-filter.c:309 #, c-format -msgid "multiple updates for ref '%s' not allowed" -msgstr "" - -#: refs.c:2044 -msgid "ref updates forbidden inside quarantine environment" +msgid "unrecognized %%(subject) argument: %s" msgstr "" -#: refs.c:2140 refs.c:2170 +#: ref-filter.c:330 #, c-format -msgid "'%s' exists; cannot create '%s'" +msgid "unknown %%(trailers) argument: %s" msgstr "" -#: refs.c:2146 refs.c:2181 +#: ref-filter.c:363 #, c-format -msgid "cannot process '%s' and '%s' at the same time" +msgid "positive value expected contents:lines=%s" msgstr "" -#: refs/files-backend.c:1234 +#: ref-filter.c:365 #, c-format -msgid "could not remove reference %s" +msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: refs/files-backend.c:1248 refs/packed-backend.c:1532 -#: refs/packed-backend.c:1542 +#: ref-filter.c:380 #, c-format -msgid "could not delete reference %s: %s" +msgid "positive value expected '%s' in %%(%s)" msgstr "" -#: refs/files-backend.c:1251 refs/packed-backend.c:1545 +#: ref-filter.c:384 #, c-format -msgid "could not delete references: %s" +msgid "unrecognized argument '%s' in %%(%s)" msgstr "" -#: refspec.c:137 +#: ref-filter.c:398 #, c-format -msgid "invalid refspec '%s'" +msgid "unrecognized email option: %s" msgstr "" -#: ref-filter.c:42 wt-status.c:1934 -msgid "gone" -msgstr "" - -#: ref-filter.c:43 +#: ref-filter.c:428 #, c-format -msgid "ahead %d" +msgid "expected format: %%(align:<width>,<position>)" msgstr "" -#: ref-filter.c:44 +#: ref-filter.c:440 #, c-format -msgid "behind %d" +msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:45 +#: ref-filter.c:447 #, c-format -msgid "ahead %d, behind %d" +msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:162 +#: ref-filter.c:456 #, c-format -msgid "expected format: %%(color:<color>)" +msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:164 +#: ref-filter.c:464 #, c-format -msgid "unrecognized color: %%(color:%s)" +msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:186 +#: ref-filter.c:482 #, c-format -msgid "Integer value expected refname:lstrip=%s" +msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:190 +#: ref-filter.c:584 #, c-format -msgid "Integer value expected refname:rstrip=%s" +msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:192 +#: ref-filter.c:611 #, c-format -msgid "unrecognized %%(%s) argument: %s" +msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:247 +#: ref-filter.c:615 #, c-format -msgid "%%(objecttype) does not take arguments" +msgid "" +"not a git repository, but the field '%.*s' requires access to object data" msgstr "" -#: ref-filter.c:269 +#: ref-filter.c:739 #, c-format -msgid "unrecognized %%(objectsize) argument: %s" +msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:277 +#: ref-filter.c:802 #, c-format -msgid "%%(deltabase) does not take arguments" +msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:289 +#: ref-filter.c:804 #, c-format -msgid "%%(body) does not take arguments" +msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:298 +#: ref-filter.c:806 #, c-format -msgid "%%(subject) does not take arguments" +msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:320 +#: ref-filter.c:834 #, c-format -msgid "unknown %%(trailers) argument: %s" +msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:349 +#: ref-filter.c:836 #, c-format -msgid "positive value expected contents:lines=%s" +msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:351 +#: ref-filter.c:838 #, c-format -msgid "unrecognized %%(contents) argument: %s" +msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:366 +#: ref-filter.c:853 #, c-format -msgid "positive value expected objectname:short=%s" +msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:370 +#: ref-filter.c:910 #, c-format -msgid "unrecognized %%(objectname) argument: %s" +msgid "malformed format string %s" msgstr "" -#: ref-filter.c:400 +#: ref-filter.c:1541 #, c-format -msgid "expected format: %%(align:<width>,<position>)" +msgid "no branch, rebasing %s" msgstr "" -#: ref-filter.c:412 +#: ref-filter.c:1544 #, c-format -msgid "unrecognized position:%s" +msgid "no branch, rebasing detached HEAD %s" msgstr "" -#: ref-filter.c:419 +#: ref-filter.c:1547 #, c-format -msgid "unrecognized width:%s" +msgid "no branch, bisect started on %s" msgstr "" -#: ref-filter.c:428 -#, c-format -msgid "unrecognized %%(align) argument: %s" +#: ref-filter.c:1557 +msgid "no branch" msgstr "" -#: ref-filter.c:436 +#: ref-filter.c:1591 ref-filter.c:1800 #, c-format -msgid "positive width expected with the %%(align) atom" +msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:454 +#: ref-filter.c:1601 #, c-format -msgid "unrecognized %%(if) argument: %s" +msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:556 +#: ref-filter.c:2054 #, c-format -msgid "malformed field name: %.*s" +msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:583 +#: ref-filter.c:2143 #, c-format -msgid "unknown field name: %.*s" +msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:587 +#: ref-filter.c:2148 refs.c:657 #, c-format -msgid "" -"not a git repository, but the field '%.*s' requires access to object data" +msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:711 +#: ref-filter.c:2464 #, c-format -msgid "format: %%(if) atom used without a %%(then) atom" +msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:774 +#: ref-filter.c:2563 #, c-format -msgid "format: %%(then) atom used without an %%(if) atom" +msgid "malformed object name %s" msgstr "" -#: ref-filter.c:776 +#: ref-filter.c:2568 #, c-format -msgid "format: %%(then) atom used more than once" +msgid "option `%s' must point to a commit" msgstr "" -#: ref-filter.c:778 +#: refs.c:264 #, c-format -msgid "format: %%(then) atom used after %%(else)" +msgid "%s does not point to a valid object!" msgstr "" -#: ref-filter.c:806 +#: refs.c:572 #, c-format -msgid "format: %%(else) atom used without an %%(if) atom" +msgid "could not retrieve `%s`" msgstr "" -#: ref-filter.c:808 +#: refs.c:579 #, c-format -msgid "format: %%(else) atom used without a %%(then) atom" +msgid "invalid branch name: %s = %s" msgstr "" -#: ref-filter.c:810 +#: refs.c:655 #, c-format -msgid "format: %%(else) atom used more than once" +msgid "ignoring dangling symref %s" msgstr "" -#: ref-filter.c:825 +#: refs.c:892 #, c-format -msgid "format: %%(end) atom used without corresponding atom" +msgid "log for ref %s has gap after %s" msgstr "" -#: ref-filter.c:882 +#: refs.c:898 #, c-format -msgid "malformed format string %s" +msgid "log for ref %s unexpectedly ended on %s" msgstr "" -#: ref-filter.c:1485 +#: refs.c:957 #, c-format -msgid "no branch, rebasing %s" +msgid "log for %s is empty" msgstr "" -#: ref-filter.c:1488 +#: refs.c:1049 #, c-format -msgid "no branch, rebasing detached HEAD %s" +msgid "refusing to update ref with bad name '%s'" msgstr "" -#: ref-filter.c:1491 +#: refs.c:1120 #, c-format -msgid "no branch, bisect started on %s" -msgstr "" - -#: ref-filter.c:1501 -msgid "no branch" +msgid "update_ref failed for ref '%s': %s" msgstr "" -#: ref-filter.c:1537 ref-filter.c:1743 +#: refs.c:1944 #, c-format -msgid "missing object %s for %s" +msgid "multiple updates for ref '%s' not allowed" msgstr "" -#: ref-filter.c:1547 -#, c-format -msgid "parse_object_buffer failed on %s for %s" +#: refs.c:2024 +msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: ref-filter.c:1998 -#, c-format -msgid "malformed object at '%s'" +#: refs.c:2035 +msgid "ref updates aborted by hook" msgstr "" -#: ref-filter.c:2087 +#: refs.c:2135 refs.c:2165 #, c-format -msgid "ignoring ref with broken name %s" +msgid "'%s' exists; cannot create '%s'" msgstr "" -#: ref-filter.c:2382 +#: refs.c:2141 refs.c:2176 #, c-format -msgid "format: %%(end) atom missing" +msgid "cannot process '%s' and '%s' at the same time" msgstr "" -#: ref-filter.c:2482 +#: refs/files-backend.c:1228 #, c-format -msgid "option `%s' is incompatible with --merged" +msgid "could not remove reference %s" msgstr "" -#: ref-filter.c:2485 +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 #, c-format -msgid "option `%s' is incompatible with --no-merged" +msgid "could not delete reference %s: %s" msgstr "" -#: ref-filter.c:2495 +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 #, c-format -msgid "malformed object name %s" +msgid "could not delete references: %s" msgstr "" -#: ref-filter.c:2500 +#: refspec.c:167 #, c-format -msgid "option `%s' must point to a commit" +msgid "invalid refspec '%s'" msgstr "" -#: remote.c:363 +#: remote.c:351 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" -#: remote.c:410 +#: remote.c:399 msgid "more than one receivepack given, using the first" msgstr "" -#: remote.c:418 +#: remote.c:407 msgid "more than one uploadpack given, using the first" msgstr "" -#: remote.c:608 +#: remote.c:590 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:612 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:616 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:684 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "" -#: remote.c:694 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "" -#: remote.c:1000 +#: remote.c:1073 #, c-format msgid "src refspec %s does not match any" msgstr "" -#: remote.c:1005 +#: remote.c:1078 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5008,7 +5856,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1093 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5022,7 +5870,7 @@ msgid "" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -#: remote.c:1040 +#: remote.c:1113 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5030,7 +5878,7 @@ msgid "" "'%s:refs/heads/%s'?" msgstr "" -#: remote.c:1045 +#: remote.c:1118 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5038,7 +5886,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1050 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5046,7 +5894,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1055 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5054,114 +5902,114 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1091 +#: remote.c:1164 #, c-format msgid "%s cannot be resolved to branch" msgstr "" -#: remote.c:1102 +#: remote.c:1175 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "" -#: remote.c:1114 +#: remote.c:1187 #, c-format msgid "dst refspec %s matches more than one" msgstr "" -#: remote.c:1121 +#: remote.c:1194 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1624 remote.c:1725 +#: remote.c:1703 remote.c:1804 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1633 +#: remote.c:1712 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1636 +#: remote.c:1715 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1642 +#: remote.c:1721 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1657 +#: remote.c:1736 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1669 +#: remote.c:1748 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1679 +#: remote.c:1758 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1692 +#: remote.c:1771 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1714 +#: remote.c:1793 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:1840 +#: remote.c:1922 #, c-format msgid "couldn't find remote ref %s" msgstr "" -#: remote.c:1853 +#: remote.c:1935 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2016 +#: remote.c:2098 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2020 +#: remote.c:2102 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2023 +#: remote.c:2105 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2027 +#: remote.c:2109 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "" -#: remote.c:2030 +#: remote.c:2112 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2034 +#: remote.c:2116 #, 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:2040 +#: remote.c:2122 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2043 +#: remote.c:2125 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5169,11 +6017,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2051 +#: remote.c:2133 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2054 +#: remote.c:2136 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5184,11 +6032,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2064 +#: remote.c:2146 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: remote.c:2247 +#: remote.c:2337 #, c-format msgid "cannot parse expected object name '%s'" msgstr "" @@ -5203,7 +6051,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 "" @@ -5266,8 +6114,8 @@ msgstr "" msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "" @@ -5301,20 +6149,34 @@ msgstr "" msgid "unable to open rr-cache directory" msgstr "" -#: revision.c:2507 -msgid "your current branch appears to be broken" +#: reset.c:42 +msgid "could not determine HEAD revision" msgstr "" -#: revision.c:2510 +#: reset.c:70 reset.c:76 sequencer.c:3426 #, c-format -msgid "your current branch '%s' does not have any commits yet" +msgid "failed to find tree of %s" +msgstr "" + +#: revision.c:2344 +msgid "--unpacked=<packfile> no longer supported" msgstr "" -#: revision.c:2710 -msgid "--first-parent is incompatible with --bisect" +#: revision.c:2364 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "" + +#: revision.c:2702 +msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2714 +#: revision.c:2705 +#, c-format +msgid "your current branch '%s' does not have any commits yet" +msgstr "" + +#: revision.c:2915 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" @@ -5322,208 +6184,206 @@ msgstr "" msgid "open /dev/null failed" msgstr "" -#: run-command.c:1269 +#: run-command.c:1270 #, c-format msgid "cannot create async thread: %s" msgstr "" -#: run-command.c:1333 +#: run-command.c:1334 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -#: send-pack.c:141 +#: send-pack.c:145 msgid "unexpected flush packet while reading remote unpack status" msgstr "" -#: send-pack.c:143 +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:145 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:306 +#: send-pack.c:372 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:420 +#: send-pack.c:460 +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "" + +#: send-pack.c:469 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:422 +#: send-pack.c:471 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:434 +#: send-pack.c:483 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:439 +#: send-pack.c:488 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:187 +#: sequencer.c:194 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:292 +#: sequencer.c:308 #, c-format msgid "could not delete '%s'" msgstr "" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "" -#: sequencer.c:321 +#: sequencer.c:339 msgid "revert" msgstr "" -#: sequencer.c:323 +#: sequencer.c:341 msgid "cherry-pick" msgstr "" -#: sequencer.c:325 -msgid "rebase -i" +#: sequencer.c:343 +msgid "rebase" msgstr "" -#: sequencer.c:327 +#: sequencer.c:345 #, c-format msgid "unknown action: %d" msgstr "" -#: sequencer.c:385 +#: sequencer.c:404 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:388 +#: sequencer.c:407 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:2909 +#: sequencer.c:420 sequencer.c:3028 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:408 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 #, c-format -msgid "could not write eol to '%s'" +msgid "could not write to '%s'" msgstr "" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:427 #, c-format -msgid "failed to finalize '%s'" +msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 -#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 -#: builtin/merge.c:1112 builtin/rebase.c:567 +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 +#: sequencer.c:3311 #, c-format -msgid "could not read '%s'" +msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:462 +#: sequencer.c:471 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:466 +#: sequencer.c:475 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:498 +#: sequencer.c:507 #, c-format msgid "%s: fast-forward" msgstr "" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:546 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:632 +#: sequencer.c:640 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:649 +#: sequencer.c:657 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:663 +#: sequencer.c:671 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:743 +#: sequencer.c:751 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:754 +#: sequencer.c:762 #, c-format msgid "unable to dequote value of '%s'" msgstr "" -#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 -#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 +#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: sequencer.c:801 +#: sequencer.c:809 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:806 +#: sequencer.c:814 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:811 +#: sequencer.c:819 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:815 +#: sequencer.c:823 #, c-format msgid "unknown variable '%s'" msgstr "" -#: sequencer.c:820 +#: sequencer.c:828 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:822 +#: sequencer.c:830 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:824 +#: sequencer.c:832 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "" - -#: sequencer.c:901 +#: sequencer.c:897 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5540,15 +6400,11 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "" - -#: sequencer.c:1216 +#: sequencer.c:1178 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1223 +#: sequencer.c:1184 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5563,7 +6419,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1236 +#: sequencer.c:1197 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5577,346 +6433,354 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1278 +#: sequencer.c:1239 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1280 +#: sequencer.c:1241 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1326 +#: sequencer.c:1287 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1328 +#: sequencer.c:1289 msgid "detached HEAD" msgstr "" -#: sequencer.c:1332 +#: sequencer.c:1293 msgid " (root-commit)" msgstr "" -#: sequencer.c:1353 +#: sequencer.c:1314 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1355 +#: sequencer.c:1316 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1373 sequencer.c:2067 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1417 sequencer.c:1535 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1446 sequencer.c:1478 +#, c-format +msgid "invalid author identity '%s'" +msgstr "" + +#: sequencer.c:1452 +msgid "corrupt author: missing date information" +msgstr "" + +#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 +#: builtin/merge.c:915 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1526 +#: sequencer.c:1518 sequencer.c:4237 +#, c-format +msgid "could not update %s" +msgstr "" + +#: sequencer.c:1567 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1531 +#: sequencer.c:1572 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1655 sequencer.c:1766 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1713 sequencer.c:1738 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1672 +#: sequencer.c:1723 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1725 sequencer.c:3338 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1676 +#: sequencer.c:1727 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1682 +#: sequencer.c:1733 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1697 +#: sequencer.c:1748 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1704 +#: sequencer.c:1755 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1710 +#: sequencer.c:1761 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1798 +#: sequencer.c:1849 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1805 +#: sequencer.c:1856 msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:1824 +#: sequencer.c:1875 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1832 sequencer.c:1840 +#: sequencer.c:1883 sequencer.c:1891 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1846 +#: sequencer.c:1897 #, 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:1865 +#: sequencer.c:1916 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1930 +#: sequencer.c:1981 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1985 +#: sequencer.c:2038 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1986 +#: sequencer.c:2039 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:2045 +#: sequencer.c:2059 +#, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "" + +#: sequencer.c:2117 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:2052 +#: sequencer.c:2124 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:2128 +#: sequencer.c:2201 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:2137 +#: sequencer.c:2210 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:2174 +#: sequencer.c:2241 #, c-format -msgid "could not parse '%.*s'" +msgid "could not parse '%s'" msgstr "" -#: sequencer.c:2228 +#: sequencer.c:2302 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2239 +#: sequencer.c:2313 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:2287 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:2323 +#: sequencer.c:2399 msgid "cancelling a cherry picking in progress" msgstr "" -#: sequencer.c:2330 +#: sequencer.c:2408 msgid "cancelling a revert in progress" msgstr "" -#: sequencer.c:2364 +#: sequencer.c:2452 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2366 +#: sequencer.c:2454 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2371 +#: sequencer.c:2459 msgid "no commits parsed." msgstr "" -#: sequencer.c:2382 +#: sequencer.c:2470 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2384 +#: sequencer.c:2472 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:2466 +#: sequencer.c:2550 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2553 +#: sequencer.c:2657 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2569 +#: sequencer.c:2677 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2769 sequencer.c:4609 msgid "empty commit set passed" msgstr "" -#: sequencer.c:2668 +#: sequencer.c:2786 msgid "revert is already in progress" msgstr "" -#: sequencer.c:2670 +#: sequencer.c:2788 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2673 +#: sequencer.c:2791 msgid "cherry-pick is already in progress" msgstr "" -#: sequencer.c:2675 +#: sequencer.c:2793 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2689 +#: sequencer.c:2807 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2704 +#: sequencer.c:2822 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2882 sequencer.c:4325 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2884 sequencer.c:2895 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2886 sequencer.c:2930 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2798 builtin/grep.c:734 +#: sequencer.c:2916 builtin/grep.c:745 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2800 +#: sequencer.c:2918 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2801 +#: sequencer.c:2919 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2807 +#: sequencer.c:2925 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2818 +#: sequencer.c:2936 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:2859 +#: sequencer.c:2977 msgid "no revert in progress" msgstr "" -#: sequencer.c:2867 +#: sequencer.c:2986 msgid "no cherry-pick in progress" msgstr "" -#: sequencer.c:2877 +#: sequencer.c:2996 msgid "failed to skip the commit" msgstr "" -#: sequencer.c:2884 +#: sequencer.c:3003 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:2887 +#: sequencer.c:3006 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3011 sequencer.c:4015 -#, c-format -msgid "could not update %s" -msgstr "" - -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:3168 sequencer.c:4217 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:3066 +#: sequencer.c:3185 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "" -#: sequencer.c:3074 +#: sequencer.c:3193 #, c-format msgid "" "You can amend the commit now, with\n" @@ -5928,27 +6792,27 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3084 +#: sequencer.c:3203 #, c-format msgid "Could not apply %s... %.*s" msgstr "" -#: sequencer.c:3091 +#: sequencer.c:3210 #, c-format msgid "Could not merge %.*s" msgstr "" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 -#: builtin/rebase.c:1953 builtin/rebase.c:2008 -msgid "could not read index" +#: sequencer.c:3240 +#, c-format +msgid "Executing: %s\n" msgstr "" -#: sequencer.c:3136 +#: sequencer.c:3255 #, c-format msgid "" "execution failed: %s\n" @@ -5958,11 +6822,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3142 +#: sequencer.c:3261 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:3148 +#: sequencer.c:3267 #, c-format msgid "" "execution succeeded: %s\n" @@ -5973,108 +6837,125 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3209 +#: sequencer.c:3328 #, c-format msgid "illegal label name: '%.*s'" msgstr "" -#: sequencer.c:3263 +#: sequencer.c:3382 msgid "writing fake root commit" msgstr "" -#: sequencer.c:3268 +#: sequencer.c:3387 msgid "writing squash-onto" msgstr "" -#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 -#, c-format -msgid "failed to find tree of %s" -msgstr "" - -#: sequencer.c:3324 builtin/rebase.c:873 -msgid "could not write index" -msgstr "" - -#: sequencer.c:3351 +#: sequencer.c:3471 #, c-format msgid "could not resolve '%s'" msgstr "" -#: sequencer.c:3379 +#: sequencer.c:3502 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:3401 +#: sequencer.c:3524 #, c-format msgid "unable to parse '%.*s'" msgstr "" -#: sequencer.c:3410 +#: sequencer.c:3533 #, c-format msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:3422 +#: sequencer.c:3545 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3437 +#: sequencer.c:3561 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:3590 +#: sequencer.c:3730 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:3606 +#: sequencer.c:3746 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3820 +msgid "Cannot autostash" +msgstr "" + +#: sequencer.c:3823 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "" + +#: sequencer.c:3829 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "" + +#: sequencer.c:3832 +#, c-format +msgid "Created autostash: %s\n" +msgstr "" + +#: sequencer.c:3836 +msgid "could not reset --hard" +msgstr "" + +#: sequencer.c:3861 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3687 +#: sequencer.c:3873 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3876 #, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:3751 -#, c-format -msgid "could not checkout %s" +#: sequencer.c:3881 +msgid "Applying autostash resulted in conflicts." +msgstr "" + +#: sequencer.c:3882 +msgid "Autostash exists; creating a new stash entry." msgstr "" -#: sequencer.c:3765 +#: sequencer.c:3974 #, c-format msgid "%s: not a valid OID" msgstr "" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "" -#: sequencer.c:3785 +#: sequencer.c:3994 #, c-format msgid "Stopped at HEAD\n" msgstr "" -#: sequencer.c:3787 +#: sequencer.c:3996 #, c-format msgid "Stopped at %s\n" msgstr "" -#: sequencer.c:3795 +#: sequencer.c:4004 #, c-format msgid "" "Could not execute the todo command\n" @@ -6087,121 +6968,129 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3877 +#: sequencer.c:4050 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "" + +#: sequencer.c:4095 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:3958 +#: sequencer.c:4166 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:4003 +#: sequencer.c:4225 msgid "could not read orig-head" msgstr "" -#: sequencer.c:4008 +#: sequencer.c:4230 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:4022 +#: sequencer.c:4244 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4115 +#: sequencer.c:4304 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "" + +#: sequencer.c:4337 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4124 +#: sequencer.c:4346 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4126 +#: sequencer.c:4348 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4128 +#: sequencer.c:4350 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4131 +#: sequencer.c:4353 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:4167 sequencer.c:4205 +#: sequencer.c:4389 sequencer.c:4428 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:4220 +#: sequencer.c:4444 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4227 +#: sequencer.c:4451 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4328 +#: sequencer.c:4477 +#, c-format +msgid "invalid committer '%s'" +msgstr "" + +#: sequencer.c:4586 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4332 +#: sequencer.c:4590 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4367 +#: sequencer.c:4625 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:4810 +#: sequencer.c:5102 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:4813 +#: sequencer.c:5105 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:4971 -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:5083 sequencer.c:5100 +#: sequencer.c:5347 sequencer.c:5364 msgid "nothing to do" msgstr "" -#: sequencer.c:5114 +#: sequencer.c:5383 msgid "could not skip unnecessary pick commands" msgstr "" -#: sequencer.c:5197 +#: sequencer.c:5480 msgid "the script was already rearranged." msgstr "" -#: setup.c:123 +#: setup.c:133 #, c-format -msgid "'%s' is outside repository" +msgid "'%s' is outside repository at '%s'" msgstr "" -#: setup.c:173 +#: setup.c:185 #, 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:186 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6209,12 +7098,12 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:235 +#: setup.c:264 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" -#: setup.c:254 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6222,381 +7111,385 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:390 +#: setup.c:419 msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:394 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:540 +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:548 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:567 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "" -#: setup.c:569 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" msgstr "" -#: setup.c:571 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "" -#: setup.c:573 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "" -#: setup.c:575 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "" -#: setup.c:577 +#: setup.c:710 #, c-format msgid "not a git repository: %s" msgstr "" -#: setup.c:676 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:690 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" msgstr "" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "" -#: setup.c:851 +#: setup.c:987 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "" -#: setup.c:1083 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1092 setup.c:1098 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "" -#: setup.c:1103 +#: setup.c:1245 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:1109 +#: setup.c:1251 #, 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:1220 +#: setup.c:1362 #, 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:1264 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "" -#: setup.c:1279 +#: setup.c:1424 msgid "fork failed" msgstr "" -#: setup.c:1284 +#: setup.c:1429 msgid "setsid failed" msgstr "" -#: sha1-file.c:453 +#: sha1-file.c:470 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -#: sha1-file.c:504 +#: sha1-file.c:521 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "" -#: sha1-file.c:576 +#: sha1-file.c:593 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: sha1-file.c:583 +#: sha1-file.c:600 #, c-format msgid "unable to normalize object directory: %s" msgstr "" -#: sha1-file.c:626 +#: sha1-file.c:643 msgid "unable to fdopen alternates lockfile" msgstr "" -#: sha1-file.c:644 +#: sha1-file.c:661 msgid "unable to read alternates file" msgstr "" -#: sha1-file.c:651 +#: sha1-file.c:668 msgid "unable to move new alternates file into place" msgstr "" -#: sha1-file.c:686 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "" -#: sha1-file.c:712 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: sha1-file.c:718 +#: sha1-file.c:730 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1-file.c:724 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1-file.c:732 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: sha1-file.c:792 +#: sha1-file.c:804 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "" -#: sha1-file.c:944 +#: sha1-file.c:954 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "" -#: sha1-file.c:969 +#: sha1-file.c:975 msgid "mmap failed" msgstr "" -#: sha1-file.c:1133 +#: sha1-file.c:1139 #, c-format msgid "object file %s is empty" msgstr "" -#: sha1-file.c:1257 sha1-file.c:2396 +#: sha1-file.c:1274 sha1-file.c:2467 #, c-format msgid "corrupt loose object '%s'" msgstr "" -#: sha1-file.c:1259 sha1-file.c:2400 +#: sha1-file.c:1276 sha1-file.c:2471 #, c-format msgid "garbage at end of loose object '%s'" msgstr "" -#: sha1-file.c:1301 +#: sha1-file.c:1318 msgid "invalid object type" msgstr "" -#: sha1-file.c:1385 +#: sha1-file.c:1402 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1388 +#: sha1-file.c:1405 #, c-format msgid "unable to unpack %s header" msgstr "" -#: sha1-file.c:1394 +#: sha1-file.c:1411 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1397 +#: sha1-file.c:1414 #, c-format msgid "unable to parse %s header" msgstr "" -#: sha1-file.c:1588 +#: sha1-file.c:1641 #, c-format msgid "failed to read object %s" msgstr "" -#: sha1-file.c:1592 +#: sha1-file.c:1645 #, c-format msgid "replacement %s not found for %s" msgstr "" -#: sha1-file.c:1596 +#: sha1-file.c:1649 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1600 +#: sha1-file.c:1653 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1703 +#: sha1-file.c:1758 #, c-format msgid "unable to write file %s" msgstr "" -#: sha1-file.c:1710 +#: sha1-file.c:1765 #, c-format msgid "unable to set permission to '%s'" msgstr "" -#: sha1-file.c:1717 +#: sha1-file.c:1772 msgid "file write error" msgstr "" -#: sha1-file.c:1736 +#: sha1-file.c:1792 msgid "error when closing loose object file" msgstr "" -#: sha1-file.c:1801 +#: sha1-file.c:1857 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: sha1-file.c:1803 +#: sha1-file.c:1859 msgid "unable to create temporary file" msgstr "" -#: sha1-file.c:1827 +#: sha1-file.c:1883 msgid "unable to write loose object file" msgstr "" -#: sha1-file.c:1833 +#: sha1-file.c:1889 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "" -#: sha1-file.c:1837 +#: sha1-file.c:1893 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "" -#: sha1-file.c:1841 +#: sha1-file.c:1897 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: sha1-file.c:1851 builtin/pack-objects.c:925 +#: sha1-file.c:1907 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "" -#: sha1-file.c:1926 +#: sha1-file.c:1984 #, c-format msgid "cannot read object for %s" msgstr "" -#: sha1-file.c:1966 +#: sha1-file.c:2035 msgid "corrupt commit" msgstr "" -#: sha1-file.c:1974 +#: sha1-file.c:2043 msgid "corrupt tag" msgstr "" -#: sha1-file.c:2073 +#: sha1-file.c:2143 #, c-format msgid "read error while indexing %s" msgstr "" -#: sha1-file.c:2076 +#: sha1-file.c:2146 #, c-format msgid "short read while indexing %s" msgstr "" -#: sha1-file.c:2149 sha1-file.c:2158 +#: sha1-file.c:2219 sha1-file.c:2229 #, c-format msgid "%s: failed to insert into database" msgstr "" -#: sha1-file.c:2164 +#: sha1-file.c:2235 #, c-format msgid "%s: unsupported file type" msgstr "" -#: sha1-file.c:2188 +#: sha1-file.c:2259 #, c-format msgid "%s is not a valid object" msgstr "" -#: sha1-file.c:2190 +#: sha1-file.c:2261 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: sha1-file.c:2217 builtin/index-pack.c:155 +#: sha1-file.c:2288 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "" -#: sha1-file.c:2407 sha1-file.c:2459 +#: sha1-file.c:2478 sha1-file.c:2531 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: sha1-file.c:2431 +#: sha1-file.c:2502 #, c-format msgid "unable to mmap %s" msgstr "" -#: sha1-file.c:2436 +#: sha1-file.c:2507 #, c-format msgid "unable to unpack header of %s" msgstr "" -#: sha1-file.c:2442 +#: sha1-file.c:2513 #, c-format msgid "unable to parse header of %s" msgstr "" -#: sha1-file.c:2453 +#: sha1-file.c:2524 #, c-format msgid "unable to unpack contents of %s" msgstr "" -#: sha1-name.c:490 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: sha1-name.c:501 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "" -#: sha1-name.c:800 +#: 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" @@ -6609,44 +7502,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:1702 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "" + +#: sha1-name.c:1708 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" + +#: sha1-name.c:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "" + +#: sha1-name.c:1745 +#, 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:1761 +#, 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:1769 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "" + +#: sha1-name.c:1771 +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "" + +#: sha1-name.c:1784 +msgid "relative path syntax can't be used outside working tree" +msgstr "" + +#: sha1-name.c:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:848 #, c-format msgid "%u.%2.2u GiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:850 #, c-format msgid "%u.%2.2u GiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u MiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:860 #, c-format msgid "%u.%2.2u MiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:867 #, c-format msgid "%u.%2.2u KiB" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:869 #, c-format msgid "%u.%2.2u KiB/s" msgstr "" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:875 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -6654,547 +7607,642 @@ msgstr[0] "" msgstr[1] "" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:877 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "" msgstr[1] "" -#: submodule.c:114 submodule.c:143 -msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 +#: builtin/rebase.c:858 +#, c-format +msgid "could not open '%s' for writing" msgstr "" -#: submodule.c:118 submodule.c:147 +#: strbuf.c:1175 #, c-format -msgid "Could not find section in .gitmodules where path=%s" +msgid "could not edit '%s'" msgstr "" -#: submodule.c:154 +#: submodule-config.c:237 #, c-format -msgid "Could not remove .gitmodules entry for %s" +msgid "ignoring suspicious submodule name: %s" msgstr "" -#: submodule.c:165 -msgid "staging updated .gitmodules failed" +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" msgstr "" -#: submodule.c:327 +#: submodule-config.c:402 #, c-format -msgid "in unpopulated submodule '%s'" +msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" -#: submodule.c:358 +#: submodule-config.c:499 #, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" +msgid "invalid value for %s" msgstr "" -#: submodule.c:910 +#: submodule-config.c:766 #, 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 -msgid "Failed to resolve HEAD as a valid ref." +msgid "Could not update .gitmodules entry %s" msgstr "" -#: submodule.c:1481 -#, c-format -msgid "Could not access submodule '%s'" +#: submodule.c:114 submodule.c:143 +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: submodule.c:1651 +#: submodule.c:118 submodule.c:147 #, c-format -msgid "'%s' not recognized as a git repository" +msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule.c:1789 +#: submodule.c:154 #, c-format -msgid "could not start 'git status' in submodule '%s'" +msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:1802 -#, c-format -msgid "could not run 'git status' in submodule '%s'" +#: submodule.c:165 +msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:1817 +#: submodule.c:327 #, c-format -msgid "Could not unset core.worktree setting in submodule '%s'" +msgid "in unpopulated submodule '%s'" msgstr "" -#: submodule.c:1907 +#: submodule.c:358 #, c-format -msgid "submodule '%s' has dirty index" +msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#: submodule.c:1959 +#: submodule.c:434 #, c-format -msgid "Submodule '%s' could not be updated." +msgid "bad --ignore-submodules argument: %s" msgstr "" -#: submodule.c:2007 +#: submodule.c:816 #, c-format msgid "" -"relocate_gitdir for submodule '%s' with more than one worktree not supported" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." msgstr "" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:919 #, c-format -msgid "could not lookup name for submodule '%s'" +msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" -#: submodule.c:2026 +#: submodule.c:1004 #, c-format msgid "" -"Migrating git directory of '%s%s' from\n" -"'%s' to\n" -"'%s'\n" +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " +"submodule %s" msgstr "" -#: submodule.c:2109 +#: submodule.c:1127 #, c-format -msgid "could not recurse into submodule '%s'" +msgid "process for submodule '%s' failed" msgstr "" -#: submodule.c:2153 -msgid "could not start ls-files in .." +#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 +msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:2192 +#: submodule.c:1167 #, c-format -msgid "ls-tree returned unexpected return code %d" +msgid "Pushing submodule '%s'\n" msgstr "" -#: submodule-config.c:232 +#: submodule.c:1170 #, c-format -msgid "ignoring suspicious submodule name: %s" +msgid "Unable to push submodule '%s'\n" msgstr "" -#: submodule-config.c:299 -msgid "negative values not allowed for submodule.fetchjobs" +#: submodule.c:1462 +#, c-format +msgid "Fetching submodule %s%s\n" msgstr "" -#: submodule-config.c:397 +#: submodule.c:1492 #, c-format -msgid "ignoring '%s' which may be interpreted as a command-line option: %s" +msgid "Could not access submodule '%s'\n" msgstr "" -#: submodule-config.c:486 +#: submodule.c:1646 #, c-format -msgid "invalid value for %s" +msgid "" +"Errors during submodule fetch:\n" +"%s" msgstr "" -#: submodule-config.c:755 +#: submodule.c:1671 #, c-format -msgid "Could not update .gitmodules entry %s" +msgid "'%s' not recognized as a git repository" msgstr "" -#: trailer.c:238 +#: submodule.c:1688 #, c-format -msgid "running trailer command '%s' failed" +msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: submodule.c:1729 #, c-format -msgid "unknown value '%s' for key '%s'" +msgid "'git status --porcelain=2' failed in submodule %s" msgstr "" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: submodule.c:1804 #, c-format -msgid "more than one %s" +msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: trailer.c:730 +#: submodule.c:1817 #, c-format -msgid "empty trailer token in trailer '%.*s'" +msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: trailer.c:750 +#: submodule.c:1832 #, c-format -msgid "could not read input file '%s'" +msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "" -#: trailer.c:753 -msgid "could not read from stdin" +#: submodule.c:1859 submodule.c:2169 +#, c-format +msgid "could not recurse into submodule '%s'" msgstr "" -#: trailer.c:1011 wrapper.c:701 -#, c-format -msgid "could not stat %s" +#: submodule.c:1880 +msgid "could not reset submodule index" msgstr "" -#: trailer.c:1013 +#: submodule.c:1922 #, c-format -msgid "file %s is not a regular file" +msgid "submodule '%s' has dirty index" msgstr "" -#: trailer.c:1015 +#: submodule.c:1974 #, c-format -msgid "file %s is not writable by user" +msgid "Submodule '%s' could not be updated." msgstr "" -#: trailer.c:1027 -msgid "could not open temporary file" +#: submodule.c:2042 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "" -#: trailer.c:1067 +#: submodule.c:2063 #, c-format -msgid "could not rename temporary file to %s" +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: transport.c:116 +#: submodule.c:2075 submodule.c:2134 #, c-format -msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgid "could not lookup name for submodule '%s'" msgstr "" -#: transport.c:142 +#: submodule.c:2079 #, c-format -msgid "could not read bundle '%s'" +msgid "refusing to move '%s' into an existing git dir" msgstr "" -#: transport.c:208 +#: submodule.c:2086 #, c-format -msgid "transport: invalid depth option '%s'" +msgid "" +"Migrating git directory of '%s%s' from\n" +"'%s' to\n" +"'%s'\n" msgstr "" -#: transport.c:259 -msgid "see protocol.version in 'git help config' for more details" +#: submodule.c:2214 +msgid "could not start ls-files in .." msgstr "" -#: transport.c:260 -msgid "server options require protocol version 2 or later" +#: submodule.c:2254 +#, c-format +msgid "ls-tree returned unexpected return code %d" msgstr "" -#: transport.c:625 -msgid "could not parse transport.color.* config" +#: trailer.c:236 +#, c-format +msgid "running trailer command '%s' failed" msgstr "" -#: transport.c:698 -msgid "support for protocol v2 not implemented yet" +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 +#, c-format +msgid "unknown value '%s' for key '%s'" msgstr "" -#: transport.c:825 +#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 #, c-format -msgid "unknown value for config '%s': %s" +msgid "more than one %s" msgstr "" -#: transport.c:891 +#: trailer.c:728 #, c-format -msgid "transport '%s' not allowed" +msgid "empty trailer token in trailer '%.*s'" msgstr "" -#: transport.c:945 -msgid "git-over-rsync is no longer supported" +#: trailer.c:748 +#, c-format +msgid "could not read input file '%s'" +msgstr "" + +#: trailer.c:751 +msgid "could not read from stdin" msgstr "" -#: transport.c:1040 +#: trailer.c:1009 wrapper.c:676 #, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" +msgid "could not stat %s" msgstr "" -#: transport.c:1044 +#: trailer.c:1011 #, c-format -msgid "" -"\n" -"Please try\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"or cd to the path and use\n" -"\n" -"\tgit push\n" -"\n" -"to push them to a remote.\n" -"\n" +msgid "file %s is not a regular file" msgstr "" -#: transport.c:1052 -msgid "Aborting." +#: trailer.c:1013 +#, c-format +msgid "file %s is not writable by user" msgstr "" -#: transport.c:1193 -msgid "failed to push all needed submodules" +#: trailer.c:1025 +msgid "could not open temporary file" msgstr "" -#: transport.c:1340 transport-helper.c:645 -msgid "operation not supported by protocol" +#: trailer.c:1065 +#, c-format +msgid "could not rename temporary file to %s" msgstr "" -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:62 transport-helper.c:91 msgid "full write to remote helper failed" msgstr "" -#: transport-helper.c:134 +#: transport-helper.c:145 #, c-format msgid "unable to find remote helper for '%s'" msgstr "" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:161 transport-helper.c:575 msgid "can't dup helper output fd" msgstr "" -#: transport-helper.c:201 +#: transport-helper.c:214 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " "version of Git" msgstr "" -#: transport-helper.c:207 +#: transport-helper.c:220 msgid "this remote helper should implement refspec capability" msgstr "" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:287 transport-helper.c:429 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "" -#: transport-helper.c:403 +#: transport-helper.c:417 #, c-format msgid "%s also locked %s" msgstr "" -#: transport-helper.c:481 +#: transport-helper.c:497 msgid "couldn't run fast-import" msgstr "" -#: transport-helper.c:504 +#: transport-helper.c:520 msgid "error while running fast-import" msgstr "" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:549 transport-helper.c:1226 #, c-format msgid "could not read ref %s" msgstr "" -#: transport-helper.c:578 +#: transport-helper.c:594 #, c-format msgid "unknown response to connect: %s" msgstr "" -#: transport-helper.c:600 +#: transport-helper.c:616 msgid "setting remote service path not supported by protocol" msgstr "" -#: transport-helper.c:602 +#: transport-helper.c:618 msgid "invalid remote service path" msgstr "" -#: transport-helper.c:648 +#: transport-helper.c:661 transport.c:1428 +msgid "operation not supported by protocol" +msgstr "" + +#: transport-helper.c:664 #, c-format msgid "can't connect to subservice %s" msgstr "" -#: transport-helper.c:720 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "" + +#: transport-helper.c:788 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "" -#: transport-helper.c:773 +#: transport-helper.c:841 #, c-format msgid "helper reported unexpected status of %s" msgstr "" -#: transport-helper.c:834 +#: transport-helper.c:924 #, c-format msgid "helper %s does not support dry-run" msgstr "" -#: transport-helper.c:837 +#: transport-helper.c:927 #, c-format msgid "helper %s does not support --signed" msgstr "" -#: transport-helper.c:840 +#: transport-helper.c:930 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" -#: transport-helper.c:847 +#: transport-helper.c:935 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "" + +#: transport-helper.c:941 #, c-format msgid "helper %s does not support 'push-option'" msgstr "" -#: transport-helper.c:945 +#: transport-helper.c:1040 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:950 +#: transport-helper.c:1045 #, c-format msgid "helper %s does not support 'force'" msgstr "" -#: transport-helper.c:997 +#: transport-helper.c:1092 msgid "couldn't run fast-export" msgstr "" -#: transport-helper.c:1002 +#: transport-helper.c:1097 msgid "error while running fast-export" msgstr "" -#: transport-helper.c:1027 +#: transport-helper.c:1122 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch such as 'master'.\n" +"Perhaps you should specify a branch.\n" msgstr "" -#: transport-helper.c:1091 +#: transport-helper.c:1203 +#, c-format +msgid "unsupported object format '%s'" +msgstr "" + +#: transport-helper.c:1212 #, c-format msgid "malformed response in ref list: %s" msgstr "" -#: transport-helper.c:1244 +#: transport-helper.c:1364 #, c-format msgid "read(%s) failed" msgstr "" -#: transport-helper.c:1271 +#: transport-helper.c:1391 #, c-format msgid "write(%s) failed" msgstr "" -#: transport-helper.c:1320 +#: transport-helper.c:1440 #, c-format msgid "%s thread failed" msgstr "" -#: transport-helper.c:1324 +#: transport-helper.c:1444 #, c-format msgid "%s thread failed to join: %s" msgstr "" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1463 transport-helper.c:1467 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1384 +#: transport-helper.c:1504 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1388 +#: transport-helper.c:1508 #, c-format msgid "%s process failed" msgstr "" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1526 transport-helper.c:1535 msgid "can't start thread for copying data" msgstr "" -#: tree-walk.c:33 +#: transport.c:116 +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "" + +#: transport.c:145 +#, c-format +msgid "could not read bundle '%s'" +msgstr "" + +#: transport.c:220 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "" + +#: transport.c:269 +msgid "see protocol.version in 'git help config' for more details" +msgstr "" + +#: transport.c:270 +msgid "server options require protocol version 2 or later" +msgstr "" + +#: transport.c:712 +msgid "could not parse transport.color.* config" +msgstr "" + +#: transport.c:785 +msgid "support for protocol v2 not implemented yet" +msgstr "" + +#: transport.c:919 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "" + +#: transport.c:985 +#, c-format +msgid "transport '%s' not allowed" +msgstr "" + +#: transport.c:1038 +msgid "git-over-rsync is no longer supported" +msgstr "" + +#: transport.c:1140 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" + +#: transport.c:1144 +#, c-format +msgid "" +"\n" +"Please try\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"or cd to the path and use\n" +"\n" +"\tgit push\n" +"\n" +"to push them to a remote.\n" +"\n" +msgstr "" + +#: transport.c:1152 +msgid "Aborting." +msgstr "" + +#: transport.c:1297 +msgid "failed to push all needed submodules" +msgstr "" + +#: 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 "" -#: unpack-trees.c:111 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:116 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:121 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" -#: unpack-trees.c:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:128 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:132 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:137 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:142 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:150 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7202,7 +8250,7 @@ msgid "" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7210,85 +8258,100 @@ msgid "" "%%s" msgstr "" -#: unpack-trees.c:155 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:160 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:170 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:173 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" +"Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:175 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout " -"update:\n" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" "%s" msgstr "" -#: unpack-trees.c:177 +#: unpack-trees.c:180 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout " -"update:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" msgstr "" -#: unpack-trees.c:179 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" "%s" msgstr "" -#: unpack-trees.c:256 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:318 -msgid "Updating files" +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" msgstr "" #: unpack-trees.c:350 +msgid "Updating files" +msgstr "" + +#: unpack-trees.c:382 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" "colliding group is in the working tree:\n" msgstr "" +#: unpack-trees.c:1498 +msgid "Updating index flags" +msgstr "" + +#: upload-pack.c:1516 +msgid "expected flush after fetch arguments" +msgstr "" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "" @@ -7318,47 +8381,87 @@ msgstr "" msgid "invalid '..' path segment" msgstr "" -#: worktree.c:258 builtin/am.c:2095 +#: walker.c:170 +msgid "Fetching objects" +msgstr "" + +#: worktree.c:236 builtin/am.c:2116 #, c-format msgid "failed to read '%s'" msgstr "" -#: worktree.c:304 +#: worktree.c:283 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:315 +#: worktree.c:294 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:327 +#: worktree.c:306 #, c-format msgid "'%s' does not exist" msgstr "" -#: worktree.c:333 +#: worktree.c:312 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "" -#: worktree.c:341 +#: worktree.c:321 #, c-format msgid "'%s' does not point back to '%s'" msgstr "" -#: wrapper.c:223 wrapper.c:393 +#: worktree.c:587 +msgid "not a directory" +msgstr "" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr "" + +#: worktree.c:598 +msgid ".git file broken" +msgstr "" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr "" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:632 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "" @@ -7391,11 +8494,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" msgstr "" @@ -7421,100 +8524,100 @@ msgstr "" msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "" -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "" -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "" -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "" -#: wt-status.c:906 +#: wt-status.c:903 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "" msgstr[1] "" -#: wt-status.c:938 +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:940 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:1022 +#: wt-status.c:1018 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -#: wt-status.c:1114 +#: wt-status.c:1110 #, c-format msgid "" "\n" @@ -7522,184 +8625,192 @@ msgid "" "You can use '--no-ahead-behind' to avoid this.\n" msgstr "" -#: wt-status.c:1144 +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1147 +#: wt-status.c:1143 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1149 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1153 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1156 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1165 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1168 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "" -#: wt-status.c:1172 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1174 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1176 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1309 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "" -#: wt-status.c:1311 +#: wt-status.c:1307 msgid "No commands done." msgstr "" -#: wt-status.c:1314 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1325 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1330 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "" -#: wt-status.c:1333 +#: wt-status.c:1329 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1341 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1353 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1358 +#: wt-status.c:1354 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1373 +#: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1375 +#: wt-status.c:1371 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1382 +#: wt-status.c:1378 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1386 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1391 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1394 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1398 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1403 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1406 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1408 +#: wt-status.c:1404 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1419 +#: wt-status.c:1415 msgid "Cherry-pick currently in progress." msgstr "" -#: wt-status.c:1422 +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1429 +#: wt-status.c:1425 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1432 +#: wt-status.c:1428 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr "" -#: wt-status.c:1435 +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1437 +#: wt-status.c:1433 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr "" + +#: wt-status.c:1435 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1447 +#: wt-status.c:1445 msgid "Revert currently in progress." msgstr "" -#: wt-status.c:1450 +#: wt-status.c:1448 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1456 +#: wt-status.c:1454 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1459 +#: wt-status.c:1457 msgid " (run \"git revert --continue\" to continue)" msgstr "" -#: wt-status.c:1462 +#: wt-status.c:1460 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" +#: wt-status.c:1462 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr "" + #: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" @@ -7717,39 +8828,44 @@ msgstr "" msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1690 +#: wt-status.c:1492 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "" + +#: wt-status.c:1731 msgid "On branch " msgstr "" -#: wt-status.c:1697 +#: wt-status.c:1738 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1699 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1709 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1726 +#: wt-status.c:1767 msgid "Initial commit" msgstr "" -#: wt-status.c:1727 +#: wt-status.c:1768 msgid "No commits yet" msgstr "" -#: wt-status.c:1741 +#: wt-status.c:1782 msgid "Untracked files" msgstr "" -#: wt-status.c:1743 +#: wt-status.c:1784 msgid "Ignored files" msgstr "" -#: wt-status.c:1747 +#: wt-status.c:1788 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -7757,216 +8873,225 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1753 +#: wt-status.c:1794 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1755 +#: wt-status.c:1796 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1761 +#: wt-status.c:1802 msgid "No changes" msgstr "" -#: wt-status.c:1766 +#: wt-status.c:1807 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1769 +#: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1772 +#: wt-status.c:1815 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1775 +#: wt-status.c:1819 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1778 +#: wt-status.c:1823 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1781 wt-status.c:1786 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1784 +#: wt-status.c:1830 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1788 +#: wt-status.c:1835 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1901 +#: wt-status.c:1940 msgid "No commits yet on " msgstr "" -#: wt-status.c:1905 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1936 +#: wt-status.c:1975 msgid "different" msgstr "" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " msgstr "" -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2505 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2472 +#: wt-status.c:2511 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2474 +#: wt-status.c:2513 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: builtin/add.c:25 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#, c-format +msgid "failed to unlink '%s'" +msgstr "" + +#: 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:285 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:896 +#: builtin/add.c:272 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "" -#: builtin/add.c:245 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:249 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "" -#: builtin/add.c:252 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "" -#: builtin/add.c:255 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:257 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:262 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:270 +#: builtin/add.c:308 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 -#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 +#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 msgid "dry run" msgstr "" -#: builtin/add.c:293 +#: builtin/add.c:331 msgid "interactive picking" msgstr "" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:295 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:296 +#: builtin/add.c:334 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:297 +#: builtin/add.c:335 msgid "update tracked files" msgstr "" -#: builtin/add.c:298 +#: builtin/add.c:336 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:299 +#: builtin/add.c:337 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:300 +#: builtin/add.c:338 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:303 +#: builtin/add.c:341 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:305 +#: builtin/add.c:343 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:306 +#: builtin/add.c:344 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:307 +#: builtin/add.c:345 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:309 builtin/update-index.c:1001 +#: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:311 +#: builtin/add.c:349 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:326 +#: builtin/add.c:351 +msgid "backend for `git stash -p`" +msgstr "" + +#: builtin/add.c:369 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -7984,169 +9109,192 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:354 +#: builtin/add.c:397 #, 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:416 +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:425 msgid "adding files failed" msgstr "" -#: builtin/add.c:419 +#: builtin/add.c:453 builtin/commit.c:345 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "" + +#: builtin/add.c:470 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "" + +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:426 +#: builtin/add.c:485 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:430 +#: builtin/add.c:489 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:445 +#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "" + +#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "" + +#: builtin/add.c:518 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:446 +#: builtin/add.c:520 +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:160 #, c-format -msgid "Maybe you wanted to say 'git add .'?\n" +msgid "invalid committer: %s" msgstr "" -#: builtin/am.c:348 +#: builtin/am.c:366 msgid "could not parse author script" msgstr "" -#: builtin/am.c:432 +#: builtin/am.c:450 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:474 +#: builtin/am.c:492 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:512 +#: builtin/am.c:530 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:538 +#: builtin/am.c:556 msgid "fseek failed" msgstr "" -#: builtin/am.c:726 +#: builtin/am.c:744 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:791 +#: builtin/am.c:809 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:839 +#: builtin/am.c:857 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:862 builtin/am.c:874 msgid "invalid Date line" msgstr "" -#: builtin/am.c:851 +#: builtin/am.c:869 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:944 +#: builtin/am.c:962 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:967 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:954 +#: builtin/am.c:972 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1084 builtin/commit.c:374 -msgid "unable to write index file" -msgstr "" - -#: builtin/am.c:1098 +#: builtin/am.c:1103 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1099 +#: builtin/am.c:1104 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1100 +#: builtin/am.c:1105 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1183 +#: builtin/am.c:1188 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1211 +#: builtin/am.c:1216 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1277 +#: builtin/am.c:1281 #, c-format -msgid "invalid ident line: %.*s" +msgid "missing author line in commit %s" msgstr "" -#: builtin/am.c:1299 +#: builtin/am.c:1284 #, c-format -msgid "unable to parse commit %s" +msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1496 +#: builtin/am.c:1503 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1498 +#: builtin/am.c:1505 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1517 +#: builtin/am.c:1524 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1523 +#: builtin/am.c:1530 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1549 +#: builtin/am.c:1556 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1581 +#: builtin/am.c:1588 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1639 builtin/am.c:1643 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1650 +#: builtin/am.c:1661 msgid "Commit Body is:" msgstr "" @@ -8154,42 +9302,46 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1671 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1710 +#: builtin/am.c:1717 builtin/commit.c:395 +msgid "unable to write index file" +msgstr "" + +#: builtin/am.c:1721 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1761 builtin/am.c:1829 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1767 +#: builtin/am.c:1778 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1773 +#: builtin/am.c:1784 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1777 -msgid "Use 'git am --show-current-patch' to see the failed patch" +#: builtin/am.c:1788 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -#: builtin/am.c:1821 +#: builtin/am.c:1832 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:1828 +#: builtin/am.c:1839 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8197,185 +9349,197 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:1987 +#: builtin/am.c:1998 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2031 +#: builtin/am.c:2042 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2128 +#: builtin/am.c:2149 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2164 +#: builtin/am.c:2191 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "" + +#: builtin/am.c:2195 +#, c-format +msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" +msgstr "" + +#: builtin/am.c:2226 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/am.c:2165 +#: builtin/am.c:2227 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2171 +#: builtin/am.c:2233 msgid "run interactively" msgstr "" -#: builtin/am.c:2173 +#: builtin/am.c:2235 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2175 +#: builtin/am.c:2237 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:296 builtin/stash.c:806 +#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:309 builtin/stash.c:816 msgid "be quiet" msgstr "" -#: builtin/am.c:2178 +#: builtin/am.c:2240 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2181 +#: builtin/am.c:2243 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2183 +#: builtin/am.c:2245 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2185 +#: builtin/am.c:2247 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2187 +#: builtin/am.c:2249 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2189 +#: builtin/am.c:2251 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2192 +#: builtin/am.c:2254 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2195 +#: builtin/am.c:2257 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 -#: builtin/am.c:2224 +#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2286 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 -#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 -#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 -#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:141 parse-options.h:162 parse-options.h:312 +#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 +#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "" -#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format" msgstr "" -#: builtin/am.c:2221 +#: builtin/am.c:2283 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2227 +#: builtin/am.c:2289 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2229 +#: builtin/am.c:2291 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2232 +#: builtin/am.c:2294 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2235 +#: builtin/am.c:2297 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2238 +#: builtin/am.c:2300 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2241 +#: builtin/am.c:2303 msgid "abort the patching operation but keep HEAD where it is." msgstr "" -#: builtin/am.c:2244 -msgid "show the patch being applied." +#: builtin/am.c:2307 +msgid "show the patch being applied" msgstr "" -#: builtin/am.c:2248 +#: builtin/am.c:2312 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2250 +#: builtin/am.c:2314 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 -#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 +#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2256 +#: builtin/am.c:2320 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2274 +#: builtin/am.c:2338 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:2281 +#: builtin/am.c:2345 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2296 +#: builtin/am.c:2360 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2320 +#: builtin/am.c:2384 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2326 +#: builtin/am.c:2390 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: builtin/am.c:2336 +#: builtin/am.c:2400 msgid "interactive mode requires patches on the command line" msgstr "" @@ -8413,117 +9577,136 @@ msgstr "" msgid "git archive: expected a flush" msgstr "" -#: builtin/bisect--helper.c:22 -msgid "git bisect--helper --next-all [--no-checkout]" +#: builtin/bisect--helper.c:23 +msgid "git bisect--helper --next-all" msgstr "" -#: builtin/bisect--helper.c:23 +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --write-terms <bad_term> <good_term>" msgstr "" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-clean-state" msgstr "" -#: builtin/bisect--helper.c:25 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" msgstr "" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:28 msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" msgstr "" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:30 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" msgstr "" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:31 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" +msgstr "" + +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-next" +msgstr "" + +#: builtin/bisect--helper.c:34 +msgid "git bisect--helper --bisect-auto-next" +msgstr "" + +#: builtin/bisect--helper.c:35 +msgid "git bisect--helper --bisect-autostart" +msgstr "" + +#: builtin/bisect--helper.c:97 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "" + +#: builtin/bisect--helper.c:104 +#, c-format +msgid "could not write to file '%s'" msgstr "" -#: builtin/bisect--helper.c:86 +#: builtin/bisect--helper.c:143 #, c-format msgid "'%s' is not a valid term" msgstr "" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:147 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "" -#: builtin/bisect--helper.c:100 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "" -#: builtin/bisect--helper.c:111 +#: builtin/bisect--helper.c:167 msgid "please use two different terms" msgstr "" -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "" - -#: builtin/bisect--helper.c:155 +#: builtin/bisect--helper.c:207 #, c-format msgid "We are not bisecting.\n" msgstr "" -#: builtin/bisect--helper.c:163 +#: builtin/bisect--helper.c:215 #, c-format msgid "'%s' is not a valid commit" msgstr "" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:224 #, 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:268 #, c-format msgid "Bad bisect_write argument: %s" msgstr "" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:273 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "" -#: builtin/bisect--helper.c:232 +#: builtin/bisect--helper.c:285 #, c-format msgid "couldn't open the file '%s'" msgstr "" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:311 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "" -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:338 #, 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:342 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -8531,7 +9714,7 @@ msgid "" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:321 +#: builtin/bisect--helper.c:362 #, c-format msgid "bisecting only with a %s commit" msgstr "" @@ -8540,136 +9723,181 @@ msgstr "" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:370 msgid "Are you sure [Y/n]? " msgstr "" -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:431 msgid "no terms defined" msgstr "" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:434 #, 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:444 #, 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:511 +msgid "revision walk setup failed\n" +msgstr "" + +#: builtin/bisect--helper.c:533 +#, c-format +msgid "could not open '%s' for appending" +msgstr "" + +#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +msgid "'' is not a valid term" +msgstr "" + +#: builtin/bisect--helper.c:674 #, c-format msgid "unrecognized option: '%s'" msgstr "" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:678 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "" -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:709 msgid "bad HEAD - I need a HEAD" msgstr "" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:724 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" -#: builtin/bisect--helper.c:547 +#: builtin/bisect--helper.c:745 msgid "won't bisect on cg-seek'ed tree" msgstr "" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:748 msgid "bad HEAD - strange symbolic ref" msgstr "" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:775 #, c-format msgid "invalid ref: '%s'" msgstr "" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:827 +msgid "You need to start by \"git bisect start\"\n" +msgstr "" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#. +#: builtin/bisect--helper.c:838 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "" + +#: builtin/bisect--helper.c:866 msgid "perform 'git bisect next'" msgstr "" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:868 msgid "write the terms to .git/BISECT_TERMS" msgstr "" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:870 msgid "cleanup the bisection state" msgstr "" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:872 msgid "check for expected revs" msgstr "" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:874 msgid "reset the bisection state" msgstr "" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:876 msgid "write out the bisection state in BISECT_LOG" msgstr "" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:878 msgid "check and set terms in a bisection state" msgstr "" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:880 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:882 msgid "print out the bisect terms" msgstr "" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:884 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:650 -msgid "update BISECT_HEAD instead of checking out the current commit" +#: builtin/bisect--helper.c:886 +msgid "find the next bisection commit" msgstr "" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:888 +msgid "verify the next bisection state then checkout the next bisection commit" +msgstr "" + +#: builtin/bisect--helper.c:890 +msgid "start the bisection if it has not yet been started" +msgstr "" + +#: builtin/bisect--helper.c:892 msgid "no log for BISECT_WRITE" msgstr "" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:910 msgid "--write-terms requires two arguments" msgstr "" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:914 msgid "--bisect-clean-state requires no arguments" msgstr "" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:921 msgid "--bisect-reset requires either no argument or a commit" msgstr "" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:925 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:931 msgid "--check-and-set-terms requires 3 arguments" msgstr "" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:937 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:943 msgid "--bisect-terms requires 0 or 1 argument" msgstr "" +#: builtin/bisect--helper.c:952 +msgid "--bisect-next requires 0 arguments" +msgstr "" + +#: builtin/bisect--helper.c:958 +msgid "--bisect-auto-next requires 0 arguments" +msgstr "" + +#: builtin/bisect--helper.c:964 +msgid "--bisect-autostart does not accept arguments" +msgstr "" + #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "" @@ -8696,132 +9924,128 @@ msgstr "" msgid "invalid value for blame.coloring" msgstr "" -#: builtin/blame.c:823 +#: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" msgstr "" -#: builtin/blame.c:845 +#: builtin/blame.c:867 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:846 -msgid "Show blank SHA-1 for boundary commits (Default: off)" +#: builtin/blame.c:868 +msgid "Do not show object names of boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:847 +#: builtin/blame.c:869 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:848 +#: builtin/blame.c:870 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:849 +#: builtin/blame.c:871 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:850 +#: builtin/blame.c:872 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:851 +#: builtin/blame.c:873 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:852 +#: builtin/blame.c:874 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:853 +#: builtin/blame.c:875 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:854 +#: builtin/blame.c:876 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:855 +#: builtin/blame.c:877 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:856 +#: builtin/blame.c:878 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:857 +#: builtin/blame.c:879 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:858 +#: builtin/blame.c:880 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:859 +#: builtin/blame.c:881 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:860 +#: builtin/blame.c:882 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:861 builtin/log.c:1629 +#: builtin/blame.c:883 builtin/log.c:1808 msgid "rev" msgstr "" -#: builtin/blame.c:861 +#: builtin/blame.c:883 msgid "Ignore <rev> when blaming" msgstr "" -#: builtin/blame.c:862 +#: builtin/blame.c:884 msgid "Ignore revisions from <file>" msgstr "" -#: builtin/blame.c:863 +#: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" msgstr "" -#: builtin/blame.c:864 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "" -#: builtin/blame.c:871 -msgid "Use an experimental heuristic to improve diffs" -msgstr "" - -#: builtin/blame.c:873 +#: builtin/blame.c:887 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:874 +#: builtin/blame.c:888 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:875 +#: builtin/blame.c:889 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "" -#: builtin/blame.c:876 +#: builtin/blame.c:890 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:877 +#: builtin/blame.c:891 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:878 +#: builtin/blame.c:892 msgid "n,m" msgstr "" -#: builtin/blame.c:878 +#: builtin/blame.c:892 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/blame.c:929 +#: builtin/blame.c:944 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -8833,23 +10057,23 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:995 msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:1087 +#: builtin/blame.c:1110 #, 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:1156 msgid "Blaming lines" msgstr "" #: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" msgstr "" #: builtin/branch.c:30 @@ -9044,7 +10268,7 @@ msgstr "" msgid "do not use" msgstr "" -#: builtin/branch.c:626 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:526 msgid "upstream" msgstr "" @@ -9053,7 +10277,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 @@ -9136,198 +10360,327 @@ msgstr "" msgid "list branches in columns" msgstr "" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:433 +#: builtin/tag.c:434 msgid "object" msgstr "" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:841 +#: builtin/branch.c:839 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" msgstr "" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" -#: builtin/bundle.c:45 +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "" + +#: builtin/bugreport.c:21 #, c-format -msgid "%s is okay\n" +msgid "uname() failed with error '%s' (%d)\n" +msgstr "" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "" + +#: builtin/bugreport.c:34 +msgid "libc info: " msgstr "" -#: builtin/bundle.c:58 +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" + +#: builtin/bugreport.c:134 +msgid "specify a destination for the bugreport file" +msgstr "" + +#: builtin/bugreport.c:136 +msgid "specify a strftime format suffix for the filename" +msgstr "" + +#: builtin/bugreport.c:158 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "" + +#: builtin/bugreport.c:165 +msgid "System Info" +msgstr "" + +#: builtin/bugreport.c:168 +msgid "Enabled Hooks" +msgstr "" + +#: builtin/bugreport.c:175 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "" + +#: builtin/bugreport.c:178 +#, c-format +msgid "unable to write to %s" +msgstr "" + +#: builtin/bugreport.c:188 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "" + +#: 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: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:67 builtin/pack-objects.c:3480 +msgid "do not show progress meter" +msgstr "" + +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +msgid "show progress meter" +msgstr "" + +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +msgid "show progress meter during object writing phase" +msgstr "" + +#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +msgid "similar to --all-progress when progress meter is shown" +msgstr "" + +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "" + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." msgstr "" -#: builtin/bundle.c:62 +#: builtin/bundle.c:107 +msgid "do not show bundle details" +msgstr "" + +#: builtin/bundle.c:122 +#, c-format +msgid "%s is okay\n" +msgstr "" + +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:594 +#: builtin/bundle.c:171 builtin/remote.c:1687 +msgid "be verbose; must be placed before a subcommand" +msgstr "" + +#: builtin/bundle.c:193 builtin/remote.c:1718 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "" + +#: builtin/cat-file.c:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:599 msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" -"filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" msgstr "" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:620 msgid "only one batch option may be specified" msgstr "" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:638 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:642 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:645 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:647 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:644 git-submodule.sh:936 +#: builtin/cat-file.c:648 msgid "blob" msgstr "" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:651 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:654 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:658 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:662 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:660 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:666 msgid "do not order --batch-all-objects output" msgstr "" @@ -9355,8 +10708,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:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 +#: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "" @@ -9368,27 +10721,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 "" @@ -9446,9 +10799,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:680 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:754 msgid "string" msgstr "" @@ -9476,153 +10829,148 @@ msgstr "" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "" -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:190 +#: builtin/checkout.c:206 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:240 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:258 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:274 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:374 +#: builtin/checkout.c:396 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:379 +#: builtin/checkout.c:401 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:386 +#: builtin/checkout.c:408 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:422 builtin/checkout.c:425 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:429 +#: builtin/checkout.c:451 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:433 +#: builtin/checkout.c:455 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "" -#: builtin/checkout.c:437 +#: builtin/checkout.c:459 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "" -#: builtin/checkout.c:442 builtin/checkout.c:447 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:528 builtin/checkout.c:535 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:679 +#: builtin/checkout.c:703 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:729 +#: builtin/checkout.c:757 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:736 -#, c-format -msgid "staged changes in the following files may be lost: %s" -msgstr "" - -#: builtin/checkout.c:833 +#: builtin/checkout.c:853 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:875 +#: builtin/checkout.c:895 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:899 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:883 +#: builtin/checkout.c:903 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:886 +#: builtin/checkout.c:906 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:890 +#: builtin/checkout.c:910 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:912 builtin/checkout.c:1338 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:894 +#: builtin/checkout.c:914 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:945 +#: builtin/checkout.c:965 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:951 +#: builtin/checkout.c:971 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -9637,7 +10985,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:970 +#: builtin/checkout.c:990 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -9654,345 +11002,357 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1025 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1029 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1069 builtin/checkout.c:1333 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:1176 -msgid "only one reference expected" +#: builtin/checkout.c:1146 +#, 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:1193 +#: builtin/checkout.c:1153 +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:1163 #, c-format -msgid "only one reference expected, %d given." +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "" + +#: builtin/checkout.c:1229 +msgid "only one reference expected" msgstr "" -#: builtin/checkout.c:1230 +#: builtin/checkout.c:1246 #, 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:291 builtin/worktree.c:456 +#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1305 builtin/checkout.c:1671 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1352 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1354 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "" -#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1355 builtin/checkout.c:1363 #, c-format msgid "a branch is expected, got '%s'" msgstr "" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1358 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1374 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1378 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:1382 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1386 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:1390 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1394 msgid "you are switching branch while bisecting" msgstr "" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1401 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 #, 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:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 +#: builtin/checkout.c:1427 builtin/checkout.c:1432 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1429 #, c-format msgid "'%s' cannot take <start-point>" msgstr "" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1437 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1444 msgid "missing branch or commit argument" msgstr "" -#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 -#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 -#: builtin/send-pack.c:174 +#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 +#: builtin/send-pack.c:192 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1487 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 +#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 msgid "style" msgstr "" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1489 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1501 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1502 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1504 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1506 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1508 builtin/merge.c:291 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1511 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1524 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1527 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1531 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1533 -msgid "-b, -B and --orphan are mutually exclusive" +#: builtin/checkout.c:1586 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1590 msgid "-p and --overlay are mutually exclusive" msgstr "" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1627 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1578 -msgid "missing branch name; try -b" +#: builtin/checkout.c:1632 +#, c-format +msgid "missing branch name; try -%c" msgstr "" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1664 #, 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:1680 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1687 #, 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:1691 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1646 +#: builtin/checkout.c:1700 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "" + +#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "" + +#: builtin/checkout.c:1716 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:1721 +msgid "you must specify path(s) to restore" msgstr "" -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 -#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 +#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 +#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 +#: builtin/worktree.c:556 msgid "branch" msgstr "" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1748 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1750 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1751 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1753 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1754 msgid "use overlay mode (default)" msgstr "" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1799 msgid "create and switch to a new branch" msgstr "" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1801 msgid "create/reset and switch to a branch" msgstr "" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1803 msgid "second guess 'git switch <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1805 msgid "throw away local modifications" msgstr "" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1839 msgid "which tree-ish to checkout from" msgstr "" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1841 msgid "restore the index" msgstr "" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1843 msgid "restore the working tree (default)" msgstr "" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1845 msgid "ignore unmerged entries" msgstr "" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1846 msgid "use overlay mode" msgstr "" -#: builtin/clean.c:28 +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:37 +#: builtin/clean.c:38 #, c-format msgid "could not lstat %s\n" msgstr "" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10001,7 +11361,7 @@ msgid "" " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10014,38 +11374,33 @@ msgid "" " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:520 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 "" -#: builtin/clean.c:662 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:699 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:720 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:786 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "" - -#: builtin/clean.c:794 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10056,76 +11411,68 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:821 git-add--interactive.perl:1849 -msgid "*** Commands ***" -msgstr "" - -#: builtin/clean.c:822 git-add--interactive.perl:1846 -msgid "What now" -msgstr "" - -#: builtin/clean.c:830 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:846 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:908 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:910 +#: builtin/clean.c:905 msgid "force" msgstr "" -#: builtin/clean.c:911 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 -#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 +#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "" -#: builtin/clean.c:915 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:916 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:936 -msgid "-x and -X cannot be used together" -msgstr "" - -#: builtin/clean.c:940 +#: builtin/clean.c:929 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:943 +#: builtin/clean.c:932 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" -#: builtin/clone.c:46 +#: builtin/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "" + +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" @@ -10133,7 +11480,7 @@ msgstr "" msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 msgid "create a bare repository" msgstr "" @@ -10153,11 +11500,11 @@ msgstr "" msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "" @@ -10165,26 +11512,26 @@ msgstr "" msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:550 msgid "template-directory" msgstr "" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:551 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3314 builtin/repack.c:319 +#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 msgid "name" msgstr "" @@ -10200,8 +11547,8 @@ msgstr "" msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/pull.c:208 msgid "depth" msgstr "" @@ -10209,7 +11556,8 @@ msgstr "" msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 +#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/pull.c:211 msgid "time" msgstr "" @@ -10217,16 +11565,17 @@ msgstr "" msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 msgid "revision" msgstr "" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:132 +#: builtin/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "" @@ -10238,11 +11587,11 @@ msgstr "" msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:559 msgid "gitdir" msgstr "" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "" @@ -10254,23 +11603,23 @@ msgstr "" msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 msgid "server-specific" msgstr "" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 msgid "option to transmit" msgstr "" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:561 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:563 msgid "use IPv6 addresses only" msgstr "" @@ -10278,183 +11627,191 @@ msgstr "" msgid "any cloned submodules will use their remote-tracking branch" msgstr "" -#: builtin/clone.c:285 +#: 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:338 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:411 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:428 +#: builtin/clone.c:431 #, c-format msgid "failed to start iterator over '%s'" msgstr "" -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "" - -#: builtin/clone.c:458 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:462 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:467 +#: builtin/clone.c:471 #, c-format msgid "failed to iterate over '%s'" msgstr "" -#: builtin/clone.c:492 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:506 +#: builtin/clone.c:512 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:583 +#: builtin/clone.c:589 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:702 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:752 +#: builtin/clone.c:756 +msgid "failed to initialize sparse-checkout" +msgstr "" + +#: builtin/clone.c:779 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:783 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:833 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:896 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:898 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:970 builtin/receive-pack.c:2434 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:942 +#: builtin/clone.c:974 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:955 +#: builtin/clone.c:987 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:958 +#: builtin/clone.c:990 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:971 +#: builtin/clone.c:1006 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:977 builtin/fetch.c:1660 +#: builtin/clone.c:1010 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:987 +#: builtin/clone.c:1020 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:997 +#: builtin/clone.c:1026 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "" + +#: builtin/clone.c:1040 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 +#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:1017 +#: builtin/clone.c:1060 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:1037 +#: builtin/clone.c:1080 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:1039 +#: builtin/clone.c:1082 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1063 +#: builtin/clone.c:1106 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1124 +#: builtin/clone.c:1170 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1126 +#: builtin/clone.c:1172 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1128 +#: builtin/clone.c:1174 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1130 +#: builtin/clone.c:1176 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1133 +#: builtin/clone.c:1179 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1138 +#: builtin/clone.c:1184 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1268 builtin/clone.c:1276 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1226 +#: builtin/clone.c:1279 msgid "You appear to have cloned an empty repository." msgstr "" @@ -10490,6 +11847,105 @@ msgstr "" msgid "--command must be the first argument" msgstr "" +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "" + +#: builtin/commit-graph.c:14 builtin/commit-graph.c:27 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--" +"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" +msgstr "" + +#: builtin/commit-graph.c:64 +#, c-format +msgid "could not find object directory matching %s" +msgstr "" + +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +msgid "dir" +msgstr "" + +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +msgid "The object directory to store the graph" +msgstr "" + +#: builtin/commit-graph.c:83 +msgid "if the commit-graph is split, only verify the tip file" +msgstr "" + +#: builtin/commit-graph.c:106 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "" + +#: builtin/commit-graph.c:142 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "" + +#: builtin/commit-graph.c:155 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "" + +#: builtin/commit-graph.c:160 +#, c-format +msgid "invalid object: %s" +msgstr "" + +#: builtin/commit-graph.c:213 +msgid "start walk at all refs" +msgstr "" + +#: builtin/commit-graph.c:215 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "" + +#: builtin/commit-graph.c:217 +msgid "start walk at commits listed by stdin" +msgstr "" + +#: builtin/commit-graph.c:219 +msgid "include all commits already in the commit-graph file" +msgstr "" + +#: builtin/commit-graph.c:221 +msgid "enable computation for changed paths" +msgstr "" + +#: builtin/commit-graph.c:224 +msgid "allow writing an incremental commit-graph file" +msgstr "" + +#: builtin/commit-graph.c:228 +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "" + +#: builtin/commit-graph.c:230 +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "" + +#: builtin/commit-graph.c:232 +msgid "only expire files older than a given date-time" +msgstr "" + +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "" + +#: builtin/commit-graph.c:255 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "" + +#: builtin/commit-graph.c:287 +msgid "Collecting commits from input" +msgstr "" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -10501,7 +11957,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:546 #, c-format msgid "not a valid object name %s" msgstr "" @@ -10529,13 +11985,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:1460 -#: builtin/tag.c:412 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/tag.c:413 msgid "message" msgstr "" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "" @@ -10543,8 +11999,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:194 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "" @@ -10581,10 +12037,14 @@ msgid "" msgstr "" #: builtin/commit.c:63 -msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgid "Otherwise, please use 'git rebase --skip'\n" msgstr "" #: builtin/commit.c:66 +msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgstr "" + +#: builtin/commit.c:69 msgid "" "and then use:\n" "\n" @@ -10597,125 +12057,135 @@ msgid "" "\n" msgstr "" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:356 +#: builtin/commit.c:348 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "" + +#: builtin/commit.c:361 +msgid "No paths with --include/--only does not make sense." +msgstr "" + +#: builtin/commit.c:373 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:376 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:378 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:455 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:457 +#: builtin/commit.c:478 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:465 +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "" + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:484 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:582 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:584 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:603 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:656 +#: builtin/commit.c:679 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:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:478 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:708 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:712 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:750 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:810 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:829 -#, c-format +#: builtin/commit.c:853 msgid "" "\n" "It looks like you may be committing a merge.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" -#: builtin/commit.c:834 -#, c-format +#: builtin/commit.c:858 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" -#: builtin/commit.c:847 +#: builtin/commit.c:868 #, 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:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -10723,599 +12193,537 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:872 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:880 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:887 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:905 +#: builtin/commit.c:926 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:276 #, 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:1331 #, 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:1187 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "" + +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1173 +#: builtin/commit.c:1200 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1175 +#: builtin/commit.c:1202 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1183 +#: builtin/commit.c:1211 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1200 +#: builtin/commit.c:1229 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:1235 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "" -#: builtin/commit.c:1343 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1347 +#: builtin/commit.c:1374 msgid "version" msgstr "" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 +#: builtin/worktree.c:722 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 -#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 -#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 +#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 msgid "mode" msgstr "" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1383 builtin/commit.c:1541 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1360 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "" -#: builtin/commit.c:1363 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1365 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1366 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "" -#: builtin/commit.c:1368 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "" -#: builtin/commit.c:1388 +#: builtin/commit.c:1415 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1493 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1494 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1496 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 msgid "read message from file" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "author" msgstr "" -#: builtin/commit.c:1498 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:539 msgid "date" msgstr "" -#: builtin/commit.c:1499 +#: builtin/commit.c:1503 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:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "" -#: builtin/commit.c:1501 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1502 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1503 +#: builtin/commit.c:1507 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1504 +#: builtin/commit.c:1508 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1505 +#: builtin/commit.c:1509 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1507 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1508 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1510 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1515 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1516 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1517 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1518 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1519 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1520 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1521 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1522 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1535 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1536 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1541 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1543 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1616 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1623 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1642 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1649 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1654 +#: builtin/commit.c:1662 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1688 +#: builtin/commit.c:1696 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 -msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" -msgstr "" - -#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 -msgid "" -"git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] <split options>" -msgstr "" - -#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 -#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 -#: builtin/log.c:1584 -msgid "dir" -msgstr "" - -#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 -#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 -msgid "The object directory to store the graph" -msgstr "" - -#: builtin/commit-graph.c:57 -msgid "if the commit-graph is split, only verify the tip file" -msgstr "" - -#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 -#, c-format -msgid "Could not open commit-graph '%s'" -msgstr "" - -#: builtin/commit-graph.c:164 -msgid "start walk at all refs" -msgstr "" - -#: builtin/commit-graph.c:166 -msgid "scan pack-indexes listed by stdin for commits" -msgstr "" - -#: builtin/commit-graph.c:168 -msgid "start walk at commits listed by stdin" -msgstr "" - -#: builtin/commit-graph.c:170 -msgid "include all commits already in the commit-graph file" -msgstr "" - -#: builtin/commit-graph.c:172 -msgid "allow writing an incremental commit-graph file" -msgstr "" - -#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 -msgid "maximum number of commits in a non-base split commit-graph" -msgstr "" - -#: builtin/commit-graph.c:176 -msgid "maximum ratio between two levels of a split commit-graph" -msgstr "" - -#: builtin/commit-graph.c:191 -msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" -msgstr "" - #: builtin/config.c:11 msgid "git config [<options>]" msgstr "" -#: builtin/config.c:103 builtin/env--helper.c:23 +#: builtin/config.c:107 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "" -#: builtin/config.c:115 +#: builtin/config.c:119 msgid "only one type at a time" msgstr "" -#: builtin/config.c:124 +#: builtin/config.c:128 msgid "Config file location" msgstr "" -#: builtin/config.c:125 +#: builtin/config.c:129 msgid "use global config file" msgstr "" -#: builtin/config.c:126 +#: builtin/config.c:130 msgid "use system config file" msgstr "" -#: builtin/config.c:127 +#: builtin/config.c:131 msgid "use repository config file" msgstr "" -#: builtin/config.c:128 +#: builtin/config.c:132 msgid "use per-worktree config file" msgstr "" -#: builtin/config.c:129 +#: builtin/config.c:133 msgid "use given config file" msgstr "" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "blob-id" msgstr "" -#: builtin/config.c:130 +#: builtin/config.c:134 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:131 +#: builtin/config.c:135 msgid "Action" msgstr "" -#: builtin/config.c:132 +#: builtin/config.c:136 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:133 +#: builtin/config.c:137 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:134 +#: builtin/config.c:138 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:135 +#: builtin/config.c:139 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:136 +#: builtin/config.c:140 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:137 +#: builtin/config.c:141 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:138 +#: builtin/config.c:142 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:139 +#: builtin/config.c:143 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:140 +#: builtin/config.c:144 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:141 +#: builtin/config.c:145 msgid "remove a section: name" msgstr "" -#: builtin/config.c:142 +#: builtin/config.c:146 msgid "list all" msgstr "" -#: builtin/config.c:143 +#: builtin/config.c:147 msgid "open an editor" msgstr "" -#: builtin/config.c:144 +#: builtin/config.c:148 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:145 +#: builtin/config.c:149 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:146 +#: builtin/config.c:150 msgid "Type" msgstr "" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:151 builtin/env--helper.c:43 msgid "value is given this type" msgstr "" -#: builtin/config.c:148 +#: builtin/config.c:152 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:149 +#: builtin/config.c:153 msgid "value is decimal number" msgstr "" -#: builtin/config.c:150 +#: builtin/config.c:154 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:151 +#: builtin/config.c:155 +msgid "value is --bool or string" +msgstr "" + +#: builtin/config.c:156 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:152 +#: builtin/config.c:157 msgid "value is an expiry date" msgstr "" -#: builtin/config.c:153 +#: builtin/config.c:158 msgid "Other" msgstr "" -#: builtin/config.c:154 +#: builtin/config.c:159 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:155 +#: builtin/config.c:160 msgid "show variable names only" msgstr "" -#: builtin/config.c:156 +#: builtin/config.c:161 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:157 +#: builtin/config.c:162 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" -#: builtin/config.c:158 builtin/env--helper.c:40 +#: builtin/config.c:163 +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" + +#: builtin/config.c:164 builtin/env--helper.c:45 msgid "value" msgstr "" -#: builtin/config.c:158 +#: builtin/config.c:164 msgid "with --get, use default value when missing entry" msgstr "" -#: builtin/config.c:172 +#: builtin/config.c:178 #, c-format msgid "wrong number of arguments, should be %d" msgstr "" -#: builtin/config.c:174 +#: builtin/config.c:180 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "" -#: builtin/config.c:308 +#: builtin/config.c:334 #, c-format msgid "invalid key pattern: %s" msgstr "" -#: builtin/config.c:344 +#: builtin/config.c:370 #, c-format msgid "failed to format default config value: %s" msgstr "" -#: builtin/config.c:401 +#: builtin/config.c:434 #, c-format msgid "cannot parse color '%s'" msgstr "" -#: builtin/config.c:443 +#: builtin/config.c:476 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:529 builtin/config.c:789 msgid "not in a git directory" msgstr "" -#: builtin/config.c:499 +#: builtin/config.c:532 msgid "writing to stdin is not supported" msgstr "" -#: builtin/config.c:502 +#: builtin/config.c:535 msgid "writing config blobs is not supported" msgstr "" -#: builtin/config.c:587 +#: builtin/config.c:620 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -11325,81 +12733,85 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:611 +#: builtin/config.c:644 msgid "only one config file at a time" msgstr "" -#: builtin/config.c:616 +#: builtin/config.c:650 msgid "--local can only be used inside a git repository" msgstr "" -#: builtin/config.c:619 +#: builtin/config.c:652 msgid "--blob can only be used inside a git repository" msgstr "" -#: builtin/config.c:638 +#: builtin/config.c:654 +msgid "--worktree can only be used inside a git repository" +msgstr "" + +#: builtin/config.c:676 msgid "$HOME not set" msgstr "" -#: builtin/config.c:658 +#: builtin/config.c:700 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:735 msgid "--get-color and variable type are incoherent" msgstr "" -#: builtin/config.c:693 +#: builtin/config.c:740 msgid "only one action at a time" msgstr "" -#: builtin/config.c:706 +#: builtin/config.c:753 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "" -#: builtin/config.c:712 +#: builtin/config.c:759 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" -#: builtin/config.c:718 +#: builtin/config.c:765 msgid "--default is only applicable to --get" msgstr "" -#: builtin/config.c:731 +#: builtin/config.c:778 #, c-format msgid "unable to read config file '%s'" msgstr "" -#: builtin/config.c:734 +#: builtin/config.c:781 msgid "error processing config file(s)" msgstr "" -#: builtin/config.c:744 +#: builtin/config.c:791 msgid "editing stdin is not supported" msgstr "" -#: builtin/config.c:746 +#: builtin/config.c:793 msgid "editing blobs is not supported" msgstr "" -#: builtin/config.c:760 +#: builtin/config.c:807 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:773 +#: builtin/config.c:820 #, 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:894 builtin/config.c:905 #, c-format msgid "no such section: %s" msgstr "" @@ -11412,11 +12824,32 @@ msgstr "" msgid "print sizes in human readable format" msgstr "" -#: builtin/describe.c:27 +#: builtin/credential-cache--daemon.c:226 +#, c-format +msgid "" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" +msgstr "" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "" + +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "" @@ -11432,285 +12865,290 @@ msgstr "" msgid "annotated" msgstr "" -#: builtin/describe.c:273 -#, c-format -msgid "annotated tag %s not available" -msgstr "" - #: builtin/describe.c:277 #, c-format -msgid "annotated tag %s has no embedded name" +msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:279 +#: builtin/describe.c:281 #, c-format -msgid "tag '%s' is really '%s' here" +msgid "tag '%s' is externally known as '%s'" msgstr "" -#: builtin/describe.c:323 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:325 +#: builtin/describe.c:330 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:379 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:405 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:409 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:439 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:442 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:510 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "" -#: builtin/describe.c:513 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:521 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "" -#: builtin/describe.c:535 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:536 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:537 +#: builtin/describe.c:556 msgid "use any ref" msgstr "" -#: builtin/describe.c:538 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:539 +#: builtin/describe.c:558 msgid "always use long format" msgstr "" -#: builtin/describe.c:540 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:543 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:545 +#: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:547 +#: builtin/describe.c:566 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:549 +#: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "" -#: builtin/describe.c:553 +#: builtin/describe.c:572 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:556 +#: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" -#: builtin/describe.c:574 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:603 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:654 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/describe.c:656 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "" -#: builtin/diff.c:84 +#: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:235 +#: builtin/diff.c:241 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:350 +#: builtin/diff.c:358 +#, c-format +msgid "%s...%s: no merge base" +msgstr "" + +#: builtin/diff.c:468 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:394 +#: builtin/diff.c:513 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:403 +#: builtin/diff.c:524 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:408 +#: builtin/diff.c:529 #, c-format msgid "unhandled object '%s' given." msgstr "" +#: builtin/diff.c:563 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "" + #: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "" -#: builtin/difftool.c:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "" -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "" -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "" -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "" -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" -#: builtin/difftool.c:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "" @@ -11718,24 +13156,24 @@ msgstr "" msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "" -#: builtin/env--helper.c:37 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 msgid "be quiet only use git_env_*() value as exit code" msgstr "" -#: builtin/env--helper.c:62 +#: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "" -#: builtin/env--helper.c:77 +#: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" @@ -11746,251 +13184,338 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:868 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "" + +#: builtin/fast-export.c:1178 +msgid "--anonymize-map token cannot be empty" +msgstr "" + +#: builtin/fast-export.c:1198 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1200 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1203 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:1132 +#: builtin/fast-export.c:1206 msgid "select handling of commit messages in an alternate encoding" msgstr "" -#: builtin/fast-export.c:1135 +#: builtin/fast-export.c:1209 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1211 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1215 +msgid "Import marks from this file if it exists" +msgstr "" + +#: builtin/fast-export.c:1217 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1219 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1221 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1222 msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1145 builtin/log.c:1632 +#: builtin/fast-export.c:1223 builtin/log.c:1811 msgid "refspec" msgstr "" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1224 msgid "Apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1225 msgid "anonymize output" msgstr "" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1226 +msgid "from:to" +msgstr "" + +#: builtin/fast-export.c:1227 +msgid "convert <from> to <to> in anonymized output" +msgstr "" + +#: builtin/fast-export.c:1230 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" -#: builtin/fast-export.c:1151 +#: builtin/fast-export.c:1232 msgid "Show original object ids of blobs/commits" msgstr "" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1234 +msgid "Label tags with mark ids" +msgstr "" + +#: builtin/fast-export.c:1257 +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "" + +#: builtin/fast-export.c:1272 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "" + +#: builtin/fast-import.c:3086 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "" + +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "" + +#: builtin/fast-import.c:3223 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "" + +#: builtin/fast-import.c:3228 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "" + +#: builtin/fast-import.c:3320 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "" + +#: builtin/fast-import.c:3374 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "" + +#: builtin/fetch-pack.c:241 +#, c-format +msgid "Lockfile created but not reported: %s" +msgstr "" + +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:31 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:32 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:33 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:119 +msgid "fetch.parallel cannot be negative" +msgstr "" + +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:144 builtin/pull.c:245 +msgid "set upstream for git pull/fetch" +msgstr "" + +#: builtin/fetch.c:146 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:148 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:130 +#: builtin/fetch.c:149 msgid "force overwrite of local reference" msgstr "" -#: builtin/fetch.c:132 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:136 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:138 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:159 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:142 +#: builtin/fetch.c:161 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "" -#: builtin/fetch.c:144 +#: builtin/fetch.c:163 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:150 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:155 +#: builtin/fetch.c:176 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:161 builtin/pull.c:230 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:164 +#: builtin/fetch.c:185 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:167 +#: builtin/fetch.c:188 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:180 +#: builtin/fetch.c:201 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "" -#: builtin/fetch.c:183 -msgid "run 'gc --auto' after fetching" +#: builtin/fetch.c:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" msgstr "" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:208 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "" -#: builtin/fetch.c:491 +#: builtin/fetch.c:210 +msgid "write the commit-graph after fetching" +msgstr "" + +#: builtin/fetch.c:212 +msgid "accept refspecs from stdin" +msgstr "" + +#: builtin/fetch.c:523 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:630 +#: builtin/fetch.c:677 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:728 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:732 +#: builtin/fetch.c:779 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:746 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:756 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:761 +#: builtin/fetch.c:808 msgid "would clobber existing tag" msgstr "" -#: builtin/fetch.c:783 +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:786 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:789 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:828 +#: builtin/fetch.c:875 msgid "forced update" msgstr "" -#: builtin/fetch.c:833 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:854 +#: builtin/fetch.c:901 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:858 +#: builtin/fetch.c:905 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -11999,148 +13524,173 @@ msgid "" " to avoid this check.\n" msgstr "" -#: builtin/fetch.c:888 +#: builtin/fetch.c:939 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:909 +#: builtin/fetch.c:960 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:1000 builtin/fetch.c:1131 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1064 #, 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:1101 +#: builtin/fetch.c:1161 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:1135 builtin/remote.c:1036 +#: builtin/fetch.c:1195 builtin/remote.c:1113 msgid "(none)" msgstr "" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1218 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1237 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1180 +#: builtin/fetch.c:1240 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1484 +#: builtin/fetch.c:1448 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "" + +#: builtin/fetch.c:1463 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "" + +#: builtin/fetch.c:1465 +msgid "not setting upstream for a remote tag" +msgstr "" + +#: builtin/fetch.c:1467 +msgid "unknown branch type" +msgstr "" + +#: builtin/fetch.c:1469 +msgid "" +"no source branch found.\n" +"you need to specify exactly one branch with the --set-upstream option." +msgstr "" + +#: builtin/fetch.c:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1486 builtin/remote.c:100 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1532 -msgid "" -"--filter can only be used with the remote configured in extensions." -"partialClone" +#: builtin/fetch.c:1620 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" msgstr "" -#: builtin/fetch.c:1556 +#: builtin/fetch.c:1724 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:1593 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1825 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1827 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1832 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1834 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1669 +#: builtin/fetch.c:1851 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1671 +#: builtin/fetch.c:1853 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1862 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1869 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fetch.c:1703 +#: builtin/fetch.c:1887 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fetch.c:1891 +msgid "--stdin can only be used when fetching from one remote" +msgstr "" + +#: builtin/fmt-merge-msg.c:7 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:18 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "" @@ -12153,7 +13703,7 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" msgstr "" #: builtin/for-each-ref.c:13 @@ -12180,7 +13730,7 @@ msgstr "" msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "" @@ -12204,267 +13754,267 @@ 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:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:101 builtin/fsck.c:121 #, 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:115 #, c-format msgid "warning in %s %s: %s" msgstr "" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:144 builtin/fsck.c:147 #, c-format msgid "broken link from %7s %s" msgstr "" -#: builtin/fsck.c:168 +#: builtin/fsck.c:156 msgid "wrong object type in link" msgstr "" -#: builtin/fsck.c:184 +#: builtin/fsck.c:172 #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -#: builtin/fsck.c:295 +#: builtin/fsck.c:283 #, c-format msgid "missing %s %s" msgstr "" -#: builtin/fsck.c:321 +#: builtin/fsck.c:310 #, c-format msgid "unreachable %s %s" msgstr "" -#: builtin/fsck.c:340 +#: builtin/fsck.c:330 #, c-format msgid "dangling %s %s" msgstr "" -#: builtin/fsck.c:349 +#: builtin/fsck.c:340 msgid "could not create lost-found" msgstr "" -#: builtin/fsck.c:360 +#: builtin/fsck.c:351 #, c-format msgid "could not finish '%s'" msgstr "" -#: builtin/fsck.c:377 +#: builtin/fsck.c:368 #, c-format msgid "Checking %s" msgstr "" -#: builtin/fsck.c:415 +#: builtin/fsck.c:406 #, c-format msgid "Checking connectivity (%d objects)" msgstr "" -#: builtin/fsck.c:434 +#: builtin/fsck.c:425 #, c-format msgid "Checking %s %s" msgstr "" -#: builtin/fsck.c:438 +#: builtin/fsck.c:430 msgid "broken links" msgstr "" -#: builtin/fsck.c:447 +#: builtin/fsck.c:439 #, c-format msgid "root %s" msgstr "" -#: builtin/fsck.c:455 +#: builtin/fsck.c:447 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "" -#: builtin/fsck.c:484 +#: builtin/fsck.c:476 #, c-format msgid "%s: object corrupt or missing" msgstr "" -#: builtin/fsck.c:509 +#: builtin/fsck.c:501 #, c-format msgid "%s: invalid reflog entry %s" msgstr "" -#: builtin/fsck.c:523 +#: builtin/fsck.c:515 #, c-format msgid "Checking reflog %s->%s" msgstr "" -#: builtin/fsck.c:557 +#: builtin/fsck.c:549 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "" -#: builtin/fsck.c:564 +#: builtin/fsck.c:556 #, c-format msgid "%s: not a commit" msgstr "" -#: builtin/fsck.c:619 +#: builtin/fsck.c:610 msgid "notice: No default references" msgstr "" -#: builtin/fsck.c:634 +#: builtin/fsck.c:625 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "" -#: builtin/fsck.c:647 +#: builtin/fsck.c:638 #, c-format msgid "%s: object could not be parsed: %s" msgstr "" -#: builtin/fsck.c:667 +#: builtin/fsck.c:658 #, c-format msgid "bad sha1 file: %s" msgstr "" -#: builtin/fsck.c:682 +#: builtin/fsck.c:673 msgid "Checking object directory" msgstr "" -#: builtin/fsck.c:685 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:700 +#: builtin/fsck.c:691 #, c-format msgid "Checking %s link" msgstr "" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:696 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "" -#: builtin/fsck.c:712 +#: builtin/fsck.c:703 #, c-format msgid "%s points to something strange (%s)" msgstr "" -#: builtin/fsck.c:718 +#: builtin/fsck.c:709 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "" -#: builtin/fsck.c:722 +#: builtin/fsck.c:713 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "" -#: builtin/fsck.c:734 +#: builtin/fsck.c:725 msgid "Checking cache tree" msgstr "" -#: builtin/fsck.c:739 +#: builtin/fsck.c:730 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "" -#: builtin/fsck.c:750 +#: builtin/fsck.c:739 msgid "non-tree in cache-tree" msgstr "" -#: builtin/fsck.c:781 +#: builtin/fsck.c:770 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:787 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:788 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:789 +#: builtin/fsck.c:778 msgid "report tags" msgstr "" -#: builtin/fsck.c:790 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:791 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:792 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:793 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:794 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:795 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:797 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "" -#: builtin/fsck.c:799 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "" -#: builtin/fsck.c:887 +#: builtin/fsck.c:875 #, c-format msgid "%s: object missing" msgstr "" -#: builtin/fsck.c:899 +#: builtin/fsck.c:886 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "" -#: builtin/gc.c:34 +#: builtin/gc.c:36 msgid "git gc [<options>]" msgstr "" -#: builtin/gc.c:90 +#: builtin/gc.c:91 #, c-format msgid "Failed to fstat %s: %s" msgstr "" -#: builtin/gc.c:126 +#: builtin/gc.c:127 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "" @@ -12535,7 +14085,60 @@ msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:29 +#: builtin/gc.c:705 +msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +msgstr "" + +#: builtin/gc.c:812 +msgid "failed to write commit-graph" +msgstr "" + +#: builtin/gc.c:905 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "" + +#: builtin/gc.c:932 +#, c-format +msgid "task '%s' failed" +msgstr "" + +#: builtin/gc.c:979 +#, c-format +msgid "'%s' is not a valid task" +msgstr "" + +#: builtin/gc.c:984 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "" + +#: builtin/gc.c:999 +msgid "run tasks based on the state of the repository" +msgstr "" + +#: builtin/gc.c:1001 +msgid "do not report progress or other information over stderr" +msgstr "" + +#: builtin/gc.c:1002 +msgid "task" +msgstr "" + +#: builtin/gc.c:1003 +msgid "run a specific task" +msgstr "" + +#: builtin/gc.c:1026 +msgid "git maintenance run [<options>]" +msgstr "" + +#: builtin/gc.c:1037 +#, c-format +msgid "invalid subcommand: %s" +msgstr "" + +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" @@ -12553,258 +14156,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:2728 +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:648 +#: builtin/grep.c:655 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:714 +#: builtin/grep.c:725 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:813 +#: builtin/grep.c:824 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:815 +#: builtin/grep.c:826 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:817 +#: builtin/grep.c:828 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:819 +#: builtin/grep.c:830 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:821 +#: builtin/grep.c:832 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:824 +#: builtin/grep.c:835 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:826 +#: builtin/grep.c:837 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:830 +#: builtin/grep.c:841 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:835 +#: builtin/grep.c:846 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:837 +#: builtin/grep.c:848 msgid "search in subdirectories (default)" msgstr "" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:846 +#: builtin/grep.c:857 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:849 +#: builtin/grep.c:860 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:852 +#: builtin/grep.c:863 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:855 +#: builtin/grep.c:866 msgid "show line numbers" msgstr "" -#: builtin/grep.c:856 +#: builtin/grep.c:867 msgid "show column number of first match" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:868 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:858 +#: builtin/grep.c:869 msgid "show filenames" msgstr "" -#: builtin/grep.c:860 +#: builtin/grep.c:871 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:873 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:864 +#: builtin/grep.c:875 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:867 +#: builtin/grep.c:878 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:869 +#: builtin/grep.c:880 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:872 +#: builtin/grep.c:883 msgid "show only matching parts of a line" msgstr "" -#: builtin/grep.c:874 +#: builtin/grep.c:885 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:875 +#: builtin/grep.c:886 msgid "highlight matches" msgstr "" -#: builtin/grep.c:877 +#: builtin/grep.c:888 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:879 +#: builtin/grep.c:890 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:882 +#: builtin/grep.c:893 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:885 +#: builtin/grep.c:896 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:887 +#: builtin/grep.c:898 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:889 +#: builtin/grep.c:900 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:890 +#: builtin/grep.c:901 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:893 +#: builtin/grep.c:904 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:895 +#: builtin/grep.c:906 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:902 +#: builtin/grep.c:913 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:914 +#: builtin/grep.c:925 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:916 +#: builtin/grep.c:927 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:918 +#: builtin/grep.c:929 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "pager" msgstr "" -#: builtin/grep.c:922 +#: builtin/grep.c:933 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:926 +#: builtin/grep.c:937 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:990 +#: builtin/grep.c:1004 msgid "no pattern given" msgstr "" -#: builtin/grep.c:1026 +#: builtin/grep.c:1040 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1034 +#: builtin/grep.c:1048 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1065 +#: builtin/grep.c:1078 +msgid "--untracked not supported with --recurse-submodules" +msgstr "" + +#: builtin/grep.c:1082 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1068 builtin/pack-objects.c:3416 +#: builtin/grep.c:1085 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 +#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1094 +#: builtin/grep.c:1122 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1117 -msgid "option not supported with --recurse-submodules" -msgstr "" - -#: builtin/grep.c:1123 +#: builtin/grep.c:1148 msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1129 +#: builtin/grep.c:1154 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1137 +#: builtin/grep.c:1162 msgid "both --cached and trees are given" msgstr "" @@ -12843,504 +14446,552 @@ msgstr "" msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "" -#: builtin/help.c:49 +#: builtin/help.c:50 msgid "print all configuration variable names" msgstr "" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "" -#: builtin/help.c:56 +#: builtin/help.c:57 msgid "print command description" msgstr "" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "" -#: builtin/help.c:448 git.c:365 +#: builtin/help.c:534 git.c:369 #, c-format msgid "bad alias.%s string: %s" msgstr "" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:491 +#: builtin/help.c:577 msgid "'git help config' for more information" msgstr "" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 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:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:342 builtin/repack.c:254 +#, c-format +msgid "unable to create '%s'" +msgstr "" + +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:612 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:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, 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:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:870 #, 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:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1288 #, 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:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1304 #, 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:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1501 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1631 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1633 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1643 +#: builtin/index-pack.c:1681 #, 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:1688 #, 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:1728 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:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "" + +#: builtin/index-pack.c:1821 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1825 +msgid "--object-format cannot be used with --stdin" +msgstr "" + +#: builtin/index-pack.c:1831 msgid "--verify with no packfile name given" msgstr "" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "" -#: builtin/init-db.c:61 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "" -#: builtin/init-db.c:66 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:78 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:80 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:86 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:90 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:121 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "" -#: builtin/init-db.c:136 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:334 +#: builtin/init-db.c:274 +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "" + +#: builtin/init-db.c:366 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:337 +#: builtin/init-db.c:369 #, c-format msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:385 +msgid "attempt to reinitialize repository with different hash" +msgstr "" + +#: builtin/init-db.c:409 builtin/init-db.c:412 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:413 +#: builtin/init-db.c:443 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "" + +#: builtin/init-db.c:474 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:414 +#: builtin/init-db.c:475 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:418 +#: builtin/init-db.c:479 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:419 +#: builtin/init-db.c:480 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:468 +#: builtin/init-db.c:529 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -#: builtin/init-db.c:491 +#: builtin/init-db.c:555 msgid "permissions" msgstr "" -#: builtin/init-db.c:492 +#: builtin/init-db.c:556 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:529 builtin/init-db.c:534 +#: builtin/init-db.c:562 +msgid "override the name of the initial branch" +msgstr "" + +#: builtin/init-db.c:563 builtin/verify-pack.c:74 +msgid "hash" +msgstr "" + +#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +msgid "specify the hash algorithm to use" +msgstr "" + +#: builtin/init-db.c:571 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "" + +#: builtin/init-db.c:600 builtin/init-db.c:605 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:538 +#: builtin/init-db.c:609 builtin/init-db.c:664 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:559 +#: builtin/init-db.c:636 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:587 +#: builtin/init-db.c:688 #, c-format msgid "Cannot access work tree '%s'" msgstr "" +#: builtin/init-db.c:693 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -13403,494 +15054,512 @@ 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:177 msgid "show source" msgstr "" -#: builtin/log.c:174 +#: builtin/log.c:178 msgid "Use mail map file" msgstr "" -#: builtin/log.c:176 +#: builtin/log.c:181 msgid "only decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:178 +#: builtin/log.c:183 msgid "do not decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:179 +#: builtin/log.c:184 msgid "decorate options" msgstr "" -#: builtin/log.c:182 +#: builtin/log.c:187 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:280 +#: builtin/log.c:297 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:534 +#: builtin/log.c:555 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:549 builtin/log.c:643 +#: builtin/log.c:570 builtin/log.c:665 #, c-format msgid "could not read object %s" msgstr "" -#: builtin/log.c:668 +#: builtin/log.c:690 #, c-format msgid "unknown type: %d" msgstr "" -#: builtin/log.c:791 +#: builtin/log.c:839 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "" + +#: builtin/log.c:846 msgid "format.headers without value" msgstr "" -#: builtin/log.c:908 +#: builtin/log.c:965 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:924 +#: builtin/log.c:981 #, c-format msgid "cannot open patch file %s" msgstr "" -#: builtin/log.c:941 +#: builtin/log.c:998 msgid "need exactly one range" msgstr "" -#: builtin/log.c:951 +#: builtin/log.c:1008 msgid "not a range" msgstr "" -#: builtin/log.c:1074 +#: builtin/log.c:1172 msgid "cover letter needs email format" msgstr "" -#: builtin/log.c:1080 +#: builtin/log.c:1178 msgid "failed to create cover-letter file" msgstr "" -#: builtin/log.c:1159 +#: builtin/log.c:1259 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1186 +#: builtin/log.c:1286 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1244 +#: builtin/log.c:1344 msgid "two output directories?" msgstr "" -#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 +#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 #, c-format msgid "unknown commit %s" msgstr "" -#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1506 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:1370 +#: builtin/log.c:1515 msgid "could not find exact merge base" msgstr "" -#: builtin/log.c:1374 +#: builtin/log.c:1525 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:1394 +#: builtin/log.c:1548 msgid "failed to find exact merge base" msgstr "" -#: builtin/log.c:1405 +#: builtin/log.c:1565 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1409 +#: builtin/log.c:1575 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1462 +#: builtin/log.c:1633 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1514 -msgid "failed to infer range-diff ranges" +#: builtin/log.c:1690 +msgid "failed to infer range-diff origin of current series" +msgstr "" + +#: builtin/log.c:1692 +#, c-format +msgid "using '%s' as range-diff origin of current series" msgstr "" -#: builtin/log.c:1559 +#: builtin/log.c:1736 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1562 +#: builtin/log.c:1739 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1566 +#: builtin/log.c:1743 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1568 +#: builtin/log.c:1745 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1570 +#: builtin/log.c:1747 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1571 +#: builtin/log.c:1748 msgid "sfx" msgstr "" -#: builtin/log.c:1572 +#: builtin/log.c:1749 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1574 +#: builtin/log.c:1751 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1576 +#: builtin/log.c:1753 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1578 +#: builtin/log.c:1755 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1581 +#: builtin/log.c:1758 +msgid "cover-from-description-mode" +msgstr "" + +#: builtin/log.c:1759 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "" + +#: builtin/log.c:1761 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1584 +#: builtin/log.c:1764 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1587 +#: builtin/log.c:1767 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1590 +#: builtin/log.c:1770 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1592 +#: builtin/log.c:1772 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1594 +#: builtin/log.c:1774 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1596 +#: builtin/log.c:1776 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1598 +#: builtin/log.c:1778 msgid "Messaging" msgstr "" -#: builtin/log.c:1599 +#: builtin/log.c:1779 msgid "header" msgstr "" -#: builtin/log.c:1600 +#: builtin/log.c:1780 msgid "add email header" msgstr "" -#: builtin/log.c:1601 builtin/log.c:1603 +#: builtin/log.c:1781 builtin/log.c:1782 msgid "email" msgstr "" -#: builtin/log.c:1601 +#: builtin/log.c:1781 msgid "add To: header" msgstr "" -#: builtin/log.c:1603 +#: builtin/log.c:1782 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1605 +#: builtin/log.c:1783 msgid "ident" msgstr "" -#: builtin/log.c:1606 +#: builtin/log.c:1784 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1608 +#: builtin/log.c:1786 msgid "message-id" msgstr "" -#: builtin/log.c:1609 +#: builtin/log.c:1787 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1610 builtin/log.c:1613 +#: builtin/log.c:1788 builtin/log.c:1791 msgid "boundary" msgstr "" -#: builtin/log.c:1611 +#: builtin/log.c:1789 msgid "attach the patch" msgstr "" -#: builtin/log.c:1614 +#: builtin/log.c:1792 msgid "inline the patch" msgstr "" -#: builtin/log.c:1618 +#: builtin/log.c:1796 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1620 +#: builtin/log.c:1798 msgid "signature" msgstr "" -#: builtin/log.c:1621 +#: builtin/log.c:1799 msgid "add a signature" msgstr "" -#: builtin/log.c:1622 +#: builtin/log.c:1800 msgid "base-commit" msgstr "" -#: builtin/log.c:1623 +#: builtin/log.c:1801 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1625 +#: builtin/log.c:1804 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1626 +#: builtin/log.c:1805 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1628 +#: builtin/log.c:1807 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1630 +#: builtin/log.c:1809 msgid "show changes against <rev> in cover letter or single patch" msgstr "" -#: builtin/log.c:1633 +#: builtin/log.c:1812 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" -#: builtin/log.c:1635 +#: builtin/log.c:1814 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1710 +#: builtin/log.c:1896 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1725 +#: builtin/log.c:1911 msgid "-n and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1727 +#: builtin/log.c:1913 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1735 +#: builtin/log.c:1921 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1737 +#: builtin/log.c:1923 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1739 +#: builtin/log.c:1925 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1771 +#: builtin/log.c:1958 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1860 +#: builtin/log.c:2062 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1864 +#: builtin/log.c:2066 msgid "Interdiff:" msgstr "" -#: builtin/log.c:1865 +#: builtin/log.c:2067 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:1871 +#: builtin/log.c:2073 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:1875 +#: builtin/log.c:2077 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1883 +#: builtin/log.c:2085 msgid "Range-diff:" msgstr "" -#: builtin/log.c:1884 +#: builtin/log.c:2086 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:1895 +#: builtin/log.c:2097 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1931 +#: builtin/log.c:2133 msgid "Generating patches" msgstr "" -#: builtin/log.c:1975 +#: builtin/log.c:2177 msgid "failed to create output files" msgstr "" -#: builtin/log.c:2034 +#: builtin/log.c:2236 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:2088 +#: builtin/log.c:2290 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "" @@ -13905,7 +15574,7 @@ msgstr "" msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 msgid "exec" msgstr "" @@ -13978,486 +15647,486 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "" -#: builtin/merge.c:55 -msgid "git merge [<options>] [<commit>...]" +#: builtin/merge-base.c:32 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "" + +#: builtin/merge-base.c:33 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "" + +#: builtin/merge-base.c:34 +msgid "git merge-base --independent <commit>..." +msgstr "" + +#: builtin/merge-base.c:35 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "" + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "" + +#: builtin/merge-base.c:151 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "" + +#: builtin/merge-file.c:9 +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "" + +#: builtin/merge-file.c:35 +msgid "send results to standard output" +msgstr "" + +#: builtin/merge-file.c:36 +msgid "use a diff3 based merge" +msgstr "" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use our version" +msgstr "" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use their version" +msgstr "" + +#: builtin/merge-file.c:41 +msgid "for conflicts, use a union version" +msgstr "" + +#: builtin/merge-file.c:44 +msgid "for conflicts, use this marker size" +msgstr "" + +#: builtin/merge-file.c:45 +msgid "do not warn about conflicts" +msgstr "" + +#: builtin/merge-file.c:47 +msgid "set labels for file1/orig-file/file2" +msgstr "" + +#: builtin/merge-recursive.c:47 +#, c-format +msgid "unknown option %s" +msgstr "" + +#: builtin/merge-recursive.c:53 +#, c-format +msgid "could not parse object '%s'" +msgstr "" + +#: builtin/merge-recursive.c:57 +#, c-format +msgid "cannot handle more than %d base. Ignoring %s." +msgid_plural "cannot handle more than %d bases. Ignoring %s." +msgstr[0] "" +msgstr[1] "" + +#: builtin/merge-recursive.c:65 +msgid "not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "" + +#: builtin/merge-recursive.c:82 +#, c-format +msgid "Merging %s with %s\n" msgstr "" #: builtin/merge.c:56 -msgid "git merge --abort" +msgid "git merge [<options>] [<commit>...]" msgstr "" #: builtin/merge.c:57 +msgid "git merge --abort" +msgstr "" + +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "" -#: builtin/merge.c:118 +#: builtin/merge.c:120 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:141 +#: builtin/merge.c:143 #, c-format msgid "option `%s' requires a value" msgstr "" -#: builtin/merge.c:187 +#: builtin/merge.c:189 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:188 +#: builtin/merge.c:190 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:193 +#: builtin/merge.c:195 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:246 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:247 builtin/pull.c:154 +#: builtin/merge.c:249 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:250 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:252 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:253 builtin/pull.c:166 +#: builtin/merge.c:255 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:255 builtin/pull.c:169 +#: builtin/merge.c:257 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:259 builtin/pull.c:154 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:259 +#: builtin/merge.c:261 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:263 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:267 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 msgid "strategy" msgstr "" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:269 builtin/pull.c:169 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option=value" msgstr "" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:271 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:271 +#: builtin/merge.c:273 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:278 +#: builtin/merge.c:280 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:280 +#: builtin/merge.c:282 msgid "--abort but leave index and working tree alone" msgstr "" -#: builtin/merge.c:282 +#: builtin/merge.c:284 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:286 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:290 -msgid "verify commit-msg hook" +#: builtin/merge.c:293 +msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" -#: builtin/merge.c:307 +#: builtin/merge.c:310 msgid "could not run stash." msgstr "" -#: builtin/merge.c:312 +#: builtin/merge.c:315 msgid "stash failed" msgstr "" -#: builtin/merge.c:317 +#: builtin/merge.c:320 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:342 builtin/merge.c:359 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:386 +#: builtin/merge.c:389 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:447 +#: builtin/merge.c:450 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:498 +#: builtin/merge.c:501 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:585 +#: builtin/merge.c:588 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:708 +#: builtin/merge.c:713 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:722 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:737 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:789 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:798 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:804 +#: builtin/merge.c:808 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:809 +#: builtin/merge.c:813 msgid "An empty message aborts the commit.\n" msgstr "" -#: builtin/merge.c:812 +#: builtin/merge.c:816 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -#: builtin/merge.c:853 +#: builtin/merge.c:869 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:872 +#: builtin/merge.c:884 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:933 +#: builtin/merge.c:945 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:972 +#: builtin/merge.c:984 msgid "No current branch." msgstr "" -#: builtin/merge.c:974 +#: builtin/merge.c:986 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:976 +#: builtin/merge.c:988 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:981 +#: builtin/merge.c:993 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1038 +#: builtin/merge.c:1050 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1141 +#: builtin/merge.c:1153 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1175 +#: builtin/merge.c:1187 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1278 +#: builtin/merge.c:1291 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1282 +#: builtin/merge.c:1295 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1291 +#: builtin/merge.c:1313 msgid "--quit expects no arguments" msgstr "" -#: builtin/merge.c:1304 +#: builtin/merge.c:1326 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1308 +#: builtin/merge.c:1330 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1324 +#: builtin/merge.c:1346 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1331 +#: builtin/merge.c:1353 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1334 +#: builtin/merge.c:1356 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1348 +#: builtin/merge.c:1370 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1350 +#: builtin/merge.c:1372 msgid "You cannot combine --squash with --commit." msgstr "" -#: builtin/merge.c:1366 +#: builtin/merge.c:1388 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1383 +#: builtin/merge.c:1405 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1385 +#: builtin/merge.c:1407 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1390 +#: builtin/merge.c:1412 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1392 +#: builtin/merge.c:1414 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1471 +#: builtin/merge.c:1495 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1480 +#: builtin/merge.c:1504 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1490 +#: builtin/merge.c:1514 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1532 +#: builtin/merge.c:1560 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1539 +#: builtin/merge.c:1567 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1564 +#: builtin/merge.c:1592 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1570 +#: builtin/merge.c:1598 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1626 builtin/merge.c:1691 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1597 +#: builtin/merge.c:1630 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1649 +#: builtin/merge.c:1682 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1651 +#: builtin/merge.c:1684 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1660 +#: builtin/merge.c:1693 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1672 +#: builtin/merge.c:1707 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" -#: builtin/merge-base.c:32 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "" - -#: builtin/merge-base.c:33 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "" - -#: builtin/merge-base.c:34 -msgid "git merge-base --independent <commit>..." -msgstr "" - -#: builtin/merge-base.c:35 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "" - -#: builtin/merge-base.c:36 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "" - -#: builtin/merge-base.c:153 -msgid "output all common ancestors" -msgstr "" - -#: builtin/merge-base.c:155 -msgid "find ancestors for a single n-way merge" -msgstr "" - -#: builtin/merge-base.c:157 -msgid "list revs not reachable from others" -msgstr "" - -#: builtin/merge-base.c:159 -msgid "is the first one ancestor of the other?" -msgstr "" - -#: builtin/merge-base.c:161 -msgid "find where <commit> forked from reflog of <ref>" -msgstr "" - -#: builtin/merge-file.c:9 -msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " -"<orig-file> <file2>" -msgstr "" - -#: builtin/merge-file.c:35 -msgid "send results to standard output" -msgstr "" - -#: builtin/merge-file.c:36 -msgid "use a diff3 based merge" -msgstr "" - -#: builtin/merge-file.c:37 -msgid "for conflicts, use our version" -msgstr "" - -#: builtin/merge-file.c:39 -msgid "for conflicts, use their version" -msgstr "" - -#: builtin/merge-file.c:41 -msgid "for conflicts, use a union version" -msgstr "" - -#: builtin/merge-file.c:44 -msgid "for conflicts, use this marker size" -msgstr "" - -#: builtin/merge-file.c:45 -msgid "do not warn about conflicts" -msgstr "" - -#: builtin/merge-file.c:47 -msgid "set labels for file1/orig-file/file2" -msgstr "" - -#: builtin/merge-recursive.c:46 -#, c-format -msgid "unknown option %s" -msgstr "" - -#: builtin/merge-recursive.c:52 -#, c-format -msgid "could not parse object '%s'" -msgstr "" - -#: builtin/merge-recursive.c:56 -#, c-format -msgid "cannot handle more than %d base. Ignoring %s." -msgid_plural "cannot handle more than %d bases. Ignoring %s." -msgstr[0] "" -msgstr[1] "" - -#: builtin/merge-recursive.c:64 -msgid "not handling anything other than two heads merge." -msgstr "" - -#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 -#, c-format -msgid "could not resolve ref '%s'" -msgstr "" - -#: builtin/merge-recursive.c:78 -#, c-format -msgid "Merging %s with %s\n" -msgstr "" - #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "" @@ -14476,29 +16145,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:25 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 "" @@ -14529,113 +16198,117 @@ msgstr "" msgid "skip move/rename errors" msgstr "" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 +#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "" -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "" -#: builtin/name-rev.c:411 -msgid "print only names (no SHA-1)" +#: builtin/name-rev.c:524 +msgid "print only ref-based names (no object names)" msgstr "" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "" @@ -14775,7 +16448,7 @@ msgstr "" msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "" @@ -14996,7 +16669,7 @@ msgid "" "abort'.\n" msgstr "" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" @@ -15014,7 +16687,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 msgid "do not remove, show only" msgstr "" @@ -15030,390 +16703,374 @@ msgstr "" msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1605 #, c-format msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:428 +#: builtin/pack-objects.c:443 #, c-format msgid "bad packed object CRC for %s" msgstr "" -#: builtin/pack-objects.c:439 +#: builtin/pack-objects.c:454 #, c-format msgid "corrupt packed object for %s" msgstr "" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:585 #, c-format msgid "recursive delta detected for object %s" msgstr "" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:796 #, 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:1004 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:854 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:917 builtin/update-index.c:89 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "" -#: builtin/pack-objects.c:970 +#: builtin/pack-objects.c:1131 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1166 +#: builtin/pack-objects.c:1348 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:1597 +#: builtin/pack-objects.c:1796 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "" -#: builtin/pack-objects.c:1606 +#: builtin/pack-objects.c:1805 #, c-format msgid "delta base offset out of bound for %s" msgstr "" -#: builtin/pack-objects.c:1875 +#: builtin/pack-objects.c:2086 msgid "Counting objects" msgstr "" -#: builtin/pack-objects.c:2005 -#, c-format -msgid "unable to get size of %s" -msgstr "" - -#: builtin/pack-objects.c:2020 +#: builtin/pack-objects.c:2231 #, c-format msgid "unable to parse object header of %s" msgstr "" -#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 -#: builtin/pack-objects.c:2116 +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 #, c-format msgid "object %s cannot be read" msgstr "" -#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" -#: builtin/pack-objects.c:2130 +#: builtin/pack-objects.c:2341 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2656 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2795 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2889 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2961 +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" +"hash> <uri>' (got '%s')" +msgstr "" + +#: builtin/pack-objects.c:2964 +#, c-format +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "" + +#: builtin/pack-objects.c:2993 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2768 +#: builtin/pack-objects.c:2999 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2866 +#: builtin/pack-objects.c:3097 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 msgid "cannot open pack index" msgstr "" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:3187 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3041 +#: builtin/pack-objects.c:3272 msgid "unable to force loose object" msgstr "" -#: builtin/pack-objects.c:3133 +#: builtin/pack-objects.c:3365 #, c-format msgid "not a rev '%s'" msgstr "" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3368 #, c-format msgid "bad revision '%s'" msgstr "" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3393 msgid "unable to add recent objects" msgstr "" -#: builtin/pack-objects.c:3214 +#: builtin/pack-objects.c:3446 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3450 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:3248 -msgid "do not show progress meter" -msgstr "" - -#: builtin/pack-objects.c:3250 -msgid "show progress meter" -msgstr "" - -#: builtin/pack-objects.c:3252 -msgid "show progress meter during object writing phase" -msgstr "" - -#: builtin/pack-objects.c:3255 -msgid "similar to --all-progress when progress meter is shown" -msgstr "" - -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3488 msgid "<version>[,<offset>]" msgstr "" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3489 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3492 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3498 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3500 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3502 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3510 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3512 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3516 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3519 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3522 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3525 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3530 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3300 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3536 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3539 msgid "use the sparse reachability algorithm" msgstr "" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3541 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3543 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3545 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3547 msgid "ignore this pack" msgstr "" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3549 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:3319 +#: builtin/pack-objects.c:3551 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3553 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3555 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:3327 +#: builtin/pack-objects.c:3559 msgid "write a bitmap index if possible" msgstr "" -#: builtin/pack-objects.c:3331 +#: builtin/pack-objects.c:3563 msgid "handling for missing objects" msgstr "" -#: builtin/pack-objects.c:3334 +#: builtin/pack-objects.c:3566 msgid "do not pack objects in promisor packfiles" msgstr "" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3568 msgid "respect islands during delta compression" msgstr "" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3570 +msgid "protocol" +msgstr "" + +#: builtin/pack-objects.c:3571 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "" + +#: builtin/pack-objects.c:3600 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" -#: builtin/pack-objects.c:3366 +#: builtin/pack-objects.c:3605 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3659 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" -#: builtin/pack-objects.c:3422 +#: builtin/pack-objects.c:3661 msgid "minimum pack size limit is 1 MiB" msgstr "" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3666 msgid "--thin cannot be used to build an indexable pack" msgstr "" -#: builtin/pack-objects.c:3430 +#: builtin/pack-objects.c:3669 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3675 msgid "cannot use --filter without --stdout" msgstr "" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3735 msgid "Enumerating objects" msgstr "" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3766 #, 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 @@ -15428,98 +17085,111 @@ msgstr "" msgid "prune loose refs (default)" msgstr "" -#: builtin/prune-packed.c:9 +#: builtin/prune-packed.c:6 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "" -#: builtin/prune-packed.c:42 -msgid "Removing duplicate objects" -msgstr "" - -#: builtin/prune.c:12 +#: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "" -#: builtin/prune.c:131 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "" -#: builtin/prune.c:134 +#: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "" -#: builtin/prune.c:136 +#: builtin/prune.c:138 msgid "limit traversal to objects outside promisor packfiles" msgstr "" -#: builtin/prune.c:150 +#: builtin/prune.c:152 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:141 +#: builtin/pull.c:123 msgid "control for recursive fetching of submodules" msgstr "" -#: builtin/pull.c:145 +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "" -#: builtin/pull.c:148 +#: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 msgid "allow fast-forward" msgstr "" -#: builtin/pull.c:185 -msgid "automatically stash/stash pop before and after rebase" +#: builtin/pull.c:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" msgstr "" -#: builtin/pull.c:201 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "" -#: builtin/pull.c:211 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "" -#: builtin/pull.c:219 +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "" -#: builtin/pull.c:316 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "" -#: builtin/pull.c:433 +#: builtin/pull.c:348 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" + +#: builtin/pull.c:458 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:435 +#: builtin/pull.c:460 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:436 +#: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:439 +#: builtin/pull.c:464 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -15527,74 +17197,70 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "" -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" -#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:449 builtin/pull.c:464 +#: builtin/pull.c:474 builtin/pull.c:489 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1246 git-parse-remote.sh:64 msgid "<remote>" msgstr "" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:468 git-parse-remote.sh:95 +#: builtin/pull.c:493 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:473 +#: builtin/pull.c:498 #, 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:581 +#: builtin/pull.c:609 #, c-format msgid "unable to access commit %s" msgstr "" -#: builtin/pull.c:861 +#: builtin/pull.c:894 msgid "ignoring --verify-signatures for rebase" msgstr "" -#: builtin/pull.c:916 -msgid "--[no-]autostash option is only valid with --rebase." -msgstr "" - -#: builtin/pull.c:924 +#: builtin/pull.c:954 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:928 +#: builtin/pull.c:958 msgid "pull with rebase" msgstr "" -#: builtin/pull.c:929 +#: builtin/pull.c:959 msgid "please commit or stash them." msgstr "" -#: builtin/pull.c:954 +#: builtin/pull.c:984 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -15602,7 +17268,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:960 +#: builtin/pull.c:990 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -15613,15 +17279,15 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:975 +#: builtin/pull.c:1005 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:979 +#: builtin/pull.c:1009 msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/pull.c:986 +#: builtin/pull.c:1017 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -15633,17 +17299,17 @@ msgstr "" msgid "tag shorthand without <tag>" msgstr "" -#: builtin/push.c:121 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "" -#: builtin/push.c:167 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:170 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -15658,7 +17324,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:185 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -15668,7 +17334,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:199 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -15677,12 +17343,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:207 +#: builtin/push.c:202 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:210 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -15690,12 +17356,12 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:269 +#: builtin/push.c:260 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:276 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -15703,7 +17369,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:282 +#: builtin/push.c:273 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" @@ -15711,7 +17377,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:288 +#: builtin/push.c:279 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" @@ -15720,143 +17386,143 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:295 +#: builtin/push.c:286 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:298 +#: builtin/push.c:289 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:351 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:364 +#: builtin/push.c:358 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:398 -#, c-format -msgid "bad repository '%s'" -msgstr "" - -#: builtin/push.c:399 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" - -#: builtin/push.c:554 +#: builtin/push.c:532 msgid "repository" msgstr "" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:533 builtin/send-pack.c:183 msgid "push all refs" msgstr "" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:534 builtin/send-pack.c:185 msgid "mirror all refs" msgstr "" -#: builtin/push.c:558 +#: builtin/push.c:536 msgid "delete refs" msgstr "" -#: builtin/push.c:559 +#: builtin/push.c:537 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:562 builtin/send-pack.c:167 +#: builtin/push.c:540 builtin/send-pack.c:186 msgid "force updates" msgstr "" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:541 builtin/send-pack.c:198 msgid "<refname>:<expect>" msgstr "" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:542 builtin/send-pack.c:199 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:568 +#: builtin/push.c:545 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:546 builtin/send-pack.c:193 msgid "use thin pack" msgstr "" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 +#: builtin/send-pack.c:181 msgid "receive pack program" msgstr "" -#: builtin/push.c:573 +#: builtin/push.c:549 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:576 +#: builtin/push.c:552 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:578 +#: builtin/push.c:554 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:579 +#: builtin/push.c:555 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:557 builtin/send-pack.c:187 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:559 builtin/send-pack.c:194 msgid "request atomic transaction on remote side" msgstr "" -#: builtin/push.c:602 +#: builtin/push.c:577 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:604 +#: builtin/push.c:579 msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/push.c:607 +#: builtin/push.c:599 +#, c-format +msgid "bad repository '%s'" +msgstr "" + +#: builtin/push.c:600 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" + +#: builtin/push.c:615 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:609 +#: builtin/push.c:617 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:613 +#: builtin/push.c:621 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:615 +#: builtin/push.c:623 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:618 +#: builtin/push.c:626 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:637 +#: builtin/push.c:630 msgid "push options must not have new line characters" msgstr "" @@ -15872,24 +17538,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 "" @@ -15968,231 +17642,212 @@ msgstr "" msgid "suppress feedback messages" msgstr "" -#: builtin/rebase.c:32 +#: builtin/read-tree.c:188 +msgid "You need to resolve your current index first" +msgstr "" + +#: builtin/rebase.c:35 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -#: builtin/rebase.c:34 +#: builtin/rebase.c:37 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" -#: builtin/rebase.c:36 +#: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 #, 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:304 #, c-format msgid "could not create temporary %s" msgstr "" -#: builtin/rebase.c:285 +#: builtin/rebase.c:310 msgid "could not mark as interactive" msgstr "" -#: builtin/rebase.c:343 +#: builtin/rebase.c:364 msgid "could not generate todo list" msgstr "" -#: builtin/rebase.c:382 +#: builtin/rebase.c:405 msgid "a base commit must be provided with --upstream or --onto" msgstr "" -#: builtin/rebase.c:437 +#: builtin/rebase.c:474 msgid "git rebase--interactive [<options>]" msgstr "" -#: builtin/rebase.c:449 -msgid "keep empty commits" +#: builtin/rebase.c:487 builtin/rebase.c:1382 +msgid "keep commits which start empty" msgstr "" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:491 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "" -#: builtin/rebase.c:452 +#: builtin/rebase.c:493 msgid "rebase merge commits" msgstr "" -#: builtin/rebase.c:454 +#: builtin/rebase.c:495 msgid "keep original branch points of cousins" msgstr "" -#: builtin/rebase.c:456 +#: builtin/rebase.c:497 msgid "move commits that begin with squash!/fixup!" msgstr "" -#: builtin/rebase.c:457 +#: builtin/rebase.c:498 msgid "sign commits" msgstr "" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:500 builtin/rebase.c:1321 msgid "display a diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:461 +#: builtin/rebase.c:502 msgid "continue rebase" msgstr "" -#: builtin/rebase.c:463 +#: builtin/rebase.c:504 msgid "skip commit" msgstr "" -#: builtin/rebase.c:464 +#: builtin/rebase.c:505 msgid "edit the todo list" msgstr "" -#: builtin/rebase.c:466 +#: builtin/rebase.c:507 msgid "show the current patch" msgstr "" -#: builtin/rebase.c:469 +#: builtin/rebase.c:510 msgid "shorten commit ids in the todo list" msgstr "" -#: builtin/rebase.c:471 +#: builtin/rebase.c:512 msgid "expand commit ids in the todo list" msgstr "" -#: builtin/rebase.c:473 +#: builtin/rebase.c:514 msgid "check the todo list" msgstr "" -#: builtin/rebase.c:475 +#: builtin/rebase.c:516 msgid "rearrange fixup/squash lines" msgstr "" -#: builtin/rebase.c:477 +#: builtin/rebase.c:518 msgid "insert exec commands in todo list" msgstr "" -#: builtin/rebase.c:478 +#: builtin/rebase.c:519 msgid "onto" msgstr "" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict-revision" msgstr "" -#: builtin/rebase.c:481 +#: builtin/rebase.c:522 msgid "restrict revision" msgstr "" -#: builtin/rebase.c:483 +#: builtin/rebase.c:524 msgid "squash-onto" msgstr "" -#: builtin/rebase.c:484 +#: builtin/rebase.c:525 msgid "squash onto" msgstr "" -#: builtin/rebase.c:486 +#: builtin/rebase.c:527 msgid "the upstream commit" msgstr "" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head-name" msgstr "" -#: builtin/rebase.c:488 +#: builtin/rebase.c:529 msgid "head name" msgstr "" -#: builtin/rebase.c:493 +#: builtin/rebase.c:534 msgid "rebase strategy" msgstr "" -#: builtin/rebase.c:494 +#: builtin/rebase.c:535 msgid "strategy-opts" msgstr "" -#: builtin/rebase.c:495 +#: builtin/rebase.c:536 msgid "strategy options" msgstr "" -#: builtin/rebase.c:496 +#: builtin/rebase.c:537 msgid "switch-to" msgstr "" -#: builtin/rebase.c:497 +#: builtin/rebase.c:538 msgid "the branch or commit to checkout" msgstr "" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto-name" msgstr "" -#: builtin/rebase.c:498 +#: builtin/rebase.c:539 msgid "onto name" msgstr "" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "cmd" msgstr "" -#: builtin/rebase.c:499 +#: builtin/rebase.c:540 msgid "the command to run" msgstr "" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:543 builtin/rebase.c:1415 msgid "automatically re-schedule any `exec` that fails" msgstr "" -#: builtin/rebase.c:518 +#: builtin/rebase.c:559 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "" -#: builtin/rebase.c:534 +#: builtin/rebase.c:575 #, c-format -msgid "%s requires an interactive rebase" +msgid "%s requires the merge backend" msgstr "" -#: builtin/rebase.c:586 +#: builtin/rebase.c:618 #, c-format msgid "could not get 'onto': '%s'" msgstr "" -#: builtin/rebase.c:601 +#: builtin/rebase.c:635 #, c-format msgid "invalid orig-head: '%s'" msgstr "" -#: builtin/rebase.c:626 +#: builtin/rebase.c:660 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "" -#: builtin/rebase.c:702 -#, c-format -msgid "Could not read '%s'" -msgstr "" - -#: builtin/rebase.c:720 -#, c-format -msgid "Cannot store %s" -msgstr "" - -#: builtin/rebase.c:827 -msgid "could not determine HEAD revision" -msgstr "" - -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:805 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" @@ -16201,7 +17856,7 @@ msgid "" "abort\"." msgstr "" -#: builtin/rebase.c:1031 +#: builtin/rebase.c:888 #, c-format msgid "" "\n" @@ -16213,7 +17868,14 @@ msgid "" "As a result, git cannot rebase them." msgstr "" -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1214 +#, c-format +msgid "" +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" +"\"." +msgstr "" + +#: builtin/rebase.c:1232 #, c-format msgid "" "%s\n" @@ -16224,7 +17886,7 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1248 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -16233,169 +17895,201 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1278 msgid "exec commands cannot contain newlines" msgstr "" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1282 msgid "empty exec command" msgstr "" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1312 msgid "rebase onto given branch instead of upstream" msgstr "" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1314 +msgid "use the merge-base of upstream and branch as the current base" +msgstr "" + +#: builtin/rebase.c:1316 msgid "allow pre-rebase hook to run" msgstr "" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1318 msgid "be quiet. implies --no-stat" msgstr "" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1324 msgid "do not show diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1327 msgid "add a Signed-off-by: line to each commit" msgstr "" -#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 -msgid "passed to 'git am'" +#: builtin/rebase.c:1330 +msgid "make committer date match author date" +msgstr "" + +#: builtin/rebase.c:1332 +msgid "ignore author date and use current date" +msgstr "" + +#: builtin/rebase.c:1334 +msgid "synonym of --reset-author-date" msgstr "" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1336 builtin/rebase.c:1340 msgid "passed to 'git apply'" msgstr "" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1338 +msgid "ignore changes in whitespace" +msgstr "" + +#: builtin/rebase.c:1342 builtin/rebase.c:1345 msgid "cherry-pick all commits, even if unchanged" msgstr "" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1347 msgid "continue" msgstr "" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1350 msgid "skip current patch and continue" msgstr "" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1352 msgid "abort and check out the original branch" msgstr "" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1355 msgid "abort but keep HEAD where it is" msgstr "" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1356 msgid "edit the todo list during an interactive rebase" msgstr "" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1359 msgid "show the patch file being applied or merged" msgstr "" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1362 +msgid "use apply strategies to rebase" +msgstr "" + +#: builtin/rebase.c:1366 msgid "use merging strategies to rebase" msgstr "" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1370 msgid "let the user edit the list of commits to rebase" msgstr "" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1374 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" -#: builtin/rebase.c:1455 -msgid "preserve empty commits during rebase" +#: builtin/rebase.c:1379 +msgid "how to handle commits that become empty" msgstr "" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1386 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" -#: builtin/rebase.c:1463 -msgid "automatically stash/stash pop before and after" -msgstr "" - -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1393 msgid "add exec lines after each commit of the editable list" msgstr "" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1397 msgid "allow rebasing commits with empty messages" msgstr "" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1401 msgid "try to rebase merges instead of skipping them" msgstr "" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1404 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1406 msgid "use the given merge strategy" msgstr "" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1408 builtin/revert.c:115 msgid "option" msgstr "" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1409 msgid "pass the argument through to the merge strategy" msgstr "" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1412 msgid "rebase all reachable commits up to the root(s)" msgstr "" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1417 +msgid "apply all changes, even those already present upstream" +msgstr "" + +#: builtin/rebase.c:1434 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" -#: builtin/rebase.c:1506 +#: builtin/rebase.c:1440 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" -#: builtin/rebase.c:1547 +#: builtin/rebase.c:1481 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" -#: builtin/rebase.c:1551 +#: builtin/rebase.c:1486 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "" + +#: builtin/rebase.c:1488 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "" + +#: builtin/rebase.c:1492 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "" + +#: builtin/rebase.c:1495 msgid "No rebase in progress?" msgstr "" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1499 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1522 msgid "Cannot read HEAD" msgstr "" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1534 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1553 msgid "could not discard worktree changes" msgstr "" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1572 #, c-format msgid "could not move back to %s" msgstr "" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1618 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -16408,171 +18102,140 @@ msgid "" "valuable there.\n" msgstr "" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1646 msgid "switch `C' expects a numerical value" msgstr "" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1688 #, c-format msgid "Unknown mode: %s" msgstr "" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1727 msgid "--strategy requires --merge or --interactive" msgstr "" -#: builtin/rebase.c:1797 -msgid "--reschedule-failed-exec requires --exec or --interactive" +#: builtin/rebase.c:1757 +msgid "cannot combine apply options with merge options" msgstr "" -#: builtin/rebase.c:1809 -msgid "cannot combine am options with either interactive or merge options" +#: builtin/rebase.c:1770 +#, c-format +msgid "Unknown rebase backend: %s" msgstr "" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1795 +msgid "--reschedule-failed-exec requires --exec or --interactive" +msgstr "" + +#: builtin/rebase.c:1815 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1819 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" -#: builtin/rebase.c:1838 -msgid "cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "" - -#: builtin/rebase.c:1841 -msgid "cannot combine '--rebase-merges' with '--strategy'" -msgstr "" - -#: builtin/rebase.c:1865 +#: builtin/rebase.c:1843 #, c-format msgid "invalid upstream '%s'" msgstr "" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1849 msgid "Could not create new root commit" msgstr "" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1875 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "" + +#: builtin/rebase.c:1878 #, c-format msgid "'%s': need exactly one merge base" msgstr "" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1886 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1912 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1931 msgid "Could not resolve HEAD to a revision" msgstr "" -#: builtin/rebase.c:1981 -msgid "Cannot autostash" -msgstr "" - -#: builtin/rebase.c:1984 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "" - -#: builtin/rebase.c:1990 -#, c-format -msgid "Could not create directory for '%s'" -msgstr "" - -#: builtin/rebase.c:1993 -#, c-format -msgid "Created autostash: %s\n" -msgstr "" - -#: builtin/rebase.c:1996 -msgid "could not reset --hard" -msgstr "" - -#: builtin/rebase.c:1997 builtin/reset.c:114 -#, c-format -msgid "HEAD is now at %s" -msgstr "" - -#: builtin/rebase.c:2013 +#: builtin/rebase.c:1952 msgid "Please commit or stash them." msgstr "" -#: builtin/rebase.c:2040 -#, c-format -msgid "could not parse '%s'" -msgstr "" - -#: builtin/rebase.c:2053 +#: builtin/rebase.c:1988 #, c-format msgid "could not switch to %s" msgstr "" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:1999 msgid "HEAD is up to date." msgstr "" -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2001 #, c-format msgid "Current branch %s is up to date.\n" msgstr "" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2009 msgid "HEAD is up to date, rebase forced." msgstr "" -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2011 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "" -#: builtin/rebase.c:2084 +#: builtin/rebase.c:2019 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2026 #, c-format msgid "Changes to %s:\n" msgstr "" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2029 #, c-format msgid "Changes from %s to %s:\n" msgstr "" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2054 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" -#: builtin/rebase.c:2128 +#: builtin/rebase.c:2063 msgid "Could not detach HEAD" msgstr "" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2072 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:1224 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" @@ -16589,7 +18252,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -#: builtin/receive-pack.c:852 +#: builtin/receive-pack.c:1244 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" @@ -16601,11 +18264,11 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:2422 msgid "quiet" msgstr "" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:2436 msgid "You must specify a directory." msgstr "" @@ -16626,210 +18289,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:697 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:701 #, 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:654 +#, c-format +msgid "could not set '%s'" +msgstr "" + +#: builtin/remote.c:659 +#, 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:690 builtin/remote.c:833 builtin/remote.c:941 #, c-format msgid "No such remote: '%s'" msgstr "" -#: builtin/remote.c:646 +#: builtin/remote.c:707 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:666 +#: builtin/remote.c:727 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -16837,17 +18513,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:702 +#: builtin/remote.c:767 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:736 +#: builtin/remote.c:801 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:802 +#: builtin/remote.c:877 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -16857,118 +18533,118 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:816 +#: builtin/remote.c:891 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:917 +#: builtin/remote.c:994 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:920 +#: builtin/remote.c:997 msgid " tracked" msgstr "" -#: builtin/remote.c:922 +#: builtin/remote.c:999 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:924 +#: builtin/remote.c:1001 msgid " ???" msgstr "" -#: builtin/remote.c:965 +#: builtin/remote.c:1042 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:974 +#: builtin/remote.c:1051 #, c-format msgid "rebases interactively onto remote %s" msgstr "" -#: builtin/remote.c:976 +#: builtin/remote.c:1053 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "" -#: builtin/remote.c:979 +#: builtin/remote.c:1056 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:983 +#: builtin/remote.c:1060 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:986 +#: builtin/remote.c:1063 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:989 +#: builtin/remote.c:1066 #, c-format msgid "%-*s and with remote %s\n" msgstr "" -#: builtin/remote.c:1032 +#: builtin/remote.c:1109 msgid "create" msgstr "" -#: builtin/remote.c:1035 +#: builtin/remote.c:1112 msgid "delete" msgstr "" -#: builtin/remote.c:1039 +#: builtin/remote.c:1116 msgid "up to date" msgstr "" -#: builtin/remote.c:1042 +#: builtin/remote.c:1119 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1045 +#: builtin/remote.c:1122 msgid "local out of date" msgstr "" -#: builtin/remote.c:1052 +#: builtin/remote.c:1129 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1055 +#: builtin/remote.c:1132 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1059 +#: builtin/remote.c:1136 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1062 +#: builtin/remote.c:1139 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1130 +#: builtin/remote.c:1207 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1157 +#: builtin/remote.c:1234 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1158 +#: builtin/remote.c:1235 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 msgid "(no URL)" msgstr "" @@ -16976,303 +18652,294 @@ msgstr "" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1250 builtin/remote.c:1252 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1177 +#: builtin/remote.c:1254 msgid "(not queried)" msgstr "" -#: builtin/remote.c:1179 +#: builtin/remote.c:1256 msgid "(unknown)" msgstr "" -#: builtin/remote.c:1183 +#: builtin/remote.c:1260 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1195 +#: builtin/remote.c:1272 #, 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:1275 builtin/remote.c:1301 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1207 +#: builtin/remote.c:1284 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:1292 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1221 +#: builtin/remote.c:1298 #, 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:1319 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1244 +#: builtin/remote.c:1321 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1259 +#: builtin/remote.c:1336 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1261 +#: builtin/remote.c:1338 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1271 +#: builtin/remote.c:1348 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1279 +#: builtin/remote.c:1356 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1281 +#: builtin/remote.c:1358 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1299 +#: builtin/remote.c:1376 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1300 +#: builtin/remote.c:1377 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1310 +#: builtin/remote.c:1387 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1311 +#: builtin/remote.c:1388 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1327 +#: builtin/remote.c:1404 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1330 +#: builtin/remote.c:1407 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1375 +#: builtin/remote.c:1452 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1454 +#: builtin/remote.c:1531 msgid "add branch" msgstr "" -#: builtin/remote.c:1461 +#: builtin/remote.c:1538 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1478 +#: builtin/remote.c:1555 msgid "query push URLs rather than fetch URLs" msgstr "" -#: builtin/remote.c:1480 +#: builtin/remote.c:1557 msgid "return all URLs" msgstr "" -#: builtin/remote.c:1508 +#: builtin/remote.c:1585 #, c-format msgid "no URLs configured for remote '%s'" msgstr "" -#: builtin/remote.c:1534 +#: builtin/remote.c:1611 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1536 +#: builtin/remote.c:1613 msgid "add URL" msgstr "" -#: builtin/remote.c:1538 +#: builtin/remote.c:1615 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1545 +#: builtin/remote.c:1622 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1584 +#: builtin/remote.c:1661 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1592 +#: builtin/remote.c:1669 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1594 +#: builtin/remote.c:1671 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:22 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "" -#: builtin/repack.c:27 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -#: builtin/repack.c:190 +#: builtin/repack.c:197 msgid "could not start pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:229 builtin/repack.c:408 +#: builtin/repack.c:236 builtin/repack.c:421 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -#: builtin/repack.c:246 +#: builtin/repack.c:260 msgid "could not finish pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:284 +#: builtin/repack.c:297 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:286 +#: builtin/repack.c:299 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:289 +#: builtin/repack.c:302 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:291 +#: builtin/repack.c:304 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:293 +#: builtin/repack.c:306 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:295 +#: builtin/repack.c:308 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:298 +#: builtin/repack.c:311 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:300 +#: builtin/repack.c:313 msgid "write bitmap index" msgstr "" -#: builtin/repack.c:302 +#: builtin/repack.c:315 msgid "pass --delta-islands to git-pack-objects" msgstr "" -#: builtin/repack.c:303 +#: builtin/repack.c:316 msgid "approxidate" msgstr "" -#: builtin/repack.c:304 +#: builtin/repack.c:317 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:306 +#: builtin/repack.c:319 msgid "with -a, repack unreachable objects" msgstr "" -#: builtin/repack.c:308 +#: builtin/repack.c:321 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:309 builtin/repack.c:315 +#: builtin/repack.c:322 builtin/repack.c:328 msgid "bytes" msgstr "" -#: builtin/repack.c:310 +#: builtin/repack.c:323 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:312 +#: builtin/repack.c:325 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:314 +#: builtin/repack.c:327 msgid "limits the maximum number of threads" msgstr "" -#: builtin/repack.c:316 +#: builtin/repack.c:329 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:318 +#: builtin/repack.c:331 msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:320 +#: builtin/repack.c:333 msgid "do not repack this pack" msgstr "" -#: builtin/repack.c:330 +#: builtin/repack.c:343 msgid "cannot delete packs in a precious-objects repo" msgstr "" -#: builtin/repack.c:334 +#: builtin/repack.c:347 msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:417 +#: builtin/repack.c:430 msgid "Nothing new to pack." msgstr "" -#: builtin/repack.c:478 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -17284,7 +18951,7 @@ msgid "" "WARNING: Please rename them in %s manually:\n" msgstr "" -#: builtin/repack.c:526 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "" @@ -17387,8 +19054,8 @@ msgstr "" msgid "unable to write object to database" msgstr "" -#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: 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 "" @@ -17407,124 +19074,124 @@ msgstr "" msgid "new object is the same as the old one: '%s'" msgstr "" -#: builtin/replace.c:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "" -#: builtin/replace.c:414 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:416 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "" -#: builtin/replace.c:428 +#: 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:467 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "" -#: builtin/replace.c:468 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "" -#: builtin/replace.c:478 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "" -#: builtin/replace.c:486 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "" -#: builtin/replace.c:490 +#: builtin/replace.c:492 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "" -#: builtin/replace.c:525 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" "%s" msgstr "" -#: builtin/replace.c:546 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "" -#: builtin/replace.c:547 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "" -#: builtin/replace.c:548 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "" -#: builtin/replace.c:549 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "" -#: builtin/replace.c:550 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "" -#: builtin/replace.c:551 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "" -#: builtin/replace.c:553 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "" -#: builtin/replace.c:554 +#: builtin/replace.c:556 msgid "use this format" msgstr "" -#: builtin/replace.c:567 +#: builtin/replace.c:569 msgid "--format cannot be used when not listing" msgstr "" -#: builtin/replace.c:575 +#: builtin/replace.c:577 msgid "-f only makes sense when writing a replacement" msgstr "" -#: builtin/replace.c:579 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "" -#: builtin/replace.c:585 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "" -#: builtin/replace.c:591 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "" -#: builtin/replace.c:597 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "" -#: builtin/replace.c:603 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "" -#: builtin/replace.c:609 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "" -#: builtin/replace.c:615 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "" @@ -17551,113 +19218,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:40 +#: builtin/reset.c:35 +msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" +msgstr "" + +#: 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:83 msgid "You do not have a valid HEAD." msgstr "" -#: builtin/reset.c:83 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "" -#: builtin/reset.c:89 +#: builtin/reset.c:91 #, c-format msgid "Failed to find tree of %s." msgstr "" -#: builtin/reset.c:193 +#: builtin/reset.c:116 +#, c-format +msgid "HEAD is now at %s" +msgstr "" + +#: builtin/reset.c:195 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:295 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:297 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:296 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:300 builtin/reset.c:302 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:302 +#: builtin/reset.c:304 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:308 +#: builtin/reset.c:310 msgid "record only the fact that removed paths will be added later" msgstr "" -#: builtin/reset.c:326 +#: builtin/reset.c:344 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "" -#: builtin/reset.c:334 +#: builtin/reset.c:352 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "" -#: builtin/reset.c:343 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:353 +#: builtin/reset.c:371 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:355 +#: builtin/reset.c:373 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:370 +#: builtin/reset.c:388 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:374 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" msgstr "" -#: builtin/reset.c:395 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "" -#: builtin/reset.c:398 +#: builtin/reset.c:416 #, c-format msgid "" "\n" @@ -17666,53 +19343,48 @@ msgid "" "to make this the default.\n" msgstr "" -#: builtin/reset.c:408 +#: builtin/reset.c:434 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" -#: builtin/reset.c:412 +#: builtin/reset.c:439 msgid "Could not write new index file." msgstr "" -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "" -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "" - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "" -#: builtin/rev-list.c:530 -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 +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" msgstr "" -#: builtin/rev-parse.c:415 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" msgstr "" -#: builtin/rev-parse.c:418 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "" -#: builtin/rev-parse.c:551 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -17845,36 +19517,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 "" @@ -17887,55 +19563,76 @@ msgid "" " --all and explicit <ref> specification are mutually exclusive." msgstr "" -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:182 msgid "remote name" msgstr "" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:195 msgid "use stateless RPC protocol" msgstr "" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:196 msgid "read refs from stdin" msgstr "" -#: builtin/send-pack.c:179 +#: builtin/send-pack.c:197 msgid "print status from remote helper" msgstr "" -#: builtin/shortlog.c:14 +#: builtin/shortlog.c:15 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:16 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "" -#: builtin/shortlog.c:264 +#: builtin/shortlog.c:134 +msgid "using multiple --group options with stdin is not supported" +msgstr "" + +#: builtin/shortlog.c:144 +msgid "using --group=trailer with stdin is not supported" +msgstr "" + +#: builtin/shortlog.c:388 +#, c-format +msgid "unknown group type: %s" +msgstr "" + +#: builtin/shortlog.c:416 msgid "Group by committer rather than author" msgstr "" -#: builtin/shortlog.c:266 +#: builtin/shortlog.c:419 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:268 +#: builtin/shortlog.c:421 msgid "Suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:423 msgid "Show the email address of each author" msgstr "" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:424 msgid "<w>[,<i1>[,<i2>]]" msgstr "" -#: builtin/shortlog.c:272 +#: builtin/shortlog.c:425 msgid "Linewrap output" msgstr "" -#: builtin/shortlog.c:301 +#: builtin/shortlog.c:427 +msgid "field" +msgstr "" + +#: builtin/shortlog.c:428 +msgid "Group by field" +msgstr "" + +#: builtin/shortlog.c:456 msgid "too many arguments given outside repository" msgstr "" @@ -18069,6 +19766,14 @@ msgstr "" msgid "cannot find commit %s (%s)" msgstr "" +#: builtin/show-index.c:21 +msgid "hash-algorithm" +msgstr "" + +#: builtin/show-index.c:31 +msgid "Unknown hash algorithm" +msgstr "" + #: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" @@ -18111,15 +19816,86 @@ 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|reapply|disable) <options>" +msgstr "" + +#: builtin/sparse-checkout.c:50 +msgid "git sparse-checkout list" +msgstr "" + +#: builtin/sparse-checkout.c:76 +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "" + +#: builtin/sparse-checkout.c:228 +msgid "failed to create directory for sparse-checkout file" +msgstr "" + +#: builtin/sparse-checkout.c:269 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "" + +#: builtin/sparse-checkout.c:271 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "" + +#: builtin/sparse-checkout.c:288 +msgid "git sparse-checkout init [--cone]" +msgstr "" + +#: builtin/sparse-checkout.c:307 +msgid "initialize the sparse-checkout in cone mode" +msgstr "" + +#: builtin/sparse-checkout.c:344 +#, c-format +msgid "failed to open '%s'" +msgstr "" + +#: builtin/sparse-checkout.c:401 +#, c-format +msgid "could not normalize path %s" +msgstr "" + +#: builtin/sparse-checkout.c:413 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "" + +#: builtin/sparse-checkout.c:438 +#, c-format +msgid "unable to unquote C-style string '%s'" +msgstr "" + +#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 +msgid "unable to load existing sparse-checkout patterns" +msgstr "" + +#: builtin/sparse-checkout.c:561 +msgid "read patterns from standard in" +msgstr "" + +#: builtin/sparse-checkout.c:576 +msgid "git sparse-checkout reapply" +msgstr "" + +#: builtin/sparse-checkout.c:595 +msgid "git sparse-checkout disable" +msgstr "" + +#: builtin/sparse-checkout.c:623 +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 "" @@ -18127,209 +19903,217 @@ 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 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 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:434 +#: builtin/stash.c:437 msgid "could not restore untracked files from stash" msgstr "" -#: builtin/stash.c:448 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:461 msgid "Index was not unstashed." msgstr "" -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 msgid "The stash entry is kept in case you need it again." msgstr "" -#: builtin/stash.c:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 msgid "No branch name specified" msgstr "" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:800 builtin/stash.c:837 #, c-format msgid "Cannot update %s with %s" msgstr "" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 msgid "stash message" msgstr "" -#: builtin/stash.c:818 +#: builtin/stash.c:828 msgid "\"git stash store\" requires one <commit> argument" msgstr "" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1043 msgid "No changes selected" msgstr "" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1143 msgid "You do not have the initial commit yet" msgstr "" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1170 msgid "Cannot save the current index state" msgstr "" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1179 msgid "Cannot save the untracked files" msgstr "" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1190 builtin/stash.c:1199 msgid "Cannot save the current worktree state" msgstr "" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1227 msgid "Cannot record working tree state" msgstr "" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1276 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" -#: builtin/stash.c:1285 +#: builtin/stash.c:1292 msgid "Did you forget to 'git add'?" msgstr "" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1307 msgid "No local changes to save" msgstr "" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1314 msgid "Cannot initialize stash" msgstr "" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1329 msgid "Cannot save the current status" msgstr "" -#: builtin/stash.c:1327 +#: builtin/stash.c:1334 #, c-format msgid "Saved working directory and index state %s" msgstr "" -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1424 msgid "Cannot remove worktree changes" msgstr "" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1463 builtin/stash.c:1528 msgid "keep index" msgstr "" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "stash in patch mode" msgstr "" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1466 builtin/stash.c:1531 msgid "quiet mode" msgstr "" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1468 builtin/stash.c:1533 msgid "include untracked files in stash" msgstr "" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1470 builtin/stash.c:1535 msgid "include ignore files" msgstr "" -#: builtin/stash.c:1555 -#, c-format -msgid "could not exec %s" +#: builtin/stash.c:1570 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." msgstr "" #: builtin/stripspace.c:18 @@ -18348,47 +20132,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:2423 #, 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:1819 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:629 +#: builtin/submodule--helper.c:652 #, 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 " @@ -18396,346 +20180,455 @@ 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:1487 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:666 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:669 +#: builtin/submodule--helper.c:670 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:679 +#: builtin/submodule--helper.c:680 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" -#: builtin/submodule--helper.c:686 +#: builtin/submodule--helper.c:687 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:708 +#: builtin/submodule--helper.c:709 msgid "Suppress output for initializing a submodule" msgstr "" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" -#: builtin/submodule--helper.c:824 +#: builtin/submodule--helper.c:835 #, 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:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "Suppress submodule status output" msgstr "" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:887 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:888 msgid "recurse into nested submodules" msgstr "" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "" + +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:1413 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:1427 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:1438 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1048 +#: builtin/submodule--helper.c:1485 msgid "Suppress output of synchronizing submodule url" msgstr "" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1546 #, 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:1558 #, 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:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1579 #, c-format msgid "could not create empty submodule directory %s" msgstr "" -#: builtin/submodule--helper.c:1158 +#: builtin/submodule--helper.c:1595 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1187 +#: builtin/submodule--helper.c:1624 msgid "Remove submodule working trees even if they contain local changes" msgstr "" -#: builtin/submodule--helper.c:1188 +#: builtin/submodule--helper.c:1625 msgid "Unregister all submodules" msgstr "" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1644 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:1713 +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:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" -#: builtin/submodule--helper.c:1348 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "" -#: builtin/submodule--helper.c:1371 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +msgid "disallow cloning into non-empty directory" +msgstr "" + +#: builtin/submodule--helper.c:1848 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:1873 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "" + +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1888 +#, c-format +msgid "directory not empty: '%s'" +msgstr "" + +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "" -#: builtin/submodule--helper.c:1474 +#: builtin/submodule--helper.c:1936 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:1478 +#: builtin/submodule--helper.c:1940 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:1571 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:2265 #, 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:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" msgstr "" -#: builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:2340 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" -#: builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "" -#: builtin/submodule--helper.c:1877 -msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +#: builtin/submodule--helper.c:2357 +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:2418 #, 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:2541 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:2094 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2636 msgid "check if it is safe to write to the .gitmodules file" msgstr "" -#: builtin/submodule--helper.c:2159 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2665 git-submodule.sh:151 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" -#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2681 +msgid "Suppress output for setting url of a submodule" +msgstr "" + +#: builtin/submodule--helper.c:2685 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "" + +#: builtin/submodule--helper.c:2718 +msgid "set the default tracking branch to master" +msgstr "" + +#: builtin/submodule--helper.c:2720 +msgid "set the default tracking branch" +msgstr "" + +#: builtin/submodule--helper.c:2724 +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "" + +#: builtin/submodule--helper.c:2725 +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "" + +#: builtin/submodule--helper.c:2732 +msgid "--branch or --default required" +msgstr "" + +#: builtin/submodule--helper.c:2735 +msgid "--branch and --default are mutually exclusive" +msgstr "" + +#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" @@ -18760,11 +20653,11 @@ msgstr "" msgid "shorten ref output" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 msgid "reason of the update" msgstr "" @@ -18782,7 +20675,8 @@ msgstr "" msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" #: builtin/tag.c:30 @@ -18839,378 +20733,382 @@ msgstr "" msgid "bad object type." msgstr "" -#: builtin/tag.c:284 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "" -#: builtin/tag.c:291 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:402 +#: builtin/tag.c:403 msgid "list tag names" msgstr "" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:406 +#: builtin/tag.c:407 msgid "delete tags" msgstr "" -#: builtin/tag.c:407 +#: builtin/tag.c:408 msgid "verify tags" msgstr "" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:413 +#: builtin/tag.c:414 msgid "tag message" msgstr "" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "force edit of tag message" msgstr "" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:419 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:420 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:421 builtin/update-ref.c:369 +#: builtin/tag.c:422 builtin/update-ref.c:492 msgid "create a reflog" msgstr "" -#: builtin/tag.c:423 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:424 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:425 builtin/tag.c:427 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "" -#: builtin/tag.c:429 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "" -#: builtin/tag.c:430 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "" -#: builtin/tag.c:434 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:504 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "" -#: builtin/tag.c:506 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:508 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:510 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "" -#: builtin/tag.c:512 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" -#: builtin/tag.c:523 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:542 +#: builtin/tag.c:543 msgid "too many params" msgstr "" -#: builtin/tag.c:548 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:553 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:584 +#: builtin/tag.c:585 #, c-format 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:971 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:974 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:977 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:979 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:981 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:983 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:986 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:990 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:994 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:995 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:1017 +#: 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:1019 +#: builtin/update-index.c:1024 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:1021 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:1023 +#: builtin/update-index.c:1028 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:1027 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1036 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:1035 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "" -#: builtin/update-index.c:1056 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "" -#: builtin/update-index.c:1058 +#: builtin/update-index.c:1063 msgid "write out the index even if is not flagged as changed" msgstr "" -#: builtin/update-index.c:1060 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "" -#: builtin/update-index.c:1168 +#: 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:1177 +#: 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:1188 +#: 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:1192 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "" -#: builtin/update-index.c:1200 +#: 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:1204 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1218 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" -#: builtin/update-index.c:1216 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1225 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" -#: builtin/update-index.c:1223 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "" @@ -19226,19 +21124,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:487 msgid "delete the reference" msgstr "" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:489 msgid "update <refname> not the one it points to" msgstr "" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:490 msgid "stdin has NUL-terminated arguments" msgstr "" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:491 msgid "read updates from stdin" msgstr "" @@ -19282,15 +21180,15 @@ msgstr "" msgid "print raw gpg status output" msgstr "" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "" -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "" @@ -19302,276 +21200,280 @@ msgstr "" msgid "print tag contents" msgstr "" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:970 #, c-format msgid "failed to delete '%s'" msgstr "" -#: builtin/worktree.c:80 -#, c-format -msgid "Removing worktrees/%s: not a valid directory" +#: builtin/worktree.c:85 +msgid "not a valid directory" msgstr "" -#: builtin/worktree.c:86 -#, c-format -msgid "Removing worktrees/%s: gitdir file does not exist" +#: builtin/worktree.c:91 +msgid "gitdir file does not exist" msgstr "" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:96 builtin/worktree.c:105 #, c-format -msgid "Removing worktrees/%s: unable to read gitdir file (%s)" +msgid "unable to read gitdir file (%s)" msgstr "" -#: builtin/worktree.c:110 +#: builtin/worktree.c:115 #, c-format -msgid "" -"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " -"%<PRIuMAX>)" +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" msgstr "" -#: builtin/worktree.c:118 -#, c-format -msgid "Removing worktrees/%s: invalid gitdir file" +#: builtin/worktree.c:123 +msgid "invalid gitdir file" msgstr "" -#: builtin/worktree.c:127 +#: builtin/worktree.c:131 +msgid "gitdir file points to non-existent location" +msgstr "" + +#: builtin/worktree.c:146 #, c-format -msgid "Removing worktrees/%s: gitdir file points to non-existent location" +msgid "Removing %s/%s: %s" msgstr "" -#: builtin/worktree.c:166 +#: builtin/worktree.c:221 msgid "report pruned working trees" msgstr "" -#: builtin/worktree.c:168 +#: builtin/worktree.c:223 msgid "expire working trees older than <time>" msgstr "" -#: builtin/worktree.c:235 +#: builtin/worktree.c:293 #, c-format msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:252 +#: builtin/worktree.c:302 #, c-format -msgid "unable to re-add worktree '%s'" +msgid "unusable worktree destination '%s'" msgstr "" -#: builtin/worktree.c:257 +#: builtin/worktree.c:307 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" -"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:259 +#: builtin/worktree.c:309 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" -"use 'add -f' to override, or 'prune' or 'remove' to clear" +"use '%s -f' to override, or 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:309 +#: builtin/worktree.c:360 #, c-format msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:494 builtin/worktree.c:500 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "" -#: builtin/worktree.c:442 +#: builtin/worktree.c:496 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" -#: builtin/worktree.c:451 +#: builtin/worktree.c:505 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "" -#: builtin/worktree.c:457 +#: builtin/worktree.c:511 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "" -#: builtin/worktree.c:498 +#: builtin/worktree.c:552 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:501 +#: builtin/worktree.c:555 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:503 +#: builtin/worktree.c:557 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:505 +#: builtin/worktree.c:559 msgid "populate the new working tree" msgstr "" -#: builtin/worktree.c:506 +#: builtin/worktree.c:560 msgid "keep the new working tree locked" msgstr "" -#: builtin/worktree.c:509 +#: builtin/worktree.c:563 msgid "set up tracking mode (see git-branch(1))" msgstr "" -#: builtin/worktree.c:512 +#: builtin/worktree.c:566 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" -#: builtin/worktree.c:520 +#: builtin/worktree.c:574 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: builtin/worktree.c:581 +#: builtin/worktree.c:635 msgid "--[no-]track can only be used if a new branch is created" msgstr "" -#: builtin/worktree.c:681 +#: builtin/worktree.c:755 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 +#: builtin/worktree.c:998 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:769 builtin/worktree.c:802 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:700 +#: builtin/worktree.c:774 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:702 +#: builtin/worktree.c:776 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:730 +#: builtin/worktree.c:804 #, c-format msgid "'%s' is not locked" msgstr "" -#: builtin/worktree.c:771 +#: builtin/worktree.c:845 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:779 +#: builtin/worktree.c:853 msgid "force move even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:802 builtin/worktree.c:929 +#: builtin/worktree.c:876 builtin/worktree.c:1000 #, c-format msgid "'%s' is a main working tree" msgstr "" -#: builtin/worktree.c:807 +#: builtin/worktree.c:881 #, c-format msgid "could not figure out destination name from '%s'" msgstr "" -#: builtin/worktree.c:813 -#, c-format -msgid "target '%s' already exists" -msgstr "" - -#: builtin/worktree.c:821 +#: builtin/worktree.c:894 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:823 +#: builtin/worktree.c:896 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:826 +#: builtin/worktree.c:899 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:831 +#: builtin/worktree.c:904 #, c-format msgid "failed to move '%s' to '%s'" msgstr "" -#: builtin/worktree.c:879 +#: builtin/worktree.c:950 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "" -#: builtin/worktree.c:883 +#: builtin/worktree.c:954 #, c-format -msgid "'%s' is dirty, use --force to delete it" +msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -#: builtin/worktree.c:888 +#: builtin/worktree.c:959 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" -#: builtin/worktree.c:911 +#: builtin/worktree.c:982 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:934 +#: builtin/worktree.c:1005 #, 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:936 +#: builtin/worktree.c:1007 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:939 +#: builtin/worktree.c:1010 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" +#: builtin/worktree.c:1034 +#, c-format +msgid "repair: %s: %s" +msgstr "" + +#: builtin/worktree.c:1037 +#, c-format +msgid "error: %s: %s" +msgstr "" + #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "" @@ -19588,25 +21490,21 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: credential-cache--daemon.c:223 +#: http-fetch.c:114 #, c-format -msgid "" -"The permissions on your socket directory are too loose; other\n" -"users may be able to read your cached credentials. Consider running:\n" -"\n" -"\tchmod 0700 %s" +msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "" -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" +#: http-fetch.c:122 +msgid "not a git repository" msgstr "" -#: t/helper/test-reach.c:152 +#: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" msgstr "" -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" msgstr "" @@ -19618,7 +21516,7 @@ msgstr "" msgid "exit immediately after advertising capabilities" msgstr "" -#: git.c:27 +#: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -19628,7 +21526,7 @@ msgid "" " <command> [<args>]" msgstr "" -#: git.c:34 +#: git.c:35 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -19636,139 +21534,139 @@ msgid "" "See 'git help git' for an overview of the system." msgstr "" -#: git.c:186 +#: git.c:187 #, c-format msgid "no directory given for --git-dir\n" msgstr "" -#: git.c:200 +#: git.c:201 #, c-format msgid "no namespace given for --namespace\n" msgstr "" -#: git.c:214 +#: git.c:215 #, c-format msgid "no directory given for --work-tree\n" msgstr "" -#: git.c:228 +#: git.c:229 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "" -#: git.c:250 +#: git.c:251 #, c-format msgid "-c expects a configuration string\n" msgstr "" -#: git.c:288 +#: git.c:289 #, c-format msgid "no directory given for -C\n" msgstr "" -#: git.c:314 +#: git.c:315 #, c-format msgid "unknown option: %s\n" msgstr "" -#: git.c:360 +#: git.c:364 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "" -#: git.c:369 +#: git.c:373 #, c-format msgid "" "alias '%s' changes environment variables.\n" "You can use '!git' in the alias to do this" msgstr "" -#: git.c:377 +#: git.c:380 #, c-format msgid "empty alias for %s" msgstr "" -#: git.c:380 +#: git.c:383 #, c-format msgid "recursive alias: %s" msgstr "" -#: git.c:460 +#: git.c:465 msgid "write failure on standard output" msgstr "" -#: git.c:462 +#: git.c:467 msgid "unknown write failure on standard output" msgstr "" -#: git.c:464 +#: git.c:469 msgid "close failed on standard output" msgstr "" -#: git.c:793 +#: git.c:819 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" -#: git.c:843 +#: git.c:869 #, c-format msgid "cannot handle %s as a builtin" msgstr "" -#: git.c:856 +#: git.c:882 #, c-format msgid "" "usage: %s\n" "\n" msgstr "" -#: git.c:876 +#: git.c:902 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:888 +#: git.c:914 #, c-format msgid "failed to run command '%s': %s\n" msgstr "" -#: http.c:378 +#: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" -#: http.c:399 +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "" -#: http.c:408 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" -#: http.c:876 +#: http.c:910 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "" -#: http.c:949 +#: http.c:989 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "" -#: http.c:1085 +#: http.c:1132 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "" -#: http.c:1092 +#: http.c:1139 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" -#: http.c:1096 +#: http.c:1143 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "" -#: http.c:1965 +#: http.c:2025 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -19776,152 +21674,192 @@ msgid "" " redirect: %s" msgstr "" -#: remote-curl.c:157 +#: remote-curl.c:174 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "" -#: remote-curl.c:254 +#: remote-curl.c:298 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "" -#: remote-curl.c:355 +#: remote-curl.c:399 msgid "invalid server response; expected service, got flush packet" msgstr "" -#: remote-curl.c:386 +#: remote-curl.c:430 #, c-format msgid "invalid server response; got '%s'" msgstr "" -#: remote-curl.c:446 +#: remote-curl.c:490 #, c-format msgid "repository '%s' not found" msgstr "" -#: remote-curl.c:450 +#: remote-curl.c:494 #, c-format msgid "Authentication failed for '%s'" msgstr "" -#: remote-curl.c:454 +#: remote-curl.c:498 #, c-format msgid "unable to access '%s': %s" msgstr "" -#: remote-curl.c:460 +#: remote-curl.c:504 #, c-format msgid "redirecting to %s" msgstr "" -#: remote-curl.c:584 +#: remote-curl.c:633 msgid "shouldn't have EOF when not gentle on EOF" msgstr "" -#: remote-curl.c:664 +#: remote-curl.c:645 +msgid "remote server sent stateless separator" +msgstr "" + +#: remote-curl.c:715 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" -#: remote-curl.c:724 +#: remote-curl.c:745 +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "" + +#: remote-curl.c:747 +msgid "remote-curl: unexpected response end packet" +msgstr "" + +#: remote-curl.c:823 #, c-format msgid "RPC failed; %s" msgstr "" -#: remote-curl.c:764 +#: remote-curl.c:863 msgid "cannot handle pushes this big" msgstr "" -#: remote-curl.c:879 +#: remote-curl.c:978 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" -#: remote-curl.c:883 +#: remote-curl.c:982 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "" -#: remote-curl.c:1014 +#: remote-curl.c:1032 +#, c-format +msgid "%d bytes of length header were received" +msgstr "" + +#: remote-curl.c:1034 +#, c-format +msgid "%d bytes of body are still expected" +msgstr "" + +#: remote-curl.c:1123 msgid "dumb http transport does not support shallow capabilities" msgstr "" -#: remote-curl.c:1028 +#: remote-curl.c:1138 msgid "fetch failed." msgstr "" -#: remote-curl.c:1076 +#: remote-curl.c:1184 msgid "cannot fetch by sha1 over smart http" msgstr "" -#: remote-curl.c:1120 remote-curl.c:1126 +#: remote-curl.c:1228 remote-curl.c:1234 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1246 remote-curl.c:1361 #, c-format msgid "http transport does not support %s" msgstr "" -#: remote-curl.c:1174 +#: remote-curl.c:1282 msgid "git-http-push failed" msgstr "" -#: remote-curl.c:1360 +#: remote-curl.c:1467 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "" -#: remote-curl.c:1392 +#: remote-curl.c:1499 msgid "remote-curl: error reading command stream from git" msgstr "" -#: remote-curl.c:1399 +#: remote-curl.c:1506 msgid "remote-curl: fetch attempted without a local repo" msgstr "" -#: remote-curl.c:1439 +#: remote-curl.c:1547 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "" -#: list-objects-filter-options.h:61 +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "" + +#: list-objects-filter-options.h:91 msgid "args" msgstr "" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "" -#: parse-options.h:170 +#: parse-options.h:183 msgid "expiry-date" msgstr "" -#: parse-options.h:184 +#: 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 -msgid "use <n> digits to display SHA-1s" +#: parse-options.h:317 +msgid "use <n> digits to display object names" msgstr "" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "" -#: ref-filter.h:101 +#: 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:96 msgid "key" msgstr "" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "field name to sort on" msgstr "" @@ -19929,11 +21867,11 @@ msgstr "" msgid "update the index with reused conflict resolution if possible" msgstr "" -#: wt-status.h:67 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "" -#: wt-status.h:68 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "" @@ -19974,689 +21912,706 @@ msgid "List, create, or delete branches" msgstr "" #: command-list.h:59 -msgid "Move objects and refs by archive" +msgid "Collect information for user to file a bug report" msgstr "" #: command-list.h:60 -msgid "Provide content or type and size information for repository objects" +msgid "Move objects and refs by archive" msgstr "" #: command-list.h:61 -msgid "Display gitattributes information" +msgid "Provide content or type and size information for repository objects" msgstr "" #: command-list.h:62 -msgid "Debug gitignore / exclude files" +msgid "Display gitattributes information" msgstr "" #: command-list.h:63 -msgid "Show canonical names and email addresses of contacts" +msgid "Debug gitignore / exclude files" msgstr "" #: command-list.h:64 -msgid "Switch branches or restore working tree files" +msgid "Show canonical names and email addresses of contacts" msgstr "" #: command-list.h:65 -msgid "Copy files from the index to the working tree" +msgid "Switch branches or restore working tree files" msgstr "" #: command-list.h:66 -msgid "Ensures that a reference name is well formed" +msgid "Copy files from the index to the working tree" msgstr "" #: command-list.h:67 -msgid "Find commits yet to be applied to upstream" +msgid "Ensures that a reference name is well formed" msgstr "" #: command-list.h:68 -msgid "Apply the changes introduced by some existing commits" +msgid "Find commits yet to be applied to upstream" msgstr "" #: command-list.h:69 -msgid "Graphical alternative to git-commit" +msgid "Apply the changes introduced by some existing commits" msgstr "" #: command-list.h:70 -msgid "Remove untracked files from the working tree" +msgid "Graphical alternative to git-commit" msgstr "" #: command-list.h:71 -msgid "Clone a repository into a new directory" +msgid "Remove untracked files from the working tree" msgstr "" #: command-list.h:72 -msgid "Display data in columns" +msgid "Clone a repository into a new directory" msgstr "" #: command-list.h:73 -msgid "Record changes to the repository" +msgid "Display data in columns" msgstr "" #: command-list.h:74 -msgid "Write and verify Git commit-graph files" +msgid "Record changes to the repository" msgstr "" #: command-list.h:75 -msgid "Create a new commit object" +msgid "Write and verify Git commit-graph files" msgstr "" #: command-list.h:76 -msgid "Get and set repository or global options" +msgid "Create a new commit object" msgstr "" #: command-list.h:77 -msgid "Count unpacked number of objects and their disk consumption" +msgid "Get and set repository or global options" msgstr "" #: command-list.h:78 -msgid "Retrieve and store user credentials" +msgid "Count unpacked number of objects and their disk consumption" msgstr "" #: command-list.h:79 -msgid "Helper to temporarily store passwords in memory" +msgid "Retrieve and store user credentials" msgstr "" #: command-list.h:80 -msgid "Helper to store credentials on disk" +msgid "Helper to temporarily store passwords in memory" msgstr "" #: command-list.h:81 -msgid "Export a single commit to a CVS checkout" +msgid "Helper to store credentials on disk" msgstr "" #: command-list.h:82 -msgid "Salvage your data out of another SCM people love to hate" +msgid "Export a single commit to a CVS checkout" msgstr "" #: command-list.h:83 -msgid "A CVS server emulator for Git" +msgid "Salvage your data out of another SCM people love to hate" msgstr "" #: command-list.h:84 -msgid "A really simple server for Git repositories" +msgid "A CVS server emulator for Git" msgstr "" #: command-list.h:85 -msgid "Give an object a human readable name based on an available ref" +msgid "A really simple server for Git repositories" msgstr "" #: command-list.h:86 -msgid "Show changes between commits, commit and working tree, etc" +msgid "Give an object a human readable name based on an available ref" msgstr "" #: command-list.h:87 -msgid "Compares files in the working tree and the index" +msgid "Show changes between commits, commit and working tree, etc" msgstr "" #: command-list.h:88 -msgid "Compare a tree to the working tree or index" +msgid "Compares files in the working tree and the index" msgstr "" #: command-list.h:89 -msgid "Compares the content and mode of blobs found via two tree objects" +msgid "Compare a tree to the working tree or index" msgstr "" #: command-list.h:90 -msgid "Show changes using common diff tools" +msgid "Compares the content and mode of blobs found via two tree objects" msgstr "" #: command-list.h:91 -msgid "Git data exporter" +msgid "Show changes using common diff tools" msgstr "" #: command-list.h:92 -msgid "Backend for fast Git data importers" +msgid "Git data exporter" msgstr "" #: command-list.h:93 -msgid "Download objects and refs from another repository" +msgid "Backend for fast Git data importers" msgstr "" #: command-list.h:94 -msgid "Receive missing objects from another repository" +msgid "Download objects and refs from another repository" msgstr "" #: command-list.h:95 -msgid "Rewrite branches" +msgid "Receive missing objects from another repository" msgstr "" #: command-list.h:96 -msgid "Produce a merge commit message" +msgid "Rewrite branches" msgstr "" #: command-list.h:97 -msgid "Output information on each ref" +msgid "Produce a merge commit message" msgstr "" #: command-list.h:98 -msgid "Prepare patches for e-mail submission" +msgid "Output information on each ref" msgstr "" #: command-list.h:99 -msgid "Verifies the connectivity and validity of the objects in the database" +msgid "Prepare patches for e-mail submission" msgstr "" #: command-list.h:100 -msgid "Cleanup unnecessary files and optimize the local repository" +msgid "Verifies the connectivity and validity of the objects in the database" msgstr "" #: command-list.h:101 -msgid "Extract commit ID from an archive created using git-archive" +msgid "Cleanup unnecessary files and optimize the local repository" msgstr "" #: command-list.h:102 -msgid "Print lines matching a pattern" +msgid "Extract commit ID from an archive created using git-archive" msgstr "" #: command-list.h:103 -msgid "A portable graphical interface to Git" +msgid "Print lines matching a pattern" msgstr "" #: command-list.h:104 -msgid "Compute object ID and optionally creates a blob from a file" +msgid "A portable graphical interface to Git" msgstr "" #: command-list.h:105 -msgid "Display help information about Git" +msgid "Compute object ID and optionally creates a blob from a file" msgstr "" #: command-list.h:106 -msgid "Server side implementation of Git over HTTP" +msgid "Display help information about Git" msgstr "" #: command-list.h:107 -msgid "Download from a remote Git repository via HTTP" +msgid "Server side implementation of Git over HTTP" msgstr "" #: command-list.h:108 -msgid "Push objects over HTTP/DAV to another repository" +msgid "Download from a remote Git repository via HTTP" msgstr "" #: command-list.h:109 -msgid "Send a collection of patches from stdin to an IMAP folder" +msgid "Push objects over HTTP/DAV to another repository" msgstr "" #: command-list.h:110 -msgid "Build pack index file for an existing packed archive" +msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "" #: command-list.h:111 -msgid "Create an empty Git repository or reinitialize an existing one" +msgid "Build pack index file for an existing packed archive" msgstr "" #: command-list.h:112 -msgid "Instantly browse your working repository in gitweb" +msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" #: command-list.h:113 -msgid "Add or parse structured information in commit messages" +msgid "Instantly browse your working repository in gitweb" msgstr "" #: command-list.h:114 -msgid "The Git repository browser" +msgid "Add or parse structured information in commit messages" msgstr "" #: command-list.h:115 -msgid "Show commit logs" +msgid "The Git repository browser" msgstr "" #: command-list.h:116 -msgid "Show information about files in the index and the working tree" +msgid "Show commit logs" msgstr "" #: command-list.h:117 -msgid "List references in a remote repository" +msgid "Show information about files in the index and the working tree" msgstr "" #: command-list.h:118 -msgid "List the contents of a tree object" +msgid "List references in a remote repository" msgstr "" #: command-list.h:119 -msgid "Extracts patch and authorship from a single e-mail message" +msgid "List the contents of a tree object" msgstr "" #: command-list.h:120 -msgid "Simple UNIX mbox splitter program" +msgid "Extracts patch and authorship from a single e-mail message" msgstr "" #: command-list.h:121 -msgid "Join two or more development histories together" +msgid "Simple UNIX mbox splitter program" msgstr "" #: command-list.h:122 -msgid "Find as good common ancestors as possible for a merge" +msgid "Run tasks to optimize Git repository data" msgstr "" #: command-list.h:123 -msgid "Run a three-way file merge" +msgid "Join two or more development histories together" msgstr "" #: command-list.h:124 -msgid "Run a merge for files needing merging" +msgid "Find as good common ancestors as possible for a merge" msgstr "" #: command-list.h:125 -msgid "The standard helper program to use with git-merge-index" +msgid "Run a three-way file merge" msgstr "" #: command-list.h:126 -msgid "Run merge conflict resolution tools to resolve merge conflicts" +msgid "Run a merge for files needing merging" msgstr "" #: command-list.h:127 -msgid "Show three-way merge without touching index" +msgid "The standard helper program to use with git-merge-index" msgstr "" #: command-list.h:128 -msgid "Write and verify multi-pack-indexes" +msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" #: command-list.h:129 -msgid "Creates a tag object" +msgid "Show three-way merge without touching index" msgstr "" #: command-list.h:130 -msgid "Build a tree-object from ls-tree formatted text" +msgid "Write and verify multi-pack-indexes" msgstr "" #: command-list.h:131 -msgid "Move or rename a file, a directory, or a symlink" +msgid "Creates a tag object" msgstr "" #: command-list.h:132 -msgid "Find symbolic names for given revs" +msgid "Build a tree-object from ls-tree formatted text" msgstr "" #: command-list.h:133 -msgid "Add or inspect object notes" +msgid "Move or rename a file, a directory, or a symlink" msgstr "" #: command-list.h:134 -msgid "Import from and submit to Perforce repositories" +msgid "Find symbolic names for given revs" msgstr "" #: command-list.h:135 -msgid "Create a packed archive of objects" +msgid "Add or inspect object notes" msgstr "" #: command-list.h:136 -msgid "Find redundant pack files" +msgid "Import from and submit to Perforce repositories" msgstr "" #: command-list.h:137 -msgid "Pack heads and tags for efficient repository access" +msgid "Create a packed archive of objects" msgstr "" #: command-list.h:138 -msgid "Routines to help parsing remote repository access parameters" +msgid "Find redundant pack files" msgstr "" #: command-list.h:139 -msgid "Compute unique ID for a patch" +msgid "Pack heads and tags for efficient repository access" msgstr "" #: command-list.h:140 -msgid "Prune all unreachable objects from the object database" +msgid "Routines to help parsing remote repository access parameters" msgstr "" #: command-list.h:141 -msgid "Remove extra objects that are already in pack files" +msgid "Compute unique ID for a patch" msgstr "" #: command-list.h:142 -msgid "Fetch from and integrate with another repository or a local branch" +msgid "Prune all unreachable objects from the object database" msgstr "" #: command-list.h:143 -msgid "Update remote refs along with associated objects" +msgid "Remove extra objects that are already in pack files" msgstr "" #: command-list.h:144 -msgid "Applies a quilt patchset onto the current branch" +msgid "Fetch from and integrate with another repository or a local branch" msgstr "" #: command-list.h:145 -msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgid "Update remote refs along with associated objects" msgstr "" #: command-list.h:146 -msgid "Reads tree information into the index" +msgid "Applies a quilt patchset onto the current branch" msgstr "" #: command-list.h:147 -msgid "Reapply commits on top of another base tip" +msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "" #: command-list.h:148 -msgid "Receive what is pushed into the repository" +msgid "Reads tree information into the index" msgstr "" #: command-list.h:149 -msgid "Manage reflog information" +msgid "Reapply commits on top of another base tip" msgstr "" #: command-list.h:150 -msgid "Manage set of tracked repositories" +msgid "Receive what is pushed into the repository" msgstr "" #: command-list.h:151 -msgid "Pack unpacked objects in a repository" +msgid "Manage reflog information" msgstr "" #: command-list.h:152 -msgid "Create, list, delete refs to replace objects" +msgid "Manage set of tracked repositories" msgstr "" #: command-list.h:153 -msgid "Generates a summary of pending changes" +msgid "Pack unpacked objects in a repository" msgstr "" #: command-list.h:154 -msgid "Reuse recorded resolution of conflicted merges" +msgid "Create, list, delete refs to replace objects" msgstr "" #: command-list.h:155 -msgid "Reset current HEAD to the specified state" +msgid "Generates a summary of pending changes" msgstr "" #: command-list.h:156 -msgid "Restore working tree files" +msgid "Reuse recorded resolution of conflicted merges" msgstr "" #: command-list.h:157 -msgid "Revert some existing commits" +msgid "Reset current HEAD to the specified state" msgstr "" #: command-list.h:158 -msgid "Lists commit objects in reverse chronological order" +msgid "Restore working tree files" msgstr "" #: command-list.h:159 -msgid "Pick out and massage parameters" +msgid "Revert some existing commits" msgstr "" #: command-list.h:160 -msgid "Remove files from the working tree and from the index" +msgid "Lists commit objects in reverse chronological order" msgstr "" #: command-list.h:161 -msgid "Send a collection of patches as emails" +msgid "Pick out and massage parameters" msgstr "" #: command-list.h:162 -msgid "Push objects over Git protocol to another repository" +msgid "Remove files from the working tree and from the index" msgstr "" #: command-list.h:163 -msgid "Restricted login shell for Git-only SSH access" +msgid "Send a collection of patches as emails" msgstr "" #: command-list.h:164 -msgid "Summarize 'git log' output" +msgid "Push objects over Git protocol to another repository" msgstr "" #: command-list.h:165 -msgid "Show various types of objects" +msgid "Restricted login shell for Git-only SSH access" msgstr "" #: command-list.h:166 -msgid "Show branches and their commits" +msgid "Summarize 'git log' output" msgstr "" #: command-list.h:167 -msgid "Show packed archive index" +msgid "Show various types of objects" msgstr "" #: command-list.h:168 -msgid "List references in a local repository" +msgid "Show branches and their commits" msgstr "" #: command-list.h:169 -msgid "Git's i18n setup code for shell scripts" +msgid "Show packed archive index" msgstr "" #: command-list.h:170 -msgid "Common Git shell script setup code" +msgid "List references in a local repository" msgstr "" #: command-list.h:171 -msgid "Stash the changes in a dirty working directory away" +msgid "Git's i18n setup code for shell scripts" msgstr "" #: command-list.h:172 -msgid "Add file contents to the staging area" +msgid "Common Git shell script setup code" msgstr "" #: command-list.h:173 -msgid "Show the working tree status" +msgid "Initialize and modify the sparse-checkout" msgstr "" #: command-list.h:174 -msgid "Remove unnecessary whitespace" +msgid "Stash the changes in a dirty working directory away" msgstr "" #: command-list.h:175 -msgid "Initialize, update or inspect submodules" +msgid "Add file contents to the staging area" msgstr "" #: command-list.h:176 -msgid "Bidirectional operation between a Subversion repository and Git" +msgid "Show the working tree status" msgstr "" #: command-list.h:177 -msgid "Switch branches" +msgid "Remove unnecessary whitespace" msgstr "" #: command-list.h:178 -msgid "Read, modify and delete symbolic refs" +msgid "Initialize, update or inspect submodules" msgstr "" #: command-list.h:179 -msgid "Create, list, delete or verify a tag object signed with GPG" +msgid "Bidirectional operation between a Subversion repository and Git" msgstr "" #: command-list.h:180 -msgid "Creates a temporary file with a blob's contents" +msgid "Switch branches" msgstr "" #: command-list.h:181 -msgid "Unpack objects from a packed archive" +msgid "Read, modify and delete symbolic refs" msgstr "" #: command-list.h:182 -msgid "Register file contents in the working tree to the index" +msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" #: command-list.h:183 -msgid "Update the object name stored in a ref safely" +msgid "Creates a temporary file with a blob's contents" msgstr "" #: command-list.h:184 -msgid "Update auxiliary info file to help dumb servers" +msgid "Unpack objects from a packed archive" msgstr "" #: command-list.h:185 -msgid "Send archive back to git-archive" +msgid "Register file contents in the working tree to the index" msgstr "" #: command-list.h:186 -msgid "Send objects packed back to git-fetch-pack" +msgid "Update the object name stored in a ref safely" msgstr "" #: command-list.h:187 -msgid "Show a Git logical variable" +msgid "Update auxiliary info file to help dumb servers" msgstr "" #: command-list.h:188 -msgid "Check the GPG signature of commits" +msgid "Send archive back to git-archive" msgstr "" #: command-list.h:189 -msgid "Validate packed Git archive files" +msgid "Send objects packed back to git-fetch-pack" msgstr "" #: command-list.h:190 -msgid "Check the GPG signature of tags" +msgid "Show a Git logical variable" msgstr "" #: command-list.h:191 -msgid "Git web interface (web frontend to Git repositories)" +msgid "Check the GPG signature of commits" msgstr "" #: command-list.h:192 -msgid "Show logs with difference each commit introduces" +msgid "Validate packed Git archive files" msgstr "" #: command-list.h:193 -msgid "Manage multiple working trees" +msgid "Check the GPG signature of tags" msgstr "" #: command-list.h:194 -msgid "Create a tree object from the current index" +msgid "Git web interface (web frontend to Git repositories)" msgstr "" #: command-list.h:195 -msgid "Defining attributes per path" +msgid "Show logs with difference each commit introduces" msgstr "" #: command-list.h:196 -msgid "Git command-line interface and conventions" +msgid "Manage multiple working trees" msgstr "" #: command-list.h:197 -msgid "A Git core tutorial for developers" +msgid "Create a tree object from the current index" msgstr "" #: command-list.h:198 -msgid "Git for CVS users" +msgid "Defining attributes per path" msgstr "" #: command-list.h:199 -msgid "Tweaking diff output" +msgid "Git command-line interface and conventions" msgstr "" #: command-list.h:200 -msgid "A useful minimum set of commands for Everyday Git" +msgid "A Git core tutorial for developers" msgstr "" #: command-list.h:201 -msgid "A Git Glossary" +msgid "Providing usernames and passwords to Git" msgstr "" #: command-list.h:202 -msgid "Hooks used by Git" +msgid "Git for CVS users" msgstr "" #: command-list.h:203 -msgid "Specifies intentionally untracked files to ignore" +msgid "Tweaking diff output" msgstr "" #: command-list.h:204 -msgid "Defining submodule properties" +msgid "A useful minimum set of commands for Everyday Git" msgstr "" #: command-list.h:205 -msgid "Git namespaces" +msgid "Frequently asked questions about using Git" msgstr "" #: command-list.h:206 -msgid "Git Repository Layout" +msgid "A Git Glossary" msgstr "" #: command-list.h:207 -msgid "Specifying revisions and ranges for Git" +msgid "Hooks used by Git" msgstr "" #: command-list.h:208 -msgid "A tutorial introduction to Git: part two" +msgid "Specifies intentionally untracked files to ignore" msgstr "" #: command-list.h:209 -msgid "A tutorial introduction to Git" +msgid "Defining submodule properties" msgstr "" #: command-list.h:210 -msgid "An overview of recommended workflows with Git" +msgid "Git namespaces" msgstr "" -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" msgstr "" -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:60 -msgid "Do you want me to do it for you [Y/n]? " +#: command-list.h:212 +msgid "Git Repository Layout" msgstr "" -#: git-bisect.sh:101 +#: command-list.h:213 +msgid "Specifying revisions and ranges for Git" +msgstr "" + +#: command-list.h:214 +msgid "Mounting one repository inside another" +msgstr "" + +#: command-list.h:215 +msgid "A tutorial introduction to Git: part two" +msgstr "" + +#: command-list.h:216 +msgid "A tutorial introduction to Git" +msgstr "" + +#: command-list.h:217 +msgid "An overview of recommended workflows with Git" +msgstr "" + +#: git-bisect.sh:79 #, sh-format msgid "Bad rev input: $arg" msgstr "" -#: git-bisect.sh:121 +#: git-bisect.sh:99 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "" -#: git-bisect.sh:130 +#: git-bisect.sh:108 #, sh-format msgid "Bad rev input: $rev" msgstr "" -#: git-bisect.sh:139 +#: git-bisect.sh:117 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "" -#: git-bisect.sh:209 +#: git-bisect.sh:149 msgid "No logfile given" msgstr "" -#: git-bisect.sh:210 +#: git-bisect.sh:150 #, sh-format msgid "cannot read $file for replaying" msgstr "" -#: git-bisect.sh:232 +#: git-bisect.sh:173 msgid "?? what are you talking about?" msgstr "" -#: git-bisect.sh:241 +#: git-bisect.sh:183 msgid "bisect run failed: no command provided." msgstr "" -#: git-bisect.sh:246 +#: git-bisect.sh:188 #, sh-format msgid "running $command" msgstr "" -#: git-bisect.sh:253 +#: git-bisect.sh:195 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -#: git-bisect.sh:279 +#: git-bisect.sh:221 msgid "bisect run cannot continue any more" msgstr "" -#: git-bisect.sh:285 +#: git-bisect.sh:227 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" -#: git-bisect.sh:292 +#: git-bisect.sh:234 msgid "bisect run success" msgstr "" -#: git-bisect.sh:300 +#: git-bisect.sh:242 msgid "We are not bisecting." msgstr "" @@ -20698,136 +22653,46 @@ msgstr "" msgid "Simple merge did not work, trying automatic merge." msgstr "" -#: git-legacy-stash.sh:220 -msgid "Cannot remove temporary index (can't happen)" -msgstr "" - -#: git-legacy-stash.sh:271 -#, sh-format -msgid "Cannot update $ref_stash with $w_commit" -msgstr "" - -#: git-legacy-stash.sh:323 -#, sh-format -msgid "error: unknown option for 'stash push': $option" -msgstr "" - -#: git-legacy-stash.sh:355 -#, sh-format -msgid "Saved working directory and index state $stash_msg" -msgstr "" - -#: git-legacy-stash.sh:535 -#, sh-format -msgid "unknown option: $opt" -msgstr "" - -#: git-legacy-stash.sh:555 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "" - -#: git-legacy-stash.sh:570 -#, sh-format -msgid "$reference is not a valid reference" -msgstr "" - -#: git-legacy-stash.sh:598 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "" - -#: git-legacy-stash.sh:609 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "" - -#: git-legacy-stash.sh:617 -msgid "unable to refresh index" -msgstr "" - -#: git-legacy-stash.sh:621 -msgid "Cannot apply a stash in the middle of a merge" -msgstr "" - -#: git-legacy-stash.sh:629 -msgid "Conflicts in index. Try without --index." -msgstr "" - -#: git-legacy-stash.sh:631 -msgid "Could not save index tree" -msgstr "" - -#: git-legacy-stash.sh:640 -msgid "Could not restore untracked files from stash entry" -msgstr "" - -#: git-legacy-stash.sh:665 -msgid "Cannot unstage modified files" -msgstr "" - -#: git-legacy-stash.sh:703 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "" - -#: git-legacy-stash.sh:704 -#, sh-format -msgid "${REV}: Could not drop stash entry" -msgstr "" - -#: git-legacy-stash.sh:791 -msgid "(To restore them type \"git stash apply\")" -msgstr "" - -#: git-submodule.sh:200 +#: git-submodule.sh:180 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:210 +#: git-submodule.sh:190 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:229 +#: git-submodule.sh:209 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:232 +#: git-submodule.sh:212 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "" -#: git-submodule.sh:239 +#: git-submodule.sh:219 #, 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:250 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:270 +#: git-submodule.sh:252 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:278 +#: git-submodule.sh:260 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:280 +#: git-submodule.sh:262 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -20838,126 +22703,102 @@ msgid "" "option." msgstr "" -#: git-submodule.sh:286 +#: git-submodule.sh:268 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:298 +#: git-submodule.sh:280 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:303 +#: git-submodule.sh:285 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:312 +#: git-submodule.sh:294 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:573 +#: git-submodule.sh:567 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:583 +#: git-submodule.sh:577 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:588 +#: git-submodule.sh:582 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" -#: git-submodule.sh:606 +#: git-submodule.sh:600 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "" -#: git-submodule.sh:612 +#: git-submodule.sh:606 #, 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:613 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:620 +#: git-submodule.sh:614 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:624 +#: git-submodule.sh:618 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:625 +#: git-submodule.sh:619 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:630 +#: git-submodule.sh:624 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:631 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:636 +#: git-submodule.sh:630 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:637 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:668 +#: git-submodule.sh:662 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:830 -msgid "The --cached option cannot be used with the --files option" -msgstr "" - -#: git-submodule.sh:882 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "" - -#: git-submodule.sh:902 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_src" -msgstr "" - -#: git-submodule.sh:905 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_dst" -msgstr "" - -#: git-submodule.sh:908 -#, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr "" - #: git-parse-remote.sh:89 #, sh-format msgid "See git-${cmd}(1) for details." @@ -20972,12 +22813,19 @@ msgstr "" msgid "Cannot store $stash_sha1" msgstr "" +#: git-rebase--preserve-merges.sh:113 +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" + #: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "" -#: git-rebase--preserve-merges.sh:207 +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -20998,7 +22846,7 @@ msgid "" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" -#: git-rebase--preserve-merges.sh:270 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -21010,83 +22858,83 @@ msgid "" "\tgit rebase --continue" msgstr "" -#: git-rebase--preserve-merges.sh:295 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "" -#: git-rebase--preserve-merges.sh:334 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:364 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "" -#: git-rebase--preserve-merges.sh:415 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:426 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "" -#: git-rebase--preserve-merges.sh:431 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:449 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:458 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:467 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "" -#: git-rebase--preserve-merges.sh:472 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "" -#: git-rebase--preserve-merges.sh:483 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "" msgstr[1] "" -#: git-rebase--preserve-merges.sh:492 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "" -#: git-rebase--preserve-merges.sh:495 +#: git-rebase--preserve-merges.sh:485 msgid "This is a combination of 2 commits." msgstr "" -#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 -#: git-rebase--preserve-merges.sh:582 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "" -#: git-rebase--preserve-merges.sh:611 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -21096,31 +22944,31 @@ msgid "" "you are able to reword the commit." msgstr "" -#: git-rebase--preserve-merges.sh:626 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "" -#: git-rebase--preserve-merges.sh:641 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "" -#: git-rebase--preserve-merges.sh:683 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "" -#: git-rebase--preserve-merges.sh:691 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "" -#: git-rebase--preserve-merges.sh:693 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "" -#: git-rebase--preserve-merges.sh:695 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -21128,7 +22976,7 @@ msgid "" msgstr "" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -21138,25 +22986,25 @@ msgid "" "\tgit rebase --continue" msgstr "" -#: git-rebase--preserve-merges.sh:719 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "" -#: git-rebase--preserve-merges.sh:720 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "" -#: git-rebase--preserve-merges.sh:755 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "" -#: git-rebase--preserve-merges.sh:812 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "" -#: git-rebase--preserve-merges.sh:817 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -21174,50 +23022,54 @@ msgid "" " git rebase --continue\n" msgstr "" -#: git-rebase--preserve-merges.sh:834 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "" -#: git-rebase--preserve-merges.sh:839 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "" -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "" -#: git-rebase--preserve-merges.sh:900 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" msgstr "" -#: git-rebase--preserve-merges.sh:907 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "" -#: git-rebase--preserve-merges.sh:908 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "" -#: git-rebase--preserve-merges.sh:911 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "" -#: git-rebase--preserve-merges.sh:943 +#: git-rebase--preserve-merges.sh:933 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "" msgstr[1] "" -#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 +#: git-rebase--preserve-merges.sh:945 +msgid "Note that empty commits are commented out" +msgstr "" + +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "" @@ -21279,122 +23131,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:1058 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:1061 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:1064 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:1067 git-add--interactive.perl:1076 +#: git-add--interactive.perl:1082 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:1070 git-add--interactive.perl:1073 +#: git-add--interactive.perl:1079 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "" -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1116 #, 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:1123 #, perl-format msgid "" "---\n" @@ -21403,31 +23189,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:1145 #, 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:1253 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -21436,7 +23203,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:1259 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -21445,7 +23212,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:1265 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -21454,7 +23221,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:1271 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -21463,7 +23230,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:1277 git-add--interactive.perl:1295 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -21472,7 +23239,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:1283 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -21481,7 +23248,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:1289 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -21490,7 +23257,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:1301 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -21499,7 +23266,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:1316 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -21512,226 +23279,90 @@ msgid "" "? - print help\n" msgstr "" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1347 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:1362 #, 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 +#: git-add--interactive.perl:1481 #, 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,?]? " +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1466 +#: git-add--interactive.perl:1482 #, perl-format -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1467 +#: git-add--interactive.perl:1483 #, perl-format -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1484 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1568 +#: git-add--interactive.perl:1601 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:1619 #, perl-format msgid "Invalid number: '%s'\n" msgstr "" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1624 #, 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:1659 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:1676 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1686 msgid "No hunk matches the given pattern\n" msgstr "" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 msgid "No previous hunk\n" msgstr "" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 msgid "No next hunk\n" msgstr "" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1732 msgid "Sorry, cannot split this hunk\n" msgstr "" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1738 #, 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:1748 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:1813 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -21742,19 +23373,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:1830 git-add--interactive.perl:1835 +#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 +#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 +#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 msgid "missing --" msgstr "" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1861 #, perl-format msgid "unknown --patch mode: %s" msgstr "" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 #, perl-format msgid "invalid argument %s, expecting --" msgstr "" @@ -21771,62 +23402,69 @@ msgstr "" msgid "the editor exited uncleanly, aborting everything" msgstr "" -#: git-send-email.perl:310 +#: git-send-email.perl:312 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" -#: git-send-email.perl:315 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "" -#: git-send-email.perl:408 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "" -#: git-send-email.perl:481 git-send-email.perl:683 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "" -#: git-send-email.perl:484 +#: git-send-email.perl:492 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "" -#: git-send-email.perl:497 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "" -#: git-send-email.perl:528 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "" -#: git-send-email.perl:556 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" -#: git-send-email.perl:558 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "" -#: git-send-email.perl:560 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" -#: git-send-email.perl:565 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "" -#: git-send-email.perl:649 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -21836,36 +23474,36 @@ msgid "" " * Giving --format-patch option if you mean a range.\n" msgstr "" -#: git-send-email.perl:670 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "" -#: git-send-email.perl:694 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" "warning: no patches were sent\n" msgstr "" -#: git-send-email.perl:705 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" "\n" msgstr "" -#: git-send-email.perl:718 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "" -#: git-send-email.perl:728 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "" -#: git-send-email.perl:739 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -21874,37 +23512,37 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "" -#: git-send-email.perl:763 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "" -#: git-send-email.perl:780 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "" -#: git-send-email.perl:823 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "" -#: git-send-email.perl:913 +#: git-send-email.perl:921 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" -#: git-send-email.perl:918 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "" -#: git-send-email.perl:926 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -21913,20 +23551,20 @@ msgid "" "want to send.\n" msgstr "" -#: git-send-email.perl:945 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "" -#: git-send-email.perl:963 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "" -#: git-send-email.perl:975 +#: git-send-email.perl:983 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -#: git-send-email.perl:1033 git-send-email.perl:1041 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "" @@ -21934,16 +23572,16 @@ msgstr "" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1045 +#: git-send-email.perl:1053 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" -#: git-send-email.perl:1362 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "" -#: git-send-email.perl:1445 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -21960,128 +23598,128 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1460 +#: git-send-email.perl:1468 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "" -#: git-send-email.perl:1463 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "" -#: git-send-email.perl:1491 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "" -#: git-send-email.perl:1538 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "" -#: git-send-email.perl:1543 git-send-email.perl:1547 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "" -#: git-send-email.perl:1556 +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -#: git-send-email.perl:1574 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "" -#: git-send-email.perl:1591 +#: git-send-email.perl:1599 msgid "Result: " msgstr "" -#: git-send-email.perl:1594 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "" -#: git-send-email.perl:1612 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "" -#: git-send-email.perl:1659 git-send-email.perl:1679 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1665 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1718 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1753 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1864 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "" -#: git-send-email.perl:1871 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "" -#: git-send-email.perl:1875 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "" -#: git-send-email.perl:1905 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "" -#: git-send-email.perl:1913 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "" -#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "" -#: git-send-email.perl:1957 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "" -#: git-send-email.perl:1974 +#: git-send-email.perl:1986 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1978 +#: git-send-email.perl:1990 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "" |