diff options
Diffstat (limited to 'po/git.pot')
| -rw-r--r-- | po/git.pot | 8118 |
1 files changed, 4283 insertions, 3835 deletions
diff --git a/po/git.pot b/po/git.pot index 68c84144e9..ee9ba62256 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-10-10 09:32+0800\n" +"POT-Creation-Date: 2021-03-04 22:41+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,200 +18,200 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: add-interactive.c:368 +#: add-interactive.c:376 #, 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 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 +#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 +#: builtin/rebase.c:1963 msgid "could not read index" msgstr "" -#: add-interactive.c:576 git-add--interactive.perl:269 +#: add-interactive.c:584 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "" -#: add-interactive.c:634 git-add--interactive.perl:278 +#: add-interactive.c:642 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "" -#: add-interactive.c:635 git-add--interactive.perl:314 +#: add-interactive.c:643 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "" -#: add-interactive.c:672 git-add--interactive.perl:643 +#: add-interactive.c:680 git-add--interactive.perl:641 msgid "Update" msgstr "" -#: add-interactive.c:689 add-interactive.c:877 +#: add-interactive.c:697 add-interactive.c:885 #, c-format msgid "could not stage '%s'" msgstr "" -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 msgid "could not write index" msgstr "" -#: add-interactive.c:698 git-add--interactive.perl:628 +#: add-interactive.c:706 git-add--interactive.perl:626 #, 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 +#: add-interactive.c:724 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "" -#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4125 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 +#: add-interactive.c:759 git-add--interactive.perl:653 msgid "Revert" msgstr "" -#: add-interactive.c:767 +#: add-interactive.c:775 msgid "Could not parse HEAD^{tree}" msgstr "" -#: add-interactive.c:805 git-add--interactive.perl:631 +#: add-interactive.c:813 git-add--interactive.perl:629 #, 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 +#: add-interactive.c:864 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "" -#: add-interactive.c:860 git-add--interactive.perl:689 +#: add-interactive.c:868 git-add--interactive.perl:687 msgid "Add untracked" msgstr "" -#: add-interactive.c:887 git-add--interactive.perl:625 +#: add-interactive.c:895 git-add--interactive.perl:623 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "" msgstr[1] "" -#: add-interactive.c:917 +#: add-interactive.c:925 #, c-format msgid "ignoring unmerged: %s" msgstr "" -#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371 +#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "" -#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "" -#: add-interactive.c:935 git-add--interactive.perl:1381 +#: add-interactive.c:943 git-add--interactive.perl:1379 msgid "Patch update" msgstr "" -#: add-interactive.c:974 git-add--interactive.perl:1794 +#: add-interactive.c:982 git-add--interactive.perl:1792 msgid "Review diff" msgstr "" -#: add-interactive.c:1002 +#: add-interactive.c:1010 msgid "show paths with changes" msgstr "" -#: add-interactive.c:1004 +#: add-interactive.c:1012 msgid "add working tree state to the staged set of changes" msgstr "" -#: add-interactive.c:1006 +#: add-interactive.c:1014 msgid "revert staged set of changes back to the HEAD version" msgstr "" -#: add-interactive.c:1008 +#: add-interactive.c:1016 msgid "pick hunks and update selectively" msgstr "" -#: add-interactive.c:1010 +#: add-interactive.c:1018 msgid "view diff between HEAD and index" msgstr "" -#: add-interactive.c:1012 +#: add-interactive.c:1020 msgid "add contents of untracked files to the staged set of changes" msgstr "" -#: add-interactive.c:1020 add-interactive.c:1069 +#: add-interactive.c:1028 add-interactive.c:1077 msgid "Prompt help:" msgstr "" -#: add-interactive.c:1022 +#: add-interactive.c:1030 msgid "select a single item" msgstr "" -#: add-interactive.c:1024 +#: add-interactive.c:1032 msgid "select a range of items" msgstr "" -#: add-interactive.c:1026 +#: add-interactive.c:1034 msgid "select multiple ranges" msgstr "" -#: add-interactive.c:1028 add-interactive.c:1073 +#: add-interactive.c:1036 add-interactive.c:1081 msgid "select item based on unique prefix" msgstr "" -#: add-interactive.c:1030 +#: add-interactive.c:1038 msgid "unselect specified items" msgstr "" -#: add-interactive.c:1032 +#: add-interactive.c:1040 msgid "choose all items" msgstr "" -#: add-interactive.c:1034 +#: add-interactive.c:1042 msgid "(empty) finish selecting" msgstr "" -#: add-interactive.c:1071 +#: add-interactive.c:1079 msgid "select a numbered item" msgstr "" -#: add-interactive.c:1075 +#: add-interactive.c:1083 msgid "(empty) select nothing" msgstr "" -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891 +#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "" -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 msgid "What now" msgstr "" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "staged" msgstr "" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 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 +#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 +#: builtin/fetch.c:150 builtin/merge.c:285 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 @@ -219,31 +219,31 @@ msgstr "" msgid "path" msgstr "" -#: add-interactive.c:1143 +#: add-interactive.c:1151 msgid "could not refresh index" msgstr "" -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805 +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "" -#: add-patch.c:34 git-add--interactive.perl:1433 +#: add-patch.c:34 git-add--interactive.perl:1431 #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:35 git-add--interactive.perl:1434 +#: add-patch.c:35 git-add--interactive.perl:1432 #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:36 git-add--interactive.perl:1435 +#: add-patch.c:36 git-add--interactive.perl:1433 #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:37 git-add--interactive.perl:1436 +#: add-patch.c:37 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "" @@ -263,22 +263,22 @@ msgid "" "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 +#: add-patch.c:56 git-add--interactive.perl:1437 #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:57 git-add--interactive.perl:1440 +#: add-patch.c:57 git-add--interactive.perl:1438 #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:58 git-add--interactive.perl:1441 +#: add-patch.c:58 git-add--interactive.perl:1439 #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:59 git-add--interactive.perl:1442 +#: add-patch.c:59 git-add--interactive.perl:1440 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "" @@ -298,22 +298,22 @@ msgid "" "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 +#: add-patch.c:80 git-add--interactive.perl:1443 #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:81 git-add--interactive.perl:1446 +#: add-patch.c:81 git-add--interactive.perl:1444 #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:82 git-add--interactive.perl:1447 +#: add-patch.c:82 git-add--interactive.perl:1445 #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:83 git-add--interactive.perl:1448 +#: add-patch.c:83 git-add--interactive.perl:1446 #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "" @@ -333,22 +333,22 @@ msgid "" "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 +#: add-patch.c:103 git-add--interactive.perl:1449 #, 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 +#: add-patch.c:104 git-add--interactive.perl:1450 #, 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 +#: add-patch.c:105 git-add--interactive.perl:1451 #, 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 +#: add-patch.c:106 git-add--interactive.perl:1452 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "" @@ -368,26 +368,26 @@ msgid "" "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 +#: add-patch.c:126 git-add--interactive.perl:1455 +#: git-add--interactive.perl:1473 #, 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 +#: add-patch.c:127 git-add--interactive.perl:1456 +#: git-add--interactive.perl:1474 #, 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 +#: add-patch.c:128 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, 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 +#: add-patch.c:129 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -407,22 +407,22 @@ msgid "" "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 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, 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 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 #, 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 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 #, 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 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -436,22 +436,22 @@ msgid "" "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 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 #, 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 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 #, 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 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 #, 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 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -507,14 +507,14 @@ msgid "" "between its input and output lines." msgstr "" -#: add-patch.c:785 +#: add-patch.c:790 #, c-format msgid "" "expected context line #%d in\n" "%.*s" msgstr "" -#: add-patch.c:800 +#: add-patch.c:805 #, c-format msgid "" "hunks do not overlap:\n" @@ -523,11 +523,11 @@ msgid "" "%.*s" msgstr "" -#: add-patch.c:1076 git-add--interactive.perl:1117 +#: add-patch.c:1081 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" -#: add-patch.c:1080 +#: add-patch.c:1085 #, c-format msgid "" "---\n" @@ -537,18 +537,18 @@ msgid "" msgstr "" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1094 git-add--interactive.perl:1131 +#: add-patch.c:1099 git-add--interactive.perl:1129 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 +#: add-patch.c:1132 msgid "could not parse hunk header" msgstr "" -#: add-patch.c:1172 +#: add-patch.c:1177 msgid "'git apply --cached' failed" msgstr "" @@ -564,24 +564,24 @@ msgstr "" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1241 git-add--interactive.perl:1244 +#: add-patch.c:1246 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" -#: add-patch.c:1284 +#: add-patch.c:1289 msgid "The selected hunks do not apply to the index!" msgstr "" -#: add-patch.c:1285 git-add--interactive.perl:1348 +#: add-patch.c:1290 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "" -#: add-patch.c:1292 git-add--interactive.perl:1351 +#: add-patch.c:1297 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "" -#: add-patch.c:1349 +#: add-patch.c:1354 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -594,132 +594,132 @@ msgid "" "? - print help\n" msgstr "" -#: add-patch.c:1511 add-patch.c:1521 +#: add-patch.c:1516 add-patch.c:1526 msgid "No previous hunk" msgstr "" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1521 add-patch.c:1531 msgid "No next hunk" msgstr "" -#: add-patch.c:1532 +#: add-patch.c:1537 msgid "No other hunks to goto" msgstr "" -#: add-patch.c:1543 git-add--interactive.perl:1608 +#: add-patch.c:1548 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "" -#: add-patch.c:1544 git-add--interactive.perl:1610 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "" -#: add-patch.c:1555 +#: add-patch.c:1560 #, c-format msgid "Invalid number: '%s'" msgstr "" -#: add-patch.c:1560 +#: add-patch.c:1565 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "" msgstr[1] "" -#: add-patch.c:1569 +#: add-patch.c:1574 msgid "No other hunks to search" msgstr "" -#: add-patch.c:1575 git-add--interactive.perl:1663 +#: add-patch.c:1580 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "" -#: add-patch.c:1590 +#: add-patch.c:1595 #, c-format msgid "Malformed search regexp %s: %s" msgstr "" -#: add-patch.c:1607 +#: add-patch.c:1612 msgid "No hunk matches the given pattern" msgstr "" -#: add-patch.c:1614 +#: add-patch.c:1619 msgid "Sorry, cannot split this hunk" msgstr "" -#: add-patch.c:1618 +#: add-patch.c:1623 #, c-format msgid "Split into %d hunks." msgstr "" -#: add-patch.c:1622 +#: add-patch.c:1627 msgid "Sorry, cannot edit this hunk" msgstr "" -#: add-patch.c:1674 +#: add-patch.c:1679 msgid "'git apply' failed" msgstr "" -#: advice.c:140 +#: advice.c:143 #, c-format msgid "" "\n" "Disable this message with \"git config advice.%s false\"" msgstr "" -#: advice.c:156 +#: advice.c:159 #, c-format msgid "%shint: %.*s%s\n" msgstr "" -#: advice.c:247 +#: advice.c:250 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:249 +#: advice.c:252 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:251 +#: advice.c:254 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:253 +#: advice.c:256 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:255 +#: advice.c:258 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:257 +#: advice.c:260 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:265 +#: advice.c:268 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:273 +#: advice.c:276 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:278 builtin/merge.c:1349 +#: advice.c:281 builtin/merge.c:1370 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:280 +#: advice.c:283 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:281 +#: advice.c:284 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:287 +#: advice.c:290 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -979,7 +979,8 @@ msgstr "" msgid "cannot checkout %s" msgstr "" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213 +#: setup.c:308 #, c-format msgid "failed to read %s" msgstr "" @@ -999,7 +1000,7 @@ msgstr "" msgid "%s: does not exist in index" msgstr "" -#: apply.c:3537 apply.c:3708 apply.c:3953 +#: apply.c:3537 apply.c:3708 apply.c:3952 #, c-format msgid "%s: does not match index" msgstr "" @@ -1058,301 +1059,301 @@ msgstr "" msgid "%s: already exists in index" msgstr "" -#: apply.c:3956 +#: apply.c:3954 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3976 +#: apply.c:3974 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3981 +#: apply.c:3979 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:4001 +#: apply.c:3999 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:4005 +#: apply.c:4003 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:4020 +#: apply.c:4018 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4112 +#: apply.c:4110 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4119 +#: apply.c:4117 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4122 +#: apply.c:4120 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4131 +#: apply.c:4129 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4141 +#: apply.c:4139 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4279 +#: apply.c:4277 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4313 +#: apply.c:4311 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4319 +#: apply.c:4317 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4327 +#: apply.c:4325 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4333 apply.c:4478 +#: apply.c:4331 apply.c:4476 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4376 builtin/bisect--helper.c:537 +#: apply.c:4374 builtin/bisect--helper.c:523 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4380 +#: apply.c:4378 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4450 +#: apply.c:4448 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4548 +#: apply.c:4546 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4556 +#: apply.c:4554 msgid "internal error" msgstr "" -#: apply.c:4559 +#: apply.c:4557 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4570 +#: apply.c:4568 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 +#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4592 +#: apply.c:4590 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4596 +#: apply.c:4594 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4715 +#: apply.c:4718 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4723 +#: apply.c:4726 msgid "unrecognized input" msgstr "" -#: apply.c:4743 +#: apply.c:4746 msgid "unable to read index file" msgstr "" -#: apply.c:4900 +#: apply.c:4903 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4927 +#: apply.c:4930 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4933 apply.c:4948 +#: apply.c:4936 apply.c:4951 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4941 +#: apply.c:4944 #, 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:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "" -#: apply.c:4985 +#: apply.c:4988 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4988 +#: apply.c:4991 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4990 builtin/am.c:2279 +#: apply.c:4993 builtin/am.c:2266 msgid "num" msgstr "" -#: apply.c:4991 +#: apply.c:4994 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: apply.c:4994 +#: apply.c:4997 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4996 +#: apply.c:4999 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:5000 +#: apply.c:5003 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:5002 +#: apply.c:5005 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:5004 +#: apply.c:5007 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:5006 +#: apply.c:5009 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:5008 +#: apply.c:5011 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:5010 +#: apply.c:5013 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:5012 +#: apply.c:5015 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:5015 +#: apply.c:5018 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:5017 +#: apply.c:5020 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:5019 +#: apply.c:5022 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 +#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:5024 +#: apply.c:5027 msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 +#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 +#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 msgid "action" msgstr "" -#: apply.c:5026 +#: apply.c:5029 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:5029 apply.c:5032 +#: apply.c:5032 apply.c:5035 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:5035 +#: apply.c:5038 msgid "apply the patch in reverse" msgstr "" -#: apply.c:5037 +#: apply.c:5040 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:5039 +#: apply.c:5042 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5041 +#: apply.c:5044 msgid "allow overlapping hunks" msgstr "" -#: 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 +#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 +#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" -#: apply.c:5044 +#: apply.c:5047 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5047 +#: apply.c:5050 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5049 builtin/am.c:2267 +#: apply.c:5052 builtin/am.c:2254 msgid "root" msgstr "" -#: apply.c:5050 +#: apply.c:5053 msgid "prepend <root> to all filenames" msgstr "" @@ -1366,16 +1367,16 @@ msgstr "" msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "" -#: archive-tar.c:449 +#: archive-tar.c:450 #, c-format msgid "unable to start '%s' filter" msgstr "" -#: archive-tar.c:452 +#: archive-tar.c:453 msgid "unable to redirect descriptor" msgstr "" -#: archive-tar.c:459 +#: archive-tar.c:460 #, c-format msgid "'%s' filter reported error" msgstr "" @@ -1422,14 +1423,14 @@ msgstr "" 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 +#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 +#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1139 #, c-format msgid "could not read '%s'" msgstr "" -#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 +#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -1463,160 +1464,152 @@ msgstr "" msgid "Not a regular file: %s" msgstr "" -#: archive.c:553 +#: archive.c:555 msgid "fmt" msgstr "" -#: archive.c:553 +#: archive.c:555 msgid "archive format" msgstr "" -#: archive.c:554 builtin/log.c:1760 +#: archive.c:556 builtin/log.c:1764 msgid "prefix" msgstr "" -#: archive.c:555 +#: archive.c:557 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: 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 +#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 +#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 +#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 +#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "" -#: archive.c:557 +#: archive.c:559 msgid "add untracked file to archive" msgstr "" -#: archive.c:560 builtin/archive.c:90 +#: archive.c:562 builtin/archive.c:90 msgid "write the archive to this file" msgstr "" -#: archive.c:562 -msgid "read .gitattributes in working directory" -msgstr "" - -#: archive.c:563 -msgid "report archived files on stderr" -msgstr "" - #: archive.c:564 -msgid "store only" +msgid "read .gitattributes in working directory" msgstr "" #: archive.c:565 -msgid "compress faster" +msgid "report archived files on stderr" msgstr "" -#: archive.c:573 -msgid "compress better" +#: archive.c:567 +msgid "set compression level" msgstr "" -#: archive.c:576 +#: archive.c:570 msgid "list supported archive formats" msgstr "" -#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 #: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "" -#: archive.c:579 builtin/archive.c:92 +#: archive.c:573 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 #: builtin/notes.c:498 msgid "command" msgstr "" -#: archive.c:581 builtin/archive.c:94 +#: archive.c:575 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:588 +#: archive.c:582 msgid "Unexpected option --remote" msgstr "" -#: archive.c:590 +#: archive.c:584 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:592 +#: archive.c:586 msgid "Unexpected option --output" msgstr "" -#: archive.c:594 +#: archive.c:588 msgid "Options --add-file and --remote cannot be used together" msgstr "" -#: archive.c:616 +#: archive.c:610 #, c-format msgid "Unknown archive format '%s'" msgstr "" -#: archive.c:623 +#: archive.c:619 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "" -#: attr.c:212 +#: attr.c:202 #, c-format msgid "%.*s is not a valid attribute name" msgstr "" -#: attr.c:369 +#: attr.c:359 #, c-format msgid "%s not allowed: %s:%d" msgstr "" -#: attr.c:409 +#: attr.c:399 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -#: bisect.c:476 +#: bisect.c:489 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" -#: bisect.c:686 +#: bisect.c:699 #, c-format msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:753 +#: bisect.c:766 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:778 +#: bisect.c:791 #, 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:783 +#: bisect.c:796 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:788 +#: bisect.c:801 #, 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:796 +#: bisect.c:809 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1624,7 +1617,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:809 +#: bisect.c:822 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1632,43 +1625,43 @@ msgid "" "We continue anyway." msgstr "" -#: bisect.c:848 +#: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:898 +#: bisect.c:911 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:974 builtin/merge.c:150 +#: bisect.c:987 builtin/merge.c:153 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:1014 +#: bisect.c:1027 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:1044 +#: bisect.c:1057 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:1053 +#: bisect.c:1066 #, c-format msgid "" "No testable commit found.\n" -"Maybe you started with bad path parameters?\n" +"Maybe you started with bad path arguments?\n" msgstr "" -#: bisect.c:1082 +#: bisect.c:1095 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1678,44 +1671,44 @@ msgstr[1] "" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1088 +#: bisect.c:1101 #, 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:2778 +#: blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:2792 +#: blame.c:2791 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:2813 +#: blame.c:2812 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: 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 +#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146 +#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 +#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 +#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 +#: builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "" -#: blame.c:2840 +#: blame.c:2839 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:2851 +#: blame.c:2850 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:2862 +#: blame.c:2861 #, c-format msgid "cannot read blob %s for path %s" msgstr "" @@ -1864,7 +1857,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" @@ -1908,306 +1901,309 @@ msgstr "" msgid "pack-objects died" msgstr "" -#: bundle.c:379 -msgid "rev-list died" -msgstr "" - -#: bundle.c:428 +#: bundle.c:386 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:498 +#: bundle.c:490 #, c-format msgid "unsupported bundle version %d" msgstr "" -#: bundle.c:500 +#: bundle.c:492 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "" -#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:530 +#: bundle.c:539 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:540 +#: bundle.c:549 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:565 +#: bundle.c:574 msgid "index-pack died" msgstr "" +#: chunk-format.c:113 +msgid "terminating chunk id appears earlier than expected" +msgstr "" + +#: chunk-format.c:122 +#, c-format +msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" +msgstr "" + +#: chunk-format.c:129 +#, c-format +msgid "duplicate chunk ID %<PRIx32> found" +msgstr "" + +#: chunk-format.c:143 +#, c-format +msgid "final chunk has non-zero id %<PRIx32>" +msgstr "" + #: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "" -#: commit-graph.c:188 midx.c:46 +#: commit-graph.c:197 midx.c:46 msgid "invalid hash version" msgstr "" -#: commit-graph.c:246 +#: commit-graph.c:255 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:311 +#: commit-graph.c:348 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" -#: commit-graph.c:318 +#: commit-graph.c:355 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "" -#: commit-graph.c:325 +#: commit-graph.c:362 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" -#: commit-graph.c:342 +#: commit-graph.c:379 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "" -#: commit-graph.c:361 -#, c-format -msgid "commit-graph improper chunk offset %08x%08x" -msgstr "" - -#: commit-graph.c:433 -#, c-format -msgid "commit-graph chunk id %08x appears multiple times" -msgstr "" - -#: commit-graph.c:499 +#: commit-graph.c:472 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:509 +#: commit-graph.c:482 msgid "commit-graph chain does not match" msgstr "" -#: commit-graph.c:557 +#: commit-graph.c:530 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:581 +#: commit-graph.c:554 msgid "unable to find all commit-graph files" msgstr "" -#: commit-graph.c:721 commit-graph.c:785 +#: commit-graph.c:735 commit-graph.c:772 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:742 +#: commit-graph.c:756 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:1042 builtin/am.c:1306 +#: commit-graph.c:789 +msgid "commit-graph requires overflow generation data but has none" +msgstr "" + +#: commit-graph.c:1065 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "" -#: commit-graph.c:1265 builtin/pack-objects.c:2864 +#: commit-graph.c:1327 builtin/pack-objects.c:2872 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:1301 +#: commit-graph.c:1358 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1318 +#: commit-graph.c:1375 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1338 +#: commit-graph.c:1395 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1357 +#: commit-graph.c:1414 +msgid "Computing commit graph topological levels" +msgstr "" + +#: commit-graph.c:1467 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1424 +#: commit-graph.c:1548 msgid "Computing commit changed paths Bloom filters" msgstr "" -#: commit-graph.c:1501 +#: commit-graph.c:1625 msgid "Collecting referenced commits" msgstr "" -#: commit-graph.c:1526 +#: commit-graph.c:1650 #, 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:1539 +#: commit-graph.c:1663 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:1543 +#: commit-graph.c:1667 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:1582 +#: commit-graph.c:1704 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:1597 -msgid "Counting distinct commits in commit graph" -msgstr "" - -#: commit-graph.c:1629 +#: commit-graph.c:1722 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1678 +#: commit-graph.c:1771 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1720 midx.c:826 +#: commit-graph.c:1802 midx.c:794 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: commit-graph.c:1733 +#: commit-graph.c:1815 msgid "unable to create temporary graph layer" msgstr "" -#: commit-graph.c:1738 +#: commit-graph.c:1820 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "" -#: commit-graph.c:1808 +#: commit-graph.c:1879 #, 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:1853 +#: commit-graph.c:1915 msgid "unable to open commit-graph chain file" msgstr "" -#: commit-graph.c:1869 +#: commit-graph.c:1931 msgid "failed to rename base commit-graph file" msgstr "" -#: commit-graph.c:1889 +#: commit-graph.c:1951 msgid "failed to rename temporary commit-graph file" msgstr "" -#: commit-graph.c:2015 +#: commit-graph.c:2084 msgid "Scanning merged commits" msgstr "" -#: commit-graph.c:2026 -#, c-format -msgid "unexpected duplicate commit id %s" -msgstr "" - -#: commit-graph.c:2049 +#: commit-graph.c:2128 msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:2259 -#, c-format -msgid "the commit graph format cannot write %d commits" +#: commit-graph.c:2235 +msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" -#: commit-graph.c:2270 +#: commit-graph.c:2342 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:2363 +#: commit-graph.c:2440 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:2373 +#: commit-graph.c:2450 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:2383 commit-graph.c:2398 +#: commit-graph.c:2460 commit-graph.c:2475 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:2390 +#: commit-graph.c:2467 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:2408 +#: commit-graph.c:2485 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2423 +#: commit-graph.c:2500 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2430 +#: commit-graph.c:2507 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2440 +#: commit-graph.c:2517 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2449 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2463 +#: commit-graph.c:2540 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2468 +#: commit-graph.c:2545 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2472 +#: commit-graph.c:2549 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2488 +#: commit-graph.c:2566 #, c-format -msgid "commit-graph generation for commit %s is %u != %u" +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" msgstr "" -#: commit-graph.c:2494 +#: commit-graph.c:2572 #, 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 +#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "" @@ -2229,27 +2225,27 @@ msgid "" "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1172 +#: commit.c:1223 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: commit.c:1176 +#: commit.c:1227 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: commit.c:1179 +#: commit.c:1230 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: commit.c:1182 +#: commit.c:1233 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: commit.c:1436 +#: commit.c:1487 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" @@ -2260,7 +2256,7 @@ msgstr "" msgid "memory exhausted" msgstr "" -#: config.c:125 +#: config.c:126 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2270,289 +2266,333 @@ msgid "" "This might be due to circular includes." msgstr "" -#: config.c:141 +#: config.c:142 #, c-format msgid "could not expand include path '%s'" msgstr "" -#: config.c:152 +#: config.c:153 msgid "relative config includes must come from files" msgstr "" -#: config.c:198 +#: config.c:199 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:378 +#: config.c:396 +#, c-format +msgid "invalid config format: %s" +msgstr "" + +#: config.c:400 +#, c-format +msgid "missing environment variable name for configuration '%.*s'" +msgstr "" + +#: config.c:405 +#, c-format +msgid "missing environment variable '%s' for configuration '%.*s'" +msgstr "" + +#: config.c:442 #, c-format msgid "key does not contain a section: %s" msgstr "" -#: config.c:384 +#: config.c:448 #, c-format msgid "key does not contain variable name: %s" msgstr "" -#: config.c:408 sequencer.c:2547 +#: config.c:472 sequencer.c:2588 #, c-format msgid "invalid key: %s" msgstr "" -#: config.c:414 +#: config.c:478 #, c-format msgid "invalid key (newline): %s" msgstr "" -#: config.c:450 config.c:462 +#: config.c:511 +msgid "empty config key" +msgstr "" + +#: config.c:529 config.c:541 #, c-format msgid "bogus config parameter: %s" msgstr "" -#: config.c:497 +#: config.c:555 config.c:572 config.c:579 config.c:588 #, c-format msgid "bogus format in %s" msgstr "" -#: config.c:836 +#: config.c:622 +#, c-format +msgid "bogus count in %s" +msgstr "" + +#: config.c:626 +#, c-format +msgid "too many entries in %s" +msgstr "" + +#: config.c:636 +#, c-format +msgid "missing config key %s" +msgstr "" + +#: config.c:644 +#, c-format +msgid "missing config value %s" +msgstr "" + +#: config.c:995 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:840 +#: config.c:999 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:844 +#: config.c:1003 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:848 +#: config.c:1007 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:852 +#: config.c:1011 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:856 +#: config.c:1015 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:993 +#: config.c:1152 msgid "out of range" msgstr "" -#: config.c:993 +#: config.c:1152 msgid "invalid unit" msgstr "" -#: config.c:994 +#: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:1013 +#: config.c:1163 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:1016 +#: config.c:1166 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:1019 +#: config.c:1169 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:1022 +#: config.c:1172 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:1025 +#: config.c:1175 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:1028 +#: config.c:1178 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:1123 +#: config.c:1194 +#, c-format +msgid "bad boolean config value '%s' for '%s'" +msgstr "" + +#: config.c:1289 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:1132 +#: config.c:1298 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "" -#: config.c:1223 +#: config.c:1391 #, c-format msgid "abbrev length out of range: %d" msgstr "" -#: config.c:1237 config.c:1248 +#: config.c:1405 config.c:1416 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1340 +#: config.c:1508 msgid "core.commentChar should only be one character" msgstr "" -#: config.c:1373 +#: config.c:1541 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1445 +#: config.c:1613 #, c-format msgid "malformed value for %s" msgstr "" -#: config.c:1471 +#: config.c:1639 #, c-format msgid "malformed value for %s: %s" msgstr "" -#: config.c:1472 +#: config.c:1640 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1533 builtin/pack-objects.c:3649 +#: config.c:1701 builtin/pack-objects.c:3666 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1655 +#: config.c:1823 #, c-format msgid "unable to load config blob object '%s'" msgstr "" -#: config.c:1658 +#: config.c:1826 #, c-format msgid "reference '%s' does not point to a blob" msgstr "" -#: config.c:1675 +#: config.c:1843 #, c-format msgid "unable to resolve config blob '%s'" msgstr "" -#: config.c:1705 +#: config.c:1873 #, c-format msgid "failed to parse %s" msgstr "" -#: config.c:1759 +#: config.c:1927 msgid "unable to parse command-line config" msgstr "" -#: config.c:2122 +#: config.c:2290 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2296 +#: config.c:2464 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2341 +#: config.c:2509 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2387 +#: config.c:2555 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2389 +#: config.c:2557 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2470 +#: config.c:2641 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2502 +#: config.c:2673 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2531 +#: config.c:2702 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2783 config.c:3107 +#: config.c:2954 config.c:3280 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2794 +#: config.c:2965 #, c-format msgid "opening %s" msgstr "" -#: config.c:2829 builtin/config.c:354 +#: config.c:3002 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:2854 +#: config.c:3027 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:2867 config.c:3120 +#: config.c:3040 config.c:3293 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2878 +#: config.c:3051 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:2887 config.c:3125 +#: config.c:3060 config.c:3298 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:2972 config.c:3222 +#: config.c:3145 config.c:3395 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:3006 +#: config.c:3179 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 +#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "" -#: config.c:3098 +#: config.c:3271 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3265 +#: config.c:3438 #, c-format msgid "missing value for '%s'" msgstr "" @@ -2610,52 +2650,52 @@ msgstr "" msgid "protocol error: unexpected '%s'" msgstr "" -#: connect.c:473 +#: connect.c:497 #, c-format msgid "unknown object format '%s' specified by server" msgstr "" -#: connect.c:500 +#: connect.c:526 #, c-format msgid "invalid ls-refs response: %s" msgstr "" -#: connect.c:504 +#: connect.c:530 msgid "expected flush after ref listing" msgstr "" -#: connect.c:507 +#: connect.c:533 msgid "expected response end packet after ref listing" msgstr "" -#: connect.c:640 +#: connect.c:666 #, c-format msgid "protocol '%s' is not supported" msgstr "" -#: connect.c:691 +#: connect.c:717 msgid "unable to set SO_KEEPALIVE on socket" msgstr "" -#: connect.c:731 connect.c:794 +#: connect.c:757 connect.c:820 #, c-format msgid "Looking up %s ... " msgstr "" -#: connect.c:735 +#: connect.c:761 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:739 connect.c:810 +#: connect.c:765 connect.c:836 #, c-format msgid "" "done.\n" "Connecting to %s (port %s) ... " msgstr "" -#: connect.c:761 connect.c:838 +#: connect.c:787 connect.c:864 #, c-format msgid "" "unable to connect to %s:\n" @@ -2663,61 +2703,65 @@ msgid "" msgstr "" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:767 connect.c:844 +#: connect.c:793 connect.c:870 msgid "done." msgstr "" -#: connect.c:798 +#: connect.c:824 #, c-format msgid "unable to look up %s (%s)" msgstr "" -#: connect.c:804 +#: connect.c:830 #, c-format msgid "unknown port %s" msgstr "" -#: connect.c:941 connect.c:1271 +#: connect.c:967 connect.c:1299 #, c-format msgid "strange hostname '%s' blocked" msgstr "" -#: connect.c:943 +#: connect.c:969 #, c-format msgid "strange port '%s' blocked" msgstr "" -#: connect.c:953 +#: connect.c:979 #, c-format msgid "cannot start proxy %s" msgstr "" -#: connect.c:1024 +#: connect.c:1050 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" -#: connect.c:1219 +#: connect.c:1190 +msgid "newline is forbidden in git:// hosts and repo paths" +msgstr "" + +#: connect.c:1247 msgid "ssh variant 'simple' does not support -4" msgstr "" -#: connect.c:1231 +#: connect.c:1259 msgid "ssh variant 'simple' does not support -6" msgstr "" -#: connect.c:1248 +#: connect.c:1276 msgid "ssh variant 'simple' does not support setting port" msgstr "" -#: connect.c:1360 +#: connect.c:1388 #, c-format msgid "strange pathname '%s' blocked" msgstr "" -#: connect.c:1408 +#: connect.c:1436 msgid "unable to fork" msgstr "" -#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 msgid "Checking connectivity" msgstr "" @@ -2970,6 +3014,31 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "" +#: diff-merges.c:70 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "" + +#: diff-lib.c:534 +msgid "--merge-base does not work with ranges" +msgstr "" + +#: diff-lib.c:536 +msgid "--merge-base only works with commits" +msgstr "" + +#: diff-lib.c:553 +msgid "unable to get HEAD" +msgstr "" + +#: diff-lib.c:560 +msgid "no merge base found" +msgstr "" + +#: diff-lib.c:562 +msgid "multiple merge bases found" +msgstr "" + #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "" @@ -3021,523 +3090,544 @@ msgid "" "%s" msgstr "" -#: diff.c:4269 +#: diff.c:4276 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4618 +#: diff.c:4628 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4621 +#: diff.c:4631 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4699 +#: diff.c:4710 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4747 +#: diff.c:4758 #, c-format msgid "invalid --stat value: %s" msgstr "" -#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "" -#: diff.c:4784 +#: diff.c:4795 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4869 +#: diff.c:4880 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4893 +#: diff.c:4904 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4907 +#: diff.c:4918 #, c-format msgid "unable to resolve '%s'" msgstr "" -#: diff.c:4957 diff.c:4963 +#: diff.c:4968 diff.c:4974 #, c-format msgid "%s expects <n>/<m> form" msgstr "" -#: diff.c:4975 +#: diff.c:4986 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:4996 +#: diff.c:5007 #, c-format msgid "bad --color-moved argument: %s" msgstr "" -#: diff.c:5015 +#: diff.c:5026 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: diff.c:5055 +#: diff.c:5066 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5091 diff.c:5111 +#: diff.c:5102 diff.c:5122 #, c-format msgid "invalid argument to %s" msgstr "" -#: diff.c:5248 +#: diff.c:5226 +#, c-format +msgid "invalid regex given to -I: '%s'" +msgstr "" + +#: diff.c:5275 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5304 +#: diff.c:5331 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5327 +#: diff.c:5367 msgid "Diff output format options" msgstr "" -#: diff.c:5329 diff.c:5335 +#: diff.c:5369 diff.c:5375 msgid "generate patch" msgstr "" -#: diff.c:5332 builtin/log.c:176 +#: diff.c:5372 builtin/log.c:179 msgid "suppress diff output" msgstr "" -#: diff.c:5337 diff.c:5451 diff.c:5458 +#: diff.c:5377 diff.c:5491 diff.c:5498 msgid "<n>" msgstr "" -#: diff.c:5338 diff.c:5341 +#: diff.c:5378 diff.c:5381 msgid "generate diffs with <n> lines context" msgstr "" -#: diff.c:5343 +#: diff.c:5383 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5346 +#: diff.c:5386 msgid "synonym for '-p --raw'" msgstr "" -#: diff.c:5350 +#: diff.c:5390 msgid "synonym for '-p --stat'" msgstr "" -#: diff.c:5354 +#: diff.c:5394 msgid "machine friendly --stat" msgstr "" -#: diff.c:5357 +#: diff.c:5397 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5359 diff.c:5367 +#: diff.c:5399 diff.c:5407 msgid "<param1,param2>..." msgstr "" -#: diff.c:5360 +#: diff.c:5400 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5364 +#: diff.c:5404 msgid "synonym for --dirstat=cumulative" msgstr "" -#: diff.c:5368 +#: diff.c:5408 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5372 +#: diff.c:5412 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5375 +#: diff.c:5415 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5378 +#: diff.c:5418 msgid "show only names of changed files" msgstr "" -#: diff.c:5381 +#: diff.c:5421 msgid "show only names and status of changed files" msgstr "" -#: diff.c:5383 +#: diff.c:5423 msgid "<width>[,<name-width>[,<count>]]" msgstr "" -#: diff.c:5384 +#: diff.c:5424 msgid "generate diffstat" msgstr "" -#: diff.c:5386 diff.c:5389 diff.c:5392 +#: diff.c:5426 diff.c:5429 diff.c:5432 msgid "<width>" msgstr "" -#: diff.c:5387 +#: diff.c:5427 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5390 +#: diff.c:5430 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5393 +#: diff.c:5433 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5395 +#: diff.c:5435 msgid "<count>" msgstr "" -#: diff.c:5396 +#: diff.c:5436 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5399 +#: diff.c:5439 msgid "generate compact summary in diffstat" msgstr "" -#: diff.c:5402 +#: diff.c:5442 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5405 +#: diff.c:5445 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5407 +#: diff.c:5447 msgid "show colored diff" msgstr "" -#: diff.c:5408 +#: diff.c:5448 msgid "<kind>" msgstr "" -#: diff.c:5409 +#: diff.c:5449 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5412 +#: diff.c:5452 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 +#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 msgid "<prefix>" msgstr "" -#: diff.c:5416 +#: diff.c:5456 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5419 +#: diff.c:5459 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5422 +#: diff.c:5462 msgid "prepend an additional prefix to every line of output" msgstr "" -#: diff.c:5425 +#: diff.c:5465 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5428 +#: diff.c:5468 msgid "show context between diff hunks up to the specified number of lines" msgstr "" -#: diff.c:5432 diff.c:5437 diff.c:5442 +#: diff.c:5472 diff.c:5477 diff.c:5482 msgid "<char>" msgstr "" -#: diff.c:5433 +#: diff.c:5473 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5438 +#: diff.c:5478 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5443 +#: diff.c:5483 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5446 +#: diff.c:5486 msgid "Diff rename options" msgstr "" -#: diff.c:5447 +#: diff.c:5487 msgid "<n>[/<m>]" msgstr "" -#: diff.c:5448 +#: diff.c:5488 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5452 +#: diff.c:5492 msgid "detect renames" msgstr "" -#: diff.c:5456 +#: diff.c:5496 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5459 +#: diff.c:5499 msgid "detect copies" msgstr "" -#: diff.c:5463 +#: diff.c:5503 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5465 +#: diff.c:5505 msgid "disable rename detection" msgstr "" -#: diff.c:5468 +#: diff.c:5508 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5470 +#: diff.c:5510 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5473 +#: diff.c:5513 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5475 +#: diff.c:5515 msgid "Diff algorithm options" msgstr "" -#: diff.c:5477 +#: diff.c:5517 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5480 +#: diff.c:5520 msgid "ignore whitespace when comparing lines" msgstr "" -#: diff.c:5483 +#: diff.c:5523 msgid "ignore changes in amount of whitespace" msgstr "" -#: diff.c:5486 +#: diff.c:5526 msgid "ignore changes in whitespace at EOL" msgstr "" -#: diff.c:5489 +#: diff.c:5529 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5492 +#: diff.c:5532 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5495 +#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 +msgid "<regex>" +msgstr "" + +#: diff.c:5535 +msgid "ignore changes whose all lines match <regex>" +msgstr "" + +#: diff.c:5538 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5498 +#: diff.c:5541 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5502 +#: diff.c:5545 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5504 +#: diff.c:5547 msgid "<algorithm>" msgstr "" -#: diff.c:5505 +#: diff.c:5548 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5507 +#: diff.c:5550 msgid "<text>" msgstr "" -#: diff.c:5508 +#: diff.c:5551 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5510 diff.c:5519 diff.c:5522 +#: diff.c:5553 diff.c:5562 diff.c:5565 msgid "<mode>" msgstr "" -#: diff.c:5511 +#: diff.c:5554 msgid "show word diff, using <mode> to delimit changed words" msgstr "" -#: diff.c:5513 diff.c:5516 diff.c:5561 -msgid "<regex>" -msgstr "" - -#: diff.c:5514 +#: diff.c:5557 msgid "use <regex> to decide what a word is" msgstr "" -#: diff.c:5517 +#: diff.c:5560 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" -#: diff.c:5520 +#: diff.c:5563 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5523 +#: diff.c:5566 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5526 +#: diff.c:5569 msgid "Other diff options" msgstr "" -#: diff.c:5528 +#: diff.c:5571 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5532 +#: diff.c:5575 msgid "treat all files as text" msgstr "" -#: diff.c:5534 +#: diff.c:5577 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5536 +#: diff.c:5579 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5538 +#: diff.c:5581 msgid "disable all output of the program" msgstr "" -#: diff.c:5540 +#: diff.c:5583 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5542 +#: diff.c:5585 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5544 +#: diff.c:5587 msgid "<when>" msgstr "" -#: diff.c:5545 +#: diff.c:5588 msgid "ignore changes to submodules in the diff generation" msgstr "" -#: diff.c:5548 +#: diff.c:5591 msgid "<format>" msgstr "" -#: diff.c:5549 +#: diff.c:5592 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5553 +#: diff.c:5596 msgid "hide 'git add -N' entries from the index" msgstr "" -#: diff.c:5556 +#: diff.c:5599 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5558 +#: diff.c:5601 msgid "<string>" msgstr "" -#: diff.c:5559 +#: diff.c:5602 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5562 +#: diff.c:5605 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5565 +#: diff.c:5608 msgid "show all changes in the changeset with -S or -G" msgstr "" -#: diff.c:5568 +#: diff.c:5611 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" -#: diff.c:5571 +#: diff.c:5614 msgid "control the order in which files appear in the output" msgstr "" -#: diff.c:5572 +#: diff.c:5615 diff.c:5618 +msgid "<path>" +msgstr "" + +#: diff.c:5616 +msgid "show the change in the specified path first" +msgstr "" + +#: diff.c:5619 +msgid "skip the output to the specified path" +msgstr "" + +#: diff.c:5621 msgid "<object-id>" msgstr "" -#: diff.c:5573 +#: diff.c:5622 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5575 +#: diff.c:5624 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5576 +#: diff.c:5625 msgid "select files by diff type" msgstr "" -#: diff.c:5578 +#: diff.c:5627 msgid "<file>" msgstr "" -#: diff.c:5579 +#: diff.c:5628 msgid "Output to a specific file" msgstr "" -#: diff.c:6236 +#: diff.c:6285 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:6239 +#: diff.c:6288 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:6242 +#: diff.c:6291 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3548,10 +3638,15 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:592 +#: diffcore-rename.c:786 msgid "Performing inexact rename detection" msgstr "" +#: diffcore-rotate.c:29 +#, c-format +msgid "No such path '%s' in the diff" +msgstr "" + #: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" @@ -3594,17 +3689,17 @@ msgstr "" msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3520 +#: dir.c:3534 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3565 dir.c:3570 +#: dir.c:3579 dir.c:3584 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3599 +#: dir.c:3613 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" @@ -3623,12 +3718,12 @@ msgstr "" msgid "could not stat file '%s'" msgstr "" -#: environment.c:150 +#: environment.c:152 #, c-format msgid "bad git namespace path \"%s\"" msgstr "" -#: environment.c:337 +#: environment.c:335 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "" @@ -3638,259 +3733,263 @@ msgstr "" msgid "too many args to run %s" msgstr "" -#: fetch-pack.c:176 +#: fetch-pack.c:177 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:179 +#: fetch-pack.c:180 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" -#: fetch-pack.c:190 +#: fetch-pack.c:191 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" -#: fetch-pack.c:210 +#: fetch-pack.c:211 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:221 +#: fetch-pack.c:222 msgid "unable to write to remote" msgstr "" -#: fetch-pack.c:282 +#: fetch-pack.c:283 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:375 fetch-pack.c:1397 +#: fetch-pack.c:378 fetch-pack.c:1457 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:381 fetch-pack.c:1403 +#: fetch-pack.c:384 fetch-pack.c:1463 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:383 fetch-pack.c:1405 +#: fetch-pack.c:386 fetch-pack.c:1465 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:386 fetch-pack.c:1408 +#: fetch-pack.c:389 fetch-pack.c:1468 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:388 fetch-pack.c:1410 +#: fetch-pack.c:391 fetch-pack.c:1470 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:391 fetch-pack.c:1414 +#: fetch-pack.c:394 fetch-pack.c:1474 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:448 +#: fetch-pack.c:451 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:479 +#: fetch-pack.c:482 msgid "giving up" msgstr "" -#: fetch-pack.c:492 progress.c:339 +#: fetch-pack.c:495 progress.c:339 msgid "done" msgstr "" -#: fetch-pack.c:504 +#: fetch-pack.c:507 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:540 +#: fetch-pack.c:543 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:755 +#: fetch-pack.c:758 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:824 +#: fetch-pack.c:844 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:832 +#: fetch-pack.c:852 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:916 +#: fetch-pack.c:946 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:933 +#: fetch-pack.c:952 +msgid "fetch-pack: invalid index-pack output" +msgstr "" + +#: fetch-pack.c:969 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:935 +#: fetch-pack.c:971 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:978 +#: fetch-pack.c:1031 #, c-format msgid "Server version is %.*s" msgstr "" -#: 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 +#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054 +#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 +#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 +#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108 #, c-format msgid "Server supports %s" msgstr "" -#: fetch-pack.c:985 +#: fetch-pack.c:1041 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:1045 +#: fetch-pack.c:1101 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:1050 +#: fetch-pack.c:1106 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:1054 +#: fetch-pack.c:1110 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1056 +#: fetch-pack.c:1112 msgid "Server does not support this repository's object format" msgstr "" -#: fetch-pack.c:1069 +#: fetch-pack.c:1125 msgid "no common commits" msgstr "" -#: fetch-pack.c:1081 fetch-pack.c:1619 +#: fetch-pack.c:1138 fetch-pack.c:1682 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1205 +#: fetch-pack.c:1265 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "" -#: fetch-pack.c:1209 +#: fetch-pack.c:1269 #, c-format msgid "the server does not support algorithm '%s'" msgstr "" -#: fetch-pack.c:1229 +#: fetch-pack.c:1289 msgid "Server does not support shallow requests" msgstr "" -#: fetch-pack.c:1236 +#: fetch-pack.c:1296 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:1275 +#: fetch-pack.c:1335 msgid "unable to write request to remote" msgstr "" -#: fetch-pack.c:1293 +#: fetch-pack.c:1353 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1299 +#: fetch-pack.c:1359 #, c-format msgid "expected '%s', received '%s'" msgstr "" -#: fetch-pack.c:1360 +#: fetch-pack.c:1420 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1365 +#: fetch-pack.c:1425 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1375 +#: fetch-pack.c:1435 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1377 +#: fetch-pack.c:1437 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1419 +#: fetch-pack.c:1479 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1466 +#: fetch-pack.c:1526 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" -#: fetch-pack.c:1471 +#: fetch-pack.c:1531 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" -#: fetch-pack.c:1476 +#: fetch-pack.c:1536 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1506 +#: fetch-pack.c:1566 msgid "git fetch-pack: expected response end packet" msgstr "" -#: fetch-pack.c:1887 +#: fetch-pack.c:1960 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1910 builtin/clone.c:692 +#: fetch-pack.c:1983 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "" -#: fetch-pack.c:1937 +#: fetch-pack.c:2010 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1940 +#: fetch-pack.c:2013 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" -#: gpg-interface.c:272 +#: gpg-interface.c:273 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:275 +#: gpg-interface.c:276 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" -#: gpg-interface.c:457 +#: gpg-interface.c:470 msgid "gpg failed to sign the data" msgstr "" @@ -3899,24 +3998,24 @@ msgstr "" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:668 +#: grep.c:543 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" msgstr "" -#: grep.c:2128 +#: grep.c:1906 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 +#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:2156 +#: grep.c:1934 #, c-format msgid "'%s': short read" msgstr "" @@ -3986,7 +4085,7 @@ msgstr "" msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:365 git.c:99 +#: help.c:365 git.c:100 #, c-format msgid "unsupported command listing type '%s'" msgstr "" @@ -4007,38 +4106,38 @@ msgstr "" msgid "Command aliases" msgstr "" -#: help.c:513 +#: help.c:527 #, 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:572 +#: help.c:543 help.c:631 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "" + +#: help.c:591 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:594 +#: help.c:613 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -#: help.c:599 +#: help.c:618 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:604 +#: help.c:623 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:612 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "" - -#: help.c:616 +#: help.c:635 msgid "" "\n" "The most similar command is" @@ -4048,16 +4147,16 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: help.c:656 +#: help.c:675 msgid "git version [<options>]" msgstr "" -#: help.c:711 +#: help.c:730 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:715 +#: help.c:734 msgid "" "\n" "Did you mean this?" @@ -4195,10 +4294,220 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "" -#: ls-refs.c:109 +#: ls-refs.c:37 +#, c-format +msgid "invalid value '%s' for lsrefs.unborn" +msgstr "" + +#: ls-refs.c:167 msgid "expected flush after ls-refs arguments" msgstr "" +#: merge-ort.c:888 merge-recursive.c:1191 +#, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "" + +#: merge-ort.c:897 merge-recursive.c:1198 +#, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "" + +#: merge-ort.c:906 merge-recursive.c:1205 +#, c-format +msgid "Failed to merge submodule %s (commits don't follow merge-base)" +msgstr "" + +#: merge-ort.c:916 merge-ort.c:923 +#, c-format +msgid "Note: Fast-forwarding submodule %s to %s" +msgstr "" + +#: merge-ort.c:944 +#, c-format +msgid "Failed to merge submodule %s" +msgstr "" + +#: merge-ort.c:951 +#, c-format +msgid "" +"Failed to merge submodule %s, but a possible merge resolution exists:\n" +"%s\n" +msgstr "" + +#: merge-ort.c:955 merge-recursive.c:1259 +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" + +#: merge-ort.c:968 +#, c-format +msgid "" +"Failed to merge submodule %s, but multiple possible merges exist:\n" +"%s" +msgstr "" + +#: merge-ort.c:1127 merge-recursive.c:1341 +msgid "Failed to execute internal merge" +msgstr "" + +#: merge-ort.c:1132 merge-recursive.c:1346 +#, c-format +msgid "Unable to add %s to database" +msgstr "" + +#: merge-ort.c:1139 merge-recursive.c:1378 +#, c-format +msgid "Auto-merging %s" +msgstr "" + +#: merge-ort.c:1278 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-ort.c:1288 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-ort.c:1471 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to rename %s to; it was " +"renamed to multiple other directories, with no destination getting a " +"majority of the files." +msgstr "" + +#: merge-ort.c:1637 merge-recursive.c:2447 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" + +#: merge-ort.c:1781 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-ort.c:1788 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-ort.c:1801 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-ort.c:1809 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-ort.c:1952 +#, c-format +msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." +msgstr "" + +#: merge-ort.c:2047 +#, c-format +msgid "" +"CONFLICT (rename involved in collision): rename of %s -> %s has content " +"conflicts AND collides with another path; this may result in nested conflict " +"markers." +msgstr "" + +#: merge-ort.c:2066 merge-ort.c:2090 +#, c-format +msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." +msgstr "" + +#: merge-ort.c:2735 +#, c-format +msgid "" +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " +"%s instead." +msgstr "" + +#: merge-ort.c:2808 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed %s " +"of them so each can be recorded somewhere." +msgstr "" + +#: merge-ort.c:2812 +msgid "both" +msgstr "" + +#: merge-ort.c:2812 +msgid "one" +msgstr "" + +#: merge-ort.c:2907 merge-recursive.c:3052 +msgid "content" +msgstr "" + +#: merge-ort.c:2909 merge-recursive.c:3056 +msgid "add/add" +msgstr "" + +#: merge-ort.c:2911 merge-recursive.c:3101 +msgid "submodule" +msgstr "" + +#: merge-ort.c:2913 merge-recursive.c:3102 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "" + +#: merge-ort.c:2938 +#, c-format +msgid "" +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " +"of %s left in tree." +msgstr "" + +#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge +#. base, and 2-3) the trees for the two trees we're merging. +#. +#: merge-ort.c:3406 +#, c-format +msgid "collecting merge info failed for trees %s, %s, %s" +msgstr "" + +#: merge-ort-wrappers.c:13 merge-recursive.c:3661 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" + +#: merge-ort-wrappers.c:33 merge-recursive.c:3436 +#, c-format +msgid "Already up to date!" +msgstr "" + #: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "" @@ -4257,21 +4566,6 @@ msgstr "" msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1191 -#, c-format -msgid "Failed to merge submodule %s (not checked out)" -msgstr "" - -#: merge-recursive.c:1198 -#, c-format -msgid "Failed to merge submodule %s (commits not present)" -msgstr "" - -#: merge-recursive.c:1205 -#, c-format -msgid "Failed to merge submodule %s (commits don't follow merge-base)" -msgstr "" - #: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" @@ -4296,36 +4590,11 @@ msgstr "" msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-recursive.c:1259 -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" - #: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" -#: merge-recursive.c:1341 -msgid "Failed to execute internal merge" -msgstr "" - -#: merge-recursive.c:1346 -#, c-format -msgid "Unable to add %s to database" -msgstr "" - -#: merge-recursive.c:1378 -#, c-format -msgid "Auto-merging %s" -msgstr "" - #: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." @@ -4416,20 +4685,6 @@ msgid "" "getting a majority of the files." msgstr "" -#: 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: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:2202 #, c-format msgid "" @@ -4437,13 +4692,6 @@ msgid "" ">%s in %s" msgstr "" -#: merge-recursive.c:2447 -#, c-format -msgid "" -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " -"renamed." -msgstr "" - #: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" @@ -4462,61 +4710,16 @@ msgstr "" msgid "modified" msgstr "" -#: merge-recursive.c:3052 -msgid "content" -msgstr "" - -#: merge-recursive.c:3056 -msgid "add/add" -msgstr "" - #: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:3101 -msgid "submodule" -msgstr "" - -#: merge-recursive.c:3102 -#, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "" - #: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "" -#: 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: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: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: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:3339 #, c-format msgid "Removing %s" @@ -4545,43 +4748,33 @@ msgstr "" msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3436 -msgid "Already up to date!" -msgstr "" - #: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3550 +#: merge-recursive.c:3539 msgid "Merging:" msgstr "" -#: merge-recursive.c:3563 +#: merge-recursive.c:3552 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3613 +#: merge-recursive.c:3602 msgid "merge returned no commit" msgstr "" -#: 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 +#: merge-recursive.c:3758 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 +#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 +#: builtin/stash.c:471 msgid "Unable to write index." msgstr "" @@ -4589,188 +4782,176 @@ msgstr "" 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 +#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 +#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "" -#: midx.c:79 +#: midx.c:62 +msgid "multi-pack-index OID fanout is of the wrong size" +msgstr "" + +#: midx.c:93 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:95 +#: midx.c:109 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:100 +#: midx.c:114 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" -#: midx.c:105 +#: midx.c:119 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "" -#: midx.c:122 -msgid "invalid chunk offset (too large)" -msgstr "" - -#: midx.c:146 -msgid "terminating multi-pack-index chunk id appears earlier than expected" -msgstr "" - -#: midx.c:159 +#: midx.c:136 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:161 +#: midx.c:138 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:163 +#: midx.c:140 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:165 +#: midx.c:142 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:179 +#: midx.c:158 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:222 +#: midx.c:202 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:272 +#: midx.c:252 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -#: midx.c:300 -msgid "error preparing packfile from multi-pack-index" -msgstr "" - -#: midx.c:485 +#: midx.c:467 #, c-format msgid "failed to add packfile '%s'" msgstr "" -#: midx.c:491 +#: midx.c:473 #, c-format msgid "failed to open pack-index '%s'" msgstr "" -#: midx.c:551 +#: midx.c:533 #, c-format msgid "failed to locate object %d in packfile" msgstr "" -#: midx.c:853 +#: midx.c:821 msgid "Adding packfiles to multi-pack-index" msgstr "" -#: midx.c:886 +#: midx.c:855 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:938 +#: midx.c:904 msgid "no pack files to index." msgstr "" -#: midx.c:990 -msgid "Writing chunks to multi-pack-index" -msgstr "" - -#: midx.c:1068 +#: midx.c:965 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" -#: midx.c:1124 +#: midx.c:1021 msgid "multi-pack-index file exists, but failed to parse" msgstr "" -#: midx.c:1132 +#: midx.c:1029 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1147 +#: midx.c:1044 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -#: midx.c:1152 +#: midx.c:1049 msgid "the midx contains no oid" msgstr "" -#: midx.c:1161 +#: midx.c:1058 msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1170 +#: midx.c:1067 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1190 +#: midx.c:1087 msgid "Sorting objects by packfile" msgstr "" -#: midx.c:1197 +#: midx.c:1094 msgid "Verifying object offsets" msgstr "" -#: midx.c:1213 +#: midx.c:1110 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" -#: midx.c:1219 +#: midx.c:1116 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" -#: midx.c:1228 +#: midx.c:1125 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" -#: midx.c:1253 +#: midx.c:1150 msgid "Counting referenced objects" msgstr "" -#: midx.c:1263 +#: midx.c:1160 msgid "Finding and deleting unreferenced packfiles" msgstr "" -#: midx.c:1454 +#: midx.c:1351 msgid "could not start pack-objects" msgstr "" -#: midx.c:1474 +#: midx.c:1371 msgid "could not finish pack-objects" msgstr "" -#: name-hash.c:537 +#: name-hash.c:538 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "" -#: name-hash.c:559 +#: name-hash.c:560 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "" -#: name-hash.c:565 +#: name-hash.c:566 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "" @@ -4811,6 +4992,342 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "" +#: object-file.c:480 +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "" + +#: object-file.c:531 +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "" + +#: object-file.c:603 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "" + +#: object-file.c:610 +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "" + +#: object-file.c:653 +msgid "unable to fdopen alternates lockfile" +msgstr "" + +#: object-file.c:671 +msgid "unable to read alternates file" +msgstr "" + +#: object-file.c:678 +msgid "unable to move new alternates file into place" +msgstr "" + +#: object-file.c:713 +#, c-format +msgid "path '%s' does not exist" +msgstr "" + +#: object-file.c:734 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "" + +#: object-file.c:740 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "" + +#: object-file.c:746 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "" + +#: object-file.c:754 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "" + +#: object-file.c:814 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "" + +#: object-file.c:964 +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "" + +#: object-file.c:985 +msgid "mmap failed" +msgstr "" + +#: object-file.c:1149 +#, c-format +msgid "object file %s is empty" +msgstr "" + +#: object-file.c:1284 object-file.c:2477 +#, c-format +msgid "corrupt loose object '%s'" +msgstr "" + +#: object-file.c:1286 object-file.c:2481 +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "" + +#: object-file.c:1328 +msgid "invalid object type" +msgstr "" + +#: object-file.c:1412 +#, c-format +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "" + +#: object-file.c:1415 +#, c-format +msgid "unable to unpack %s header" +msgstr "" + +#: object-file.c:1421 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "" + +#: object-file.c:1424 +#, c-format +msgid "unable to parse %s header" +msgstr "" + +#: object-file.c:1651 +#, c-format +msgid "failed to read object %s" +msgstr "" + +#: object-file.c:1655 +#, c-format +msgid "replacement %s not found for %s" +msgstr "" + +#: object-file.c:1659 +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "" + +#: object-file.c:1663 +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "" + +#: object-file.c:1768 +#, c-format +msgid "unable to write file %s" +msgstr "" + +#: object-file.c:1775 +#, c-format +msgid "unable to set permission to '%s'" +msgstr "" + +#: object-file.c:1782 +msgid "file write error" +msgstr "" + +#: object-file.c:1802 +msgid "error when closing loose object file" +msgstr "" + +#: object-file.c:1867 +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "" + +#: object-file.c:1869 +msgid "unable to create temporary file" +msgstr "" + +#: object-file.c:1893 +msgid "unable to write loose object file" +msgstr "" + +#: object-file.c:1899 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "" + +#: object-file.c:1903 +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "" + +#: object-file.c:1907 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "" + +#: object-file.c:1917 builtin/pack-objects.c:1097 +#, c-format +msgid "failed utime() on %s" +msgstr "" + +#: object-file.c:1994 +#, c-format +msgid "cannot read object for %s" +msgstr "" + +#: object-file.c:2045 +msgid "corrupt commit" +msgstr "" + +#: object-file.c:2053 +msgid "corrupt tag" +msgstr "" + +#: object-file.c:2153 +#, c-format +msgid "read error while indexing %s" +msgstr "" + +#: object-file.c:2156 +#, c-format +msgid "short read while indexing %s" +msgstr "" + +#: object-file.c:2229 object-file.c:2239 +#, c-format +msgid "%s: failed to insert into database" +msgstr "" + +#: object-file.c:2245 +#, c-format +msgid "%s: unsupported file type" +msgstr "" + +#: object-file.c:2269 +#, c-format +msgid "%s is not a valid object" +msgstr "" + +#: object-file.c:2271 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "" + +#: object-file.c:2298 builtin/index-pack.c:192 +#, c-format +msgid "unable to open %s" +msgstr "" + +#: object-file.c:2488 object-file.c:2541 +#, c-format +msgid "hash mismatch for %s (expected %s)" +msgstr "" + +#: object-file.c:2512 +#, c-format +msgid "unable to mmap %s" +msgstr "" + +#: object-file.c:2517 +#, c-format +msgid "unable to unpack header of %s" +msgstr "" + +#: object-file.c:2523 +#, c-format +msgid "unable to parse header of %s" +msgstr "" + +#: object-file.c:2534 +#, c-format +msgid "unable to unpack contents of %s" +msgstr "" + +#: object-name.c:486 +#, c-format +msgid "short object ID %s is ambiguous" +msgstr "" + +#: object-name.c:497 +msgid "The candidates are:" +msgstr "" + +#: object-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" +"may be created by mistake. For example,\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "" + +#: object-name.c:916 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "" + +#: object-name.c:924 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "" + +#: object-name.c:1702 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "" + +#: object-name.c:1708 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" + +#: object-name.c:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "" + +#: object-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 "" + +#: object-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 "" + +#: object-name.c:1769 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "" + +#: object-name.c:1771 +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "" + +#: object-name.c:1784 +msgid "relative path syntax can't be used outside working tree" +msgstr "" + +#: object-name.c:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "" + #: object.c:53 #, c-format msgid "invalid object type \"%s\"" @@ -4836,21 +5353,70 @@ msgstr "" msgid "hash mismatch %s" msgstr "" -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 #, c-format msgid "unable to get size of %s" msgstr "" -#: packfile.c:630 +#: pack-bitmap.c:1489 builtin/rev-list.c:92 +#, c-format +msgid "unable to get disk usage of %s" +msgstr "" + +#: pack-revindex.c:220 +#, c-format +msgid "reverse-index file %s is too small" +msgstr "" + +#: pack-revindex.c:225 +#, c-format +msgid "reverse-index file %s is corrupt" +msgstr "" + +#: pack-revindex.c:233 +#, c-format +msgid "reverse-index file %s has unknown signature" +msgstr "" + +#: pack-revindex.c:237 +#, c-format +msgid "reverse-index file %s has unsupported version %<PRIu32>" +msgstr "" + +#: pack-revindex.c:242 +#, c-format +msgid "reverse-index file %s has unsupported hash id %<PRIu32>" +msgstr "" + +#: pack-write.c:236 +msgid "cannot both write and verify reverse index" +msgstr "" + +#: pack-write.c:257 +#, c-format +msgid "could not stat: %s" +msgstr "" + +#: pack-write.c:269 +#, c-format +msgid "failed to make %s readable" +msgstr "" + +#: pack-write.c:508 +#, c-format +msgid "could not write '%s' promisor file" +msgstr "" + +#: packfile.c:625 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1922 +#: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1926 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -5092,21 +5658,21 @@ msgstr "" msgid "protocol error: bad line length %d" msgstr "" -#: pkt-line.c:373 sideband.c:150 +#: pkt-line.c:373 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "" -#: preload-index.c:119 +#: preload-index.c:125 msgid "Refreshing index" msgstr "" -#: preload-index.c:138 +#: preload-index.c:144 #, c-format msgid "unable to create threaded lstat: %s" msgstr "" -#: pretty.c:983 +#: pretty.c:984 msgid "unable to parse --pretty format" msgstr "" @@ -5131,36 +5697,40 @@ msgstr "" msgid "Removing duplicate objects" msgstr "" -#: range-diff.c:77 +#: range-diff.c:78 msgid "could not start `log`" msgstr "" -#: range-diff.c:79 +#: range-diff.c:80 msgid "could not read `log` output" msgstr "" -#: range-diff.c:98 sequencer.c:5283 +#: range-diff.c:101 sequencer.c:5318 #, c-format msgid "could not parse commit '%s'" msgstr "" -#: range-diff.c:112 +#: range-diff.c:115 #, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " "'%s'" msgstr "" -#: range-diff.c:137 +#: range-diff.c:140 #, c-format msgid "could not parse git header '%.*s'" msgstr "" -#: range-diff.c:301 +#: range-diff.c:306 msgid "failed to generate diff" msgstr "" -#: range-diff.c:534 range-diff.c:536 +#: range-diff.c:558 +msgid "--left-only and --right-only are mutually exclusive" +msgstr "" + +#: range-diff.c:561 range-diff.c:563 #, c-format msgid "could not parse log for '%s'" msgstr "" @@ -5204,157 +5774,157 @@ msgstr "" msgid "'%s' appears as both a file and as a directory" msgstr "" -#: read-cache.c:1524 +#: read-cache.c:1532 msgid "Refresh index" msgstr "" -#: read-cache.c:1639 +#: read-cache.c:1657 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1649 +#: read-cache.c:1667 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1705 +#: read-cache.c:1723 #, c-format msgid "bad signature 0x%08x" msgstr "" -#: read-cache.c:1708 +#: read-cache.c:1726 #, c-format msgid "bad index version %d" msgstr "" -#: read-cache.c:1717 +#: read-cache.c:1735 msgid "bad index file sha1 signature" msgstr "" -#: read-cache.c:1747 +#: read-cache.c:1765 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1749 +#: read-cache.c:1767 #, c-format msgid "ignoring %.4s extension" msgstr "" -#: read-cache.c:1786 +#: read-cache.c:1804 #, c-format msgid "unknown index entry format 0x%08x" msgstr "" -#: read-cache.c:1802 +#: read-cache.c:1820 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1859 +#: read-cache.c:1877 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1862 +#: read-cache.c:1880 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "" -#: read-cache.c:1865 +#: read-cache.c:1883 #, c-format msgid "unordered stage entries for '%s'" msgstr "" -#: 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 +#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181 +#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505 #: 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:2115 +#: read-cache.c:2133 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2128 +#: read-cache.c:2146 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2161 +#: read-cache.c:2179 #, c-format msgid "%s: index file open failed" msgstr "" -#: read-cache.c:2165 +#: read-cache.c:2183 #, c-format msgid "%s: cannot stat the open index" msgstr "" -#: read-cache.c:2169 +#: read-cache.c:2187 #, c-format msgid "%s: index file smaller than expected" msgstr "" -#: read-cache.c:2173 +#: read-cache.c:2191 #, c-format msgid "%s: unable to map index file" msgstr "" -#: read-cache.c:2215 +#: read-cache.c:2233 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2242 +#: read-cache.c:2260 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2274 +#: read-cache.c:2292 #, c-format msgid "could not freshen shared index '%s'" msgstr "" -#: read-cache.c:2321 +#: read-cache.c:2339 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 +#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 +#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3133 +#: read-cache.c:3151 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3145 +#: read-cache.c:3163 #, c-format msgid "unable to unlink: %s" msgstr "" -#: read-cache.c:3170 +#: read-cache.c:3188 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" -#: read-cache.c:3319 +#: read-cache.c:3337 #, c-format msgid "%s: cannot drop to stage #0" msgstr "" @@ -5429,14 +5999,14 @@ msgid "" "\n" msgstr "" -#: 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 +#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615 +#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272 #, c-format msgid "could not write '%s'" msgstr "" -#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 -#: builtin/rebase.c:246 +#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230 +#: builtin/rebase.c:254 #, c-format msgid "could not write '%s'." msgstr "" @@ -5459,14 +6029,14 @@ msgid "" "\n" msgstr "" -#: 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 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402 +#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241 +#: builtin/rebase.c:266 #, c-format msgid "could not read '%s'." msgstr "" -#: ref-filter.c:42 wt-status.c:1973 +#: ref-filter.c:42 wt-status.c:1975 msgid "gone" msgstr "" @@ -5485,232 +6055,247 @@ msgstr "" msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:169 +#: ref-filter.c:175 #, c-format msgid "expected format: %%(color:<color>)" msgstr "" -#: ref-filter.c:171 +#: ref-filter.c:177 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:193 +#: ref-filter.c:199 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: ref-filter.c:197 +#: ref-filter.c:203 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:199 +#: ref-filter.c:205 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: ref-filter.c:254 +#: ref-filter.c:260 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "" -#: ref-filter.c:276 +#: ref-filter.c:282 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "" -#: ref-filter.c:284 +#: ref-filter.c:290 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "" -#: ref-filter.c:296 +#: ref-filter.c:302 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:309 +#: ref-filter.c:315 #, c-format msgid "unrecognized %%(subject) argument: %s" msgstr "" -#: ref-filter.c:330 +#: ref-filter.c:334 +#, c-format +msgid "expected %%(trailers:key=<value>)" +msgstr "" + +#: ref-filter.c:336 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "" -#: ref-filter.c:363 +#: ref-filter.c:367 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:365 +#: ref-filter.c:369 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:380 +#: ref-filter.c:384 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "" -#: ref-filter.c:384 +#: ref-filter.c:388 #, c-format msgid "unrecognized argument '%s' in %%(%s)" msgstr "" -#: ref-filter.c:398 +#: ref-filter.c:402 #, c-format msgid "unrecognized email option: %s" msgstr "" -#: ref-filter.c:428 +#: ref-filter.c:432 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "" -#: ref-filter.c:440 +#: ref-filter.c:444 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:447 +#: ref-filter.c:451 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:456 +#: ref-filter.c:460 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:464 +#: ref-filter.c:468 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:482 +#: ref-filter.c:486 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:584 +#: ref-filter.c:588 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:611 +#: ref-filter.c:615 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:615 +#: ref-filter.c:619 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" -#: ref-filter.c:739 +#: ref-filter.c:743 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:802 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:804 +#: ref-filter.c:808 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:806 +#: ref-filter.c:810 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:834 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:836 +#: ref-filter.c:840 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:838 +#: ref-filter.c:842 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:853 +#: ref-filter.c:857 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:910 +#: ref-filter.c:914 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1541 +#: ref-filter.c:1555 #, c-format -msgid "no branch, rebasing %s" +msgid "(no branch, rebasing %s)" msgstr "" -#: ref-filter.c:1544 +#: ref-filter.c:1558 #, c-format -msgid "no branch, rebasing detached HEAD %s" +msgid "(no branch, rebasing detached HEAD %s)" msgstr "" -#: ref-filter.c:1547 +#: ref-filter.c:1561 #, c-format -msgid "no branch, bisect started on %s" +msgid "(no branch, bisect started on %s)" msgstr "" -#: ref-filter.c:1557 -msgid "no branch" +#: ref-filter.c:1565 +#, c-format +msgid "(HEAD detached at %s)" +msgstr "" + +#: ref-filter.c:1568 +#, c-format +msgid "(HEAD detached from %s)" msgstr "" -#: ref-filter.c:1591 ref-filter.c:1800 +#: ref-filter.c:1571 +msgid "(no branch)" +msgstr "" + +#: ref-filter.c:1603 ref-filter.c:1812 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1601 +#: ref-filter.c:1613 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:2054 +#: ref-filter.c:1996 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:2143 +#: ref-filter.c:2085 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:2148 refs.c:657 +#: ref-filter.c:2090 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:2464 +#: ref-filter.c:2430 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2563 +#: ref-filter.c:2529 #, c-format msgid "malformed object name %s" msgstr "" -#: ref-filter.c:2568 +#: ref-filter.c:2534 #, c-format msgid "option `%s' must point to a commit" msgstr "" @@ -5720,65 +6305,80 @@ msgstr "" msgid "%s does not point to a valid object!" msgstr "" -#: refs.c:572 +#: refs.c:566 +#, c-format +msgid "" +"Using '%s' as the name for the initial branch. This default branch name\n" +"is subject to change. To configure the initial branch name to use in all\n" +"of your new repositories, which will suppress this warning, call:\n" +"\n" +"\tgit config --global init.defaultBranch <name>\n" +"\n" +"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n" +"'development'. The just-created branch can be renamed via this command:\n" +"\n" +"\tgit branch -m <name>\n" +msgstr "" + +#: refs.c:588 #, c-format msgid "could not retrieve `%s`" msgstr "" -#: refs.c:579 +#: refs.c:598 #, c-format msgid "invalid branch name: %s = %s" msgstr "" -#: refs.c:655 +#: refs.c:674 #, c-format msgid "ignoring dangling symref %s" msgstr "" -#: refs.c:892 +#: refs.c:922 #, c-format msgid "log for ref %s has gap after %s" msgstr "" -#: refs.c:898 +#: refs.c:929 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "" -#: refs.c:957 +#: refs.c:994 #, c-format msgid "log for %s is empty" msgstr "" -#: refs.c:1049 +#: refs.c:1086 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "" -#: refs.c:1120 +#: refs.c:1157 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "" -#: refs.c:1944 +#: refs.c:2051 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "" -#: refs.c:2024 +#: refs.c:2131 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs.c:2035 +#: refs.c:2142 msgid "ref updates aborted by hook" msgstr "" -#: refs.c:2135 refs.c:2165 +#: refs.c:2242 refs.c:2272 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "" -#: refs.c:2141 refs.c:2176 +#: refs.c:2248 refs.c:2283 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "" @@ -5799,7 +6399,7 @@ msgstr "" msgid "could not delete references: %s" msgstr "" -#: refspec.c:167 +#: refspec.c:170 #, c-format msgid "invalid refspec '%s'" msgstr "" @@ -5842,12 +6442,12 @@ msgstr "" msgid "value '%s' of pattern has no '*'" msgstr "" -#: remote.c:1073 +#: remote.c:1083 #, c-format msgid "src refspec %s does not match any" msgstr "" -#: remote.c:1078 +#: remote.c:1088 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5856,7 +6456,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1093 +#: remote.c:1103 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5870,7 +6470,7 @@ msgid "" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -#: remote.c:1113 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5878,7 +6478,7 @@ msgid "" "'%s:refs/heads/%s'?" msgstr "" -#: remote.c:1118 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5886,7 +6486,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1123 +#: remote.c:1133 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5894,7 +6494,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1128 +#: remote.c:1138 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5902,114 +6502,114 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1164 +#: remote.c:1174 #, c-format msgid "%s cannot be resolved to branch" msgstr "" -#: remote.c:1175 +#: remote.c:1185 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "" -#: remote.c:1187 +#: remote.c:1197 #, c-format msgid "dst refspec %s matches more than one" msgstr "" -#: remote.c:1194 +#: remote.c:1204 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1703 remote.c:1804 +#: remote.c:1724 remote.c:1825 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1712 +#: remote.c:1733 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1715 +#: remote.c:1736 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1721 +#: remote.c:1742 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1736 +#: remote.c:1757 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1748 +#: remote.c:1769 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1758 +#: remote.c:1779 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1771 +#: remote.c:1792 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1793 +#: remote.c:1814 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:1922 +#: remote.c:1943 #, c-format msgid "couldn't find remote ref %s" msgstr "" -#: remote.c:1935 +#: remote.c:1956 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2098 +#: remote.c:2119 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2102 +#: remote.c:2123 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2105 +#: remote.c:2126 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2109 +#: remote.c:2130 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "" -#: remote.c:2112 +#: remote.c:2133 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2116 +#: remote.c:2137 #, 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:2122 +#: remote.c:2143 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2125 +#: remote.c:2146 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6017,11 +6617,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2133 +#: remote.c:2154 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2136 +#: remote.c:2157 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6032,11 +6632,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2146 +#: remote.c:2167 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: remote.c:2337 +#: remote.c:2359 #, c-format msgid "cannot parse expected object name '%s'" msgstr "" @@ -6056,96 +6656,96 @@ msgstr "" msgid "replace depth too high for object %s" msgstr "" -#: rerere.c:217 rerere.c:226 rerere.c:229 +#: rerere.c:201 rerere.c:210 rerere.c:213 msgid "corrupt MERGE_RR" msgstr "" -#: rerere.c:264 rerere.c:269 +#: rerere.c:248 rerere.c:253 msgid "unable to write rerere record" msgstr "" -#: rerere.c:495 +#: rerere.c:479 #, c-format msgid "there were errors while writing '%s' (%s)" msgstr "" -#: rerere.c:498 +#: rerere.c:482 #, c-format msgid "failed to flush '%s'" msgstr "" -#: rerere.c:503 rerere.c:1039 +#: rerere.c:487 rerere.c:1023 #, c-format msgid "could not parse conflict hunks in '%s'" msgstr "" -#: rerere.c:684 +#: rerere.c:668 #, c-format msgid "failed utime() on '%s'" msgstr "" -#: rerere.c:694 +#: rerere.c:678 #, c-format msgid "writing '%s' failed" msgstr "" -#: rerere.c:714 +#: rerere.c:698 #, c-format msgid "Staged '%s' using previous resolution." msgstr "" -#: rerere.c:753 +#: rerere.c:737 #, c-format msgid "Recorded resolution for '%s'." msgstr "" -#: rerere.c:788 +#: rerere.c:772 #, c-format msgid "Resolved '%s' using previous resolution." msgstr "" -#: rerere.c:803 +#: rerere.c:787 #, c-format msgid "cannot unlink stray '%s'" msgstr "" -#: rerere.c:807 +#: rerere.c:791 #, c-format msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: rerere.c:865 submodule.c:2088 builtin/log.c:1991 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "" -#: rerere.c:1057 +#: rerere.c:1041 #, c-format msgid "failed to update conflicted state in '%s'" msgstr "" -#: rerere.c:1068 rerere.c:1075 +#: rerere.c:1052 rerere.c:1059 #, c-format msgid "no remembered resolution for '%s'" msgstr "" -#: rerere.c:1077 +#: rerere.c:1061 #, c-format msgid "cannot unlink '%s'" msgstr "" -#: rerere.c:1087 +#: rerere.c:1071 #, c-format msgid "Updated preimage for '%s'" msgstr "" -#: rerere.c:1096 +#: rerere.c:1080 #, c-format msgid "Forgot resolution for '%s'\n" msgstr "" -#: rerere.c:1199 +#: rerere.c:1191 msgid "unable to open rr-cache directory" msgstr "" @@ -6153,171 +6753,166 @@ msgstr "" msgid "could not determine HEAD revision" msgstr "" -#: reset.c:70 reset.c:76 sequencer.c:3426 +#: reset.c:70 reset.c:76 sequencer.c:3468 #, c-format msgid "failed to find tree of %s" msgstr "" -#: revision.c:2344 +#: revision.c:2338 msgid "--unpacked=<packfile> no longer supported" msgstr "" -#: revision.c:2364 -#, c-format -msgid "unknown value for --diff-merges: %s" -msgstr "" - -#: revision.c:2702 +#: revision.c:2668 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2705 +#: revision.c:2671 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2915 +#: revision.c:2877 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" -#: run-command.c:763 +#: run-command.c:767 msgid "open /dev/null failed" msgstr "" -#: run-command.c:1270 +#: run-command.c:1274 #, c-format msgid "cannot create async thread: %s" msgstr "" -#: run-command.c:1334 +#: run-command.c:1338 #, 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:145 +#: send-pack.c:146 msgid "unexpected flush packet while reading remote unpack status" msgstr "" -#: send-pack.c:147 +#: send-pack.c:148 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:149 +#: send-pack.c:150 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:372 +#: send-pack.c:374 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:460 +#: send-pack.c:467 msgid "the receiving end does not support this repository's hash algorithm" msgstr "" -#: send-pack.c:469 +#: send-pack.c:476 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:471 +#: send-pack.c:478 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:483 +#: send-pack.c:490 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:488 +#: send-pack.c:495 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:194 +#: sequencer.c:195 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:308 +#: sequencer.c:323 #, c-format msgid "could not delete '%s'" msgstr "" -#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 +#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "" -#: sequencer.c:339 +#: sequencer.c:353 msgid "revert" msgstr "" -#: sequencer.c:341 +#: sequencer.c:355 msgid "cherry-pick" msgstr "" -#: sequencer.c:343 +#: sequencer.c:357 msgid "rebase" msgstr "" -#: sequencer.c:345 +#: sequencer.c:359 #, c-format msgid "unknown action: %d" msgstr "" -#: sequencer.c:404 +#: sequencer.c:418 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:407 +#: sequencer.c:421 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:420 sequencer.c:3028 +#: sequencer.c:434 sequencer.c:3070 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 -#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088 +#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "" -#: sequencer.c:427 +#: sequencer.c:441 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 -#: sequencer.c:3311 +#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090 +#: sequencer.c:3353 #, c-format msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:471 +#: sequencer.c:485 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:475 +#: sequencer.c:489 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:507 +#: sequencer.c:521 #, c-format msgid "%s: fast-forward" msgstr "" -#: sequencer.c:546 builtin/tag.c:566 +#: sequencer.c:560 builtin/tag.c:598 #, c-format msgid "Invalid cleanup mode %s" msgstr "" @@ -6325,65 +6920,65 @@ msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:640 +#: sequencer.c:670 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:657 +#: sequencer.c:684 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:671 +#: sequencer.c:698 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:751 +#: sequencer.c:778 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:762 +#: sequencer.c:789 #, c-format msgid "unable to dequote value of '%s'" msgstr "" -#: 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 +#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: sequencer.c:809 +#: sequencer.c:836 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:814 +#: sequencer.c:841 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:819 +#: sequencer.c:846 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:823 +#: sequencer.c:850 #, c-format msgid "unknown variable '%s'" msgstr "" -#: sequencer.c:828 +#: sequencer.c:855 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:830 +#: sequencer.c:857 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:832 +#: sequencer.c:859 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" -#: sequencer.c:897 +#: sequencer.c:924 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6400,11 +6995,11 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:1178 +#: sequencer.c:1211 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1184 +#: sequencer.c:1217 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6419,7 +7014,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1197 +#: sequencer.c:1230 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6433,354 +7028,354 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1239 +#: sequencer.c:1272 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1241 +#: sequencer.c:1274 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1287 +#: sequencer.c:1320 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1289 +#: sequencer.c:1322 msgid "detached HEAD" msgstr "" -#: sequencer.c:1293 +#: sequencer.c:1326 msgid " (root-commit)" msgstr "" -#: sequencer.c:1314 +#: sequencer.c:1347 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1316 +#: sequencer.c:1349 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 +#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1373 sequencer.c:2067 +#: sequencer.c:1409 sequencer.c:2108 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 +#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1417 sequencer.c:1535 +#: sequencer.c:1453 sequencer.c:1573 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1446 sequencer.c:1478 +#: sequencer.c:1484 sequencer.c:1516 #, c-format msgid "invalid author identity '%s'" msgstr "" -#: sequencer.c:1452 +#: sequencer.c:1490 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 +#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905 +#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1518 sequencer.c:4237 +#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:1567 +#: sequencer.c:1605 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1572 +#: sequencer.c:1610 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1655 sequencer.c:1766 +#: sequencer.c:1693 sequencer.c:1804 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1713 sequencer.c:1738 +#: sequencer.c:1751 sequencer.c:1776 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1723 +#: sequencer.c:1761 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1725 sequencer.c:3338 +#: sequencer.c:1763 sequencer.c:3380 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1727 +#: sequencer.c:1765 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1733 +#: sequencer.c:1771 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 +#: sequencer.c:1778 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1748 +#: sequencer.c:1786 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1755 +#: sequencer.c:1793 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1761 +#: sequencer.c:1799 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1849 +#: sequencer.c:1887 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1856 +#: sequencer.c:1894 msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:1875 +#: sequencer.c:1913 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1883 sequencer.c:1891 +#: sequencer.c:1921 sequencer.c:1929 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1897 +#: sequencer.c:1935 #, 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:1916 +#: sequencer.c:1954 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1981 +#: sequencer.c:2019 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:2038 +#: sequencer.c:2079 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:2039 +#: sequencer.c:2080 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:2059 +#: sequencer.c:2100 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "" -#: sequencer.c:2117 +#: sequencer.c:2158 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:2124 +#: sequencer.c:2165 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:2201 +#: sequencer.c:2242 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:2210 +#: sequencer.c:2251 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:2241 +#: sequencer.c:2282 #, c-format msgid "could not parse '%s'" msgstr "" -#: sequencer.c:2302 +#: sequencer.c:2343 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2313 +#: sequencer.c:2354 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:2399 +#: sequencer.c:2440 msgid "cancelling a cherry picking in progress" msgstr "" -#: sequencer.c:2408 +#: sequencer.c:2449 msgid "cancelling a revert in progress" msgstr "" -#: sequencer.c:2452 +#: sequencer.c:2493 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2454 +#: sequencer.c:2495 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2459 +#: sequencer.c:2500 msgid "no commits parsed." msgstr "" -#: sequencer.c:2470 +#: sequencer.c:2511 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2472 +#: sequencer.c:2513 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:2550 +#: sequencer.c:2591 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2657 +#: sequencer.c:2698 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2677 +#: sequencer.c:2718 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2769 sequencer.c:4609 +#: sequencer.c:2811 sequencer.c:4644 msgid "empty commit set passed" msgstr "" -#: sequencer.c:2786 +#: sequencer.c:2828 msgid "revert is already in progress" msgstr "" -#: sequencer.c:2788 +#: sequencer.c:2830 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2791 +#: sequencer.c:2833 msgid "cherry-pick is already in progress" msgstr "" -#: sequencer.c:2793 +#: sequencer.c:2835 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2807 +#: sequencer.c:2849 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2822 +#: sequencer.c:2864 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2882 sequencer.c:4325 +#: sequencer.c:2924 sequencer.c:4379 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2884 sequencer.c:2895 +#: sequencer.c:2926 sequencer.c:2937 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2886 sequencer.c:2930 +#: sequencer.c:2928 sequencer.c:2972 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2916 builtin/grep.c:745 +#: sequencer.c:2958 builtin/grep.c:757 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2918 +#: sequencer.c:2960 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2919 +#: sequencer.c:2961 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2925 +#: sequencer.c:2967 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2936 +#: sequencer.c:2978 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:2977 +#: sequencer.c:3019 msgid "no revert in progress" msgstr "" -#: sequencer.c:2986 +#: sequencer.c:3028 msgid "no cherry-pick in progress" msgstr "" -#: sequencer.c:2996 +#: sequencer.c:3038 msgid "failed to skip the commit" msgstr "" -#: sequencer.c:3003 +#: sequencer.c:3045 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:3006 +#: sequencer.c:3048 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3168 sequencer.c:4217 +#: sequencer.c:3210 sequencer.c:4271 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:3185 +#: sequencer.c:3227 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "" -#: sequencer.c:3193 +#: sequencer.c:3235 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6792,27 +7387,27 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3203 +#: sequencer.c:3245 #, c-format msgid "Could not apply %s... %.*s" msgstr "" -#: sequencer.c:3210 +#: sequencer.c:3252 #, c-format msgid "Could not merge %.*s" msgstr "" -#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 +#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:3240 +#: sequencer.c:3282 #, c-format msgid "Executing: %s\n" msgstr "" -#: sequencer.c:3255 +#: sequencer.c:3297 #, c-format msgid "" "execution failed: %s\n" @@ -6822,11 +7417,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3261 +#: sequencer.c:3303 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:3267 +#: sequencer.c:3309 #, c-format msgid "" "execution succeeded: %s\n" @@ -6837,90 +7432,90 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3328 +#: sequencer.c:3370 #, c-format msgid "illegal label name: '%.*s'" msgstr "" -#: sequencer.c:3382 +#: sequencer.c:3424 msgid "writing fake root commit" msgstr "" -#: sequencer.c:3387 +#: sequencer.c:3429 msgid "writing squash-onto" msgstr "" -#: sequencer.c:3471 +#: sequencer.c:3513 #, c-format msgid "could not resolve '%s'" msgstr "" -#: sequencer.c:3502 +#: sequencer.c:3546 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:3524 +#: sequencer.c:3568 #, c-format msgid "unable to parse '%.*s'" msgstr "" -#: sequencer.c:3533 +#: sequencer.c:3577 #, c-format msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:3545 +#: sequencer.c:3589 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3561 +#: sequencer.c:3605 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:3730 +#: sequencer.c:3788 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:3746 +#: sequencer.c:3804 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:3820 +#: sequencer.c:3878 msgid "Cannot autostash" msgstr "" -#: sequencer.c:3823 +#: sequencer.c:3881 #, c-format msgid "Unexpected stash response: '%s'" msgstr "" -#: sequencer.c:3829 +#: sequencer.c:3887 #, c-format msgid "Could not create directory for '%s'" msgstr "" -#: sequencer.c:3832 +#: sequencer.c:3890 #, c-format msgid "Created autostash: %s\n" msgstr "" -#: sequencer.c:3836 +#: sequencer.c:3894 msgid "could not reset --hard" msgstr "" -#: sequencer.c:3861 +#: sequencer.c:3919 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3873 +#: sequencer.c:3931 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:3876 +#: sequencer.c:3934 #, c-format msgid "" "%s\n" @@ -6928,34 +7523,29 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:3881 +#: sequencer.c:3939 msgid "Applying autostash resulted in conflicts." msgstr "" -#: sequencer.c:3882 +#: sequencer.c:3940 msgid "Autostash exists; creating a new stash entry." msgstr "" -#: sequencer.c:3974 -#, c-format -msgid "%s: not a valid OID" -msgstr "" - -#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4033 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "" -#: sequencer.c:3994 +#: sequencer.c:4048 #, c-format msgid "Stopped at HEAD\n" msgstr "" -#: sequencer.c:3996 +#: sequencer.c:4050 #, c-format msgid "Stopped at %s\n" msgstr "" -#: sequencer.c:4004 +#: sequencer.c:4058 #, c-format msgid "" "Could not execute the todo command\n" @@ -6968,113 +7558,108 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:4050 +#: sequencer.c:4104 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "" -#: sequencer.c:4095 +#: sequencer.c:4149 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:4166 +#: sequencer.c:4220 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:4225 +#: sequencer.c:4279 msgid "could not read orig-head" msgstr "" -#: sequencer.c:4230 +#: sequencer.c:4284 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:4244 +#: sequencer.c:4298 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4304 +#: sequencer.c:4358 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "" -#: sequencer.c:4337 +#: sequencer.c:4391 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4346 +#: sequencer.c:4400 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4348 +#: sequencer.c:4402 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4350 +#: sequencer.c:4404 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4353 +#: sequencer.c:4407 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:4389 sequencer.c:4428 +#: sequencer.c:4443 sequencer.c:4482 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:4444 +#: sequencer.c:4498 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4451 +#: sequencer.c:4505 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4477 -#, c-format -msgid "invalid committer '%s'" -msgstr "" - -#: sequencer.c:4586 +#: sequencer.c:4621 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4590 +#: sequencer.c:4625 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4625 +#: sequencer.c:4660 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:5102 +#: sequencer.c:5137 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:5105 +#: sequencer.c:5140 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:5347 sequencer.c:5364 +#: sequencer.c:5382 sequencer.c:5399 msgid "nothing to do" msgstr "" -#: sequencer.c:5383 +#: sequencer.c:5418 msgid "could not skip unnecessary pick commands" msgstr "" -#: sequencer.c:5480 +#: sequencer.c:5512 msgid "the script was already rearranged." msgstr "" @@ -7226,342 +7811,6 @@ msgstr "" msgid "setsid failed" msgstr "" -#: sha1-file.c:470 -#, c-format -msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "" - -#: sha1-file.c:521 -#, c-format -msgid "unable to normalize alternate object path: %s" -msgstr "" - -#: sha1-file.c:593 -#, c-format -msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "" - -#: sha1-file.c:600 -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "" - -#: sha1-file.c:643 -msgid "unable to fdopen alternates lockfile" -msgstr "" - -#: sha1-file.c:661 -msgid "unable to read alternates file" -msgstr "" - -#: sha1-file.c:668 -msgid "unable to move new alternates file into place" -msgstr "" - -#: sha1-file.c:703 -#, c-format -msgid "path '%s' does not exist" -msgstr "" - -#: sha1-file.c:724 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "" - -#: sha1-file.c:730 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "" - -#: sha1-file.c:736 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "" - -#: sha1-file.c:744 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "" - -#: sha1-file.c:804 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "" - -#: sha1-file.c:954 -#, c-format -msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" -msgstr "" - -#: sha1-file.c:975 -msgid "mmap failed" -msgstr "" - -#: sha1-file.c:1139 -#, c-format -msgid "object file %s is empty" -msgstr "" - -#: sha1-file.c:1274 sha1-file.c:2467 -#, c-format -msgid "corrupt loose object '%s'" -msgstr "" - -#: sha1-file.c:1276 sha1-file.c:2471 -#, c-format -msgid "garbage at end of loose object '%s'" -msgstr "" - -#: sha1-file.c:1318 -msgid "invalid object type" -msgstr "" - -#: sha1-file.c:1402 -#, c-format -msgid "unable to unpack %s header with --allow-unknown-type" -msgstr "" - -#: sha1-file.c:1405 -#, c-format -msgid "unable to unpack %s header" -msgstr "" - -#: sha1-file.c:1411 -#, c-format -msgid "unable to parse %s header with --allow-unknown-type" -msgstr "" - -#: sha1-file.c:1414 -#, c-format -msgid "unable to parse %s header" -msgstr "" - -#: sha1-file.c:1641 -#, c-format -msgid "failed to read object %s" -msgstr "" - -#: sha1-file.c:1645 -#, c-format -msgid "replacement %s not found for %s" -msgstr "" - -#: sha1-file.c:1649 -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "" - -#: sha1-file.c:1653 -#, c-format -msgid "packed object %s (stored in %s) is corrupt" -msgstr "" - -#: sha1-file.c:1758 -#, c-format -msgid "unable to write file %s" -msgstr "" - -#: sha1-file.c:1765 -#, c-format -msgid "unable to set permission to '%s'" -msgstr "" - -#: sha1-file.c:1772 -msgid "file write error" -msgstr "" - -#: sha1-file.c:1792 -msgid "error when closing loose object file" -msgstr "" - -#: sha1-file.c:1857 -#, c-format -msgid "insufficient permission for adding an object to repository database %s" -msgstr "" - -#: sha1-file.c:1859 -msgid "unable to create temporary file" -msgstr "" - -#: sha1-file.c:1883 -msgid "unable to write loose object file" -msgstr "" - -#: sha1-file.c:1889 -#, c-format -msgid "unable to deflate new object %s (%d)" -msgstr "" - -#: sha1-file.c:1893 -#, c-format -msgid "deflateEnd on object %s failed (%d)" -msgstr "" - -#: sha1-file.c:1897 -#, c-format -msgid "confused by unstable object source data for %s" -msgstr "" - -#: sha1-file.c:1907 builtin/pack-objects.c:1086 -#, c-format -msgid "failed utime() on %s" -msgstr "" - -#: sha1-file.c:1984 -#, c-format -msgid "cannot read object for %s" -msgstr "" - -#: sha1-file.c:2035 -msgid "corrupt commit" -msgstr "" - -#: sha1-file.c:2043 -msgid "corrupt tag" -msgstr "" - -#: sha1-file.c:2143 -#, c-format -msgid "read error while indexing %s" -msgstr "" - -#: sha1-file.c:2146 -#, c-format -msgid "short read while indexing %s" -msgstr "" - -#: sha1-file.c:2219 sha1-file.c:2229 -#, c-format -msgid "%s: failed to insert into database" -msgstr "" - -#: sha1-file.c:2235 -#, c-format -msgid "%s: unsupported file type" -msgstr "" - -#: sha1-file.c:2259 -#, c-format -msgid "%s is not a valid object" -msgstr "" - -#: sha1-file.c:2261 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "" - -#: sha1-file.c:2288 builtin/index-pack.c:192 -#, c-format -msgid "unable to open %s" -msgstr "" - -#: sha1-file.c:2478 sha1-file.c:2531 -#, c-format -msgid "hash mismatch for %s (expected %s)" -msgstr "" - -#: sha1-file.c:2502 -#, c-format -msgid "unable to mmap %s" -msgstr "" - -#: sha1-file.c:2507 -#, c-format -msgid "unable to unpack header of %s" -msgstr "" - -#: sha1-file.c:2513 -#, c-format -msgid "unable to parse header of %s" -msgstr "" - -#: sha1-file.c:2524 -#, c-format -msgid "unable to unpack contents of %s" -msgstr "" - -#: sha1-name.c:486 -#, c-format -msgid "short SHA1 %s is ambiguous" -msgstr "" - -#: sha1-name.c:497 -msgid "The candidates are:" -msgstr "" - -#: 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" -"may be created by mistake. For example,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" -"examine these refs and maybe delete them. Turn this message off by\n" -"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:848 #, c-format @@ -7614,8 +7863,8 @@ msgid_plural "%u bytes/s" msgstr[0] "" msgstr[1] "" -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 -#: builtin/rebase.c:858 +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" msgstr "" @@ -7677,137 +7926,137 @@ msgstr "" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#: submodule.c:434 +#: submodule.c:435 #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "" -#: submodule.c:816 +#: submodule.c:817 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " "same. Skipping it." msgstr "" -#: submodule.c:919 +#: submodule.c:920 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" -#: submodule.c:1004 +#: submodule.c:1005 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " "submodule %s" msgstr "" -#: submodule.c:1127 +#: submodule.c:1128 #, c-format msgid "process for submodule '%s' failed" msgstr "" -#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469 +#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:1167 +#: submodule.c:1168 #, c-format msgid "Pushing submodule '%s'\n" msgstr "" -#: submodule.c:1170 +#: submodule.c:1171 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "" -#: submodule.c:1462 +#: submodule.c:1463 #, c-format msgid "Fetching submodule %s%s\n" msgstr "" -#: submodule.c:1492 +#: submodule.c:1497 #, c-format msgid "Could not access submodule '%s'\n" msgstr "" -#: submodule.c:1646 +#: submodule.c:1652 #, c-format msgid "" "Errors during submodule fetch:\n" "%s" msgstr "" -#: submodule.c:1671 +#: submodule.c:1677 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1688 +#: submodule.c:1694 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "" -#: submodule.c:1729 +#: submodule.c:1735 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "" -#: submodule.c:1804 +#: submodule.c:1810 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1817 +#: submodule.c:1823 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1832 +#: submodule.c:1838 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "" -#: submodule.c:1859 submodule.c:2169 +#: submodule.c:1865 submodule.c:2175 #, c-format msgid "could not recurse into submodule '%s'" msgstr "" -#: submodule.c:1880 +#: submodule.c:1886 msgid "could not reset submodule index" msgstr "" -#: submodule.c:1922 +#: submodule.c:1928 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:1974 +#: submodule.c:1980 #, c-format msgid "Submodule '%s' could not be updated." msgstr "" -#: submodule.c:2042 +#: submodule.c:2048 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "" -#: submodule.c:2063 +#: submodule.c:2069 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:2075 submodule.c:2134 +#: submodule.c:2081 submodule.c:2140 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:2079 +#: submodule.c:2085 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "" -#: submodule.c:2086 +#: submodule.c:2092 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7815,11 +8064,11 @@ msgid "" "'%s'\n" msgstr "" -#: submodule.c:2214 +#: submodule.c:2220 msgid "could not start ls-files in .." msgstr "" -#: submodule.c:2254 +#: submodule.c:2260 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" @@ -7835,7 +8084,7 @@ msgstr "" msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "" @@ -7850,7 +8099,7 @@ msgstr "" msgid "could not read input file '%s'" msgstr "" -#: trailer.c:751 +#: trailer.c:751 builtin/mktag.c:91 msgid "could not read from stdin" msgstr "" @@ -7920,7 +8169,7 @@ msgstr "" msgid "error while running fast-import" msgstr "" -#: transport-helper.c:549 transport-helper.c:1226 +#: transport-helper.c:549 transport-helper.c:1237 #, c-format msgid "could not read ref %s" msgstr "" @@ -7938,7 +8187,7 @@ msgstr "" msgid "invalid remote service path" msgstr "" -#: transport-helper.c:661 transport.c:1428 +#: transport-helper.c:661 transport.c:1447 msgid "operation not supported by protocol" msgstr "" @@ -7956,106 +8205,111 @@ msgstr "" msgid "expected ok/error, helper said '%s'" msgstr "" -#: transport-helper.c:841 +#: transport-helper.c:845 #, c-format msgid "helper reported unexpected status of %s" msgstr "" -#: transport-helper.c:924 +#: transport-helper.c:928 #, c-format msgid "helper %s does not support dry-run" msgstr "" -#: transport-helper.c:927 +#: transport-helper.c:931 #, c-format msgid "helper %s does not support --signed" msgstr "" -#: transport-helper.c:930 +#: transport-helper.c:934 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" -#: transport-helper.c:935 +#: transport-helper.c:939 #, c-format msgid "helper %s does not support --atomic" msgstr "" -#: transport-helper.c:941 +#: transport-helper.c:943 +#, c-format +msgid "helper %s does not support --%s" +msgstr "" + +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'push-option'" msgstr "" -#: transport-helper.c:1040 +#: transport-helper.c:1050 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:1045 +#: transport-helper.c:1055 #, c-format msgid "helper %s does not support 'force'" msgstr "" -#: transport-helper.c:1092 +#: transport-helper.c:1102 msgid "couldn't run fast-export" msgstr "" -#: transport-helper.c:1097 +#: transport-helper.c:1107 msgid "error while running fast-export" msgstr "" -#: transport-helper.c:1122 +#: transport-helper.c:1132 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" "Perhaps you should specify a branch.\n" msgstr "" -#: transport-helper.c:1203 +#: transport-helper.c:1214 #, c-format msgid "unsupported object format '%s'" msgstr "" -#: transport-helper.c:1212 +#: transport-helper.c:1223 #, c-format msgid "malformed response in ref list: %s" msgstr "" -#: transport-helper.c:1364 +#: transport-helper.c:1375 #, c-format msgid "read(%s) failed" msgstr "" -#: transport-helper.c:1391 +#: transport-helper.c:1402 #, c-format msgid "write(%s) failed" msgstr "" -#: transport-helper.c:1440 +#: transport-helper.c:1451 #, c-format msgid "%s thread failed" msgstr "" -#: transport-helper.c:1444 +#: transport-helper.c:1455 #, c-format msgid "%s thread failed to join: %s" msgstr "" -#: transport-helper.c:1463 transport-helper.c:1467 +#: transport-helper.c:1474 transport-helper.c:1478 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1504 +#: transport-helper.c:1515 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1508 +#: transport-helper.c:1519 #, c-format msgid "%s process failed" msgstr "" -#: transport-helper.c:1526 transport-helper.c:1535 +#: transport-helper.c:1537 transport-helper.c:1546 msgid "can't start thread for copying data" msgstr "" @@ -8082,36 +8336,36 @@ msgstr "" msgid "server options require protocol version 2 or later" msgstr "" -#: transport.c:712 +#: transport.c:727 msgid "could not parse transport.color.* config" msgstr "" -#: transport.c:785 +#: transport.c:802 msgid "support for protocol v2 not implemented yet" msgstr "" -#: transport.c:919 +#: transport.c:936 #, c-format msgid "unknown value for config '%s': %s" msgstr "" -#: transport.c:985 +#: transport.c:1002 #, c-format msgid "transport '%s' not allowed" msgstr "" -#: transport.c:1038 +#: transport.c:1055 msgid "git-over-rsync is no longer supported" msgstr "" -#: transport.c:1140 +#: transport.c:1157 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:1144 +#: transport.c:1161 #, c-format msgid "" "\n" @@ -8127,27 +8381,27 @@ msgid "" "\n" msgstr "" -#: transport.c:1152 +#: transport.c:1169 msgid "Aborting." msgstr "" -#: transport.c:1297 +#: transport.c:1316 msgid "failed to push all needed submodules" msgstr "" -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "" @@ -8348,7 +8602,7 @@ msgstr "" msgid "Updating index flags" msgstr "" -#: upload-pack.c:1516 +#: upload-pack.c:1543 msgid "expected flush after fetch arguments" msgstr "" @@ -8385,72 +8639,102 @@ msgstr "" msgid "Fetching objects" msgstr "" -#: worktree.c:236 builtin/am.c:2116 +#: worktree.c:238 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "" -#: worktree.c:283 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:294 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:306 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "" -#: worktree.c:312 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "" -#: worktree.c:321 +#: worktree.c:342 #, c-format msgid "'%s' does not point back to '%s'" msgstr "" -#: worktree.c:587 +#: worktree.c:608 msgid "not a directory" msgstr "" -#: worktree.c:596 +#: worktree.c:617 msgid ".git is not a file" msgstr "" -#: worktree.c:598 +#: worktree.c:619 msgid ".git file broken" msgstr "" -#: worktree.c:600 +#: worktree.c:621 msgid ".git file incorrect" msgstr "" -#: worktree.c:670 +#: worktree.c:727 msgid "not a valid path" msgstr "" -#: worktree.c:676 +#: worktree.c:733 msgid "unable to locate repository; .git is not a file" msgstr "" -#: worktree.c:679 +#: worktree.c:737 +msgid "unable to locate repository; .git file does not reference a repository" +msgstr "" + +#: worktree.c:741 msgid "unable to locate repository; .git file broken" msgstr "" -#: worktree.c:685 +#: worktree.c:747 msgid "gitdir unreadable" msgstr "" -#: worktree.c:689 +#: worktree.c:751 msgid "gitdir incorrect" msgstr "" +#: worktree.c:776 +msgid "not a valid directory" +msgstr "" + +#: worktree.c:782 +msgid "gitdir file does not exist" +msgstr "" + +#: worktree.c:787 worktree.c:796 +#, c-format +msgid "unable to read gitdir file (%s)" +msgstr "" + +#: worktree.c:806 +#, c-format +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "" + +#: worktree.c:814 +msgid "invalid gitdir file" +msgstr "" + +#: worktree.c:822 +msgid "gitdir file points to non-existent location" +msgstr "" + #: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" @@ -8494,11 +8778,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:211 wt-status.c:1070 +#: wt-status.c:211 wt-status.c:1072 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:234 wt-status.c:1079 +#: wt-status.c:234 wt-status.c:1081 msgid "Changes not staged for commit:" msgstr "" @@ -8596,28 +8880,28 @@ msgstr "" msgid "untracked content, " msgstr "" -#: wt-status.c:903 +#: wt-status.c:905 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "" msgstr[1] "" -#: wt-status.c:934 +#: wt-status.c:936 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:936 +#: wt-status.c:938 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:1018 +#: wt-status.c:1020 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -#: wt-status.c:1110 +#: wt-status.c:1112 #, c-format msgid "" "\n" @@ -8625,247 +8909,255 @@ msgid "" "You can use '--no-ahead-behind' to avoid this.\n" msgstr "" -#: wt-status.c:1140 +#: wt-status.c:1142 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1143 +#: wt-status.c:1145 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1145 +#: wt-status.c:1147 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1149 +#: wt-status.c:1151 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1152 +#: wt-status.c:1154 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1161 +#: wt-status.c:1163 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1164 +#: wt-status.c:1166 msgid "The current patch is empty." msgstr "" -#: wt-status.c:1168 +#: wt-status.c:1170 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1170 +#: wt-status.c:1172 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1172 +#: wt-status.c:1174 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1305 +#: wt-status.c:1307 msgid "git-rebase-todo is missing." msgstr "" -#: wt-status.c:1307 +#: wt-status.c:1309 msgid "No commands done." msgstr "" -#: wt-status.c:1310 +#: wt-status.c:1312 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1321 +#: wt-status.c:1323 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1326 +#: wt-status.c:1328 msgid "No commands remaining." msgstr "" -#: wt-status.c:1329 +#: wt-status.c:1331 #, 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:1337 +#: wt-status.c:1339 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1349 +#: wt-status.c:1351 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1354 +#: wt-status.c:1356 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1367 +#: wt-status.c:1369 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1369 +#: wt-status.c:1371 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1373 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1378 +#: wt-status.c:1380 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1382 +#: wt-status.c:1384 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1387 +#: wt-status.c:1389 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1390 +#: wt-status.c:1392 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1394 +#: wt-status.c:1396 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1399 +#: wt-status.c:1401 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1402 +#: wt-status.c:1404 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1404 +#: wt-status.c:1406 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1415 +#: wt-status.c:1417 msgid "Cherry-pick currently in progress." msgstr "" -#: wt-status.c:1418 +#: wt-status.c:1420 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1425 +#: wt-status.c:1427 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1428 +#: wt-status.c:1430 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr "" -#: wt-status.c:1431 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1433 +#: wt-status.c:1435 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1435 +#: wt-status.c:1437 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1445 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "" -#: wt-status.c:1448 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1454 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1457 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr "" -#: wt-status.c:1460 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1462 +#: wt-status.c:1464 msgid " (use \"git revert --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1464 +#: wt-status.c:1466 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1474 +#: wt-status.c:1476 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1478 +#: wt-status.c:1480 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1481 +#: wt-status.c:1483 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1492 +#: wt-status.c:1494 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "" -#: wt-status.c:1731 +#: wt-status.c:1733 msgid "On branch " msgstr "" -#: wt-status.c:1738 +#: wt-status.c:1740 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1740 +#: wt-status.c:1742 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1750 +#: wt-status.c:1747 +msgid "HEAD detached at " +msgstr "" + +#: wt-status.c:1749 +msgid "HEAD detached from " +msgstr "" + +#: wt-status.c:1752 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1767 +#: wt-status.c:1769 msgid "Initial commit" msgstr "" -#: wt-status.c:1768 +#: wt-status.c:1770 msgid "No commits yet" msgstr "" -#: wt-status.c:1782 +#: wt-status.c:1784 msgid "Untracked files" msgstr "" -#: wt-status.c:1784 +#: wt-status.c:1786 msgid "Ignored files" msgstr "" -#: wt-status.c:1788 +#: wt-status.c:1790 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8873,97 +9165,97 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1794 +#: wt-status.c:1796 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1796 +#: wt-status.c:1798 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1802 +#: wt-status.c:1804 msgid "No changes" msgstr "" -#: wt-status.c:1807 +#: wt-status.c:1809 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1811 +#: wt-status.c:1813 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1815 +#: wt-status.c:1817 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1819 +#: wt-status.c:1821 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1823 +#: wt-status.c:1825 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1827 wt-status.c:1833 +#: wt-status.c:1829 wt-status.c:1835 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1830 +#: wt-status.c:1832 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1835 +#: wt-status.c:1837 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1940 +#: wt-status.c:1942 msgid "No commits yet on " msgstr "" -#: wt-status.c:1944 +#: wt-status.c:1946 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1975 +#: wt-status.c:1977 msgid "different" msgstr "" -#: wt-status.c:1977 wt-status.c:1985 +#: wt-status.c:1979 wt-status.c:1987 msgid "behind " msgstr "" -#: wt-status.c:1980 wt-status.c:1983 +#: wt-status.c:1982 wt-status.c:1985 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2505 +#: wt-status.c:2507 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2511 +#: wt-status.c:2513 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2513 +#: wt-status.c:2515 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#: compat/precompose_utf8.c:58 builtin/clone.c:457 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -8972,126 +9264,131 @@ msgstr "" msgid "git add [<options>] [--] <pathspec>..." msgstr "" -#: builtin/add.c:88 +#: builtin/add.c:58 +#, c-format +msgid "cannot chmod %cx '%s'" +msgstr "" + +#: builtin/add.c:96 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:93 builtin/commit.c:285 +#: builtin/add.c:101 builtin/commit.c:285 msgid "updating files failed" msgstr "" -#: builtin/add.c:103 +#: builtin/add.c:111 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:178 +#: builtin/add.c:186 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:272 builtin/rev-parse.c:904 +#: builtin/add.c:280 builtin/rev-parse.c:991 msgid "Could not read the index" msgstr "" -#: builtin/add.c:283 +#: builtin/add.c:291 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:287 +#: builtin/add.c:295 msgid "Could not write patch" msgstr "" -#: builtin/add.c:290 +#: builtin/add.c:298 msgid "editing patch failed" msgstr "" -#: builtin/add.c:293 +#: builtin/add.c:301 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:295 +#: builtin/add.c:303 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:300 +#: builtin/add.c:308 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:308 +#: builtin/add.c:316 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: 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 +#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" msgstr "" -#: builtin/add.c:331 +#: builtin/add.c:339 msgid "interactive picking" msgstr "" -#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 +#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:333 +#: builtin/add.c:341 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:334 +#: builtin/add.c:342 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:335 +#: builtin/add.c:343 msgid "update tracked files" msgstr "" -#: builtin/add.c:336 +#: builtin/add.c:344 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:337 +#: builtin/add.c:345 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:338 +#: builtin/add.c:346 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:341 +#: builtin/add.c:349 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:343 +#: builtin/add.c:351 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:344 +#: builtin/add.c:352 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:345 +#: builtin/add.c:353 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:347 builtin/update-index.c:1004 +#: builtin/add.c:355 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:349 +#: builtin/add.c:357 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:351 +#: builtin/add.c:359 msgid "backend for `git stash -p`" msgstr "" -#: builtin/add.c:369 +#: builtin/add.c:377 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9109,192 +9406,187 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:397 +#: builtin/add.c:405 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:416 +#: builtin/add.c:424 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:425 +#: builtin/add.c:433 msgid "adding files failed" msgstr "" -#: builtin/add.c:453 builtin/commit.c:345 +#: builtin/add.c:461 builtin/commit.c:345 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "" -#: builtin/add.c:470 +#: builtin/add.c:478 msgid "--pathspec-from-file is incompatible with --edit" msgstr "" -#: builtin/add.c:482 +#: builtin/add.c:490 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:485 +#: builtin/add.c:493 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:489 +#: builtin/add.c:497 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569 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 +#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "" -#: builtin/add.c:518 +#: builtin/add.c:526 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:520 +#: builtin/add.c:528 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 "invalid committer: %s" -msgstr "" - -#: builtin/am.c:366 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "" -#: builtin/am.c:450 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:492 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:530 +#: builtin/am.c:516 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:556 +#: builtin/am.c:542 msgid "fseek failed" msgstr "" -#: builtin/am.c:744 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:809 +#: builtin/am.c:795 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:857 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:862 builtin/am.c:874 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "" -#: builtin/am.c:869 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:962 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:967 builtin/clone.c:409 +#: builtin/am.c:953 builtin/clone.c:410 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:972 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1103 +#: builtin/am.c:1089 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1104 +#: builtin/am.c:1090 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1105 +#: builtin/am.c:1091 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1188 +#: builtin/am.c:1174 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1216 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1281 +#: builtin/am.c:1267 #, c-format msgid "missing author line in commit %s" msgstr "" -#: builtin/am.c:1284 +#: builtin/am.c:1270 #, c-format msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1503 +#: builtin/am.c:1489 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1505 +#: builtin/am.c:1491 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1524 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1530 +#: builtin/am.c:1516 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1556 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1588 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1639 builtin/am.c:1643 +#: builtin/am.c:1626 builtin/am.c:1630 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1661 +#: builtin/am.c:1648 msgid "Commit Body is:" msgstr "" @@ -9302,46 +9594,46 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1671 +#: builtin/am.c:1658 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1717 builtin/commit.c:395 +#: builtin/am.c:1704 builtin/commit.c:395 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1721 +#: builtin/am.c:1708 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1761 builtin/am.c:1829 +#: builtin/am.c:1748 builtin/am.c:1816 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1778 +#: builtin/am.c:1765 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1784 +#: builtin/am.c:1771 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1788 +#: builtin/am.c:1775 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -#: builtin/am.c:1832 +#: builtin/am.c:1819 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:1839 +#: builtin/am.c:1826 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9349,197 +9641,197 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:1998 +#: builtin/am.c:1985 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2042 +#: builtin/am.c:2029 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2149 +#: builtin/am.c:2136 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2191 +#: builtin/am.c:2178 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "" -#: builtin/am.c:2195 +#: builtin/am.c:2182 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "" -#: builtin/am.c:2226 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/am.c:2227 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2233 +#: builtin/am.c:2220 msgid "run interactively" msgstr "" -#: builtin/am.c:2235 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2237 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 -#: builtin/repack.c:309 builtin/stash.c:816 +#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 +#: builtin/repack.c:334 builtin/stash.c:882 msgid "be quiet" msgstr "" -#: builtin/am.c:2240 -msgid "add a Signed-off-by line to the commit message" +#: builtin/am.c:2227 +msgid "add a Signed-off-by trailer to the commit message" msgstr "" -#: builtin/am.c:2243 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2245 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2247 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2249 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2251 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2254 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2257 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "" -#: 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 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "" -#: 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/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261 #: 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 +#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349 +#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175 #: parse-options.h:316 msgid "n" msgstr "" -#: 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/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470 #: builtin/verify-tag.c:38 msgid "format" msgstr "" -#: builtin/am.c:2283 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2289 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2291 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2294 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2297 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2300 -msgid "restore the original branch and abort the patching operation." +#: builtin/am.c:2287 +msgid "restore the original branch and abort the patching operation" msgstr "" -#: builtin/am.c:2303 -msgid "abort the patching operation but keep HEAD where it is." +#: builtin/am.c:2290 +msgid "abort the patching operation but keep HEAD where it is" msgstr "" -#: builtin/am.c:2307 +#: builtin/am.c:2294 msgid "show the patch being applied" msgstr "" -#: builtin/am.c:2312 +#: builtin/am.c:2299 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2314 +#: builtin/am.c:2301 msgid "use current timestamp for author date" msgstr "" -#: 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 +#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538 +#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451 msgid "key-id" msgstr "" -#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 +#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2320 +#: builtin/am.c:2307 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2338 +#: builtin/am.c:2325 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:2345 +#: builtin/am.c:2332 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2360 +#: builtin/am.c:2347 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2384 +#: builtin/am.c:2371 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2390 +#: builtin/am.c:2377 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: builtin/am.c:2400 +#: builtin/am.c:2387 msgid "interactive mode requires patches on the command line" msgstr "" @@ -9578,135 +9870,119 @@ msgid "git archive: expected a flush" msgstr "" #: builtin/bisect--helper.c:23 -msgid "git bisect--helper --next-all" +msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "" #: builtin/bisect--helper.c:24 -msgid "git bisect--helper --write-terms <bad_term> <good_term>" +msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" #: builtin/bisect--helper.c:25 -msgid "git bisect--helper --bisect-clean-state" +msgid "" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"term-new]" msgstr "" #: builtin/bisect--helper.c:26 -msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "" - -#: builtin/bisect--helper.c:27 msgid "" -"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " -"<bad_term>" +"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:28 -msgid "" -"git bisect--helper --bisect-check-and-set-terms <command> <good_term> " -"<bad_term>" +msgid "git bisect--helper --bisect-next" msgstr "" #: builtin/bisect--helper.c:29 -msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" +msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" msgstr "" #: builtin/bisect--helper.c:30 -msgid "" -"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" -"term-new]" +msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" msgstr "" #: builtin/bisect--helper.c:31 -msgid "" -"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" +msgid "git bisect--helper --bisect-replay <filename>" msgstr "" -#: builtin/bisect--helper.c:35 -msgid "git bisect--helper --bisect-autostart" +#: builtin/bisect--helper.c:32 +msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" msgstr "" -#: builtin/bisect--helper.c:97 +#: builtin/bisect--helper.c:107 #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "" -#: builtin/bisect--helper.c:104 +#: builtin/bisect--helper.c:114 #, c-format msgid "could not write to file '%s'" msgstr "" -#: builtin/bisect--helper.c:143 +#: builtin/bisect--helper.c:153 #, c-format msgid "'%s' is not a valid term" msgstr "" -#: builtin/bisect--helper.c:147 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:167 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:177 msgid "please use two different terms" msgstr "" -#: builtin/bisect--helper.c:207 +#: builtin/bisect--helper.c:193 #, c-format msgid "We are not bisecting.\n" msgstr "" -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:201 #, c-format msgid "'%s' is not a valid commit" msgstr "" -#: builtin/bisect--helper.c:224 +#: builtin/bisect--helper.c:210 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "" -#: builtin/bisect--helper.c:268 +#: builtin/bisect--helper.c:254 #, c-format msgid "Bad bisect_write argument: %s" msgstr "" -#: builtin/bisect--helper.c:273 +#: builtin/bisect--helper.c:259 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "" -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:271 #, c-format msgid "couldn't open the file '%s'" msgstr "" -#: builtin/bisect--helper.c:311 +#: builtin/bisect--helper.c:297 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "" -#: builtin/bisect--helper.c:338 +#: builtin/bisect--helper.c:324 #, 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:342 +#: builtin/bisect--helper.c:328 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9714,7 +9990,7 @@ msgid "" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:362 +#: builtin/bisect--helper.c:348 #, c-format msgid "bisecting only with a %s commit" msgstr "" @@ -9723,74 +9999,74 @@ msgstr "" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:370 +#: builtin/bisect--helper.c:356 msgid "Are you sure [Y/n]? " msgstr "" -#: builtin/bisect--helper.c:431 +#: builtin/bisect--helper.c:417 msgid "no terms defined" msgstr "" -#: builtin/bisect--helper.c:434 +#: builtin/bisect--helper.c:420 #, 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:444 +#: builtin/bisect--helper.c:430 #, 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:511 +#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014 msgid "revision walk setup failed\n" msgstr "" -#: builtin/bisect--helper.c:533 +#: builtin/bisect--helper.c:519 #, c-format msgid "could not open '%s' for appending" msgstr "" -#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 msgid "'' is not a valid term" msgstr "" -#: builtin/bisect--helper.c:674 +#: builtin/bisect--helper.c:661 #, c-format msgid "unrecognized option: '%s'" msgstr "" -#: builtin/bisect--helper.c:678 +#: builtin/bisect--helper.c:665 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "" -#: builtin/bisect--helper.c:709 +#: builtin/bisect--helper.c:696 msgid "bad HEAD - I need a HEAD" msgstr "" -#: builtin/bisect--helper.c:724 +#: builtin/bisect--helper.c:711 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" -#: builtin/bisect--helper.c:745 +#: builtin/bisect--helper.c:732 msgid "won't bisect on cg-seek'ed tree" msgstr "" -#: builtin/bisect--helper.c:748 +#: builtin/bisect--helper.c:735 msgid "bad HEAD - strange symbolic ref" msgstr "" -#: builtin/bisect--helper.c:775 +#: builtin/bisect--helper.c:755 #, c-format msgid "invalid ref: '%s'" msgstr "" -#: builtin/bisect--helper.c:827 +#: builtin/bisect--helper.c:813 msgid "You need to start by \"git bisect start\"\n" msgstr "" @@ -9798,104 +10074,100 @@ msgstr "" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:838 +#: builtin/bisect--helper.c:824 msgid "Do you want me to do it for you [Y/n]? " msgstr "" -#: builtin/bisect--helper.c:866 -msgid "perform 'git bisect next'" +#: builtin/bisect--helper.c:842 +msgid "Please call `--bisect-state` with at least one argument" msgstr "" -#: builtin/bisect--helper.c:868 -msgid "write the terms to .git/BISECT_TERMS" +#: builtin/bisect--helper.c:855 +#, c-format +msgid "'git bisect %s' can take only one argument." msgstr "" -#: builtin/bisect--helper.c:870 -msgid "cleanup the bisection state" +#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878 +#, c-format +msgid "Bad rev input: %s" msgstr "" -#: builtin/bisect--helper.c:872 -msgid "check for expected revs" +#: builtin/bisect--helper.c:912 +msgid "We are not bisecting." msgstr "" -#: builtin/bisect--helper.c:874 -msgid "reset the bisection state" +#: builtin/bisect--helper.c:962 +#, c-format +msgid "'%s'?? what are you talking about?" msgstr "" -#: builtin/bisect--helper.c:876 -msgid "write out the bisection state in BISECT_LOG" +#: builtin/bisect--helper.c:974 +#, c-format +msgid "cannot read file '%s' for replaying" msgstr "" -#: builtin/bisect--helper.c:878 -msgid "check and set terms in a bisection state" +#: builtin/bisect--helper.c:1047 +msgid "reset the bisection state" msgstr "" -#: builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:1049 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:882 +#: builtin/bisect--helper.c:1051 msgid "print out the bisect terms" msgstr "" -#: builtin/bisect--helper.c:884 +#: builtin/bisect--helper.c:1053 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:886 +#: builtin/bisect--helper.c:1055 msgid "find the next bisection commit" msgstr "" -#: builtin/bisect--helper.c:888 -msgid "verify the next bisection state then checkout the next bisection commit" +#: builtin/bisect--helper.c:1057 +msgid "mark the state of ref (or refs)" msgstr "" -#: builtin/bisect--helper.c:890 -msgid "start the bisection if it has not yet been started" +#: builtin/bisect--helper.c:1059 +msgid "list the bisection steps so far" msgstr "" -#: builtin/bisect--helper.c:892 -msgid "no log for BISECT_WRITE" +#: builtin/bisect--helper.c:1061 +msgid "replay the bisection process from the given file" msgstr "" -#: builtin/bisect--helper.c:910 -msgid "--write-terms requires two arguments" +#: builtin/bisect--helper.c:1063 +msgid "skip some commits for checkout" msgstr "" -#: builtin/bisect--helper.c:914 -msgid "--bisect-clean-state requires no arguments" +#: builtin/bisect--helper.c:1065 +msgid "no log for BISECT_WRITE" msgstr "" -#: builtin/bisect--helper.c:921 +#: builtin/bisect--helper.c:1080 msgid "--bisect-reset requires either no argument or a commit" msgstr "" -#: builtin/bisect--helper.c:925 -msgid "--bisect-write requires either 4 or 5 arguments" -msgstr "" - -#: builtin/bisect--helper.c:931 -msgid "--check-and-set-terms requires 3 arguments" -msgstr "" - -#: builtin/bisect--helper.c:937 +#: builtin/bisect--helper.c:1085 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "" -#: builtin/bisect--helper.c:943 +#: builtin/bisect--helper.c:1091 msgid "--bisect-terms requires 0 or 1 argument" msgstr "" -#: builtin/bisect--helper.c:952 +#: builtin/bisect--helper.c:1100 msgid "--bisect-next requires 0 arguments" msgstr "" -#: builtin/bisect--helper.c:958 -msgid "--bisect-auto-next requires 0 arguments" +#: builtin/bisect--helper.c:1111 +msgid "--bisect-log requires 0 arguments" msgstr "" -#: builtin/bisect--helper.c:964 -msgid "--bisect-autostart does not accept arguments" +#: builtin/bisect--helper.c:1116 +msgid "no logfile given" msgstr "" #: builtin/blame.c:32 @@ -9915,12 +10187,12 @@ msgstr "" msgid "must end with a color" msgstr "" -#: builtin/blame.c:730 +#: builtin/blame.c:728 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "" -#: builtin/blame.c:748 +#: builtin/blame.c:746 msgid "invalid value for blame.coloring" msgstr "" @@ -9930,79 +10202,82 @@ msgid "cannot find revision %s to ignore" msgstr "" #: builtin/blame.c:867 -msgid "Show blame entries as we find them, incrementally" +msgid "show blame entries as we find them, incrementally" msgstr "" #: builtin/blame.c:868 -msgid "Do not show object names of boundary commits (Default: off)" +msgid "do not show object names of boundary commits (Default: off)" msgstr "" #: builtin/blame.c:869 -msgid "Do not treat root commits as boundaries (Default: off)" +msgid "do not treat root commits as boundaries (Default: off)" msgstr "" #: builtin/blame.c:870 -msgid "Show work cost statistics" +msgid "show work cost statistics" msgstr "" -#: builtin/blame.c:871 -msgid "Force progress reporting" +#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92 +#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175 +#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119 +#: builtin/push.c:575 builtin/send-pack.c:198 +msgid "force progress reporting" msgstr "" #: builtin/blame.c:872 -msgid "Show output score for blame entries" +msgid "show output score for blame entries" msgstr "" #: builtin/blame.c:873 -msgid "Show original filename (Default: auto)" +msgid "show original filename (Default: auto)" msgstr "" #: builtin/blame.c:874 -msgid "Show original linenumber (Default: off)" +msgid "show original linenumber (Default: off)" msgstr "" #: builtin/blame.c:875 -msgid "Show in a format designed for machine consumption" +msgid "show in a format designed for machine consumption" msgstr "" #: builtin/blame.c:876 -msgid "Show porcelain format with per-line commit information" +msgid "show porcelain format with per-line commit information" msgstr "" #: builtin/blame.c:877 -msgid "Use the same output mode as git-annotate (Default: off)" +msgid "use the same output mode as git-annotate (Default: off)" msgstr "" #: builtin/blame.c:878 -msgid "Show raw timestamp (Default: off)" +msgid "show raw timestamp (Default: off)" msgstr "" #: builtin/blame.c:879 -msgid "Show long commit SHA1 (Default: off)" +msgid "show long commit SHA1 (Default: off)" msgstr "" #: builtin/blame.c:880 -msgid "Suppress author name and timestamp (Default: off)" +msgid "suppress author name and timestamp (Default: off)" msgstr "" #: builtin/blame.c:881 -msgid "Show author email instead of name (Default: off)" +msgid "show author email instead of name (Default: off)" msgstr "" #: builtin/blame.c:882 -msgid "Ignore whitespace differences" +msgid "ignore whitespace differences" msgstr "" -#: builtin/blame.c:883 builtin/log.c:1808 +#: builtin/blame.c:883 builtin/log.c:1812 msgid "rev" msgstr "" #: builtin/blame.c:883 -msgid "Ignore <rev> when blaming" +msgid "ignore <rev> when blaming" msgstr "" #: builtin/blame.c:884 -msgid "Ignore revisions from <file>" +msgid "ignore revisions from <file>" msgstr "" #: builtin/blame.c:885 @@ -10014,15 +10289,15 @@ msgid "color lines by age" msgstr "" #: builtin/blame.c:887 -msgid "Spend extra cycles to find better match" +msgid "spend extra cycles to find better match" msgstr "" #: builtin/blame.c:888 -msgid "Use revisions from <file> instead of calling git-rev-list" +msgid "use revisions from <file> instead of calling git-rev-list" msgstr "" #: builtin/blame.c:889 -msgid "Use <file>'s contents as the final image" +msgid "use <file>'s contents as the final image" msgstr "" #: builtin/blame.c:890 builtin/blame.c:891 @@ -10030,22 +10305,22 @@ msgid "score" msgstr "" #: builtin/blame.c:890 -msgid "Find line copies within and across files" +msgid "find line copies within and across files" msgstr "" #: builtin/blame.c:891 -msgid "Find line movements within and across files" +msgid "find line movements within and across files" msgstr "" #: builtin/blame.c:892 -msgid "n,m" +msgid "range" msgstr "" -#: builtin/blame.c:892 -msgid "Process only line range n,m, counting from 1" +#: builtin/blame.c:893 +msgid "process only line range <start>,<end> or function :<funcname>" msgstr "" -#: builtin/blame.c:944 +#: builtin/blame.c:945 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -10057,18 +10332,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:995 +#: builtin/blame.c:996 msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:1110 +#: builtin/blame.c:1112 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "" msgstr[1] "" -#: builtin/blame.c:1156 +#: builtin/blame.c:1157 msgid "Blaming lines" msgstr "" @@ -10130,117 +10405,107 @@ msgstr "" msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:220 +#: builtin/branch.c:223 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:226 +#: builtin/branch.c:230 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:240 +#: builtin/branch.c:244 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "" -#: builtin/branch.c:255 +#: builtin/branch.c:259 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "" -#: builtin/branch.c:256 +#: builtin/branch.c:260 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:271 -#, c-format -msgid "Error deleting remote-tracking branch '%s'" -msgstr "" - -#: builtin/branch.c:272 -#, c-format -msgid "Error deleting branch '%s'" -msgstr "" - -#: builtin/branch.c:279 +#: builtin/branch.c:291 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:280 +#: builtin/branch.c:292 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:429 builtin/tag.c:61 +#: builtin/branch.c:438 builtin/tag.c:61 msgid "unable to parse format string" msgstr "" -#: builtin/branch.c:460 +#: builtin/branch.c:469 msgid "could not resolve HEAD" msgstr "" -#: builtin/branch.c:466 +#: builtin/branch.c:475 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "" -#: builtin/branch.c:481 +#: builtin/branch.c:490 #, c-format msgid "Branch %s is being rebased at %s" msgstr "" -#: builtin/branch.c:485 +#: builtin/branch.c:494 #, c-format msgid "Branch %s is being bisected at %s" msgstr "" -#: builtin/branch.c:502 +#: builtin/branch.c:511 msgid "cannot copy the current branch while not on any." msgstr "" -#: builtin/branch.c:504 +#: builtin/branch.c:513 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:515 +#: builtin/branch.c:524 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:542 +#: builtin/branch.c:553 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:544 +#: builtin/branch.c:555 msgid "Branch copy failed" msgstr "" -#: builtin/branch.c:548 +#: builtin/branch.c:559 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "" -#: builtin/branch.c:551 +#: builtin/branch.c:562 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:557 +#: builtin/branch.c:568 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:566 +#: builtin/branch.c:577 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:568 +#: builtin/branch.c:579 msgid "Branch is copied, but update of config-file failed" msgstr "" -#: builtin/branch.c:584 +#: builtin/branch.c:595 #, c-format msgid "" "Please edit the description for the branch\n" @@ -10248,215 +10513,215 @@ msgid "" "Lines starting with '%c' will be stripped.\n" msgstr "" -#: builtin/branch.c:618 +#: builtin/branch.c:629 msgid "Generic options" msgstr "" -#: builtin/branch.c:620 +#: builtin/branch.c:631 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:621 +#: builtin/branch.c:632 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:622 +#: builtin/branch.c:633 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:624 +#: builtin/branch.c:635 msgid "do not use" msgstr "" -#: builtin/branch.c:626 builtin/rebase.c:526 +#: builtin/branch.c:637 builtin/rebase.c:534 msgid "upstream" msgstr "" -#: builtin/branch.c:626 +#: builtin/branch.c:637 msgid "change the upstream info" msgstr "" -#: builtin/branch.c:627 +#: builtin/branch.c:638 msgid "unset the upstream info" msgstr "" -#: builtin/branch.c:628 +#: builtin/branch.c:639 msgid "use colored output" msgstr "" -#: builtin/branch.c:629 +#: builtin/branch.c:640 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:631 builtin/branch.c:633 +#: builtin/branch.c:642 builtin/branch.c:644 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:632 builtin/branch.c:634 +#: builtin/branch.c:643 builtin/branch.c:645 msgid "print only branches that don't contain the commit" msgstr "" -#: builtin/branch.c:637 +#: builtin/branch.c:648 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:638 +#: builtin/branch.c:649 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:640 +#: builtin/branch.c:651 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:641 +#: builtin/branch.c:652 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:642 +#: builtin/branch.c:653 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:643 +#: builtin/branch.c:654 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:644 +#: builtin/branch.c:655 msgid "copy a branch and its reflog" msgstr "" -#: builtin/branch.c:645 +#: builtin/branch.c:656 msgid "copy a branch, even if target exists" msgstr "" -#: builtin/branch.c:646 +#: builtin/branch.c:657 msgid "list branch names" msgstr "" -#: builtin/branch.c:647 +#: builtin/branch.c:658 msgid "show current branch name" msgstr "" -#: builtin/branch.c:648 +#: builtin/branch.c:659 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:650 +#: builtin/branch.c:661 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:651 +#: builtin/branch.c:662 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:652 +#: builtin/branch.c:663 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:653 +#: builtin/branch.c:664 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:654 +#: builtin/branch.c:665 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:667 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:434 +#: builtin/tag.c:466 msgid "object" msgstr "" -#: builtin/branch.c:657 +#: builtin/branch.c:668 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 +#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:682 builtin/clone.c:789 +#: builtin/branch.c:693 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:706 +#: builtin/branch.c:717 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 +#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797 msgid "branch name required" msgstr "" -#: builtin/branch.c:751 +#: builtin/branch.c:764 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:756 +#: builtin/branch.c:769 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:763 +#: builtin/branch.c:776 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:766 +#: builtin/branch.c:779 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:781 +#: builtin/branch.c:794 msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:790 +#: builtin/branch.c:803 msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:795 +#: builtin/branch.c:808 msgid "too many arguments to set new upstream" msgstr "" -#: builtin/branch.c:799 +#: builtin/branch.c:812 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:802 builtin/branch.c:825 +#: builtin/branch.c:815 builtin/branch.c:838 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:806 +#: builtin/branch.c:819 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:819 +#: builtin/branch.c:832 msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:823 +#: builtin/branch.c:836 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:829 +#: builtin/branch.c:842 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:839 +#: builtin/branch.c:852 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:843 +#: builtin/branch.c:856 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -10506,38 +10771,38 @@ msgid "" "You can delete any lines you don't wish to share.\n" msgstr "" -#: builtin/bugreport.c:134 +#: builtin/bugreport.c:135 msgid "specify a destination for the bugreport file" msgstr "" -#: builtin/bugreport.c:136 +#: builtin/bugreport.c:137 msgid "specify a strftime format suffix for the filename" msgstr "" -#: builtin/bugreport.c:158 +#: builtin/bugreport.c:159 #, c-format msgid "could not create leading directories for '%s'" msgstr "" -#: builtin/bugreport.c:165 +#: builtin/bugreport.c:166 msgid "System Info" msgstr "" -#: builtin/bugreport.c:168 +#: builtin/bugreport.c:169 msgid "Enabled Hooks" msgstr "" -#: builtin/bugreport.c:175 +#: builtin/bugreport.c:176 #, c-format msgid "couldn't create a new file at '%s'" msgstr "" -#: builtin/bugreport.c:178 +#: builtin/bugreport.c:179 #, c-format msgid "unable to write to %s" msgstr "" -#: builtin/bugreport.c:188 +#: builtin/bugreport.c:189 #, c-format msgid "Created new report at '%s'.\n" msgstr "" @@ -10558,19 +10823,19 @@ msgstr "" msgid "git bundle unbundle <file> [<refname>...]" msgstr "" -#: builtin/bundle.c:67 builtin/pack-objects.c:3480 +#: builtin/bundle.c:67 builtin/pack-objects.c:3495 msgid "do not show progress meter" msgstr "" -#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +#: builtin/bundle.c:69 builtin/pack-objects.c:3497 msgid "show progress meter" msgstr "" -#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +#: builtin/bundle.c:71 builtin/pack-objects.c:3499 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +#: builtin/bundle.c:74 builtin/pack-objects.c:3502 msgid "similar to --all-progress when progress meter is shown" msgstr "" @@ -10595,11 +10860,11 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/bundle.c:171 builtin/remote.c:1687 +#: builtin/bundle.c:171 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "" -#: builtin/bundle.c:193 builtin/remote.c:1718 +#: builtin/bundle.c:193 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -10708,8 +10973,8 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 -#: builtin/worktree.c:561 +#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549 +#: builtin/worktree.c:489 msgid "suppress progress reporting" msgstr "" @@ -10762,54 +11027,54 @@ msgstr "" msgid "no contacts specified" msgstr "" -#: builtin/checkout-index.c:131 +#: builtin/checkout-index.c:152 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/checkout-index.c:148 +#: builtin/checkout-index.c:169 msgid "stage should be between 1 and 3 or all" msgstr "" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:186 msgid "check out all files in the index" msgstr "" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:187 msgid "force overwrite of existing files" msgstr "" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:189 msgid "no warning for existing files and files not in index" msgstr "" -#: builtin/checkout-index.c:169 +#: builtin/checkout-index.c:191 msgid "don't checkout new files" msgstr "" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:193 msgid "update stat information in the index file" msgstr "" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:197 msgid "read list of paths from the standard input" msgstr "" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:199 msgid "write the content to temporary files" msgstr "" -#: builtin/checkout-index.c:178 builtin/column.c:31 +#: builtin/checkout-index.c:200 builtin/column.c:31 #: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 #: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:754 +#: builtin/worktree.c:717 msgid "string" msgstr "" -#: builtin/checkout-index.c:179 +#: builtin/checkout-index.c:201 msgid "when creating files, prepend <string>" msgstr "" -#: builtin/checkout-index.c:181 +#: builtin/checkout-index.c:203 msgid "copy out the files from named stage" msgstr "" @@ -10911,66 +11176,66 @@ msgstr "" msgid "'%s' or '%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:528 builtin/checkout.c:535 +#: builtin/checkout.c:543 builtin/checkout.c:550 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:703 +#: builtin/checkout.c:718 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:757 +#: builtin/checkout.c:772 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:853 +#: builtin/checkout.c:865 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:895 +#: builtin/checkout.c:907 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:899 builtin/clone.c:720 +#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:903 +#: builtin/checkout.c:915 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:906 +#: builtin/checkout.c:918 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:910 +#: builtin/checkout.c:922 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:912 builtin/checkout.c:1338 +#: builtin/checkout.c:924 builtin/checkout.c:1355 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:914 +#: builtin/checkout.c:926 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:965 +#: builtin/checkout.c:977 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:971 +#: builtin/checkout.c:983 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10985,7 +11250,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:990 +#: builtin/checkout.c:1002 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11002,26 +11267,26 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1025 +#: builtin/checkout.c:1037 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:1029 +#: builtin/checkout.c:1041 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:1069 builtin/checkout.c:1333 +#: builtin/checkout.c:1081 builtin/checkout.c:1350 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1163 #, 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:1153 +#: builtin/checkout.c:1170 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" @@ -11033,287 +11298,280 @@ msgid "" "checkout.defaultRemote=origin in your config." msgstr "" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1180 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "" -#: builtin/checkout.c:1229 +#: builtin/checkout.c:1246 msgid "only one reference expected" msgstr "" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1263 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 +#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1305 builtin/checkout.c:1671 +#: builtin/checkout.c:1322 builtin/checkout.c:1688 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1369 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "" -#: builtin/checkout.c:1354 +#: builtin/checkout.c:1371 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "" -#: builtin/checkout.c:1355 builtin/checkout.c:1363 +#: builtin/checkout.c:1372 builtin/checkout.c:1380 #, c-format msgid "a branch is expected, got '%s'" msgstr "" -#: builtin/checkout.c:1358 +#: builtin/checkout.c:1375 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "" -#: builtin/checkout.c:1374 +#: builtin/checkout.c:1391 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1378 +#: builtin/checkout.c:1395 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1382 +#: builtin/checkout.c:1399 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1386 +#: builtin/checkout.c:1403 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1394 +#: builtin/checkout.c:1411 msgid "you are switching branch while bisecting" msgstr "" -#: builtin/checkout.c:1401 +#: builtin/checkout.c:1418 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 +#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 -#: builtin/checkout.c:1427 builtin/checkout.c:1432 +#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439 +#: builtin/checkout.c:1444 builtin/checkout.c:1449 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1429 +#: builtin/checkout.c:1446 #, c-format msgid "'%s' cannot take <start-point>" msgstr "" -#: builtin/checkout.c:1437 +#: builtin/checkout.c:1454 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1444 +#: builtin/checkout.c:1461 msgid "missing branch or commit argument" msgstr "" -#: 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:1487 +#: builtin/checkout.c:1504 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 +#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322 msgid "style" msgstr "" -#: builtin/checkout.c:1489 +#: builtin/checkout.c:1506 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1501 builtin/worktree.c:558 +#: builtin/checkout.c:1518 builtin/worktree.c:486 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1502 +#: builtin/checkout.c:1519 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1504 +#: builtin/checkout.c:1521 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1523 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1523 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1508 builtin/merge.c:291 +#: builtin/checkout.c:1525 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1511 +#: builtin/checkout.c:1528 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1524 +#: builtin/checkout.c:1541 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1544 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1531 +#: builtin/checkout.c:1548 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1586 +#: builtin/checkout.c:1603 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1590 +#: builtin/checkout.c:1607 msgid "-p and --overlay are mutually exclusive" msgstr "" -#: builtin/checkout.c:1627 +#: builtin/checkout.c:1644 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1632 +#: builtin/checkout.c:1649 #, c-format msgid "missing branch name; try -%c" msgstr "" -#: builtin/checkout.c:1664 +#: builtin/checkout.c:1681 #, c-format msgid "could not resolve %s" msgstr "" -#: builtin/checkout.c:1680 +#: builtin/checkout.c:1697 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1687 +#: builtin/checkout.c:1704 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1691 +#: builtin/checkout.c:1708 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1700 +#: builtin/checkout.c:1717 msgid "--pathspec-from-file is incompatible with --detach" msgstr "" -#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566 msgid "--pathspec-from-file is incompatible with --patch" msgstr "" -#: builtin/checkout.c:1716 +#: builtin/checkout.c:1733 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:1721 +#: builtin/checkout.c:1738 msgid "you must specify path(s) to restore" msgstr "" -#: 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 +#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815 +#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482 +#: builtin/worktree.c:484 msgid "branch" msgstr "" -#: builtin/checkout.c:1748 +#: builtin/checkout.c:1765 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1767 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1751 +#: builtin/checkout.c:1768 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1753 +#: builtin/checkout.c:1770 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1771 msgid "use overlay mode (default)" msgstr "" -#: builtin/checkout.c:1799 +#: builtin/checkout.c:1816 msgid "create and switch to a new branch" msgstr "" -#: builtin/checkout.c:1801 +#: builtin/checkout.c:1818 msgid "create/reset and switch to a branch" msgstr "" -#: builtin/checkout.c:1803 +#: builtin/checkout.c:1820 msgid "second guess 'git switch <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1805 +#: builtin/checkout.c:1822 msgid "throw away local modifications" msgstr "" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1856 msgid "which tree-ish to checkout from" msgstr "" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1858 msgid "restore the index" msgstr "" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1860 msgid "restore the working tree (default)" msgstr "" -#: builtin/checkout.c:1845 +#: builtin/checkout.c:1862 msgid "ignore unmerged entries" msgstr "" -#: builtin/checkout.c:1846 +#: builtin/checkout.c:1863 msgid "use overlay mode" msgstr "" @@ -11352,7 +11610,7 @@ msgstr "" msgid "could not lstat %s\n" msgstr "" -#: builtin/clean.c:302 git-add--interactive.perl:595 +#: builtin/clean.c:302 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -11361,7 +11619,7 @@ msgid "" " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:306 git-add--interactive.perl:604 +#: builtin/clean.c:306 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -11374,8 +11632,8 @@ msgid "" " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:521 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" @@ -11438,8 +11696,8 @@ msgid "remove whole directories" msgstr "" #: 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/grep.c:922 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "" @@ -11476,342 +11734,347 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 +#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:104 +#: builtin/clone.c:105 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "pathspec" msgstr "" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:111 builtin/init-db.c:550 +#: builtin/clone.c:112 builtin/init-db.c:552 msgid "template-directory" msgstr "" -#: builtin/clone.c:112 builtin/init-db.c:551 +#: builtin/clone.c:113 builtin/init-db.c:553 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 #: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "" -#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/clone.c:119 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/init-db.c:561 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 +#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357 msgid "name" msgstr "" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:122 +#: builtin/clone.c:123 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:124 +#: builtin/clone.c:125 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861 #: builtin/pull.c:208 msgid "depth" msgstr "" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550 #: builtin/pull.c:211 msgid "time" msgstr "" -#: builtin/clone.c:128 +#: builtin/clone.c:129 msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323 msgid "revision" msgstr "" -#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 +#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/clone.c:133 builtin/submodule--helper.c:1843 #: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:134 +#: builtin/clone.c:135 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" -#: builtin/clone.c:136 +#: builtin/clone.c:137 msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:137 builtin/init-db.c:559 +#: builtin/clone.c:138 builtin/init-db.c:561 msgid "gitdir" msgstr "" -#: builtin/clone.c:138 builtin/init-db.c:560 +#: builtin/clone.c:139 builtin/init-db.c:562 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "key=value" msgstr "" -#: builtin/clone.c:140 +#: builtin/clone.c:141 msgid "set config inside the new repository" msgstr "" -#: 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 +#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "" -#: 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 +#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "" -#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 -#: builtin/push.c:561 +#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234 +#: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 -#: builtin/push.c:563 +#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237 +#: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:149 +#: builtin/clone.c:150 msgid "any cloned submodules will use their remote-tracking branch" msgstr "" -#: builtin/clone.c:151 +#: builtin/clone.c:152 msgid "initialize sparse-checkout file to include only files at root" msgstr "" -#: builtin/clone.c:287 +#: builtin/clone.c:288 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:340 +#: builtin/clone.c:341 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:413 +#: builtin/clone.c:414 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:431 +#: builtin/clone.c:432 #, c-format msgid "failed to start iterator over '%s'" msgstr "" -#: builtin/clone.c:462 +#: builtin/clone.c:463 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:466 +#: builtin/clone.c:467 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, c-format msgid "failed to iterate over '%s'" msgstr "" -#: builtin/clone.c:498 +#: builtin/clone.c:499 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:512 +#: builtin/clone.c:513 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:589 +#: builtin/clone.c:590 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:708 +#: builtin/clone.c:709 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:756 +#: builtin/clone.c:757 msgid "failed to initialize sparse-checkout" msgstr "" -#: builtin/clone.c:779 +#: builtin/clone.c:780 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:811 +#: builtin/clone.c:812 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:868 +#: builtin/clone.c:887 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:931 +#: builtin/clone.c:950 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:933 +#: builtin/clone.c:952 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:970 builtin/receive-pack.c:2434 +#: builtin/clone.c:993 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:974 +#: builtin/clone.c:997 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:987 +#: builtin/clone.c:1010 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:990 +#: builtin/clone.c:1013 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:1006 +#: builtin/clone.c:1026 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:1010 builtin/fetch.c:1841 +#: builtin/clone.c:1030 builtin/fetch.c:1951 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:1020 +#: builtin/clone.c:1040 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:1026 +#: builtin/clone.c:1046 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:1040 +#: builtin/clone.c:1060 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 -#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 +#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271 +#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:1060 +#: builtin/clone.c:1080 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:1080 +#: builtin/clone.c:1100 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:1082 +#: builtin/clone.c:1102 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1106 +#: builtin/clone.c:1126 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1170 +#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "" + +#: builtin/clone.c:1211 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1172 +#: builtin/clone.c:1213 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1174 +#: builtin/clone.c:1215 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1176 +#: builtin/clone.c:1217 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1179 +#: builtin/clone.c:1220 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1184 +#: builtin/clone.c:1225 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1268 builtin/clone.c:1276 +#: builtin/clone.c:1315 builtin/clone.c:1323 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1279 +#: builtin/clone.c:1326 msgid "You appear to have cloned an empty repository." msgstr "" @@ -11865,13 +12128,13 @@ 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 +#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768 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" +msgid "the object directory to store the graph" msgstr "" #: builtin/commit-graph.c:83 @@ -11957,7 +12220,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557 #, c-format msgid "not a valid object name %s" msgstr "" @@ -11985,9 +12248,9 @@ msgstr "" msgid "id of a parent commit object" msgstr "" -#: 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 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537 +#: builtin/tag.c:445 msgid "message" msgstr "" @@ -11999,7 +12262,7 @@ msgstr "" msgid "read commit log message from file" msgstr "" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "" @@ -12134,7 +12397,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:729 builtin/shortlog.c:478 +#: builtin/commit.c:729 builtin/shortlog.c:413 #, c-format msgid "(reading log message from standard input)\n" msgstr "" @@ -12216,7 +12479,7 @@ msgstr "" msgid "Error building trees" msgstr "" -#: builtin/commit.c:1011 builtin/tag.c:276 +#: builtin/commit.c:1011 builtin/tag.c:308 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" @@ -12305,8 +12568,8 @@ msgstr "" msgid "version" msgstr "" -#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 -#: builtin/worktree.c:722 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 +#: builtin/worktree.c:679 msgid "machine-readable output" msgstr "" @@ -12319,8 +12582,8 @@ msgid "terminate entries with NUL" msgstr "" #: 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 +#: builtin/fast-export.c:1198 builtin/fast-export.c:1201 +#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336 msgid "mode" msgstr "" @@ -12372,7 +12635,7 @@ msgstr "" msgid "Commit message options" msgstr "" -#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 +#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447 msgid "read message from file" msgstr "" @@ -12384,7 +12647,7 @@ msgstr "" msgid "override author for commit" msgstr "" -#: builtin/commit.c:1503 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:550 msgid "date" msgstr "" @@ -12393,7 +12656,7 @@ msgid "override date for commit" msgstr "" #: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 -#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90 msgid "commit" msgstr "" @@ -12417,9 +12680,9 @@ msgstr "" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 -msgid "add Signed-off-by:" +msgid "add a Signed-off-by trailer" msgstr "" #: builtin/commit.c:1511 @@ -12517,213 +12780,217 @@ msgstr "" msgid "git config [<options>]" msgstr "" -#: builtin/config.c:107 builtin/env--helper.c:27 +#: builtin/config.c:109 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "" -#: builtin/config.c:119 +#: builtin/config.c:121 msgid "only one type at a time" msgstr "" -#: builtin/config.c:128 +#: builtin/config.c:130 msgid "Config file location" msgstr "" -#: builtin/config.c:129 +#: builtin/config.c:131 msgid "use global config file" msgstr "" -#: builtin/config.c:130 +#: builtin/config.c:132 msgid "use system config file" msgstr "" -#: builtin/config.c:131 +#: builtin/config.c:133 msgid "use repository config file" msgstr "" -#: builtin/config.c:132 +#: builtin/config.c:134 msgid "use per-worktree config file" msgstr "" -#: builtin/config.c:133 +#: builtin/config.c:135 msgid "use given config file" msgstr "" -#: builtin/config.c:134 +#: builtin/config.c:136 msgid "blob-id" msgstr "" -#: builtin/config.c:134 -msgid "read config from given blob object" -msgstr "" - -#: builtin/config.c:135 -msgid "Action" -msgstr "" - #: builtin/config.c:136 -msgid "get value: name [value-regex]" +msgid "read config from given blob object" msgstr "" #: builtin/config.c:137 -msgid "get all values: key [value-regex]" +msgid "Action" msgstr "" #: builtin/config.c:138 -msgid "get values for regexp: name-regex [value-regex]" +msgid "get value: name [value-pattern]" msgstr "" #: builtin/config.c:139 -msgid "get value specific for the URL: section[.var] URL" +msgid "get all values: key [value-pattern]" msgstr "" #: builtin/config.c:140 -msgid "replace all matching variables: name value [value_regex]" +msgid "get values for regexp: name-regex [value-pattern]" msgstr "" #: builtin/config.c:141 -msgid "add a new variable: name value" +msgid "get value specific for the URL: section[.var] URL" msgstr "" #: builtin/config.c:142 -msgid "remove a variable: name [value-regex]" +msgid "replace all matching variables: name value [value-pattern]" msgstr "" #: builtin/config.c:143 -msgid "remove all matches: name [value-regex]" +msgid "add a new variable: name value" msgstr "" #: builtin/config.c:144 -msgid "rename section: old-name new-name" +msgid "remove a variable: name [value-pattern]" msgstr "" #: builtin/config.c:145 -msgid "remove a section: name" +msgid "remove all matches: name [value-pattern]" msgstr "" #: builtin/config.c:146 -msgid "list all" +msgid "rename section: old-name new-name" msgstr "" #: builtin/config.c:147 -msgid "open an editor" +msgid "remove a section: name" msgstr "" #: builtin/config.c:148 -msgid "find the color configured: slot [default]" +msgid "list all" msgstr "" #: builtin/config.c:149 -msgid "find the color setting: slot [stdout-is-tty]" +msgid "use string equality when comparing values to 'value-pattern'" msgstr "" #: builtin/config.c:150 +msgid "open an editor" +msgstr "" + +#: builtin/config.c:151 +msgid "find the color configured: slot [default]" +msgstr "" + +#: builtin/config.c:152 +msgid "find the color setting: slot [stdout-is-tty]" +msgstr "" + +#: builtin/config.c:153 msgid "Type" msgstr "" -#: builtin/config.c:151 builtin/env--helper.c:43 +#: builtin/config.c:154 builtin/env--helper.c:43 msgid "value is given this type" msgstr "" -#: builtin/config.c:152 +#: builtin/config.c:155 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:153 +#: builtin/config.c:156 msgid "value is decimal number" msgstr "" -#: builtin/config.c:154 +#: builtin/config.c:157 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:155 +#: builtin/config.c:158 msgid "value is --bool or string" msgstr "" -#: builtin/config.c:156 +#: builtin/config.c:159 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:157 +#: builtin/config.c:160 msgid "value is an expiry date" msgstr "" -#: builtin/config.c:158 +#: builtin/config.c:161 msgid "Other" msgstr "" -#: builtin/config.c:159 +#: builtin/config.c:162 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:160 +#: builtin/config.c:163 msgid "show variable names only" msgstr "" -#: builtin/config.c:161 +#: builtin/config.c:164 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:162 +#: builtin/config.c:165 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" -#: builtin/config.c:163 +#: builtin/config.c:166 msgid "show scope of config (worktree, local, global, system, command)" msgstr "" -#: builtin/config.c:164 builtin/env--helper.c:45 +#: builtin/config.c:167 builtin/env--helper.c:45 msgid "value" msgstr "" -#: builtin/config.c:164 +#: builtin/config.c:167 msgid "with --get, use default value when missing entry" msgstr "" -#: builtin/config.c:178 +#: builtin/config.c:181 #, c-format msgid "wrong number of arguments, should be %d" msgstr "" -#: builtin/config.c:180 +#: builtin/config.c:183 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "" -#: builtin/config.c:334 +#: builtin/config.c:339 #, c-format msgid "invalid key pattern: %s" msgstr "" -#: builtin/config.c:370 +#: builtin/config.c:377 #, c-format msgid "failed to format default config value: %s" msgstr "" -#: builtin/config.c:434 +#: builtin/config.c:441 #, c-format msgid "cannot parse color '%s'" msgstr "" -#: builtin/config.c:476 +#: builtin/config.c:483 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:529 builtin/config.c:789 +#: builtin/config.c:536 builtin/config.c:833 msgid "not in a git directory" msgstr "" -#: builtin/config.c:532 +#: builtin/config.c:539 msgid "writing to stdin is not supported" msgstr "" -#: builtin/config.c:535 +#: builtin/config.c:542 msgid "writing config blobs is not supported" msgstr "" -#: builtin/config.c:620 +#: builtin/config.c:627 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12733,85 +13000,89 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:644 +#: builtin/config.c:652 msgid "only one config file at a time" msgstr "" -#: builtin/config.c:650 +#: builtin/config.c:658 msgid "--local can only be used inside a git repository" msgstr "" -#: builtin/config.c:652 +#: builtin/config.c:660 msgid "--blob can only be used inside a git repository" msgstr "" -#: builtin/config.c:654 +#: builtin/config.c:662 msgid "--worktree can only be used inside a git repository" msgstr "" -#: builtin/config.c:676 +#: builtin/config.c:684 msgid "$HOME not set" msgstr "" -#: builtin/config.c:700 +#: builtin/config.c:708 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:735 +#: builtin/config.c:743 msgid "--get-color and variable type are incoherent" msgstr "" -#: builtin/config.c:740 +#: builtin/config.c:748 msgid "only one action at a time" msgstr "" -#: builtin/config.c:753 +#: builtin/config.c:761 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "" -#: builtin/config.c:759 +#: builtin/config.c:767 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" -#: builtin/config.c:765 +#: builtin/config.c:773 msgid "--default is only applicable to --get" msgstr "" -#: builtin/config.c:778 +#: builtin/config.c:806 +msgid "--fixed-value only applies with 'value-pattern'" +msgstr "" + +#: builtin/config.c:822 #, c-format msgid "unable to read config file '%s'" msgstr "" -#: builtin/config.c:781 +#: builtin/config.c:825 msgid "error processing config file(s)" msgstr "" -#: builtin/config.c:791 +#: builtin/config.c:835 msgid "editing stdin is not supported" msgstr "" -#: builtin/config.c:793 +#: builtin/config.c:837 msgid "editing blobs is not supported" msgstr "" -#: builtin/config.c:807 +#: builtin/config.c:851 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:820 +#: builtin/config.c:864 #, 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:894 builtin/config.c:905 +#: builtin/config.c:943 builtin/config.c:954 #, c-format msgid "no such section: %s" msgstr "" @@ -12845,6 +13116,11 @@ msgstr "" msgid "credential-cache unavailable; no unix socket support" msgstr "" +#: builtin/credential-store.c:66 +#, c-format +msgid "unable to get credential storage lock in %d ms" +msgstr "" + #: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "" @@ -13003,41 +13279,49 @@ msgstr "" msgid "--broken is incompatible with commit-ishes" msgstr "" -#: builtin/diff.c:91 +#: builtin/diff-tree.c:155 +msgid "--stdin and --merge-base are mutually exclusive" +msgstr "" + +#: builtin/diff-tree.c:157 +msgid "--merge-base only works with two commits" +msgstr "" + +#: builtin/diff.c:92 #, c-format msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:241 +#: builtin/diff.c:259 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:358 +#: builtin/diff.c:376 #, c-format msgid "%s...%s: no merge base" msgstr "" -#: builtin/diff.c:468 +#: builtin/diff.c:486 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:513 +#: builtin/diff.c:532 builtin/grep.c:682 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:524 +#: builtin/diff.c:543 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:529 +#: builtin/diff.c:548 #, c-format msgid "unhandled object '%s' given." msgstr "" -#: builtin/diff.c:563 +#: builtin/diff.c:582 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "" @@ -13066,89 +13350,89 @@ msgstr "" msgid "could not read object %s for symlink %s" msgstr "" -#: builtin/difftool.c:413 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" -#: builtin/difftool.c:634 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "" -#: builtin/difftool.c:636 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "" -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "" -#: builtin/difftool.c:648 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "" -#: builtin/difftool.c:697 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "" -#: builtin/difftool.c:699 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "" -#: builtin/difftool.c:701 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "tool" msgstr "" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "" -#: builtin/difftool.c:717 +#: builtin/difftool.c:716 msgid "passed to `diff`" msgstr "" -#: builtin/difftool.c:732 +#: builtin/difftool.c:731 msgid "difftool requires worktree or --no-index" msgstr "" -#: builtin/difftool.c:739 +#: builtin/difftool.c:738 msgid "--dir-diff is incompatible with --no-index" msgstr "" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "" -#: builtin/difftool.c:750 +#: builtin/difftool.c:749 msgid "no <tool> given for --tool=<tool>" msgstr "" -#: builtin/difftool.c:757 +#: builtin/difftool.c:756 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "" @@ -13188,124 +13472,124 @@ msgstr "" msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1177 msgid "--anonymize-map token cannot be empty" msgstr "" -#: builtin/fast-export.c:1198 +#: builtin/fast-export.c:1197 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:1200 +#: builtin/fast-export.c:1199 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:1203 +#: builtin/fast-export.c:1202 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:1206 +#: builtin/fast-export.c:1205 msgid "select handling of commit messages in an alternate encoding" msgstr "" -#: builtin/fast-export.c:1209 -msgid "Dump marks to this file" +#: builtin/fast-export.c:1208 +msgid "dump marks to this file" msgstr "" -#: builtin/fast-export.c:1211 -msgid "Import marks from this file" +#: builtin/fast-export.c:1210 +msgid "import marks from this file" msgstr "" -#: builtin/fast-export.c:1215 -msgid "Import marks from this file if it exists" +#: builtin/fast-export.c:1214 +msgid "import marks from this file if it exists" msgstr "" -#: builtin/fast-export.c:1217 -msgid "Fake a tagger when tags lack one" +#: builtin/fast-export.c:1216 +msgid "fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:1219 -msgid "Output full tree for each commit" +#: builtin/fast-export.c:1218 +msgid "output full tree for each commit" msgstr "" -#: builtin/fast-export.c:1221 -msgid "Use the done feature to terminate the stream" +#: builtin/fast-export.c:1220 +msgid "use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:1222 -msgid "Skip output of blob data" +#: builtin/fast-export.c:1221 +msgid "skip output of blob data" msgstr "" -#: builtin/fast-export.c:1223 builtin/log.c:1811 +#: builtin/fast-export.c:1222 builtin/log.c:1815 msgid "refspec" msgstr "" -#: builtin/fast-export.c:1224 -msgid "Apply refspec to exported refs" +#: builtin/fast-export.c:1223 +msgid "apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c:1224 msgid "anonymize output" msgstr "" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1225 msgid "from:to" msgstr "" -#: builtin/fast-export.c:1227 +#: builtin/fast-export.c:1226 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" +#: builtin/fast-export.c:1229 +msgid "reference parents which are not in fast-export stream by object id" msgstr "" -#: builtin/fast-export.c:1232 -msgid "Show original object ids of blobs/commits" +#: builtin/fast-export.c:1231 +msgid "show original object ids of blobs/commits" msgstr "" -#: builtin/fast-export.c:1234 -msgid "Label tags with mark ids" +#: builtin/fast-export.c:1233 +msgid "label tags with mark ids" msgstr "" -#: builtin/fast-export.c:1257 +#: builtin/fast-export.c:1256 msgid "--anonymize-map without --anonymize does not make sense" msgstr "" -#: builtin/fast-export.c:1272 +#: builtin/fast-export.c:1271 msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "" -#: builtin/fast-import.c:3086 +#: builtin/fast-import.c:3088 #, c-format msgid "Missing from marks for submodule '%s'" msgstr "" -#: builtin/fast-import.c:3088 +#: builtin/fast-import.c:3090 #, c-format msgid "Missing to marks for submodule '%s'" msgstr "" -#: builtin/fast-import.c:3223 +#: builtin/fast-import.c:3225 #, c-format msgid "Expected 'mark' command, got %s" msgstr "" -#: builtin/fast-import.c:3228 +#: builtin/fast-import.c:3230 #, c-format msgid "Expected 'to' command, got %s" msgstr "" -#: builtin/fast-import.c:3320 +#: builtin/fast-import.c:3322 msgid "Expected format name:filename for submodule rewrite option" msgstr "" -#: builtin/fast-import.c:3374 +#: builtin/fast-import.c:3377 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "" -#: builtin/fetch-pack.c:241 +#: builtin/fetch-pack.c:242 #, c-format msgid "Lockfile created but not reported: %s" msgstr "" @@ -13326,196 +13610,200 @@ msgstr "" msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:119 +#: builtin/fetch.c:120 msgid "fetch.parallel cannot be negative" msgstr "" -#: builtin/fetch.c:142 builtin/pull.c:185 +#: builtin/fetch.c:143 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:144 builtin/pull.c:245 +#: builtin/fetch.c:145 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "" -#: builtin/fetch.c:146 builtin/pull.c:188 +#: builtin/fetch.c:147 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:148 builtin/pull.c:191 +#: builtin/fetch.c:149 +msgid "use atomic transaction to update references" +msgstr "" + +#: builtin/fetch.c:151 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:149 +#: builtin/fetch.c:152 msgid "force overwrite of local reference" msgstr "" -#: builtin/fetch.c:151 +#: builtin/fetch.c:154 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:153 builtin/pull.c:195 +#: builtin/fetch.c:156 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:155 +#: builtin/fetch.c:158 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:157 +#: builtin/fetch.c:160 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:159 builtin/pull.c:198 +#: builtin/fetch.c:162 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:161 +#: builtin/fetch.c:164 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 +#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122 msgid "on-demand" msgstr "" -#: builtin/fetch.c:163 +#: builtin/fetch.c:166 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:168 +#: builtin/fetch.c:171 msgid "write fetched references to the FETCH_HEAD file" msgstr "" -#: builtin/fetch.c:169 builtin/pull.c:206 +#: builtin/fetch.c:172 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:171 +#: builtin/fetch.c:174 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:176 builtin/pull.c:212 +#: builtin/fetch.c:179 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:182 builtin/pull.c:221 +#: builtin/fetch.c:185 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:185 +#: builtin/fetch.c:188 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:188 +#: builtin/fetch.c:191 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:192 builtin/pull.c:224 +#: builtin/fetch.c:195 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:193 builtin/pull.c:226 +#: builtin/fetch.c:196 builtin/pull.c:226 msgid "refmap" msgstr "" -#: builtin/fetch.c:194 builtin/pull.c:227 +#: builtin/fetch.c:197 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:201 builtin/pull.c:240 +#: builtin/fetch.c:204 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "" -#: builtin/fetch.c:204 builtin/fetch.c:206 +#: builtin/fetch.c:207 builtin/fetch.c:209 msgid "run 'maintenance --auto' after fetching" msgstr "" -#: builtin/fetch.c:208 builtin/pull.c:243 +#: builtin/fetch.c:211 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "" -#: builtin/fetch.c:210 +#: builtin/fetch.c:213 msgid "write the commit-graph after fetching" msgstr "" -#: builtin/fetch.c:212 +#: builtin/fetch.c:215 msgid "accept refspecs from stdin" msgstr "" -#: builtin/fetch.c:523 +#: builtin/fetch.c:526 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:677 +#: builtin/fetch.c:697 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:775 +#: builtin/fetch.c:796 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:779 +#: builtin/fetch.c:800 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 +#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:793 +#: builtin/fetch.c:814 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:803 +#: builtin/fetch.c:824 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 -#: builtin/fetch.c:875 +#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884 +#: builtin/fetch.c:896 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:808 +#: builtin/fetch.c:829 msgid "would clobber existing tag" msgstr "" -#: builtin/fetch.c:830 +#: builtin/fetch.c:851 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:833 +#: builtin/fetch.c:854 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:836 +#: builtin/fetch.c:857 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:875 +#: builtin/fetch.c:896 msgid "forced update" msgstr "" -#: builtin/fetch.c:880 +#: builtin/fetch.c:901 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:901 +#: builtin/fetch.c:1005 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:905 +#: builtin/fetch.c:1009 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13524,148 +13812,152 @@ msgid "" " to avoid this check.\n" msgstr "" -#: builtin/fetch.c:939 +#: builtin/fetch.c:1041 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:960 +#: builtin/fetch.c:1069 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:1053 builtin/fetch.c:1191 +#: builtin/fetch.c:1146 builtin/fetch.c:1297 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:1064 +#: builtin/fetch.c:1168 #, 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:1161 +#: builtin/fetch.c:1267 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:1162 +#: builtin/fetch.c:1268 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:1194 +#: builtin/fetch.c:1300 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:1195 builtin/remote.c:1113 +#: builtin/fetch.c:1301 builtin/remote.c:1118 msgid "(none)" msgstr "" -#: builtin/fetch.c:1218 +#: builtin/fetch.c:1324 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1237 +#: builtin/fetch.c:1343 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1240 +#: builtin/fetch.c:1346 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1448 +#: builtin/fetch.c:1558 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "" -#: builtin/fetch.c:1463 +#: builtin/fetch.c:1573 msgid "not setting upstream for a remote remote-tracking branch" msgstr "" -#: builtin/fetch.c:1465 +#: builtin/fetch.c:1575 msgid "not setting upstream for a remote tag" msgstr "" -#: builtin/fetch.c:1467 +#: builtin/fetch.c:1577 msgid "unknown branch type" msgstr "" -#: builtin/fetch.c:1469 +#: builtin/fetch.c:1579 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 +#: builtin/fetch.c:1708 builtin/fetch.c:1771 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 +#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1620 +#: builtin/fetch.c:1730 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "" -#: builtin/fetch.c:1724 +#: builtin/fetch.c:1834 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:1760 +#: builtin/fetch.c:1870 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1825 +#: builtin/fetch.c:1935 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1827 +#: builtin/fetch.c:1937 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1832 +#: builtin/fetch.c:1942 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1834 +#: builtin/fetch.c:1944 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1851 +#: builtin/fetch.c:1961 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1853 +#: builtin/fetch.c:1963 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1862 +#: builtin/fetch.c:1972 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1869 +#: builtin/fetch.c:1979 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fetch.c:1887 +#: builtin/fetch.c:1997 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "" -#: builtin/fetch.c:1891 +#: builtin/fetch.c:2001 +msgid "--atomic can only be used when fetching from one remote" +msgstr "" + +#: builtin/fetch.c:2005 msgid "--stdin can only be used when fetching from one remote" msgstr "" @@ -13730,7 +14022,7 @@ msgstr "" msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:39 builtin/tag.c:440 +#: builtin/for-each-ref.c:39 builtin/tag.c:472 msgid "respect format colors" msgstr "" @@ -13754,272 +14046,288 @@ msgstr "" msgid "print only refs which don't contain the commit" msgstr "" -#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 +#: builtin/for-each-repo.c:9 +msgid "git for-each-repo --config=<config> <command-args>" +msgstr "" + +#: builtin/for-each-repo.c:37 +msgid "config" +msgstr "" + +#: builtin/for-each-repo.c:38 +msgid "config key storing a list of repository paths" +msgstr "" + +#: builtin/for-each-repo.c:46 +msgid "missing --config=<config>" +msgstr "" + +#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131 msgid "unknown" msgstr "" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:101 builtin/fsck.c:121 +#: builtin/fsck.c:83 builtin/fsck.c:103 #, c-format msgid "error in %s %s: %s" msgstr "" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:115 +#: builtin/fsck.c:97 #, c-format msgid "warning in %s %s: %s" msgstr "" -#: builtin/fsck.c:144 builtin/fsck.c:147 +#: builtin/fsck.c:126 builtin/fsck.c:129 #, c-format msgid "broken link from %7s %s" msgstr "" -#: builtin/fsck.c:156 +#: builtin/fsck.c:138 msgid "wrong object type in link" msgstr "" -#: builtin/fsck.c:172 +#: builtin/fsck.c:154 #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -#: builtin/fsck.c:283 +#: builtin/fsck.c:265 #, c-format msgid "missing %s %s" msgstr "" -#: builtin/fsck.c:310 +#: builtin/fsck.c:292 #, c-format msgid "unreachable %s %s" msgstr "" -#: builtin/fsck.c:330 +#: builtin/fsck.c:312 #, c-format msgid "dangling %s %s" msgstr "" -#: builtin/fsck.c:340 +#: builtin/fsck.c:322 msgid "could not create lost-found" msgstr "" -#: builtin/fsck.c:351 +#: builtin/fsck.c:333 #, c-format msgid "could not finish '%s'" msgstr "" -#: builtin/fsck.c:368 +#: builtin/fsck.c:350 #, c-format msgid "Checking %s" msgstr "" -#: builtin/fsck.c:406 +#: builtin/fsck.c:388 #, c-format msgid "Checking connectivity (%d objects)" msgstr "" -#: builtin/fsck.c:425 +#: builtin/fsck.c:407 #, c-format msgid "Checking %s %s" msgstr "" -#: builtin/fsck.c:430 +#: builtin/fsck.c:412 msgid "broken links" msgstr "" -#: builtin/fsck.c:439 +#: builtin/fsck.c:421 #, c-format msgid "root %s" msgstr "" -#: builtin/fsck.c:447 +#: builtin/fsck.c:429 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "" -#: builtin/fsck.c:476 +#: builtin/fsck.c:458 #, c-format msgid "%s: object corrupt or missing" msgstr "" -#: builtin/fsck.c:501 +#: builtin/fsck.c:483 #, c-format msgid "%s: invalid reflog entry %s" msgstr "" -#: builtin/fsck.c:515 +#: builtin/fsck.c:497 #, c-format msgid "Checking reflog %s->%s" msgstr "" -#: builtin/fsck.c:549 +#: builtin/fsck.c:531 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "" -#: builtin/fsck.c:556 +#: builtin/fsck.c:538 #, c-format msgid "%s: not a commit" msgstr "" -#: builtin/fsck.c:610 +#: builtin/fsck.c:592 msgid "notice: No default references" msgstr "" -#: builtin/fsck.c:625 +#: builtin/fsck.c:607 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "" -#: builtin/fsck.c:638 +#: builtin/fsck.c:620 #, c-format msgid "%s: object could not be parsed: %s" msgstr "" -#: builtin/fsck.c:658 +#: builtin/fsck.c:640 #, c-format msgid "bad sha1 file: %s" msgstr "" -#: builtin/fsck.c:673 +#: builtin/fsck.c:655 msgid "Checking object directory" msgstr "" -#: builtin/fsck.c:676 +#: builtin/fsck.c:658 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:691 +#: builtin/fsck.c:673 #, c-format msgid "Checking %s link" msgstr "" -#: builtin/fsck.c:696 builtin/index-pack.c:865 +#: builtin/fsck.c:678 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "" -#: builtin/fsck.c:703 +#: builtin/fsck.c:685 #, c-format msgid "%s points to something strange (%s)" msgstr "" -#: builtin/fsck.c:709 +#: builtin/fsck.c:691 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "" -#: builtin/fsck.c:713 +#: builtin/fsck.c:695 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "" -#: builtin/fsck.c:725 +#: builtin/fsck.c:707 msgid "Checking cache tree" msgstr "" -#: builtin/fsck.c:730 +#: builtin/fsck.c:712 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "" -#: builtin/fsck.c:739 +#: builtin/fsck.c:721 msgid "non-tree in cache-tree" msgstr "" -#: builtin/fsck.c:770 +#: builtin/fsck.c:752 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:776 +#: builtin/fsck.c:758 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:777 +#: builtin/fsck.c:759 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:778 +#: builtin/fsck.c:760 msgid "report tags" msgstr "" -#: builtin/fsck.c:779 +#: builtin/fsck.c:761 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:780 +#: builtin/fsck.c:762 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:781 +#: builtin/fsck.c:763 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:782 +#: builtin/fsck.c:764 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:783 +#: builtin/fsck.c:765 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:784 +#: builtin/fsck.c:766 builtin/mktag.c:78 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:786 +#: builtin/fsck.c:768 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:787 builtin/prune.c:134 +#: builtin/fsck.c:769 builtin/prune.c:134 msgid "show progress" msgstr "" -#: builtin/fsck.c:788 +#: builtin/fsck.c:770 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:847 builtin/index-pack.c:261 +#: builtin/fsck.c:829 builtin/index-pack.c:261 msgid "Checking objects" msgstr "" -#: builtin/fsck.c:875 +#: builtin/fsck.c:857 #, c-format msgid "%s: object missing" msgstr "" -#: builtin/fsck.c:886 +#: builtin/fsck.c:868 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "" -#: builtin/gc.c:36 +#: builtin/gc.c:39 msgid "git gc [<options>]" msgstr "" -#: builtin/gc.c:91 +#: builtin/gc.c:93 #, c-format msgid "Failed to fstat %s: %s" msgstr "" -#: builtin/gc.c:127 +#: builtin/gc.c:129 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "" -#: builtin/gc.c:476 builtin/init-db.c:58 +#: builtin/gc.c:487 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 +#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/gc.c:492 +#: builtin/gc.c:503 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14029,111 +14337,217 @@ msgid "" "%s" msgstr "" -#: builtin/gc.c:540 +#: builtin/gc.c:551 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:542 +#: builtin/gc.c:553 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:543 +#: builtin/gc.c:554 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:546 +#: builtin/gc.c:557 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:549 +#: builtin/gc.c:560 msgid "repack all other packs except the largest pack" msgstr "" -#: builtin/gc.c:566 +#: builtin/gc.c:576 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "" -#: builtin/gc.c:577 +#: builtin/gc.c:587 #, c-format msgid "failed to parse prune expiry value %s" msgstr "" -#: builtin/gc.c:597 +#: builtin/gc.c:607 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:599 +#: builtin/gc.c:609 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:600 +#: builtin/gc.c:610 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:640 +#: builtin/gc.c:650 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:695 +#: builtin/gc.c:705 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/gc.c:705 -msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +#: builtin/gc.c:715 +msgid "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" +msgstr "" + +#: builtin/gc.c:745 +msgid "--no-schedule is not allowed" msgstr "" -#: builtin/gc.c:812 +#: builtin/gc.c:750 +#, c-format +msgid "unrecognized --schedule argument '%s'" +msgstr "" + +#: builtin/gc.c:869 msgid "failed to write commit-graph" msgstr "" -#: builtin/gc.c:905 +#: builtin/gc.c:914 +msgid "failed to fill remotes" +msgstr "" + +#: builtin/gc.c:1037 +msgid "failed to start 'git pack-objects' process" +msgstr "" + +#: builtin/gc.c:1054 +msgid "failed to finish 'git pack-objects' process" +msgstr "" + +#: builtin/gc.c:1106 +msgid "failed to write multi-pack-index" +msgstr "" + +#: builtin/gc.c:1124 +msgid "'git multi-pack-index expire' failed" +msgstr "" + +#: builtin/gc.c:1185 +msgid "'git multi-pack-index repack' failed" +msgstr "" + +#: builtin/gc.c:1194 +msgid "" +"skipping incremental-repack task because core.multiPackIndex is disabled" +msgstr "" + +#: builtin/gc.c:1298 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "" -#: builtin/gc.c:932 +#: builtin/gc.c:1328 #, c-format msgid "task '%s' failed" msgstr "" -#: builtin/gc.c:979 +#: builtin/gc.c:1410 #, c-format msgid "'%s' is not a valid task" msgstr "" -#: builtin/gc.c:984 +#: builtin/gc.c:1415 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "" -#: builtin/gc.c:999 +#: builtin/gc.c:1430 msgid "run tasks based on the state of the repository" msgstr "" -#: builtin/gc.c:1001 +#: builtin/gc.c:1431 +msgid "frequency" +msgstr "" + +#: builtin/gc.c:1432 +msgid "run tasks based on frequency" +msgstr "" + +#: builtin/gc.c:1435 msgid "do not report progress or other information over stderr" msgstr "" -#: builtin/gc.c:1002 +#: builtin/gc.c:1436 msgid "task" msgstr "" -#: builtin/gc.c:1003 +#: builtin/gc.c:1437 msgid "run a specific task" msgstr "" -#: builtin/gc.c:1026 -msgid "git maintenance run [<options>]" +#: builtin/gc.c:1454 +msgid "use at most one of --auto and --schedule=<frequency>" msgstr "" -#: builtin/gc.c:1037 +#: builtin/gc.c:1497 +msgid "failed to run 'git config'" +msgstr "" + +#: builtin/gc.c:1562 +#, c-format +msgid "failed to expand path '%s'" +msgstr "" + +#: builtin/gc.c:1591 +msgid "failed to start launchctl" +msgstr "" + +#: builtin/gc.c:1628 +#, c-format +msgid "failed to create directories for '%s'" +msgstr "" + +#: builtin/gc.c:1689 +#, c-format +msgid "failed to bootstrap service %s" +msgstr "" + +#: builtin/gc.c:1760 +msgid "failed to create temp xml file" +msgstr "" + +#: builtin/gc.c:1850 +msgid "failed to start schtasks" +msgstr "" + +#: builtin/gc.c:1894 +msgid "failed to run 'crontab -l'; your system might not support 'cron'" +msgstr "" + +#: builtin/gc.c:1911 +msgid "failed to run 'crontab'; your system might not support 'cron'" +msgstr "" + +#: builtin/gc.c:1915 +msgid "failed to open stdin of 'crontab'" +msgstr "" + +#: builtin/gc.c:1956 +msgid "'crontab' died" +msgstr "" + +#: builtin/gc.c:1990 +msgid "another process is scheduling background maintenance" +msgstr "" + +#: builtin/gc.c:2009 +msgid "failed to add repo to global config" +msgstr "" + +#: builtin/gc.c:2019 +msgid "git maintenance <subcommand> [<options>]" +msgstr "" + +#: builtin/gc.c:2038 #, c-format msgid "invalid subcommand: %s" msgstr "" @@ -14142,12 +14556,12 @@ msgstr "" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" -#: builtin/grep.c:225 +#: builtin/grep.c:223 #, c-format msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:279 +#: builtin/grep.c:277 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "" @@ -14156,258 +14570,258 @@ msgstr "" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 -#: builtin/pack-objects.c:2936 +#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808 +#: builtin/pack-objects.c:2944 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 +#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:655 +#: builtin/grep.c:656 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:725 +#: builtin/grep.c:737 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:824 +#: builtin/grep.c:836 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:826 +#: builtin/grep.c:838 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:828 +#: builtin/grep.c:840 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:830 +#: builtin/grep.c:842 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:832 +#: builtin/grep.c:844 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:835 +#: builtin/grep.c:847 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:837 +#: builtin/grep.c:849 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:839 +#: builtin/grep.c:851 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:841 +#: builtin/grep.c:853 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:843 +#: builtin/grep.c:855 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:846 +#: builtin/grep.c:858 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:848 +#: builtin/grep.c:860 msgid "search in subdirectories (default)" msgstr "" -#: builtin/grep.c:850 +#: builtin/grep.c:862 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:854 +#: builtin/grep.c:866 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:869 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:860 +#: builtin/grep.c:872 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:863 +#: builtin/grep.c:875 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:866 +#: builtin/grep.c:878 msgid "show line numbers" msgstr "" -#: builtin/grep.c:867 +#: builtin/grep.c:879 msgid "show column number of first match" msgstr "" -#: builtin/grep.c:868 +#: builtin/grep.c:880 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:869 +#: builtin/grep.c:881 msgid "show filenames" msgstr "" -#: builtin/grep.c:871 +#: builtin/grep.c:883 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:873 +#: builtin/grep.c:885 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:875 +#: builtin/grep.c:887 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:878 +#: builtin/grep.c:890 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:880 +#: builtin/grep.c:892 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:883 +#: builtin/grep.c:895 msgid "show only matching parts of a line" msgstr "" -#: builtin/grep.c:885 +#: builtin/grep.c:897 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:886 +#: builtin/grep.c:898 msgid "highlight matches" msgstr "" -#: builtin/grep.c:888 +#: builtin/grep.c:900 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:890 +#: builtin/grep.c:902 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:893 +#: builtin/grep.c:905 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:896 +#: builtin/grep.c:908 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:898 +#: builtin/grep.c:910 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:912 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:901 +#: builtin/grep.c:913 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:904 +#: builtin/grep.c:916 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:906 +#: builtin/grep.c:918 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:909 +#: builtin/grep.c:921 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:911 +#: builtin/grep.c:923 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:913 +#: builtin/grep.c:925 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:925 +#: builtin/grep.c:937 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:927 +#: builtin/grep.c:939 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:929 -msgid "show parse tree for grep expression" -msgstr "" - -#: builtin/grep.c:933 +#: builtin/grep.c:942 msgid "pager" msgstr "" -#: builtin/grep.c:933 +#: builtin/grep.c:942 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:937 +#: builtin/grep.c:946 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:1004 +#: builtin/grep.c:1012 msgid "no pattern given" msgstr "" -#: builtin/grep.c:1040 +#: builtin/grep.c:1048 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1048 +#: builtin/grep.c:1056 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1078 +#: builtin/grep.c:1086 msgid "--untracked not supported with --recurse-submodules" msgstr "" -#: builtin/grep.c:1082 +#: builtin/grep.c:1090 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1085 builtin/pack-objects.c:3655 +#: builtin/grep.c:1093 builtin/pack-objects.c:3672 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 +#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1122 +#: builtin/grep.c:1130 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1148 +#: builtin/grep.c:1156 msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1154 +#: builtin/grep.c:1159 +msgid "--untracked cannot be used with --cached" +msgstr "" + +#: builtin/grep.c:1165 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1162 +#: builtin/grep.c:1173 msgid "both --cached and trees are given" msgstr "" @@ -14532,12 +14946,12 @@ msgstr "" msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:520 builtin/help.c:531 git.c:337 +#: builtin/help.c:520 builtin/help.c:531 git.c:340 #, c-format msgid "'%s' is aliased to '%s'" msgstr "" -#: builtin/help.c:534 git.c:369 +#: builtin/help.c:534 git.c:372 #, c-format msgid "bad alias.%s string: %s" msgstr "" @@ -14585,7 +14999,7 @@ msgstr "" msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:324 builtin/pack-objects.c:619 +#: builtin/index-pack.c:324 builtin/pack-objects.c:624 msgid "pack too large for current definition of off_t" msgstr "" @@ -14593,7 +15007,7 @@ msgstr "" msgid "pack exceeds maximum allowed size" msgstr "" -#: builtin/index-pack.c:342 builtin/repack.c:254 +#: builtin/index-pack.c:342 #, c-format msgid "unable to create '%s'" msgstr "" @@ -14718,7 +15132,7 @@ msgstr "" msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707 #, c-format msgid "unable to create thread: %s" msgstr "" @@ -14756,9 +15170,9 @@ msgstr "" msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1444 +#: builtin/index-pack.c:1445 #, c-format -msgid "packfile name '%s' does not end with '.pack'" +msgid "packfile name '%s' does not end with '.%s'" msgstr "" #: builtin/index-pack.c:1469 @@ -14771,79 +15185,83 @@ msgstr "" msgid "cannot close written %s file '%s'" msgstr "" -#: builtin/index-pack.c:1501 +#: builtin/index-pack.c:1503 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1515 +#: builtin/index-pack.c:1517 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1523 +#: builtin/index-pack.c:1525 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 +#: builtin/index-pack.c:1534 +msgid "cannot store reverse index file" +msgstr "" + +#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1631 +#: builtin/index-pack.c:1650 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1633 +#: builtin/index-pack.c:1652 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1681 +#: builtin/index-pack.c:1700 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1688 +#: builtin/index-pack.c:1707 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1728 +#: builtin/index-pack.c:1765 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 -#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 +#: builtin/index-pack.c:1819 builtin/index-pack.c:1822 +#: builtin/index-pack.c:1838 builtin/index-pack.c:1842 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623 +#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625 #, c-format msgid "unknown hash algorithm '%s'" msgstr "" -#: builtin/index-pack.c:1821 +#: builtin/index-pack.c:1867 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1823 +#: builtin/index-pack.c:1869 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1825 +#: builtin/index-pack.c:1871 msgid "--object-format cannot be used with --stdin" msgstr "" -#: builtin/index-pack.c:1831 +#: builtin/index-pack.c:1886 msgid "--verify with no packfile name given" msgstr "" -#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "" @@ -14887,108 +15305,108 @@ msgstr "" msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:274 +#: builtin/init-db.c:275 #, c-format msgid "invalid initial branch name: '%s'" msgstr "" -#: builtin/init-db.c:366 +#: builtin/init-db.c:367 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:369 +#: builtin/init-db.c:370 #, c-format msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:385 +#: builtin/init-db.c:386 msgid "attempt to reinitialize repository with different hash" msgstr "" -#: builtin/init-db.c:409 builtin/init-db.c:412 +#: builtin/init-db.c:410 builtin/init-db.c:413 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:443 +#: builtin/init-db.c:445 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "" -#: builtin/init-db.c:474 +#: builtin/init-db.c:476 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:475 +#: builtin/init-db.c:477 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:479 +#: builtin/init-db.c:481 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:480 +#: builtin/init-db.c:482 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:529 +#: builtin/init-db.c:531 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -#: builtin/init-db.c:555 +#: builtin/init-db.c:557 msgid "permissions" msgstr "" -#: builtin/init-db.c:556 +#: builtin/init-db.c:558 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:562 +#: builtin/init-db.c:564 msgid "override the name of the initial branch" msgstr "" -#: builtin/init-db.c:563 builtin/verify-pack.c:74 +#: builtin/init-db.c:565 builtin/verify-pack.c:74 msgid "hash" msgstr "" -#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "" -#: builtin/init-db.c:571 +#: builtin/init-db.c:573 msgid "--separate-git-dir and --bare are mutually exclusive" msgstr "" -#: builtin/init-db.c:600 builtin/init-db.c:605 +#: builtin/init-db.c:602 builtin/init-db.c:607 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:609 builtin/init-db.c:664 +#: builtin/init-db.c:611 builtin/init-db.c:666 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:636 +#: builtin/init-db.c:638 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:688 +#: builtin/init-db.c:690 #, c-format msgid "Cannot access work tree '%s'" msgstr "" -#: builtin/init-db.c:693 +#: builtin/init-db.c:695 msgid "--separate-git-dir incompatible with bare repository" msgstr "" @@ -15054,515 +15472,525 @@ msgstr "" msgid "no input file given for in-place editing" msgstr "" -#: builtin/log.c:56 +#: builtin/log.c:59 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/log.c:57 +#: builtin/log.c:60 msgid "git show [<options>] <object>..." msgstr "" -#: builtin/log.c:110 +#: builtin/log.c:113 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:177 +#: builtin/log.c:180 msgid "show source" msgstr "" -#: builtin/log.c:178 -msgid "Use mail map file" +#: builtin/log.c:181 +msgid "use mail map file" msgstr "" -#: builtin/log.c:181 +#: builtin/log.c:184 msgid "only decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:183 +#: builtin/log.c:186 msgid "do not decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:184 +#: builtin/log.c:187 msgid "decorate options" msgstr "" -#: builtin/log.c:187 -msgid "Process line range n,m in file, counting from 1" +#: builtin/log.c:190 +msgid "" +"trace the evolution of line range <start>,<end> or function :<funcname> in " +"<file>" +msgstr "" + +#: builtin/log.c:213 +msgid "-L<range>:<file> cannot be used with pathspec" msgstr "" -#: builtin/log.c:297 +#: builtin/log.c:303 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:555 +#: builtin/log.c:566 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:570 builtin/log.c:665 +#: builtin/log.c:581 builtin/log.c:671 #, c-format msgid "could not read object %s" msgstr "" -#: builtin/log.c:690 +#: builtin/log.c:696 #, c-format msgid "unknown type: %d" msgstr "" -#: builtin/log.c:839 +#: builtin/log.c:841 #, c-format msgid "%s: invalid cover from description mode" msgstr "" -#: builtin/log.c:846 +#: builtin/log.c:848 msgid "format.headers without value" msgstr "" -#: builtin/log.c:965 -msgid "name of output directory is too long" -msgstr "" - -#: builtin/log.c:981 +#: builtin/log.c:977 #, c-format msgid "cannot open patch file %s" msgstr "" -#: builtin/log.c:998 +#: builtin/log.c:994 msgid "need exactly one range" msgstr "" -#: builtin/log.c:1008 +#: builtin/log.c:1004 msgid "not a range" msgstr "" -#: builtin/log.c:1172 +#: builtin/log.c:1168 msgid "cover letter needs email format" msgstr "" -#: builtin/log.c:1178 +#: builtin/log.c:1174 msgid "failed to create cover-letter file" msgstr "" -#: builtin/log.c:1259 +#: builtin/log.c:1261 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1286 +#: builtin/log.c:1288 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1344 +#: builtin/log.c:1346 msgid "two output directories?" msgstr "" -#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 +#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331 #, c-format msgid "unknown commit %s" msgstr "" -#: builtin/log.c:1506 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1508 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:1515 +#: builtin/log.c:1517 msgid "could not find exact merge base" msgstr "" -#: builtin/log.c:1525 +#: builtin/log.c:1527 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:1548 +#: builtin/log.c:1550 msgid "failed to find exact merge base" msgstr "" -#: builtin/log.c:1565 +#: builtin/log.c:1567 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1575 +#: builtin/log.c:1577 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1633 +#: builtin/log.c:1635 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1690 +#: builtin/log.c:1692 msgid "failed to infer range-diff origin of current series" msgstr "" -#: builtin/log.c:1692 +#: builtin/log.c:1694 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "" -#: builtin/log.c:1736 +#: builtin/log.c:1738 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1739 +#: builtin/log.c:1741 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1743 +#: builtin/log.c:1745 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1745 +#: builtin/log.c:1747 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1747 +#: builtin/log.c:1749 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1748 +#: builtin/log.c:1750 msgid "sfx" msgstr "" -#: builtin/log.c:1749 +#: builtin/log.c:1751 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1751 +#: builtin/log.c:1753 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1753 +#: builtin/log.c:1755 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1755 -msgid "Use [RFC PATCH] instead of [PATCH]" +#: builtin/log.c:1757 +msgid "max length of output filename" +msgstr "" + +#: builtin/log.c:1759 +msgid "use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1758 +#: builtin/log.c:1762 msgid "cover-from-description-mode" msgstr "" -#: builtin/log.c:1759 +#: builtin/log.c:1763 msgid "generate parts of a cover letter based on a branch's description" msgstr "" -#: builtin/log.c:1761 -msgid "Use [<prefix>] instead of [PATCH]" +#: builtin/log.c:1765 +msgid "use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1764 +#: builtin/log.c:1768 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1767 +#: builtin/log.c:1771 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1770 +#: builtin/log.c:1774 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1772 +#: builtin/log.c:1776 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1774 +#: builtin/log.c:1778 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1776 +#: builtin/log.c:1780 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1778 +#: builtin/log.c:1782 msgid "Messaging" msgstr "" -#: builtin/log.c:1779 +#: builtin/log.c:1783 msgid "header" msgstr "" -#: builtin/log.c:1780 +#: builtin/log.c:1784 msgid "add email header" msgstr "" -#: builtin/log.c:1781 builtin/log.c:1782 +#: builtin/log.c:1785 builtin/log.c:1786 msgid "email" msgstr "" -#: builtin/log.c:1781 +#: builtin/log.c:1785 msgid "add To: header" msgstr "" -#: builtin/log.c:1782 +#: builtin/log.c:1786 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1783 +#: builtin/log.c:1787 msgid "ident" msgstr "" -#: builtin/log.c:1784 +#: builtin/log.c:1788 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1786 +#: builtin/log.c:1790 msgid "message-id" msgstr "" -#: builtin/log.c:1787 +#: builtin/log.c:1791 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1788 builtin/log.c:1791 +#: builtin/log.c:1792 builtin/log.c:1795 msgid "boundary" msgstr "" -#: builtin/log.c:1789 +#: builtin/log.c:1793 msgid "attach the patch" msgstr "" -#: builtin/log.c:1792 +#: builtin/log.c:1796 msgid "inline the patch" msgstr "" -#: builtin/log.c:1796 +#: builtin/log.c:1800 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1798 +#: builtin/log.c:1802 msgid "signature" msgstr "" -#: builtin/log.c:1799 +#: builtin/log.c:1803 msgid "add a signature" msgstr "" -#: builtin/log.c:1800 +#: builtin/log.c:1804 msgid "base-commit" msgstr "" -#: builtin/log.c:1801 +#: builtin/log.c:1805 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1804 +#: builtin/log.c:1808 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1805 +#: builtin/log.c:1809 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1807 +#: builtin/log.c:1811 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1809 +#: builtin/log.c:1813 msgid "show changes against <rev> in cover letter or single patch" msgstr "" -#: builtin/log.c:1812 +#: builtin/log.c:1816 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" -#: builtin/log.c:1814 +#: builtin/log.c:1818 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1896 +#: builtin/log.c:1904 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1911 +#: builtin/log.c:1919 msgid "-n and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1913 +#: builtin/log.c:1921 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1921 +#: builtin/log.c:1929 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1923 +#: builtin/log.c:1931 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1925 +#: builtin/log.c:1933 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1958 -msgid "standard output, or directory, which one?" +#: builtin/log.c:1955 +msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "" -#: builtin/log.c:2062 +#: builtin/log.c:2078 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:2066 +#: builtin/log.c:2082 msgid "Interdiff:" msgstr "" -#: builtin/log.c:2067 +#: builtin/log.c:2083 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:2073 +#: builtin/log.c:2089 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:2077 +#: builtin/log.c:2093 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:2085 +#: builtin/log.c:2101 msgid "Range-diff:" msgstr "" -#: builtin/log.c:2086 +#: builtin/log.c:2102 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:2097 +#: builtin/log.c:2113 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:2133 +#: builtin/log.c:2149 msgid "Generating patches" msgstr "" -#: builtin/log.c:2177 +#: builtin/log.c:2193 msgid "failed to create output files" msgstr "" -#: builtin/log.c:2236 +#: builtin/log.c:2252 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:2290 +#: builtin/log.c:2306 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:486 msgid "git ls-files [<options>] [<file>...]" msgstr "" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:542 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:544 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:546 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "" -#: builtin/ls-files.c:533 +#: builtin/ls-files.c:548 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:535 +#: builtin/ls-files.c:550 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:537 +#: builtin/ls-files.c:552 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:539 +#: builtin/ls-files.c:554 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:556 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:559 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:561 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:563 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:565 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:567 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:570 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:572 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:574 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:562 +#: builtin/ls-files.c:577 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:580 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:582 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:571 +#: builtin/ls-files.c:586 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:589 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:591 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:592 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:578 +#: builtin/ls-files.c:593 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:580 +#: builtin/ls-files.c:595 msgid "show debugging data" msgstr "" +#: builtin/ls-files.c:597 +msgid "suppress duplicate entries" +msgstr "" + #: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" @@ -15570,39 +15998,39 @@ msgid "" " [--symref] [<repository> [<refs>...]]" msgstr "" -#: builtin/ls-remote.c:59 +#: builtin/ls-remote.c:60 msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404 msgid "exec" msgstr "" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 +#: builtin/ls-remote.c:62 builtin/ls-remote.c:64 msgid "path of git-upload-pack on the remote host" msgstr "" -#: builtin/ls-remote.c:65 +#: builtin/ls-remote.c:66 msgid "limit to tags" msgstr "" -#: builtin/ls-remote.c:66 +#: builtin/ls-remote.c:67 msgid "limit to heads" msgstr "" -#: builtin/ls-remote.c:67 +#: builtin/ls-remote.c:68 msgid "do not show peeled tags" msgstr "" -#: builtin/ls-remote.c:69 +#: builtin/ls-remote.c:70 msgid "take url.<base>.insteadOf into account" msgstr "" -#: builtin/ls-remote.c:72 +#: builtin/ls-remote.c:73 msgid "exit with exit code 2 if no matching refs are found" msgstr "" -#: builtin/ls-remote.c:75 +#: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" msgstr "" @@ -15756,377 +16184,418 @@ msgstr "" msgid "Merging %s with %s\n" msgstr "" -#: builtin/merge.c:56 +#: builtin/merge.c:58 msgid "git merge [<options>] [<commit>...]" msgstr "" -#: builtin/merge.c:57 +#: builtin/merge.c:59 msgid "git merge --abort" msgstr "" -#: builtin/merge.c:58 +#: builtin/merge.c:60 msgid "git merge --continue" msgstr "" -#: builtin/merge.c:120 +#: builtin/merge.c:123 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:143 +#: builtin/merge.c:146 #, c-format msgid "option `%s' requires a value" msgstr "" -#: builtin/merge.c:189 +#: builtin/merge.c:199 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:190 +#: builtin/merge.c:200 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:195 +#: builtin/merge.c:205 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:246 builtin/pull.c:133 +#: builtin/merge.c:256 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:249 builtin/pull.c:136 +#: builtin/merge.c:259 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:250 builtin/pull.c:139 +#: builtin/merge.c:260 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:252 builtin/pull.c:142 +#: builtin/merge.c:262 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:255 builtin/pull.c:148 +#: builtin/merge.c:265 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:257 builtin/pull.c:151 +#: builtin/merge.c:267 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:259 builtin/pull.c:154 +#: builtin/merge.c:269 builtin/pull.c:154 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:261 +#: builtin/merge.c:271 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:263 builtin/pull.c:161 +#: builtin/merge.c:273 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:267 builtin/pull.c:164 +#: builtin/merge.c:277 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 +#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114 msgid "strategy" msgstr "" -#: builtin/merge.c:269 builtin/pull.c:169 +#: builtin/merge.c:279 builtin/pull.c:169 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:280 builtin/pull.c:172 msgid "option=value" msgstr "" -#: builtin/merge.c:271 builtin/pull.c:173 +#: builtin/merge.c:281 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:273 +#: builtin/merge.c:283 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:280 +#: builtin/merge.c:290 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:282 +#: builtin/merge.c:292 msgid "--abort but leave index and working tree alone" msgstr "" -#: builtin/merge.c:284 +#: builtin/merge.c:294 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:286 builtin/pull.c:180 +#: builtin/merge.c:296 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:293 +#: builtin/merge.c:303 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" -#: builtin/merge.c:310 +#: builtin/merge.c:320 msgid "could not run stash." msgstr "" -#: builtin/merge.c:315 +#: builtin/merge.c:325 msgid "stash failed" msgstr "" -#: builtin/merge.c:320 +#: builtin/merge.c:330 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:342 builtin/merge.c:359 +#: builtin/merge.c:352 builtin/merge.c:369 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:389 +#: builtin/merge.c:399 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:400 +#: builtin/merge.c:410 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:450 +#: builtin/merge.c:460 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:501 +#: builtin/merge.c:511 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:588 +#: builtin/merge.c:598 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:713 +#: builtin/merge.c:724 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:726 +#: builtin/merge.c:737 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:741 +#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:793 +#: builtin/merge.c:808 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:802 +#: builtin/merge.c:817 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:808 +#: builtin/merge.c:823 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:813 +#: builtin/merge.c:828 msgid "An empty message aborts the commit.\n" msgstr "" -#: builtin/merge.c:816 +#: builtin/merge.c:831 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -#: builtin/merge.c:869 +#: builtin/merge.c:884 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:884 +#: builtin/merge.c:899 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:945 +#: builtin/merge.c:960 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:984 +#: builtin/merge.c:999 msgid "No current branch." msgstr "" -#: builtin/merge.c:986 +#: builtin/merge.c:1001 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:988 +#: builtin/merge.c:1003 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:993 +#: builtin/merge.c:1008 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1050 +#: builtin/merge.c:1065 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1153 +#: builtin/merge.c:1168 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1187 +#: builtin/merge.c:1202 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1291 +#: builtin/merge.c:1312 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1295 +#: builtin/merge.c:1316 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1313 +#: builtin/merge.c:1334 msgid "--quit expects no arguments" msgstr "" -#: builtin/merge.c:1326 +#: builtin/merge.c:1347 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1330 +#: builtin/merge.c:1351 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1346 +#: builtin/merge.c:1367 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1353 +#: builtin/merge.c:1374 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1356 +#: builtin/merge.c:1377 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1370 +#: builtin/merge.c:1391 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1372 +#: builtin/merge.c:1393 msgid "You cannot combine --squash with --commit." msgstr "" -#: builtin/merge.c:1388 +#: builtin/merge.c:1409 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1405 +#: builtin/merge.c:1426 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1407 +#: builtin/merge.c:1428 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1412 +#: builtin/merge.c:1433 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1414 +#: builtin/merge.c:1435 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1495 +#: builtin/merge.c:1516 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1504 +#: builtin/merge.c:1525 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1514 +#: builtin/merge.c:1535 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1560 +#: builtin/merge.c:1581 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1567 +#: builtin/merge.c:1588 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1592 +#: builtin/merge.c:1613 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1598 +#: builtin/merge.c:1619 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1626 builtin/merge.c:1691 +#: builtin/merge.c:1647 builtin/merge.c:1712 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1630 +#: builtin/merge.c:1651 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1682 +#: builtin/merge.c:1703 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1684 +#: builtin/merge.c:1705 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1693 +#: builtin/merge.c:1714 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1707 +#: builtin/merge.c:1728 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" +#: builtin/mktag.c:10 +msgid "git mktag" +msgstr "" + +#: builtin/mktag.c:30 +#, c-format +msgid "warning: tag input does not pass fsck: %s" +msgstr "" + +#: builtin/mktag.c:41 +#, c-format +msgid "error: tag input does not pass fsck: %s" +msgstr "" + +#: builtin/mktag.c:44 +#, c-format +msgid "%d (FSCK_IGNORE?) should never trigger this callback" +msgstr "" + +#: builtin/mktag.c:59 +#, c-format +msgid "could not read tagged object '%s'" +msgstr "" + +#: builtin/mktag.c:62 +#, c-format +msgid "object '%s' tagged as '%s', but is a '%s' type" +msgstr "" + +#: builtin/mktag.c:99 +msgid "tag on stdin did not pass our strict fsck check" +msgstr "" + +#: builtin/mktag.c:102 +msgid "tag on stdin did not refer to a valid object" +msgstr "" + +#: builtin/mktag.c:105 builtin/tag.c:232 +msgid "unable to write tag file" +msgstr "" + #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "" @@ -16159,7 +16628,10 @@ msgid "" "larger than this size" msgstr "" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 +#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431 +#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598 +#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963 +#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575 msgid "too many arguments" msgstr "" @@ -16263,7 +16735,7 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483 #, c-format msgid "renaming '%s' failed" msgstr "" @@ -16448,7 +16920,7 @@ msgstr "" msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:242 builtin/tag.c:533 +#: builtin/notes.c:242 builtin/tag.c:565 #, c-format msgid "could not open or read '%s'" msgstr "" @@ -16488,12 +16960,6 @@ msgstr "" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "" -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 -#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 -#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 -msgid "too many parameters" -msgstr "" - #: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." @@ -16549,7 +17015,7 @@ msgid "load rewriting config for <command> (implies --stdin)" msgstr "" #: builtin/notes.c:517 -msgid "too few parameters" +msgid "too few arguments" msgstr "" #: builtin/notes.c:538 @@ -16669,7 +17135,7 @@ msgid "" "abort'.\n" msgstr "" -#: builtin/notes.c:897 builtin/tag.c:546 +#: builtin/notes.c:897 builtin/tag.c:578 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" @@ -16687,7 +17153,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 msgid "do not remove, show only" msgstr "" @@ -16703,7 +17169,7 @@ msgstr "" msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1034 builtin/stash.c:1605 +#: builtin/notes.c:1034 builtin/stash.c:1671 #, c-format msgid "unknown subcommand: %s" msgstr "" @@ -16718,361 +17184,382 @@ msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:443 +#: builtin/pack-objects.c:440 +#, c-format +msgid "" +"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " +"pack %s" +msgstr "" + +#: builtin/pack-objects.c:448 #, c-format msgid "bad packed object CRC for %s" msgstr "" -#: builtin/pack-objects.c:454 +#: builtin/pack-objects.c:459 #, c-format msgid "corrupt packed object for %s" msgstr "" -#: builtin/pack-objects.c:585 +#: builtin/pack-objects.c:590 #, c-format msgid "recursive delta detected for object %s" msgstr "" -#: builtin/pack-objects.c:796 +#: builtin/pack-objects.c:801 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1004 +#: builtin/pack-objects.c:896 +#, c-format +msgid "expected object at offset %<PRIuMAX> in pack %s" +msgstr "" + +#: builtin/pack-objects.c:1015 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:1017 +#: builtin/pack-objects.c:1028 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1078 builtin/update-index.c:90 +#: builtin/pack-objects.c:1089 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "" -#: builtin/pack-objects.c:1131 +#: builtin/pack-objects.c:1141 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1348 +#: builtin/pack-objects.c:1358 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:1796 +#: builtin/pack-objects.c:1806 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "" -#: builtin/pack-objects.c:1805 +#: builtin/pack-objects.c:1815 #, c-format msgid "delta base offset out of bound for %s" msgstr "" -#: builtin/pack-objects.c:2086 +#: builtin/pack-objects.c:2096 msgid "Counting objects" msgstr "" -#: builtin/pack-objects.c:2231 +#: builtin/pack-objects.c:2241 #, c-format msgid "unable to parse object header of %s" msgstr "" -#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 -#: builtin/pack-objects.c:2327 +#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327 +#: builtin/pack-objects.c:2337 #, c-format msgid "object %s cannot be read" msgstr "" -#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 +#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" -#: builtin/pack-objects.c:2341 +#: builtin/pack-objects.c:2351 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2656 +#: builtin/pack-objects.c:2666 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2805 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2891 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2897 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:2961 +#: builtin/pack-objects.c:2976 #, 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 +#: builtin/pack-objects.c:2979 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "" -#: builtin/pack-objects.c:2993 +#: builtin/pack-objects.c:3008 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2999 +#: builtin/pack-objects.c:3014 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:3097 +#: builtin/pack-objects.c:3112 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279 msgid "cannot open pack index" msgstr "" -#: builtin/pack-objects.c:3187 +#: builtin/pack-objects.c:3202 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3287 msgid "unable to force loose object" msgstr "" -#: builtin/pack-objects.c:3365 +#: builtin/pack-objects.c:3380 #, c-format msgid "not a rev '%s'" msgstr "" -#: builtin/pack-objects.c:3368 +#: builtin/pack-objects.c:3383 #, c-format msgid "bad revision '%s'" msgstr "" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3408 msgid "unable to add recent objects" msgstr "" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3461 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3465 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:3488 +#: builtin/pack-objects.c:3503 msgid "<version>[,<offset>]" msgstr "" -#: builtin/pack-objects.c:3489 +#: builtin/pack-objects.c:3504 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3507 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3494 +#: builtin/pack-objects.c:3509 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3496 +#: builtin/pack-objects.c:3511 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3513 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3500 +#: builtin/pack-objects.c:3515 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3502 +#: builtin/pack-objects.c:3517 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3519 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3506 +#: builtin/pack-objects.c:3521 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3508 +#: builtin/pack-objects.c:3523 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3510 +#: builtin/pack-objects.c:3525 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3512 +#: builtin/pack-objects.c:3527 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3514 +#: builtin/pack-objects.c:3529 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3516 +#: builtin/pack-objects.c:3531 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3534 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3522 +#: builtin/pack-objects.c:3537 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3525 +#: builtin/pack-objects.c:3540 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3528 +#: builtin/pack-objects.c:3543 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3530 +#: builtin/pack-objects.c:3545 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3532 +#: builtin/pack-objects.c:3547 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3549 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3536 +#: builtin/pack-objects.c:3551 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:3539 +#: builtin/pack-objects.c:3554 msgid "use the sparse reachability algorithm" msgstr "" -#: builtin/pack-objects.c:3541 +#: builtin/pack-objects.c:3556 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:3543 +#: builtin/pack-objects.c:3558 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:3545 +#: builtin/pack-objects.c:3560 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:3547 +#: builtin/pack-objects.c:3562 msgid "ignore this pack" msgstr "" -#: builtin/pack-objects.c:3549 +#: builtin/pack-objects.c:3564 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3566 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3568 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:3555 +#: builtin/pack-objects.c:3570 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:3559 +#: builtin/pack-objects.c:3574 msgid "write a bitmap index if possible" msgstr "" -#: builtin/pack-objects.c:3563 +#: builtin/pack-objects.c:3578 msgid "handling for missing objects" msgstr "" -#: builtin/pack-objects.c:3566 +#: builtin/pack-objects.c:3581 msgid "do not pack objects in promisor packfiles" msgstr "" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3583 msgid "respect islands during delta compression" msgstr "" -#: builtin/pack-objects.c:3570 +#: builtin/pack-objects.c:3585 msgid "protocol" msgstr "" -#: builtin/pack-objects.c:3571 +#: builtin/pack-objects.c:3586 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" -#: builtin/pack-objects.c:3600 +#: builtin/pack-objects.c:3617 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" -#: builtin/pack-objects.c:3605 +#: builtin/pack-objects.c:3622 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" -#: builtin/pack-objects.c:3659 +#: builtin/pack-objects.c:3676 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" -#: builtin/pack-objects.c:3661 +#: builtin/pack-objects.c:3678 msgid "minimum pack size limit is 1 MiB" msgstr "" -#: builtin/pack-objects.c:3666 +#: builtin/pack-objects.c:3683 msgid "--thin cannot be used to build an indexable pack" msgstr "" -#: builtin/pack-objects.c:3669 +#: builtin/pack-objects.c:3686 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "" -#: builtin/pack-objects.c:3675 +#: builtin/pack-objects.c:3692 msgid "cannot use --filter without --stdout" msgstr "" -#: builtin/pack-objects.c:3735 +#: builtin/pack-objects.c:3752 msgid "Enumerating objects" msgstr "" -#: builtin/pack-objects.c:3766 +#: builtin/pack-objects.c:3783 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" "reused %<PRIu32>" msgstr "" +#: builtin/pack-redundant.c:601 +msgid "" +"'git pack-redundant' is nominated for removal.\n" +"If you still use this command, please add an extra\n" +"option, '--i-still-use-this', on the command line\n" +"and let us know you still use it by sending an e-mail\n" +"to <git@vger.kernel.org>. Thanks.\n" +msgstr "" + #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" msgstr "" @@ -17130,7 +17617,7 @@ msgstr "" msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126 msgid "allow fast-forward" msgstr "" @@ -17155,41 +17642,24 @@ msgstr "" msgid "Invalid value for pull.ff: %s" msgstr "" -#: 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 +#: builtin/pull.c:445 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:460 +#: builtin/pull.c:447 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:461 +#: builtin/pull.c:448 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:464 +#: builtin/pull.c:451 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17197,70 +17667,86 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73 +#: builtin/pull.c:456 builtin/rebase.c:1253 msgid "You are not currently on a branch." msgstr "" -#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79 +#: builtin/pull.c:458 builtin/pull.c:473 msgid "Please specify which branch you want to rebase against." msgstr "" -#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82 +#: builtin/pull.c:460 builtin/pull.c:475 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:474 builtin/pull.c:489 +#: builtin/pull.c:461 builtin/pull.c:476 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 -#: builtin/rebase.c:1246 git-parse-remote.sh:64 +#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 +#: builtin/rebase.c:1259 msgid "<remote>" msgstr "" -#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 -#: git-parse-remote.sh:65 +#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483 msgid "<branch>" msgstr "" -#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75 +#: builtin/pull.c:471 builtin/rebase.c:1251 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:493 git-parse-remote.sh:95 +#: builtin/pull.c:480 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" -#: builtin/pull.c:498 +#: builtin/pull.c:485 #, 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:609 +#: builtin/pull.c:596 #, c-format msgid "unable to access commit %s" msgstr "" -#: builtin/pull.c:894 +#: builtin/pull.c:902 msgid "ignoring --verify-signatures for rebase" msgstr "" -#: builtin/pull.c:954 +#: builtin/pull.c:930 +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:991 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:958 +#: builtin/pull.c:995 msgid "pull with rebase" msgstr "" -#: builtin/pull.c:959 +#: builtin/pull.c:996 msgid "please commit or stash them." msgstr "" -#: builtin/pull.c:984 +#: builtin/pull.c:1021 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17268,7 +17754,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:990 +#: builtin/pull.c:1027 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17279,15 +17765,15 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:1005 +#: builtin/pull.c:1042 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:1009 +#: builtin/pull.c:1046 msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/pull.c:1017 +#: builtin/pull.c:1067 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -17397,99 +17883,111 @@ msgid "" "without using the '--force' option.\n" msgstr "" -#: builtin/push.c:351 +#: builtin/push.c:294 +msgid "" +"Updates were rejected because the tip of the remote-tracking\n" +"branch has been updated since the last checkout. You may want\n" +"to integrate those changes locally (e.g., 'git pull ...')\n" +"before forcing an update.\n" +msgstr "" + +#: builtin/push.c:364 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:358 +#: builtin/push.c:371 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:532 +#: builtin/push.c:553 msgid "repository" msgstr "" -#: builtin/push.c:533 builtin/send-pack.c:183 +#: builtin/push.c:554 builtin/send-pack.c:189 msgid "push all refs" msgstr "" -#: builtin/push.c:534 builtin/send-pack.c:185 +#: builtin/push.c:555 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "" -#: builtin/push.c:536 +#: builtin/push.c:557 msgid "delete refs" msgstr "" -#: builtin/push.c:537 +#: builtin/push.c:558 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:540 builtin/send-pack.c:186 +#: builtin/push.c:561 builtin/send-pack.c:192 msgid "force updates" msgstr "" -#: builtin/push.c:541 builtin/send-pack.c:198 +#: builtin/push.c:562 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "" -#: builtin/push.c:542 builtin/send-pack.c:199 +#: builtin/push.c:563 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:545 +#: builtin/push.c:566 builtin/send-pack.c:208 +msgid "require remote updates to be integrated locally" +msgstr "" + +#: builtin/push.c:569 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:546 builtin/send-pack.c:193 +#: builtin/push.c:570 builtin/send-pack.c:199 msgid "use thin pack" msgstr "" -#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 -#: builtin/send-pack.c:181 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/send-pack.c:187 msgid "receive pack program" msgstr "" -#: builtin/push.c:549 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:552 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:554 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:555 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:557 builtin/send-pack.c:187 +#: builtin/push.c:581 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:559 builtin/send-pack.c:194 +#: builtin/push.c:583 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "" -#: builtin/push.c:577 +#: builtin/push.c:601 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:579 +#: builtin/push.c:603 msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/push.c:599 +#: builtin/push.c:623 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:600 +#: builtin/push.c:624 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -17502,68 +18000,76 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:615 +#: builtin/push.c:639 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:617 +#: builtin/push.c:641 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:621 +#: builtin/push.c:645 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:623 +#: builtin/push.c:647 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:626 +#: builtin/push.c:650 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:630 +#: builtin/push.c:657 msgid "push options must not have new line characters" msgstr "" -#: builtin/range-diff.c:8 +#: builtin/range-diff.c:9 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "" -#: builtin/range-diff.c:9 +#: builtin/range-diff.c:10 msgid "git range-diff [<options>] <old-tip>...<new-tip>" msgstr "" -#: builtin/range-diff.c:10 +#: builtin/range-diff.c:11 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:28 msgid "Percentage by which creation is weighted" msgstr "" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:30 msgid "use simple diff colors" msgstr "" -#: builtin/range-diff.c:26 +#: builtin/range-diff.c:32 msgid "notes" msgstr "" -#: builtin/range-diff.c:26 +#: builtin/range-diff.c:32 msgid "passed to 'git log'" msgstr "" -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:35 +msgid "only emit output related to the first range" +msgstr "" + +#: builtin/range-diff.c:37 +msgid "only emit output related to the second range" +msgstr "" + +#: builtin/range-diff.c:60 builtin/range-diff.c:64 #, c-format -msgid "no .. in range: '%s'" +msgid "not a commit range: '%s'" msgstr "" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:74 msgid "single arg format must be symmetric range" msgstr "" -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:89 msgid "need two commit ranges" msgstr "" @@ -17661,193 +18167,193 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "" -#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 +#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246 #, c-format msgid "unusable todo list: '%s'" msgstr "" -#: builtin/rebase.c:304 +#: builtin/rebase.c:312 #, c-format msgid "could not create temporary %s" msgstr "" -#: builtin/rebase.c:310 +#: builtin/rebase.c:318 msgid "could not mark as interactive" msgstr "" -#: builtin/rebase.c:364 +#: builtin/rebase.c:371 msgid "could not generate todo list" msgstr "" -#: builtin/rebase.c:405 +#: builtin/rebase.c:413 msgid "a base commit must be provided with --upstream or --onto" msgstr "" -#: builtin/rebase.c:474 +#: builtin/rebase.c:482 msgid "git rebase--interactive [<options>]" msgstr "" -#: builtin/rebase.c:487 builtin/rebase.c:1382 +#: builtin/rebase.c:495 builtin/rebase.c:1394 msgid "keep commits which start empty" msgstr "" -#: builtin/rebase.c:491 builtin/revert.c:128 +#: builtin/rebase.c:499 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "" -#: builtin/rebase.c:493 +#: builtin/rebase.c:501 msgid "rebase merge commits" msgstr "" -#: builtin/rebase.c:495 +#: builtin/rebase.c:503 msgid "keep original branch points of cousins" msgstr "" -#: builtin/rebase.c:497 +#: builtin/rebase.c:505 msgid "move commits that begin with squash!/fixup!" msgstr "" -#: builtin/rebase.c:498 +#: builtin/rebase.c:506 msgid "sign commits" msgstr "" -#: builtin/rebase.c:500 builtin/rebase.c:1321 +#: builtin/rebase.c:508 builtin/rebase.c:1333 msgid "display a diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:502 +#: builtin/rebase.c:510 msgid "continue rebase" msgstr "" -#: builtin/rebase.c:504 +#: builtin/rebase.c:512 msgid "skip commit" msgstr "" -#: builtin/rebase.c:505 +#: builtin/rebase.c:513 msgid "edit the todo list" msgstr "" -#: builtin/rebase.c:507 +#: builtin/rebase.c:515 msgid "show the current patch" msgstr "" -#: builtin/rebase.c:510 +#: builtin/rebase.c:518 msgid "shorten commit ids in the todo list" msgstr "" -#: builtin/rebase.c:512 +#: builtin/rebase.c:520 msgid "expand commit ids in the todo list" msgstr "" -#: builtin/rebase.c:514 +#: builtin/rebase.c:522 msgid "check the todo list" msgstr "" -#: builtin/rebase.c:516 +#: builtin/rebase.c:524 msgid "rearrange fixup/squash lines" msgstr "" -#: builtin/rebase.c:518 +#: builtin/rebase.c:526 msgid "insert exec commands in todo list" msgstr "" -#: builtin/rebase.c:519 +#: builtin/rebase.c:527 msgid "onto" msgstr "" -#: builtin/rebase.c:522 +#: builtin/rebase.c:530 msgid "restrict-revision" msgstr "" -#: builtin/rebase.c:522 +#: builtin/rebase.c:530 msgid "restrict revision" msgstr "" -#: builtin/rebase.c:524 +#: builtin/rebase.c:532 msgid "squash-onto" msgstr "" -#: builtin/rebase.c:525 +#: builtin/rebase.c:533 msgid "squash onto" msgstr "" -#: builtin/rebase.c:527 +#: builtin/rebase.c:535 msgid "the upstream commit" msgstr "" -#: builtin/rebase.c:529 +#: builtin/rebase.c:537 msgid "head-name" msgstr "" -#: builtin/rebase.c:529 +#: builtin/rebase.c:537 msgid "head name" msgstr "" -#: builtin/rebase.c:534 +#: builtin/rebase.c:542 msgid "rebase strategy" msgstr "" -#: builtin/rebase.c:535 +#: builtin/rebase.c:543 msgid "strategy-opts" msgstr "" -#: builtin/rebase.c:536 +#: builtin/rebase.c:544 msgid "strategy options" msgstr "" -#: builtin/rebase.c:537 +#: builtin/rebase.c:545 msgid "switch-to" msgstr "" -#: builtin/rebase.c:538 +#: builtin/rebase.c:546 msgid "the branch or commit to checkout" msgstr "" -#: builtin/rebase.c:539 +#: builtin/rebase.c:547 msgid "onto-name" msgstr "" -#: builtin/rebase.c:539 +#: builtin/rebase.c:547 msgid "onto name" msgstr "" -#: builtin/rebase.c:540 +#: builtin/rebase.c:548 msgid "cmd" msgstr "" -#: builtin/rebase.c:540 +#: builtin/rebase.c:548 msgid "the command to run" msgstr "" -#: builtin/rebase.c:543 builtin/rebase.c:1415 +#: builtin/rebase.c:551 builtin/rebase.c:1427 msgid "automatically re-schedule any `exec` that fails" msgstr "" -#: builtin/rebase.c:559 +#: builtin/rebase.c:567 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "" -#: builtin/rebase.c:575 +#: builtin/rebase.c:583 #, c-format msgid "%s requires the merge backend" msgstr "" -#: builtin/rebase.c:618 +#: builtin/rebase.c:626 #, c-format msgid "could not get 'onto': '%s'" msgstr "" -#: builtin/rebase.c:635 +#: builtin/rebase.c:643 #, c-format msgid "invalid orig-head: '%s'" msgstr "" -#: builtin/rebase.c:660 +#: builtin/rebase.c:668 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "" -#: builtin/rebase.c:805 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:813 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" @@ -17856,7 +18362,7 @@ msgid "" "abort\"." msgstr "" -#: builtin/rebase.c:888 +#: builtin/rebase.c:896 #, c-format msgid "" "\n" @@ -17868,14 +18374,14 @@ msgid "" "As a result, git cannot rebase them." msgstr "" -#: builtin/rebase.c:1214 +#: builtin/rebase.c:1227 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" "\"." msgstr "" -#: builtin/rebase.c:1232 +#: builtin/rebase.c:1245 #, c-format msgid "" "%s\n" @@ -17886,7 +18392,7 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1248 +#: builtin/rebase.c:1261 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17895,201 +18401,201 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1278 +#: builtin/rebase.c:1291 msgid "exec commands cannot contain newlines" msgstr "" -#: builtin/rebase.c:1282 +#: builtin/rebase.c:1295 msgid "empty exec command" msgstr "" -#: builtin/rebase.c:1312 +#: builtin/rebase.c:1324 msgid "rebase onto given branch instead of upstream" msgstr "" -#: builtin/rebase.c:1314 +#: builtin/rebase.c:1326 msgid "use the merge-base of upstream and branch as the current base" msgstr "" -#: builtin/rebase.c:1316 +#: builtin/rebase.c:1328 msgid "allow pre-rebase hook to run" msgstr "" -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1330 msgid "be quiet. implies --no-stat" msgstr "" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1336 msgid "do not show diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:1327 -msgid "add a Signed-off-by: line to each commit" +#: builtin/rebase.c:1339 +msgid "add a Signed-off-by trailer to each commit" msgstr "" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1342 msgid "make committer date match author date" msgstr "" -#: builtin/rebase.c:1332 +#: builtin/rebase.c:1344 msgid "ignore author date and use current date" msgstr "" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1346 msgid "synonym of --reset-author-date" msgstr "" -#: builtin/rebase.c:1336 builtin/rebase.c:1340 +#: builtin/rebase.c:1348 builtin/rebase.c:1352 msgid "passed to 'git apply'" msgstr "" -#: builtin/rebase.c:1338 +#: builtin/rebase.c:1350 msgid "ignore changes in whitespace" msgstr "" -#: builtin/rebase.c:1342 builtin/rebase.c:1345 +#: builtin/rebase.c:1354 builtin/rebase.c:1357 msgid "cherry-pick all commits, even if unchanged" msgstr "" -#: builtin/rebase.c:1347 +#: builtin/rebase.c:1359 msgid "continue" msgstr "" -#: builtin/rebase.c:1350 +#: builtin/rebase.c:1362 msgid "skip current patch and continue" msgstr "" -#: builtin/rebase.c:1352 +#: builtin/rebase.c:1364 msgid "abort and check out the original branch" msgstr "" -#: builtin/rebase.c:1355 +#: builtin/rebase.c:1367 msgid "abort but keep HEAD where it is" msgstr "" -#: builtin/rebase.c:1356 +#: builtin/rebase.c:1368 msgid "edit the todo list during an interactive rebase" msgstr "" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1371 msgid "show the patch file being applied or merged" msgstr "" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1374 msgid "use apply strategies to rebase" msgstr "" -#: builtin/rebase.c:1366 +#: builtin/rebase.c:1378 msgid "use merging strategies to rebase" msgstr "" -#: builtin/rebase.c:1370 +#: builtin/rebase.c:1382 msgid "let the user edit the list of commits to rebase" msgstr "" -#: builtin/rebase.c:1374 +#: builtin/rebase.c:1386 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" -#: builtin/rebase.c:1379 +#: builtin/rebase.c:1391 msgid "how to handle commits that become empty" msgstr "" -#: builtin/rebase.c:1386 +#: builtin/rebase.c:1398 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" -#: builtin/rebase.c:1393 +#: builtin/rebase.c:1405 msgid "add exec lines after each commit of the editable list" msgstr "" -#: builtin/rebase.c:1397 +#: builtin/rebase.c:1409 msgid "allow rebasing commits with empty messages" msgstr "" -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1413 msgid "try to rebase merges instead of skipping them" msgstr "" -#: builtin/rebase.c:1404 +#: builtin/rebase.c:1416 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1418 msgid "use the given merge strategy" msgstr "" -#: builtin/rebase.c:1408 builtin/revert.c:115 +#: builtin/rebase.c:1420 builtin/revert.c:115 msgid "option" msgstr "" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1421 msgid "pass the argument through to the merge strategy" msgstr "" -#: builtin/rebase.c:1412 +#: builtin/rebase.c:1424 msgid "rebase all reachable commits up to the root(s)" msgstr "" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1429 msgid "apply all changes, even those already present upstream" msgstr "" -#: builtin/rebase.c:1434 +#: builtin/rebase.c:1446 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1452 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1493 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" -#: builtin/rebase.c:1486 +#: builtin/rebase.c:1498 msgid "cannot combine '--keep-base' with '--onto'" msgstr "" -#: builtin/rebase.c:1488 +#: builtin/rebase.c:1500 msgid "cannot combine '--keep-base' with '--root'" msgstr "" -#: builtin/rebase.c:1492 +#: builtin/rebase.c:1504 msgid "cannot combine '--root' with '--fork-point'" msgstr "" -#: builtin/rebase.c:1495 +#: builtin/rebase.c:1507 msgid "No rebase in progress?" msgstr "" -#: builtin/rebase.c:1499 +#: builtin/rebase.c:1511 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: builtin/rebase.c:1522 +#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "" -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1546 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: builtin/rebase.c:1553 +#: builtin/rebase.c:1565 msgid "could not discard worktree changes" msgstr "" -#: builtin/rebase.c:1572 +#: builtin/rebase.c:1584 #, c-format msgid "could not move back to %s" msgstr "" -#: builtin/rebase.c:1618 +#: builtin/rebase.c:1630 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18102,131 +18608,131 @@ msgid "" "valuable there.\n" msgstr "" -#: builtin/rebase.c:1646 +#: builtin/rebase.c:1658 msgid "switch `C' expects a numerical value" msgstr "" -#: builtin/rebase.c:1688 +#: builtin/rebase.c:1700 #, c-format msgid "Unknown mode: %s" msgstr "" -#: builtin/rebase.c:1727 +#: builtin/rebase.c:1739 msgid "--strategy requires --merge or --interactive" msgstr "" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1769 msgid "cannot combine apply options with merge options" msgstr "" -#: builtin/rebase.c:1770 +#: builtin/rebase.c:1782 #, c-format msgid "Unknown rebase backend: %s" msgstr "" -#: builtin/rebase.c:1795 +#: builtin/rebase.c:1812 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "" -#: builtin/rebase.c:1815 +#: builtin/rebase.c:1832 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "" -#: builtin/rebase.c:1819 +#: builtin/rebase.c:1836 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" -#: builtin/rebase.c:1843 +#: builtin/rebase.c:1860 #, c-format msgid "invalid upstream '%s'" msgstr "" -#: builtin/rebase.c:1849 +#: builtin/rebase.c:1866 msgid "Could not create new root commit" msgstr "" -#: builtin/rebase.c:1875 +#: builtin/rebase.c:1892 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "" -#: builtin/rebase.c:1878 +#: builtin/rebase.c:1895 #, c-format msgid "'%s': need exactly one merge base" msgstr "" -#: builtin/rebase.c:1886 +#: builtin/rebase.c:1903 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "" -#: builtin/rebase.c:1912 +#: builtin/rebase.c:1931 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "" -#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/rebase.c:1939 builtin/submodule--helper.c:40 #: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "" -#: builtin/rebase.c:1931 +#: builtin/rebase.c:1950 msgid "Could not resolve HEAD to a revision" msgstr "" -#: builtin/rebase.c:1952 +#: builtin/rebase.c:1971 msgid "Please commit or stash them." msgstr "" -#: builtin/rebase.c:1988 +#: builtin/rebase.c:2007 #, c-format msgid "could not switch to %s" msgstr "" -#: builtin/rebase.c:1999 +#: builtin/rebase.c:2018 msgid "HEAD is up to date." msgstr "" -#: builtin/rebase.c:2001 +#: builtin/rebase.c:2020 #, c-format msgid "Current branch %s is up to date.\n" msgstr "" -#: builtin/rebase.c:2009 +#: builtin/rebase.c:2028 msgid "HEAD is up to date, rebase forced." msgstr "" -#: builtin/rebase.c:2011 +#: builtin/rebase.c:2030 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "" -#: builtin/rebase.c:2019 +#: builtin/rebase.c:2038 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: builtin/rebase.c:2026 +#: builtin/rebase.c:2045 #, c-format msgid "Changes to %s:\n" msgstr "" -#: builtin/rebase.c:2029 +#: builtin/rebase.c:2048 #, c-format msgid "Changes from %s to %s:\n" msgstr "" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:2073 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" -#: builtin/rebase.c:2063 +#: builtin/rebase.c:2082 msgid "Could not detach HEAD" msgstr "" -#: builtin/rebase.c:2072 +#: builtin/rebase.c:2091 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "" @@ -18235,7 +18741,7 @@ msgstr "" msgid "git receive-pack <git-dir>" msgstr "" -#: builtin/receive-pack.c:1224 +#: builtin/receive-pack.c:1276 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" @@ -18252,7 +18758,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -#: builtin/receive-pack.c:1244 +#: builtin/receive-pack.c:1296 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" @@ -18264,11 +18770,11 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" -#: builtin/receive-pack.c:2422 +#: builtin/receive-pack.c:2481 msgid "quiet" msgstr "" -#: builtin/receive-pack.c:2436 +#: builtin/receive-pack.c:2495 msgid "You must specify a directory." msgstr "" @@ -18294,36 +18800,36 @@ msgstr "" msgid "'%s' is not a valid timestamp" msgstr "" -#: builtin/reflog.c:606 +#: builtin/reflog.c:609 #, c-format msgid "Marking reachable objects..." msgstr "" -#: builtin/reflog.c:644 +#: builtin/reflog.c:647 #, c-format msgid "%s points nowhere!" msgstr "" -#: builtin/reflog.c:696 +#: builtin/reflog.c:699 msgid "no reflog specified to delete" msgstr "" -#: builtin/reflog.c:705 +#: builtin/reflog.c:708 #, c-format msgid "not a reflog: %s" msgstr "" -#: builtin/reflog.c:710 +#: builtin/reflog.c:713 #, c-format msgid "no reflog for '%s'" msgstr "" -#: builtin/reflog.c:756 +#: builtin/reflog.c:759 #, c-format msgid "invalid ref format: %s" msgstr "" -#: builtin/reflog.c:765 +#: builtin/reflog.c:768 msgid "git reflog [ show | expire | delete | exists ]" msgstr "" @@ -18454,40 +18960,35 @@ msgstr "" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:195 builtin/remote.c:697 +#: builtin/remote.c:195 builtin/remote.c:700 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:199 builtin/remote.c:701 -#, c-format -msgid "'%s' is not a valid remote name" -msgstr "" - -#: builtin/remote.c:239 +#: builtin/remote.c:240 #, c-format msgid "Could not setup master '%s'" msgstr "" -#: builtin/remote.c:354 +#: builtin/remote.c:355 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:454 builtin/remote.c:462 msgid "(matching)" msgstr "" -#: builtin/remote.c:465 +#: builtin/remote.c:466 msgid "(delete)" msgstr "" -#: builtin/remote.c:654 +#: builtin/remote.c:655 #, c-format msgid "could not set '%s'" msgstr "" -#: builtin/remote.c:659 +#: builtin/remote.c:660 #, c-format msgid "" "The %s configuration remote.pushDefault in:\n" @@ -18495,17 +18996,17 @@ msgid "" "now names the non-existent remote '%s'" msgstr "" -#: builtin/remote.c:690 builtin/remote.c:833 builtin/remote.c:941 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 #, c-format msgid "No such remote: '%s'" msgstr "" -#: builtin/remote.c:707 +#: builtin/remote.c:710 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:727 +#: builtin/remote.c:730 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -18513,17 +19014,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:767 +#: builtin/remote.c:770 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:801 +#: builtin/remote.c:804 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:877 +#: builtin/remote.c:882 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18533,118 +19034,118 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:891 +#: builtin/remote.c:896 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:994 +#: builtin/remote.c:999 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:997 +#: builtin/remote.c:1002 msgid " tracked" msgstr "" -#: builtin/remote.c:999 +#: builtin/remote.c:1004 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:1001 +#: builtin/remote.c:1006 msgid " ???" msgstr "" -#: builtin/remote.c:1042 +#: builtin/remote.c:1047 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:1051 +#: builtin/remote.c:1056 #, c-format msgid "rebases interactively onto remote %s" msgstr "" -#: builtin/remote.c:1053 +#: builtin/remote.c:1058 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "" -#: builtin/remote.c:1056 +#: builtin/remote.c:1061 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:1060 +#: builtin/remote.c:1065 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:1063 +#: builtin/remote.c:1068 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:1066 +#: builtin/remote.c:1071 #, c-format msgid "%-*s and with remote %s\n" msgstr "" -#: builtin/remote.c:1109 +#: builtin/remote.c:1114 msgid "create" msgstr "" -#: builtin/remote.c:1112 +#: builtin/remote.c:1117 msgid "delete" msgstr "" -#: builtin/remote.c:1116 +#: builtin/remote.c:1121 msgid "up to date" msgstr "" -#: builtin/remote.c:1119 +#: builtin/remote.c:1124 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1122 +#: builtin/remote.c:1127 msgid "local out of date" msgstr "" -#: builtin/remote.c:1129 +#: builtin/remote.c:1134 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1132 +#: builtin/remote.c:1137 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1136 +#: builtin/remote.c:1141 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1139 +#: builtin/remote.c:1144 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1207 +#: builtin/remote.c:1212 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1234 +#: builtin/remote.c:1239 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1235 +#: builtin/remote.c:1240 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 +#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 msgid "(no URL)" msgstr "" @@ -18652,308 +19153,301 @@ msgstr "" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1250 builtin/remote.c:1252 +#: builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 +#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1254 +#: builtin/remote.c:1259 msgid "(not queried)" msgstr "" -#: builtin/remote.c:1256 +#: builtin/remote.c:1261 msgid "(unknown)" msgstr "" -#: builtin/remote.c:1260 +#: builtin/remote.c:1265 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1272 +#: builtin/remote.c:1277 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1275 builtin/remote.c:1301 +#: builtin/remote.c:1280 builtin/remote.c:1306 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1284 +#: builtin/remote.c:1289 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1292 +#: builtin/remote.c:1297 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1298 +#: builtin/remote.c:1303 #, 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:1319 +#: builtin/remote.c:1324 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1321 +#: builtin/remote.c:1326 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1336 +#: builtin/remote.c:1341 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1338 +#: builtin/remote.c:1343 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1348 +#: builtin/remote.c:1353 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1356 +#: builtin/remote.c:1361 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1358 +#: builtin/remote.c:1363 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1376 +#: builtin/remote.c:1381 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1377 +#: builtin/remote.c:1382 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1387 +#: builtin/remote.c:1392 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1388 +#: builtin/remote.c:1393 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1404 +#: builtin/remote.c:1409 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1407 +#: builtin/remote.c:1412 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1452 +#: builtin/remote.c:1457 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 +#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1531 +#: builtin/remote.c:1539 msgid "add branch" msgstr "" -#: builtin/remote.c:1538 +#: builtin/remote.c:1546 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1555 +#: builtin/remote.c:1563 msgid "query push URLs rather than fetch URLs" msgstr "" -#: builtin/remote.c:1557 +#: builtin/remote.c:1565 msgid "return all URLs" msgstr "" -#: builtin/remote.c:1585 +#: builtin/remote.c:1595 #, c-format msgid "no URLs configured for remote '%s'" msgstr "" -#: builtin/remote.c:1611 +#: builtin/remote.c:1621 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1613 +#: builtin/remote.c:1623 msgid "add URL" msgstr "" -#: builtin/remote.c:1615 +#: builtin/remote.c:1625 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1622 +#: builtin/remote.c:1632 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1661 +#: builtin/remote.c:1673 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1669 +#: builtin/remote.c:1681 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1671 +#: builtin/remote.c:1683 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/repack.c:25 +#: builtin/repack.c:26 msgid "git repack [<options>]" msgstr "" -#: builtin/repack.c:30 +#: builtin/repack.c:31 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -#: builtin/repack.c:197 +#: builtin/repack.c:198 msgid "could not start pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:236 builtin/repack.c:421 +#: builtin/repack.c:270 builtin/repack.c:446 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -#: builtin/repack.c:260 +#: builtin/repack.c:294 msgid "could not finish pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:297 +#: builtin/repack.c:322 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:299 +#: builtin/repack.c:324 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:302 +#: builtin/repack.c:327 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:304 +#: builtin/repack.c:329 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:306 +#: builtin/repack.c:331 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:308 +#: builtin/repack.c:333 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:311 +#: builtin/repack.c:336 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:313 +#: builtin/repack.c:338 msgid "write bitmap index" msgstr "" -#: builtin/repack.c:315 +#: builtin/repack.c:340 msgid "pass --delta-islands to git-pack-objects" msgstr "" -#: builtin/repack.c:316 +#: builtin/repack.c:341 msgid "approxidate" msgstr "" -#: builtin/repack.c:317 +#: builtin/repack.c:342 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:319 +#: builtin/repack.c:344 msgid "with -a, repack unreachable objects" msgstr "" -#: builtin/repack.c:321 +#: builtin/repack.c:346 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:322 builtin/repack.c:328 +#: builtin/repack.c:347 builtin/repack.c:353 msgid "bytes" msgstr "" -#: builtin/repack.c:323 +#: builtin/repack.c:348 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:325 +#: builtin/repack.c:350 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:327 +#: builtin/repack.c:352 msgid "limits the maximum number of threads" msgstr "" -#: builtin/repack.c:329 +#: builtin/repack.c:354 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:331 +#: builtin/repack.c:356 msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:333 +#: builtin/repack.c:358 msgid "do not repack this pack" msgstr "" -#: builtin/repack.c:343 +#: builtin/repack.c:368 msgid "cannot delete packs in a precious-objects repo" msgstr "" -#: builtin/repack.c:347 +#: builtin/repack.c:372 msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:430 +#: builtin/repack.c:455 msgid "Nothing new to pack." msgstr "" -#: builtin/repack.c:486 +#: builtin/repack.c:485 #, c-format -msgid "" -"WARNING: Some packs in use have been renamed by\n" -"WARNING: prefixing old- to their name, in order to\n" -"WARNING: replace them with the new version of the\n" -"WARNING: file. But the operation failed, and the\n" -"WARNING: attempt to rename them back to their\n" -"WARNING: original names also failed.\n" -"WARNING: Please rename them in %s manually:\n" +msgid "missing required file: %s" msgstr "" -#: builtin/repack.c:534 +#: builtin/repack.c:487 #, c-format -msgid "failed to remove '%s'" +msgid "could not unlink: %s" msgstr "" #: builtin/replace.c:22 @@ -19273,8 +19767,8 @@ msgstr "" msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661 +#: builtin/stash.c:685 msgid "be quiet, only report errors" msgstr "" @@ -19352,19 +19846,19 @@ msgstr "" msgid "Could not write new index file." msgstr "" -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:534 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:595 msgid "object filtering requires --objects" msgstr "" -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:651 msgid "rev-list does not support display of notes" msgstr "" -#: builtin/rev-list.c:615 +#: builtin/rev-list.c:656 msgid "marked counting is incompatible with --objects" msgstr "" @@ -19471,11 +19965,11 @@ msgstr "" msgid "keep redundant, empty commits" msgstr "" -#: builtin/revert.c:232 +#: builtin/revert.c:239 msgid "revert failed" msgstr "" -#: builtin/revert.c:245 +#: builtin/revert.c:252 msgid "cherry-pick failed" msgstr "" @@ -19563,76 +20057,76 @@ msgid "" " --all and explicit <ref> specification are mutually exclusive." msgstr "" -#: builtin/send-pack.c:182 +#: builtin/send-pack.c:188 msgid "remote name" msgstr "" -#: builtin/send-pack.c:195 +#: builtin/send-pack.c:201 msgid "use stateless RPC protocol" msgstr "" -#: builtin/send-pack.c:196 +#: builtin/send-pack.c:202 msgid "read refs from stdin" msgstr "" -#: builtin/send-pack.c:197 +#: builtin/send-pack.c:203 msgid "print status from remote helper" msgstr "" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:16 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/shortlog.c:16 +#: builtin/shortlog.c:17 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "" -#: builtin/shortlog.c:134 +#: builtin/shortlog.c:123 msgid "using multiple --group options with stdin is not supported" msgstr "" -#: builtin/shortlog.c:144 +#: builtin/shortlog.c:133 msgid "using --group=trailer with stdin is not supported" msgstr "" -#: builtin/shortlog.c:388 +#: builtin/shortlog.c:323 #, c-format msgid "unknown group type: %s" msgstr "" -#: builtin/shortlog.c:416 -msgid "Group by committer rather than author" +#: builtin/shortlog.c:351 +msgid "group by committer rather than author" msgstr "" -#: builtin/shortlog.c:419 +#: builtin/shortlog.c:354 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:421 -msgid "Suppress commit descriptions, only provides commit count" +#: builtin/shortlog.c:356 +msgid "suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:423 -msgid "Show the email address of each author" +#: builtin/shortlog.c:358 +msgid "show the email address of each author" msgstr "" -#: builtin/shortlog.c:424 +#: builtin/shortlog.c:359 msgid "<w>[,<i1>[,<i2>]]" msgstr "" -#: builtin/shortlog.c:425 -msgid "Linewrap output" +#: builtin/shortlog.c:360 +msgid "linewrap output" msgstr "" -#: builtin/shortlog.c:427 +#: builtin/shortlog.c:362 msgid "field" msgstr "" -#: builtin/shortlog.c:428 -msgid "Group by field" +#: builtin/shortlog.c:363 +msgid "group by field" msgstr "" -#: builtin/shortlog.c:456 +#: builtin/shortlog.c:391 msgid "too many arguments given outside repository" msgstr "" @@ -19820,70 +20314,70 @@ msgstr "" msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "" -#: builtin/sparse-checkout.c:50 +#: builtin/sparse-checkout.c:45 msgid "git sparse-checkout list" msgstr "" -#: builtin/sparse-checkout.c:76 +#: builtin/sparse-checkout.c:71 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" -#: builtin/sparse-checkout.c:228 +#: builtin/sparse-checkout.c:223 msgid "failed to create directory for sparse-checkout file" msgstr "" -#: builtin/sparse-checkout.c:269 +#: builtin/sparse-checkout.c:264 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "" -#: builtin/sparse-checkout.c:271 +#: builtin/sparse-checkout.c:266 msgid "failed to set extensions.worktreeConfig setting" msgstr "" -#: builtin/sparse-checkout.c:288 +#: builtin/sparse-checkout.c:283 msgid "git sparse-checkout init [--cone]" msgstr "" -#: builtin/sparse-checkout.c:307 +#: builtin/sparse-checkout.c:302 msgid "initialize the sparse-checkout in cone mode" msgstr "" -#: builtin/sparse-checkout.c:344 +#: builtin/sparse-checkout.c:339 #, c-format msgid "failed to open '%s'" msgstr "" -#: builtin/sparse-checkout.c:401 +#: builtin/sparse-checkout.c:396 #, c-format msgid "could not normalize path %s" msgstr "" -#: builtin/sparse-checkout.c:413 +#: builtin/sparse-checkout.c:408 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "" -#: builtin/sparse-checkout.c:438 +#: builtin/sparse-checkout.c:433 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "" -#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 +#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511 msgid "unable to load existing sparse-checkout patterns" msgstr "" -#: builtin/sparse-checkout.c:561 +#: builtin/sparse-checkout.c:556 msgid "read patterns from standard in" msgstr "" -#: builtin/sparse-checkout.c:576 +#: builtin/sparse-checkout.c:571 msgid "git sparse-checkout reapply" msgstr "" -#: builtin/sparse-checkout.c:595 +#: builtin/sparse-checkout.c:590 msgid "git sparse-checkout disable" msgstr "" -#: builtin/sparse-checkout.c:623 +#: builtin/sparse-checkout.c:618 msgid "error while refreshing working directory" msgstr "" @@ -19964,153 +20458,161 @@ msgid "%s is not a valid reference" msgstr "" #: builtin/stash.c:225 -msgid "git stash clear with parameters is unimplemented" +msgid "git stash clear with arguments is unimplemented" +msgstr "" + +#: builtin/stash.c:429 +#, c-format +msgid "" +"WARNING: Untracked file in way of tracked file! Renaming\n" +" %s -> %s\n" +" to make room.\n" msgstr "" -#: builtin/stash.c:404 +#: builtin/stash.c:490 msgid "cannot apply a stash in the middle of a merge" msgstr "" -#: builtin/stash.c:415 +#: builtin/stash.c:501 #, c-format msgid "could not generate diff %s^!." msgstr "" -#: builtin/stash.c:422 -msgid "conflicts in index.Try without --index." +#: builtin/stash.c:508 +msgid "conflicts in index. Try without --index." msgstr "" -#: builtin/stash.c:428 +#: builtin/stash.c:514 msgid "could not save index tree" msgstr "" -#: builtin/stash.c:437 +#: builtin/stash.c:523 msgid "could not restore untracked files from stash" msgstr "" -#: builtin/stash.c:451 +#: builtin/stash.c:537 #, c-format msgid "Merging %s with %s" msgstr "" -#: builtin/stash.c:461 +#: builtin/stash.c:547 msgid "Index was not unstashed." msgstr "" -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:589 builtin/stash.c:687 msgid "attempt to recreate the index" msgstr "" -#: builtin/stash.c:555 +#: builtin/stash.c:633 #, c-format msgid "Dropped %s (%s)" msgstr "" -#: builtin/stash.c:558 +#: builtin/stash.c:636 #, c-format msgid "%s: Could not drop stash entry" msgstr "" -#: builtin/stash.c:583 +#: builtin/stash.c:649 #, c-format msgid "'%s' is not a stash reference" msgstr "" -#: builtin/stash.c:633 +#: builtin/stash.c:699 msgid "The stash entry is kept in case you need it again." msgstr "" -#: builtin/stash.c:656 +#: builtin/stash.c:722 msgid "No branch name specified" msgstr "" -#: builtin/stash.c:800 builtin/stash.c:837 +#: builtin/stash.c:866 builtin/stash.c:903 #, c-format msgid "Cannot update %s with %s" msgstr "" -#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603 msgid "stash message" msgstr "" -#: builtin/stash.c:828 +#: builtin/stash.c:894 msgid "\"git stash store\" requires one <commit> argument" msgstr "" -#: builtin/stash.c:1043 +#: builtin/stash.c:1109 msgid "No changes selected" msgstr "" -#: builtin/stash.c:1143 +#: builtin/stash.c:1209 msgid "You do not have the initial commit yet" msgstr "" -#: builtin/stash.c:1170 +#: builtin/stash.c:1236 msgid "Cannot save the current index state" msgstr "" -#: builtin/stash.c:1179 +#: builtin/stash.c:1245 msgid "Cannot save the untracked files" msgstr "" -#: builtin/stash.c:1190 builtin/stash.c:1199 +#: builtin/stash.c:1256 builtin/stash.c:1265 msgid "Cannot save the current worktree state" msgstr "" -#: builtin/stash.c:1227 +#: builtin/stash.c:1293 msgid "Cannot record working tree state" msgstr "" -#: builtin/stash.c:1276 +#: builtin/stash.c:1342 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" -#: builtin/stash.c:1292 +#: builtin/stash.c:1358 msgid "Did you forget to 'git add'?" msgstr "" -#: builtin/stash.c:1307 +#: builtin/stash.c:1373 msgid "No local changes to save" msgstr "" -#: builtin/stash.c:1314 +#: builtin/stash.c:1380 msgid "Cannot initialize stash" msgstr "" -#: builtin/stash.c:1329 +#: builtin/stash.c:1395 msgid "Cannot save the current status" msgstr "" -#: builtin/stash.c:1334 +#: builtin/stash.c:1400 #, c-format msgid "Saved working directory and index state %s" msgstr "" -#: builtin/stash.c:1424 +#: builtin/stash.c:1490 msgid "Cannot remove worktree changes" msgstr "" -#: builtin/stash.c:1463 builtin/stash.c:1528 +#: builtin/stash.c:1529 builtin/stash.c:1594 msgid "keep index" msgstr "" -#: builtin/stash.c:1465 builtin/stash.c:1530 +#: builtin/stash.c:1531 builtin/stash.c:1596 msgid "stash in patch mode" msgstr "" -#: builtin/stash.c:1466 builtin/stash.c:1531 +#: builtin/stash.c:1532 builtin/stash.c:1597 msgid "quiet mode" msgstr "" -#: builtin/stash.c:1468 builtin/stash.c:1533 +#: builtin/stash.c:1534 builtin/stash.c:1599 msgid "include untracked files in stash" msgstr "" -#: builtin/stash.c:1470 builtin/stash.c:1535 +#: builtin/stash.c:1536 builtin/stash.c:1601 msgid "include ignore files" msgstr "" -#: builtin/stash.c:1570 +#: builtin/stash.c:1636 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -20181,11 +20683,12 @@ msgid "" msgstr "" #: builtin/submodule--helper.c:565 -msgid "Suppress output of entering each submodule command" +msgid "suppress output of entering each submodule command" msgstr "" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 -msgid "Recurse into nested submodules" +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:1487 +msgid "recurse into nested submodules" msgstr "" #: builtin/submodule--helper.c:572 @@ -20220,7 +20723,7 @@ msgid "Failed to register update mode for submodule path '%s'" msgstr "" #: builtin/submodule--helper.c:709 -msgid "Suppress output for initializing a submodule" +msgid "suppress output for initializing a submodule" msgstr "" #: builtin/submodule--helper.c:714 @@ -20243,19 +20746,15 @@ msgid "failed to recurse into submodule '%s'" msgstr "" #: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 -msgid "Suppress submodule status output" +msgid "suppress submodule status output" msgstr "" #: builtin/submodule--helper.c:887 msgid "" -"Use commit stored in the index instead of the one stored in the submodule " +"use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" -#: builtin/submodule--helper.c:888 -msgid "recurse into nested submodules" -msgstr "" - #: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "" @@ -20338,7 +20837,7 @@ msgid "failed to update remote for submodule '%s'" msgstr "" #: builtin/submodule--helper.c:1485 -msgid "Suppress output of synchronizing submodule url" +msgid "suppress output of synchronizing submodule url" msgstr "" #: builtin/submodule--helper.c:1492 @@ -20380,11 +20879,11 @@ msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "" #: builtin/submodule--helper.c:1624 -msgid "Remove submodule working trees even if they contain local changes" +msgid "remove submodule working trees even if they contain local changes" msgstr "" #: builtin/submodule--helper.c:1625 -msgid "Unregister all submodules" +msgid "unregister all submodules" msgstr "" #: builtin/submodule--helper.c:1630 @@ -20522,7 +21021,7 @@ msgid "rebase, merge, checkout or none" msgstr "" #: builtin/submodule--helper.c:2340 -msgid "Create a shallow clone truncated to the specified number of revisions" +msgid "create a shallow clone truncated to the specified number of revisions" msgstr "" #: builtin/submodule--helper.c:2343 @@ -20585,13 +21084,13 @@ msgstr "" msgid "git submodule--helper config --check-writeable" msgstr "" -#: builtin/submodule--helper.c:2665 git-submodule.sh:151 +#: builtin/submodule--helper.c:2665 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" #: builtin/submodule--helper.c:2681 -msgid "Suppress output for setting url of a submodule" +msgid "suppress output for setting url of a submodule" msgstr "" #: builtin/submodule--helper.c:2685 @@ -20623,7 +21122,7 @@ msgstr "" msgid "--branch and --default are mutually exclusive" msgstr "" -#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 +#: builtin/submodule--helper.c:2792 git.c:441 git.c:714 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" @@ -20653,11 +21152,11 @@ msgstr "" msgid "shorten ref output" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason of the update" msgstr "" @@ -20688,12 +21187,12 @@ msgstr "" msgid "tag '%s' not found." msgstr "" -#: builtin/tag.c:105 +#: builtin/tag.c:124 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:135 +#: builtin/tag.c:159 #, c-format msgid "" "\n" @@ -20702,7 +21201,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:139 +#: builtin/tag.c:163 #, c-format msgid "" "\n" @@ -20712,15 +21211,11 @@ msgid "" "want to.\n" msgstr "" -#: builtin/tag.c:198 +#: builtin/tag.c:230 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:200 -msgid "unable to write tag file" -msgstr "" - -#: builtin/tag.c:216 +#: builtin/tag.c:248 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -20729,138 +21224,134 @@ msgid "" "\tgit tag -f %s %s^{}" msgstr "" -#: builtin/tag.c:232 +#: builtin/tag.c:264 msgid "bad object type." msgstr "" -#: builtin/tag.c:285 +#: builtin/tag.c:317 msgid "no tag message?" msgstr "" -#: builtin/tag.c:292 +#: builtin/tag.c:324 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:403 +#: builtin/tag.c:435 msgid "list tag names" msgstr "" -#: builtin/tag.c:405 +#: builtin/tag.c:437 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:407 +#: builtin/tag.c:439 msgid "delete tags" msgstr "" -#: builtin/tag.c:408 +#: builtin/tag.c:440 msgid "verify tags" msgstr "" -#: builtin/tag.c:410 +#: builtin/tag.c:442 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:412 +#: builtin/tag.c:444 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:414 +#: builtin/tag.c:446 msgid "tag message" msgstr "" -#: builtin/tag.c:416 +#: builtin/tag.c:448 msgid "force edit of tag message" msgstr "" -#: builtin/tag.c:417 +#: builtin/tag.c:449 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:420 +#: builtin/tag.c:452 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:421 +#: builtin/tag.c:453 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:422 builtin/update-ref.c:492 +#: builtin/tag.c:454 builtin/update-ref.c:505 msgid "create a reflog" msgstr "" -#: builtin/tag.c:424 +#: builtin/tag.c:456 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:425 +#: builtin/tag.c:457 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:458 builtin/tag.c:460 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:427 builtin/tag.c:429 +#: builtin/tag.c:459 builtin/tag.c:461 msgid "print only tags that don't contain the commit" msgstr "" -#: builtin/tag.c:430 +#: builtin/tag.c:462 msgid "print only tags that are merged" msgstr "" -#: builtin/tag.c:431 +#: builtin/tag.c:463 msgid "print only tags that are not merged" msgstr "" -#: builtin/tag.c:435 +#: builtin/tag.c:467 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:483 +#: builtin/tag.c:515 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:505 +#: builtin/tag.c:537 msgid "-n option is only allowed in list mode" msgstr "" -#: builtin/tag.c:507 +#: builtin/tag.c:539 msgid "--contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:509 +#: builtin/tag.c:541 msgid "--no-contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:511 +#: builtin/tag.c:543 msgid "--points-at option is only allowed in list mode" msgstr "" -#: builtin/tag.c:513 +#: builtin/tag.c:545 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" -#: builtin/tag.c:524 +#: builtin/tag.c:556 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:543 -msgid "too many params" -msgstr "" - -#: builtin/tag.c:549 +#: builtin/tag.c:581 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:554 +#: builtin/tag.c:586 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:585 +#: builtin/tag.c:617 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" @@ -21124,19 +21615,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "" -#: builtin/update-ref.c:487 +#: builtin/update-ref.c:500 msgid "delete the reference" msgstr "" -#: builtin/update-ref.c:489 +#: builtin/update-ref.c:502 msgid "update <refname> not the one it points to" msgstr "" -#: builtin/update-ref.c:490 +#: builtin/update-ref.c:503 msgid "stdin has NUL-terminated arguments" msgstr "" -#: builtin/update-ref.c:491 +#: builtin/update-ref.c:504 msgid "read updates from stdin" msgstr "" @@ -21200,276 +21691,262 @@ msgstr "" msgid "print tag contents" msgstr "" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:60 builtin/worktree.c:970 +#: builtin/worktree.c:61 builtin/worktree.c:933 #, c-format msgid "failed to delete '%s'" msgstr "" -#: builtin/worktree.c:85 -msgid "not a valid directory" -msgstr "" - -#: builtin/worktree.c:91 -msgid "gitdir file does not exist" -msgstr "" - -#: builtin/worktree.c:96 builtin/worktree.c:105 -#, c-format -msgid "unable to read gitdir file (%s)" -msgstr "" - -#: builtin/worktree.c:115 -#, c-format -msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" -msgstr "" - -#: builtin/worktree.c:123 -msgid "invalid gitdir file" -msgstr "" - -#: builtin/worktree.c:131 -msgid "gitdir file points to non-existent location" -msgstr "" - -#: builtin/worktree.c:146 +#: builtin/worktree.c:74 #, c-format msgid "Removing %s/%s: %s" msgstr "" -#: builtin/worktree.c:221 +#: builtin/worktree.c:149 msgid "report pruned working trees" msgstr "" -#: builtin/worktree.c:223 +#: builtin/worktree.c:151 msgid "expire working trees older than <time>" msgstr "" -#: builtin/worktree.c:293 +#: builtin/worktree.c:221 #, c-format msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:302 +#: builtin/worktree.c:230 #, c-format msgid "unusable worktree destination '%s'" msgstr "" -#: builtin/worktree.c:307 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" "use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:309 +#: builtin/worktree.c:237 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" "use '%s -f' to override, or 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:360 +#: builtin/worktree.c:288 #, c-format msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:494 builtin/worktree.c:500 +#: builtin/worktree.c:422 builtin/worktree.c:428 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "" -#: builtin/worktree.c:496 +#: builtin/worktree.c:424 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" -#: builtin/worktree.c:505 +#: builtin/worktree.c:433 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "" -#: builtin/worktree.c:511 +#: builtin/worktree.c:439 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "" -#: builtin/worktree.c:552 +#: builtin/worktree.c:480 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:555 +#: builtin/worktree.c:483 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:557 +#: builtin/worktree.c:485 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:559 +#: builtin/worktree.c:487 msgid "populate the new working tree" msgstr "" -#: builtin/worktree.c:560 +#: builtin/worktree.c:488 msgid "keep the new working tree locked" msgstr "" -#: builtin/worktree.c:563 +#: builtin/worktree.c:491 msgid "set up tracking mode (see git-branch(1))" msgstr "" -#: builtin/worktree.c:566 +#: builtin/worktree.c:494 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" -#: builtin/worktree.c:574 +#: builtin/worktree.c:502 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: builtin/worktree.c:635 +#: builtin/worktree.c:563 msgid "--[no-]track can only be used if a new branch is created" msgstr "" -#: builtin/worktree.c:755 +#: builtin/worktree.c:680 +msgid "show extended annotations and reasons, if available" +msgstr "" + +#: builtin/worktree.c:682 +msgid "add 'prunable' annotation to worktrees older than <time>" +msgstr "" + +#: builtin/worktree.c:691 +msgid "--verbose and --porcelain are mutually exclusive" +msgstr "" + +#: builtin/worktree.c:718 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 -#: builtin/worktree.c:998 +#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837 +#: builtin/worktree.c:961 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:769 builtin/worktree.c:802 +#: builtin/worktree.c:732 builtin/worktree.c:765 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:774 +#: builtin/worktree.c:737 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:776 +#: builtin/worktree.c:739 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:804 +#: builtin/worktree.c:767 #, c-format msgid "'%s' is not locked" msgstr "" -#: builtin/worktree.c:845 +#: builtin/worktree.c:808 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:853 +#: builtin/worktree.c:816 msgid "force move even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:876 builtin/worktree.c:1000 +#: builtin/worktree.c:839 builtin/worktree.c:963 #, c-format msgid "'%s' is a main working tree" msgstr "" -#: builtin/worktree.c:881 +#: builtin/worktree.c:844 #, c-format msgid "could not figure out destination name from '%s'" msgstr "" -#: builtin/worktree.c:894 +#: builtin/worktree.c:857 #, 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:896 +#: builtin/worktree.c:859 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:899 +#: builtin/worktree.c:862 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:904 +#: builtin/worktree.c:867 #, c-format msgid "failed to move '%s' to '%s'" msgstr "" -#: builtin/worktree.c:950 +#: builtin/worktree.c:913 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "" -#: builtin/worktree.c:954 +#: builtin/worktree.c:917 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -#: builtin/worktree.c:959 +#: builtin/worktree.c:922 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" -#: builtin/worktree.c:982 +#: builtin/worktree.c:945 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:1005 +#: builtin/worktree.c:968 #, 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:1007 +#: builtin/worktree.c:970 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:1010 +#: builtin/worktree.c:973 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" -#: builtin/worktree.c:1034 +#: builtin/worktree.c:997 #, c-format msgid "repair: %s: %s" msgstr "" -#: builtin/worktree.c:1037 +#: builtin/worktree.c:1000 #, c-format msgid "error: %s: %s" msgstr "" @@ -21490,15 +21967,31 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: http-fetch.c:114 +#: http-fetch.c:118 #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "" -#: http-fetch.c:122 +#: http-fetch.c:128 msgid "not a git repository" msgstr "" +#: http-fetch.c:134 +msgid "--packfile requires --index-pack-args" +msgstr "" + +#: http-fetch.c:143 +msgid "--index-pack-args can only be used with --packfile" +msgstr "" + +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" +msgstr "" + +#: t/helper/test-fast-rebase.c:146 +msgid "error preparing revisions" +msgstr "" + #: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" @@ -21523,10 +22016,11 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" " <command> [<args>]" msgstr "" -#: git.c:35 +#: git.c:36 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" @@ -21534,98 +22028,98 @@ msgid "" "See 'git help git' for an overview of the system." msgstr "" -#: git.c:187 +#: git.c:188 #, c-format msgid "no directory given for --git-dir\n" msgstr "" -#: git.c:201 +#: git.c:202 #, c-format msgid "no namespace given for --namespace\n" msgstr "" -#: git.c:215 +#: git.c:216 #, c-format msgid "no directory given for --work-tree\n" msgstr "" -#: git.c:229 +#: git.c:230 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "" -#: git.c:251 +#: git.c:252 #, c-format msgid "-c expects a configuration string\n" msgstr "" -#: git.c:289 +#: git.c:292 #, c-format msgid "no directory given for -C\n" msgstr "" -#: git.c:315 +#: git.c:318 #, c-format msgid "unknown option: %s\n" msgstr "" -#: git.c:364 +#: git.c:367 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "" -#: git.c:373 +#: git.c:376 #, c-format msgid "" "alias '%s' changes environment variables.\n" "You can use '!git' in the alias to do this" msgstr "" -#: git.c:380 +#: git.c:383 #, c-format msgid "empty alias for %s" msgstr "" -#: git.c:383 +#: git.c:386 #, c-format msgid "recursive alias: %s" msgstr "" -#: git.c:465 +#: git.c:468 msgid "write failure on standard output" msgstr "" -#: git.c:467 +#: git.c:470 msgid "unknown write failure on standard output" msgstr "" -#: git.c:469 +#: git.c:472 msgid "close failed on standard output" msgstr "" -#: git.c:819 +#: git.c:823 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" -#: git.c:869 +#: git.c:873 #, c-format msgid "cannot handle %s as a builtin" msgstr "" -#: git.c:882 +#: git.c:886 #, c-format msgid "" "usage: %s\n" "\n" msgstr "" -#: git.c:902 +#: git.c:906 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:914 +#: git.c:918 #, c-format msgid "failed to run command '%s': %s\n" msgstr "" @@ -21674,134 +22168,134 @@ msgid "" " redirect: %s" msgstr "" -#: remote-curl.c:174 +#: remote-curl.c:183 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "" -#: remote-curl.c:298 +#: remote-curl.c:307 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "" -#: remote-curl.c:399 +#: remote-curl.c:408 msgid "invalid server response; expected service, got flush packet" msgstr "" -#: remote-curl.c:430 +#: remote-curl.c:439 #, c-format msgid "invalid server response; got '%s'" msgstr "" -#: remote-curl.c:490 +#: remote-curl.c:499 #, c-format msgid "repository '%s' not found" msgstr "" -#: remote-curl.c:494 +#: remote-curl.c:503 #, c-format msgid "Authentication failed for '%s'" msgstr "" -#: remote-curl.c:498 +#: remote-curl.c:507 #, c-format msgid "unable to access '%s': %s" msgstr "" -#: remote-curl.c:504 +#: remote-curl.c:513 #, c-format msgid "redirecting to %s" msgstr "" -#: remote-curl.c:633 +#: remote-curl.c:642 msgid "shouldn't have EOF when not gentle on EOF" msgstr "" -#: remote-curl.c:645 +#: remote-curl.c:654 msgid "remote server sent stateless separator" msgstr "" -#: remote-curl.c:715 +#: remote-curl.c:724 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" -#: remote-curl.c:745 +#: remote-curl.c:754 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "" -#: remote-curl.c:747 +#: remote-curl.c:756 msgid "remote-curl: unexpected response end packet" msgstr "" -#: remote-curl.c:823 +#: remote-curl.c:832 #, c-format msgid "RPC failed; %s" msgstr "" -#: remote-curl.c:863 +#: remote-curl.c:872 msgid "cannot handle pushes this big" msgstr "" -#: remote-curl.c:978 +#: remote-curl.c:987 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" -#: remote-curl.c:982 +#: remote-curl.c:991 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "" -#: remote-curl.c:1032 +#: remote-curl.c:1041 #, c-format msgid "%d bytes of length header were received" msgstr "" -#: remote-curl.c:1034 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of body are still expected" msgstr "" -#: remote-curl.c:1123 +#: remote-curl.c:1132 msgid "dumb http transport does not support shallow capabilities" msgstr "" -#: remote-curl.c:1138 +#: remote-curl.c:1147 msgid "fetch failed." msgstr "" -#: remote-curl.c:1184 +#: remote-curl.c:1193 msgid "cannot fetch by sha1 over smart http" msgstr "" -#: remote-curl.c:1228 remote-curl.c:1234 +#: remote-curl.c:1237 remote-curl.c:1243 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "" -#: remote-curl.c:1246 remote-curl.c:1361 +#: remote-curl.c:1255 remote-curl.c:1373 #, c-format msgid "http transport does not support %s" msgstr "" -#: remote-curl.c:1282 +#: remote-curl.c:1291 msgid "git-http-push failed" msgstr "" -#: remote-curl.c:1467 +#: remote-curl.c:1479 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "" -#: remote-curl.c:1499 +#: remote-curl.c:1511 msgid "remote-curl: error reading command stream from git" msgstr "" -#: remote-curl.c:1506 +#: remote-curl.c:1518 msgid "remote-curl: fetch attempted without a local repo" msgstr "" -#: remote-curl.c:1547 +#: remote-curl.c:1559 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "" @@ -21855,11 +22349,11 @@ msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "" -#: ref-filter.h:96 +#: ref-filter.h:99 msgid "key" msgstr "" -#: ref-filter.h:96 +#: ref-filter.h:99 msgid "field name to sort on" msgstr "" @@ -21867,14 +22361,6 @@ msgstr "" msgid "update the index with reused conflict resolution if possible" msgstr "" -#: wt-status.h:80 -msgid "HEAD detached at " -msgstr "" - -#: wt-status.h:81 -msgid "HEAD detached from " -msgstr "" - #: command-list.h:50 msgid "Add file contents to the index" msgstr "" @@ -22072,171 +22558,171 @@ msgid "Output information on each ref" msgstr "" #: command-list.h:99 -msgid "Prepare patches for e-mail submission" +msgid "Run a Git command on a list of repositories" msgstr "" #: command-list.h:100 -msgid "Verifies the connectivity and validity of the objects in the database" +msgid "Prepare patches for e-mail submission" msgstr "" #: command-list.h:101 -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:102 -msgid "Extract commit ID from an archive created using git-archive" +msgid "Cleanup unnecessary files and optimize the local repository" msgstr "" #: command-list.h:103 -msgid "Print lines matching a pattern" +msgid "Extract commit ID from an archive created using git-archive" msgstr "" #: command-list.h:104 -msgid "A portable graphical interface to Git" +msgid "Print lines matching a pattern" msgstr "" #: command-list.h:105 -msgid "Compute object ID and optionally creates a blob from a file" +msgid "A portable graphical interface to Git" msgstr "" #: command-list.h:106 -msgid "Display help information about Git" +msgid "Compute object ID and optionally creates a blob from a file" msgstr "" #: command-list.h:107 -msgid "Server side implementation of Git over HTTP" +msgid "Display help information about Git" msgstr "" #: command-list.h:108 -msgid "Download from a remote Git repository via HTTP" +msgid "Server side implementation of Git over HTTP" msgstr "" #: command-list.h:109 -msgid "Push objects over HTTP/DAV to another repository" +msgid "Download from a remote Git repository via HTTP" msgstr "" #: command-list.h:110 -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:111 -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:112 -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:113 -msgid "Instantly browse your working repository in gitweb" +msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" #: command-list.h:114 -msgid "Add or parse structured information in commit messages" +msgid "Instantly browse your working repository in gitweb" msgstr "" #: command-list.h:115 -msgid "The Git repository browser" +msgid "Add or parse structured information in commit messages" msgstr "" #: command-list.h:116 -msgid "Show commit logs" +msgid "The Git repository browser" msgstr "" #: command-list.h:117 -msgid "Show information about files in the index and the working tree" +msgid "Show commit logs" msgstr "" #: command-list.h:118 -msgid "List references in a remote repository" +msgid "Show information about files in the index and the working tree" msgstr "" #: command-list.h:119 -msgid "List the contents of a tree object" +msgid "List references in a remote repository" msgstr "" #: command-list.h:120 -msgid "Extracts patch and authorship from a single e-mail message" +msgid "List the contents of a tree object" msgstr "" #: command-list.h:121 -msgid "Simple UNIX mbox splitter program" +msgid "Extracts patch and authorship from a single e-mail message" msgstr "" #: command-list.h:122 -msgid "Run tasks to optimize Git repository data" +msgid "Simple UNIX mbox splitter program" msgstr "" #: command-list.h:123 -msgid "Join two or more development histories together" +msgid "Run tasks to optimize Git repository data" msgstr "" #: command-list.h:124 -msgid "Find as good common ancestors as possible for a merge" +msgid "Join two or more development histories together" msgstr "" #: command-list.h:125 -msgid "Run a three-way file merge" +msgid "Find as good common ancestors as possible for a merge" msgstr "" #: command-list.h:126 -msgid "Run a merge for files needing merging" +msgid "Run a three-way file merge" msgstr "" #: command-list.h:127 -msgid "The standard helper program to use with git-merge-index" +msgid "Run a merge for files needing merging" msgstr "" #: command-list.h:128 -msgid "Run merge conflict resolution tools to resolve merge conflicts" +msgid "The standard helper program to use with git-merge-index" msgstr "" #: command-list.h:129 -msgid "Show three-way merge without touching index" +msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" #: command-list.h:130 -msgid "Write and verify multi-pack-indexes" +msgid "Show three-way merge without touching index" msgstr "" #: command-list.h:131 -msgid "Creates a tag object" +msgid "Write and verify multi-pack-indexes" msgstr "" #: command-list.h:132 -msgid "Build a tree-object from ls-tree formatted text" +msgid "Creates a tag object with extra validation" msgstr "" #: command-list.h:133 -msgid "Move or rename a file, a directory, or a symlink" +msgid "Build a tree-object from ls-tree formatted text" msgstr "" #: command-list.h:134 -msgid "Find symbolic names for given revs" +msgid "Move or rename a file, a directory, or a symlink" msgstr "" #: command-list.h:135 -msgid "Add or inspect object notes" +msgid "Find symbolic names for given revs" msgstr "" #: command-list.h:136 -msgid "Import from and submit to Perforce repositories" +msgid "Add or inspect object notes" msgstr "" #: command-list.h:137 -msgid "Create a packed archive of objects" +msgid "Import from and submit to Perforce repositories" msgstr "" #: command-list.h:138 -msgid "Find redundant pack files" +msgid "Create a packed archive of objects" msgstr "" #: command-list.h:139 -msgid "Pack heads and tags for efficient repository access" +msgid "Find redundant pack files" msgstr "" #: command-list.h:140 -msgid "Routines to help parsing remote repository access parameters" +msgid "Pack heads and tags for efficient repository access" msgstr "" #: command-list.h:141 @@ -22512,109 +22998,76 @@ msgid "Specifies intentionally untracked files to ignore" msgstr "" #: command-list.h:209 -msgid "Defining submodule properties" +msgid "Map author/committer names and/or E-Mail addresses" msgstr "" #: command-list.h:210 -msgid "Git namespaces" +msgid "Defining submodule properties" msgstr "" #: command-list.h:211 -msgid "Helper programs to interact with remote repositories" +msgid "Git namespaces" msgstr "" #: command-list.h:212 -msgid "Git Repository Layout" +msgid "Helper programs to interact with remote repositories" msgstr "" #: command-list.h:213 -msgid "Specifying revisions and ranges for Git" +msgid "Git Repository Layout" msgstr "" #: command-list.h:214 -msgid "Mounting one repository inside another" +msgid "Specifying revisions and ranges for Git" msgstr "" #: command-list.h:215 -msgid "A tutorial introduction to Git: part two" +msgid "Mounting one repository inside another" msgstr "" #: command-list.h:216 -msgid "A tutorial introduction to Git" +msgid "A tutorial introduction to Git: part two" 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:99 -#, sh-format -msgid "Bad rev input: $bisected_head" -msgstr "" - -#: git-bisect.sh:108 -#, sh-format -msgid "Bad rev input: $rev" -msgstr "" - -#: git-bisect.sh:117 -#, sh-format -msgid "'git bisect $TERM_BAD' can take only one argument." -msgstr "" - -#: git-bisect.sh:149 -msgid "No logfile given" -msgstr "" - -#: git-bisect.sh:150 -#, sh-format -msgid "cannot read $file for replaying" +msgid "A tutorial introduction to Git" msgstr "" -#: git-bisect.sh:173 -msgid "?? what are you talking about?" +#: command-list.h:218 +msgid "An overview of recommended workflows with Git" msgstr "" -#: git-bisect.sh:183 +#: git-bisect.sh:68 msgid "bisect run failed: no command provided." msgstr "" -#: git-bisect.sh:188 +#: git-bisect.sh:73 #, sh-format msgid "running $command" msgstr "" -#: git-bisect.sh:195 +#: git-bisect.sh:80 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -#: git-bisect.sh:221 +#: git-bisect.sh:105 msgid "bisect run cannot continue any more" msgstr "" -#: git-bisect.sh:227 +#: git-bisect.sh:111 #, sh-format msgid "" "bisect run failed:\n" -"'bisect_state $state' exited with error code $res" +"'bisect-state $state' exited with error code $res" msgstr "" -#: git-bisect.sh:234 +#: git-bisect.sh:118 msgid "bisect run success" msgstr "" -#: git-bisect.sh:242 -msgid "We are not bisecting." -msgstr "" - #: git-merge-octopus.sh:46 msgid "" "Error: Your local changes to the following files would be overwritten by " @@ -22653,46 +23106,46 @@ msgstr "" msgid "Simple merge did not work, trying automatic merge." msgstr "" -#: git-submodule.sh:180 +#: git-submodule.sh:179 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:190 +#: git-submodule.sh:189 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:209 +#: git-submodule.sh:208 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:212 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "" -#: git-submodule.sh:219 +#: git-submodule.sh:218 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "" -#: git-submodule.sh:250 +#: git-submodule.sh:249 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:252 +#: git-submodule.sh:251 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:260 +#: git-submodule.sh:259 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:262 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22703,107 +23156,102 @@ msgid "" "option." msgstr "" -#: git-submodule.sh:268 +#: git-submodule.sh:267 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:280 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:285 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:294 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:567 +#: git-submodule.sh:568 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:577 +#: git-submodule.sh:578 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:582 +#: git-submodule.sh:583 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" -#: git-submodule.sh:600 +#: git-submodule.sh:601 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "" -#: git-submodule.sh:606 +#: git-submodule.sh:607 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -#: git-submodule.sh:613 +#: git-submodule.sh:614 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:614 +#: git-submodule.sh:615 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:618 +#: git-submodule.sh:619 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:619 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:624 +#: git-submodule.sh:625 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:625 +#: git-submodule.sh:626 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:630 +#: git-submodule.sh:631 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:631 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:662 +#: git-submodule.sh:663 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-parse-remote.sh:89 -#, sh-format -msgid "See git-${cmd}(1) for details." -msgstr "" - #: git-rebase--preserve-merges.sh:109 msgid "Applied autostash." msgstr "" @@ -23136,51 +23584,51 @@ msgstr "" msgid "%12s %12s %s" msgstr "" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:1058 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "" -#: git-add--interactive.perl:1061 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "" -#: git-add--interactive.perl:1064 +#: git-add--interactive.perl:1062 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "" -#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 -#: git-add--interactive.perl:1082 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1074 +#: git-add--interactive.perl:1080 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "" -#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 -#: git-add--interactive.perl:1079 +#: git-add--interactive.perl:1068 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "" -#: git-add--interactive.perl:1116 +#: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "" -#: git-add--interactive.perl:1123 +#: git-add--interactive.perl:1121 #, perl-format msgid "" "---\n" @@ -23189,12 +23637,12 @@ msgid "" "Lines starting with %s will be removed.\n" msgstr "" -#: git-add--interactive.perl:1145 +#: git-add--interactive.perl:1143 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "" -#: git-add--interactive.perl:1253 +#: git-add--interactive.perl:1251 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -23203,7 +23651,7 @@ msgid "" "d - do not stage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1259 +#: git-add--interactive.perl:1257 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -23212,7 +23660,7 @@ msgid "" "d - do not stash this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1265 +#: git-add--interactive.perl:1263 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -23221,7 +23669,7 @@ msgid "" "d - do not unstage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1271 +#: git-add--interactive.perl:1269 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -23230,7 +23678,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 +#: git-add--interactive.perl:1275 git-add--interactive.perl:1293 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -23239,7 +23687,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1283 +#: git-add--interactive.perl:1281 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -23248,7 +23696,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1289 +#: git-add--interactive.perl:1287 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -23257,7 +23705,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1301 +#: git-add--interactive.perl:1299 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -23266,7 +23714,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1316 +#: git-add--interactive.perl:1314 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -23279,90 +23727,90 @@ msgid "" "? - print help\n" msgstr "" -#: git-add--interactive.perl:1347 +#: git-add--interactive.perl:1345 msgid "The selected hunks do not apply to the index!\n" msgstr "" -#: git-add--interactive.perl:1362 +#: git-add--interactive.perl:1360 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "" -#: git-add--interactive.perl:1481 +#: git-add--interactive.perl:1479 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1482 +#: git-add--interactive.perl:1480 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1483 +#: git-add--interactive.perl:1481 #, perl-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1484 +#: git-add--interactive.perl:1482 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1601 +#: git-add--interactive.perl:1599 msgid "No other hunks to goto\n" msgstr "" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1617 #, perl-format msgid "Invalid number: '%s'\n" msgstr "" -#: git-add--interactive.perl:1624 +#: git-add--interactive.perl:1622 #, 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:1659 +#: git-add--interactive.perl:1657 msgid "No other hunks to search\n" msgstr "" -#: git-add--interactive.perl:1676 +#: git-add--interactive.perl:1674 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "" -#: git-add--interactive.perl:1686 +#: git-add--interactive.perl:1684 msgid "No hunk matches the given pattern\n" msgstr "" -#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 +#: git-add--interactive.perl:1696 git-add--interactive.perl:1718 msgid "No previous hunk\n" msgstr "" -#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 +#: git-add--interactive.perl:1705 git-add--interactive.perl:1724 msgid "No next hunk\n" msgstr "" -#: git-add--interactive.perl:1732 +#: git-add--interactive.perl:1730 msgid "Sorry, cannot split this hunk\n" msgstr "" -#: git-add--interactive.perl:1738 +#: git-add--interactive.perl:1736 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "" msgstr[1] "" -#: git-add--interactive.perl:1748 +#: git-add--interactive.perl:1746 msgid "Sorry, cannot edit this hunk\n" msgstr "" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1813 +#: git-add--interactive.perl:1811 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23373,19 +23821,19 @@ msgid "" "changes\n" msgstr "" -#: 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 +#: git-add--interactive.perl:1828 git-add--interactive.perl:1840 +#: git-add--interactive.perl:1843 git-add--interactive.perl:1850 +#: git-add--interactive.perl:1853 git-add--interactive.perl:1860 +#: git-add--interactive.perl:1864 git-add--interactive.perl:1870 msgid "missing --" msgstr "" -#: git-add--interactive.perl:1861 +#: git-add--interactive.perl:1866 #, perl-format msgid "unknown --patch mode: %s" msgstr "" -#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 +#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 #, perl-format msgid "invalid argument %s, expecting --" msgstr "" |