diff options
| -rw-r--r-- | po/git.pot | 4651 |
1 files changed, 2375 insertions, 2276 deletions
diff --git a/po/git.pot b/po/git.pot index 68c84144e9..b8d87b753b 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: 2020-12-15 16:27+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:3284 +#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532 +#: builtin/rebase.c:1955 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:3478 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:4127 builtin/checkout.c:295 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: add-interactive.c:751 git-add--interactive.perl:655 +#: 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:4989 apply.c:4992 builtin/am.c:2257 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 +#: builtin/fetch.c:147 builtin/merge.c:284 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:1369 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,7 @@ 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:73 setup.c:308 #, c-format msgid "failed to read %s" msgstr "" @@ -1138,7 +1138,7 @@ msgstr "" msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4376 builtin/bisect--helper.c:537 +#: apply.c:4376 builtin/bisect--helper.c:524 #, c-format msgid "failed to write to '%s'" msgstr "" @@ -1189,170 +1189,170 @@ msgstr "" msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4715 +#: apply.c:4720 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4723 +#: apply.c:4728 msgid "unrecognized input" msgstr "" -#: apply.c:4743 +#: apply.c:4748 msgid "unable to read index file" msgstr "" -#: apply.c:4900 +#: apply.c:4905 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4927 +#: apply.c:4932 #, 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:4938 apply.c:4953 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4941 +#: apply.c:4946 #, 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:4962 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "" -#: apply.c:4985 +#: apply.c:4990 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4988 +#: apply.c:4993 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4990 builtin/am.c:2279 +#: apply.c:4995 builtin/am.c:2266 msgid "num" msgstr "" -#: apply.c:4991 +#: apply.c:4996 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: apply.c:4994 +#: apply.c:4999 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4996 +#: apply.c:5001 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:5000 +#: apply.c:5005 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:5002 +#: apply.c:5007 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:5004 +#: apply.c:5009 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:5006 +#: apply.c:5011 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:5008 +#: apply.c:5013 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:5010 +#: apply.c:5015 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:5012 +#: apply.c:5017 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:5015 +#: apply.c:5020 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:5017 +#: apply.c:5022 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:5019 +#: apply.c:5024 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:5027 builtin/checkout-index.c:182 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:5024 +#: apply.c:5029 msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 +#: apply.c:5030 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:3562 builtin/rebase.c:1346 msgid "action" msgstr "" -#: apply.c:5026 +#: apply.c:5031 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:5029 apply.c:5032 +#: apply.c:5034 apply.c:5037 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:5035 +#: apply.c:5040 msgid "apply the patch in reverse" msgstr "" -#: apply.c:5037 +#: apply.c:5042 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:5039 +#: apply.c:5044 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5041 +#: apply.c:5046 msgid "allow overlapping hunks" msgstr "" -#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: apply.c:5047 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 +#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" -#: apply.c:5044 +#: apply.c:5049 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5047 +#: apply.c:5052 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5049 builtin/am.c:2267 +#: apply.c:5054 builtin/am.c:2254 msgid "root" msgstr "" -#: apply.c:5050 +#: apply.c:5055 msgid "prepend <root> to all filenames" msgstr "" @@ -1366,16 +1366,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,9 +1422,9 @@ 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:1736 sequencer.c:2886 +#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1138 #, c-format msgid "could not read '%s'" msgstr "" @@ -1463,160 +1463,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:1765 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 +#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 +#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 #: 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/fast-export.c:1214 builtin/grep.c:919 builtin/hash-object.c:105 #: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "" -#: archive.c: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 +1616,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 +1624,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:255 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:974 builtin/merge.c:150 +#: bisect.c:987 builtin/merge.c:152 #, 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" msgstr "" -#: bisect.c:1082 +#: bisect.c:1095 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1678,44 +1670,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:2272 remote.c:2031 sequencer.c:2138 +#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409 +#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336 +#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:267 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 +1856,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:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" @@ -1927,7 +1919,7 @@ msgstr "" 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:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -1950,7 +1942,7 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit-graph.c:188 midx.c:46 +#: commit-graph.c:188 midx.c:47 msgid "invalid hash version" msgstr "" @@ -2014,7 +2006,7 @@ msgstr "" msgid "could not find commit %s" msgstr "" -#: commit-graph.c:1042 builtin/am.c:1306 +#: commit-graph.c:1042 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "" @@ -2081,7 +2073,7 @@ msgstr "" msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1720 midx.c:826 +#: commit-graph.c:1720 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "" @@ -2118,96 +2110,95 @@ msgstr "" msgid "Scanning merged commits" msgstr "" -#: commit-graph.c:2026 -#, c-format -msgid "unexpected duplicate commit id %s" +#: commit-graph.c:2059 +msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:2049 -msgid "Merging commit-graph" +#: commit-graph.c:2165 +msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" -#: commit-graph.c:2259 +#: commit-graph.c:2274 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "" -#: commit-graph.c:2270 +#: commit-graph.c:2285 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:2363 +#: commit-graph.c:2378 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:2373 +#: commit-graph.c:2388 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:2383 commit-graph.c:2398 +#: commit-graph.c:2398 commit-graph.c:2413 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:2390 +#: commit-graph.c:2405 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:2408 +#: commit-graph.c:2423 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2423 +#: commit-graph.c:2438 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2430 +#: commit-graph.c:2445 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2440 +#: commit-graph.c:2455 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2449 +#: commit-graph.c:2464 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2463 +#: commit-graph.c:2478 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2468 +#: commit-graph.c:2483 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2472 +#: commit-graph.c:2487 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2488 +#: commit-graph.c:2503 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" -#: commit-graph.c:2494 +#: commit-graph.c:2509 #, 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:2879 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 "" @@ -2293,7 +2284,7 @@ msgstr "" msgid "key does not contain variable name: %s" msgstr "" -#: config.c:408 sequencer.c:2547 +#: config.c:408 sequencer.c:2580 #, c-format msgid "invalid key: %s" msgstr "" @@ -2482,77 +2473,77 @@ msgstr "" msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2470 +#: config.c:2473 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2502 +#: config.c:2505 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2531 +#: config.c:2534 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2783 config.c:3107 +#: config.c:2786 config.c:3112 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2794 +#: config.c:2797 #, c-format msgid "opening %s" msgstr "" -#: config.c:2829 builtin/config.c:354 +#: config.c:2834 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:2854 +#: config.c:2859 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:2867 config.c:3120 +#: config.c:2872 config.c:3125 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2878 +#: config.c:2883 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:2887 config.c:3125 +#: config.c:2892 config.c:3130 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:2972 config.c:3222 +#: config.c:2977 config.c:3227 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:3006 +#: config.c:3011 #, 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:3013 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:3103 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3265 +#: config.c:3270 #, c-format msgid "missing value for '%s'" msgstr "" @@ -2970,6 +2961,26 @@ msgstr "" msgid "Marked %d islands, done.\n" 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 +3032,532 @@ msgid "" "%s" msgstr "" -#: diff.c:4269 +#: diff.c:4276 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4618 +#: diff.c:4625 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4621 +#: diff.c:4628 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4699 +#: diff.c:4706 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4747 +#: diff.c:4754 #, 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:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302 #: 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:4791 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4869 +#: diff.c:4876 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4893 +#: diff.c:4900 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4907 +#: diff.c:4914 #, c-format msgid "unable to resolve '%s'" msgstr "" -#: diff.c:4957 diff.c:4963 +#: diff.c:4964 diff.c:4970 #, c-format msgid "%s expects <n>/<m> form" msgstr "" -#: diff.c:4975 +#: diff.c:4982 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:4996 +#: diff.c:5003 #, c-format msgid "bad --color-moved argument: %s" msgstr "" -#: diff.c:5015 +#: diff.c:5022 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: diff.c:5055 +#: diff.c:5062 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5091 diff.c:5111 +#: diff.c:5098 diff.c:5118 #, c-format msgid "invalid argument to %s" msgstr "" -#: diff.c:5248 +#: diff.c:5222 +#, c-format +msgid "invalid regex given to -I: '%s'" +msgstr "" + +#: diff.c:5271 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5304 +#: diff.c:5327 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5327 +#: diff.c:5350 msgid "Diff output format options" msgstr "" -#: diff.c:5329 diff.c:5335 +#: diff.c:5352 diff.c:5358 msgid "generate patch" msgstr "" -#: diff.c:5332 builtin/log.c:176 +#: diff.c:5355 builtin/log.c:178 msgid "suppress diff output" msgstr "" -#: diff.c:5337 diff.c:5451 diff.c:5458 +#: diff.c:5360 diff.c:5474 diff.c:5481 msgid "<n>" msgstr "" -#: diff.c:5338 diff.c:5341 +#: diff.c:5361 diff.c:5364 msgid "generate diffs with <n> lines context" msgstr "" -#: diff.c:5343 +#: diff.c:5366 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5346 +#: diff.c:5369 msgid "synonym for '-p --raw'" msgstr "" -#: diff.c:5350 +#: diff.c:5373 msgid "synonym for '-p --stat'" msgstr "" -#: diff.c:5354 +#: diff.c:5377 msgid "machine friendly --stat" msgstr "" -#: diff.c:5357 +#: diff.c:5380 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5359 diff.c:5367 +#: diff.c:5382 diff.c:5390 msgid "<param1,param2>..." msgstr "" -#: diff.c:5360 +#: diff.c:5383 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5364 +#: diff.c:5387 msgid "synonym for --dirstat=cumulative" msgstr "" -#: diff.c:5368 +#: diff.c:5391 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5372 +#: diff.c:5395 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5375 +#: diff.c:5398 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5378 +#: diff.c:5401 msgid "show only names of changed files" msgstr "" -#: diff.c:5381 +#: diff.c:5404 msgid "show only names and status of changed files" msgstr "" -#: diff.c:5383 +#: diff.c:5406 msgid "<width>[,<name-width>[,<count>]]" msgstr "" -#: diff.c:5384 +#: diff.c:5407 msgid "generate diffstat" msgstr "" -#: diff.c:5386 diff.c:5389 diff.c:5392 +#: diff.c:5409 diff.c:5412 diff.c:5415 msgid "<width>" msgstr "" -#: diff.c:5387 +#: diff.c:5410 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5390 +#: diff.c:5413 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5393 +#: diff.c:5416 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5395 +#: diff.c:5418 msgid "<count>" msgstr "" -#: diff.c:5396 +#: diff.c:5419 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5399 +#: diff.c:5422 msgid "generate compact summary in diffstat" msgstr "" -#: diff.c:5402 +#: diff.c:5425 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5405 +#: diff.c:5428 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5407 +#: diff.c:5430 msgid "show colored diff" msgstr "" -#: diff.c:5408 +#: diff.c:5431 msgid "<kind>" msgstr "" -#: diff.c:5409 +#: diff.c:5432 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5412 +#: diff.c:5435 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:5438 diff.c:5441 diff.c:5444 diff.c:5553 msgid "<prefix>" msgstr "" -#: diff.c:5416 +#: diff.c:5439 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5419 +#: diff.c:5442 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5422 +#: diff.c:5445 msgid "prepend an additional prefix to every line of output" msgstr "" -#: diff.c:5425 +#: diff.c:5448 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5428 +#: diff.c:5451 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:5455 diff.c:5460 diff.c:5465 msgid "<char>" msgstr "" -#: diff.c:5433 +#: diff.c:5456 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5438 +#: diff.c:5461 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5443 +#: diff.c:5466 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5446 +#: diff.c:5469 msgid "Diff rename options" msgstr "" -#: diff.c:5447 +#: diff.c:5470 msgid "<n>[/<m>]" msgstr "" -#: diff.c:5448 +#: diff.c:5471 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5452 +#: diff.c:5475 msgid "detect renames" msgstr "" -#: diff.c:5456 +#: diff.c:5479 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5459 +#: diff.c:5482 msgid "detect copies" msgstr "" -#: diff.c:5463 +#: diff.c:5486 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5465 +#: diff.c:5488 msgid "disable rename detection" msgstr "" -#: diff.c:5468 +#: diff.c:5491 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5470 +#: diff.c:5493 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5473 +#: diff.c:5496 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5475 +#: diff.c:5498 msgid "Diff algorithm options" msgstr "" -#: diff.c:5477 +#: diff.c:5500 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5480 +#: diff.c:5503 msgid "ignore whitespace when comparing lines" msgstr "" -#: diff.c:5483 +#: diff.c:5506 msgid "ignore changes in amount of whitespace" msgstr "" -#: diff.c:5486 +#: diff.c:5509 msgid "ignore changes in whitespace at EOL" msgstr "" -#: diff.c:5489 +#: diff.c:5512 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5492 +#: diff.c:5515 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5495 +#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587 +msgid "<regex>" +msgstr "" + +#: diff.c:5518 +msgid "ignore changes whose all lines match <regex>" +msgstr "" + +#: diff.c:5521 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5498 +#: diff.c:5524 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5502 +#: diff.c:5528 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5504 +#: diff.c:5530 msgid "<algorithm>" msgstr "" -#: diff.c:5505 +#: diff.c:5531 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5507 +#: diff.c:5533 msgid "<text>" msgstr "" -#: diff.c:5508 +#: diff.c:5534 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5510 diff.c:5519 diff.c:5522 +#: diff.c:5536 diff.c:5545 diff.c:5548 msgid "<mode>" msgstr "" -#: diff.c:5511 +#: diff.c:5537 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:5540 msgid "use <regex> to decide what a word is" msgstr "" -#: diff.c:5517 +#: diff.c:5543 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" -#: diff.c:5520 +#: diff.c:5546 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5523 +#: diff.c:5549 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5526 +#: diff.c:5552 msgid "Other diff options" msgstr "" -#: diff.c:5528 +#: diff.c:5554 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5532 +#: diff.c:5558 msgid "treat all files as text" msgstr "" -#: diff.c:5534 +#: diff.c:5560 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5536 +#: diff.c:5562 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5538 +#: diff.c:5564 msgid "disable all output of the program" msgstr "" -#: diff.c:5540 +#: diff.c:5566 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5542 +#: diff.c:5568 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5544 +#: diff.c:5570 msgid "<when>" msgstr "" -#: diff.c:5545 +#: diff.c:5571 msgid "ignore changes to submodules in the diff generation" msgstr "" -#: diff.c:5548 +#: diff.c:5574 msgid "<format>" msgstr "" -#: diff.c:5549 +#: diff.c:5575 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5553 +#: diff.c:5579 msgid "hide 'git add -N' entries from the index" msgstr "" -#: diff.c:5556 +#: diff.c:5582 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5558 +#: diff.c:5584 msgid "<string>" msgstr "" -#: diff.c:5559 +#: diff.c:5585 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5562 +#: diff.c:5588 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5565 +#: diff.c:5591 msgid "show all changes in the changeset with -S or -G" msgstr "" -#: diff.c:5568 +#: diff.c:5594 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" -#: diff.c:5571 +#: diff.c:5597 msgid "control the order in which files appear in the output" msgstr "" -#: diff.c:5572 +#: diff.c:5598 msgid "<object-id>" msgstr "" -#: diff.c:5573 +#: diff.c:5599 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5575 +#: diff.c:5601 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5576 +#: diff.c:5602 msgid "select files by diff type" msgstr "" -#: diff.c:5578 +#: diff.c:5604 msgid "<file>" msgstr "" -#: diff.c:5579 +#: diff.c:5605 msgid "Output to a specific file" msgstr "" -#: diff.c:6236 +#: diff.c:6262 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:6239 +#: diff.c:6265 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:6242 +#: diff.c:6268 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3638,245 +3658,245 @@ 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:1406 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:381 fetch-pack.c:1403 +#: fetch-pack.c:384 fetch-pack.c:1412 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:383 fetch-pack.c:1405 +#: fetch-pack.c:386 fetch-pack.c:1414 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:386 fetch-pack.c:1408 +#: fetch-pack.c:389 fetch-pack.c:1417 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:388 fetch-pack.c:1410 +#: fetch-pack.c:391 fetch-pack.c:1419 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:391 fetch-pack.c:1414 +#: fetch-pack.c:394 fetch-pack.c:1423 #, 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:827 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:832 +#: fetch-pack.c:835 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:916 +#: fetch-pack.c:919 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:933 +#: fetch-pack.c:937 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:935 +#: fetch-pack.c:939 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:978 +#: fetch-pack.c:982 #, 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:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005 +#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021 +#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059 #, c-format msgid "Server supports %s" msgstr "" -#: fetch-pack.c:985 +#: fetch-pack.c:992 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:1045 +#: fetch-pack.c:1052 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:1050 +#: fetch-pack.c:1057 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:1054 +#: fetch-pack.c:1061 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1056 +#: fetch-pack.c:1063 msgid "Server does not support this repository's object format" msgstr "" -#: fetch-pack.c:1069 +#: fetch-pack.c:1076 msgid "no common commits" msgstr "" -#: fetch-pack.c:1081 fetch-pack.c:1619 +#: fetch-pack.c:1088 fetch-pack.c:1628 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1205 +#: fetch-pack.c:1214 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "" -#: fetch-pack.c:1209 +#: fetch-pack.c:1218 #, c-format msgid "the server does not support algorithm '%s'" msgstr "" -#: fetch-pack.c:1229 +#: fetch-pack.c:1238 msgid "Server does not support shallow requests" msgstr "" -#: fetch-pack.c:1236 +#: fetch-pack.c:1245 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:1275 +#: fetch-pack.c:1284 msgid "unable to write request to remote" msgstr "" -#: fetch-pack.c:1293 +#: fetch-pack.c:1302 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1299 +#: fetch-pack.c:1308 #, c-format msgid "expected '%s', received '%s'" msgstr "" -#: fetch-pack.c:1360 +#: fetch-pack.c:1369 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1365 +#: fetch-pack.c:1374 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1375 +#: fetch-pack.c:1384 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1377 +#: fetch-pack.c:1386 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1419 +#: fetch-pack.c:1428 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1466 +#: fetch-pack.c:1475 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" -#: fetch-pack.c:1471 +#: fetch-pack.c:1480 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" -#: fetch-pack.c:1476 +#: fetch-pack.c:1485 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1506 +#: fetch-pack.c:1515 msgid "git fetch-pack: expected response end packet" msgstr "" -#: fetch-pack.c:1887 +#: fetch-pack.c:1897 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1910 builtin/clone.c:692 +#: fetch-pack.c:1920 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "" -#: fetch-pack.c:1937 +#: fetch-pack.c:1947 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1940 +#: fetch-pack.c:1950 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" @@ -3899,24 +3919,24 @@ msgstr "" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:668 +#: grep.c:640 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" msgstr "" -#: grep.c:2128 +#: grep.c:2100 #, 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:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:2156 +#: grep.c:2128 #, c-format msgid "'%s': short read" msgstr "" @@ -4007,38 +4027,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 +4068,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?" @@ -4199,6 +4219,18 @@ msgstr "" msgid "expected flush after ls-refs arguments" msgstr "" +#: merge-ort-wrappers.c:13 merge-recursive.c:3672 +#, 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 "" @@ -4545,10 +4577,6 @@ 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" @@ -4569,19 +4597,12 @@ msgstr[1] "" 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 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 +#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 msgid "Unable to write index." msgstr "" @@ -4589,174 +4610,170 @@ 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:720 builtin/am.c:1883 builtin/am.c:1917 +#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "" -#: midx.c:79 +#: midx.c:80 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:95 +#: midx.c:96 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:100 +#: midx.c:101 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" -#: midx.c:105 +#: midx.c:106 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "" -#: midx.c:122 +#: midx.c:123 msgid "invalid chunk offset (too large)" msgstr "" -#: midx.c:146 +#: midx.c:147 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" -#: midx.c:159 +#: midx.c:160 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:161 +#: midx.c:162 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:163 +#: midx.c:164 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:165 +#: midx.c:166 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:179 +#: midx.c:180 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:222 +#: midx.c:223 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:272 +#: midx.c:273 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:480 #, c-format msgid "failed to add packfile '%s'" msgstr "" -#: midx.c:491 +#: midx.c:486 #, c-format msgid "failed to open pack-index '%s'" msgstr "" -#: midx.c:551 +#: midx.c:546 #, c-format msgid "failed to locate object %d in packfile" msgstr "" -#: midx.c:853 +#: midx.c:846 msgid "Adding packfiles to multi-pack-index" msgstr "" -#: midx.c:886 +#: midx.c:879 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:938 +#: midx.c:931 msgid "no pack files to index." msgstr "" -#: midx.c:990 +#: midx.c:982 msgid "Writing chunks to multi-pack-index" msgstr "" -#: midx.c:1068 +#: midx.c:1060 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" -#: midx.c:1124 +#: midx.c:1116 msgid "multi-pack-index file exists, but failed to parse" msgstr "" -#: midx.c:1132 +#: midx.c:1124 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1147 +#: midx.c:1139 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -#: midx.c:1152 +#: midx.c:1144 msgid "the midx contains no oid" msgstr "" -#: midx.c:1161 +#: midx.c:1153 msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1170 +#: midx.c:1162 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1190 +#: midx.c:1182 msgid "Sorting objects by packfile" msgstr "" -#: midx.c:1197 +#: midx.c:1189 msgid "Verifying object offsets" msgstr "" -#: midx.c:1213 +#: midx.c:1205 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" -#: midx.c:1219 +#: midx.c:1211 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" -#: midx.c:1228 +#: midx.c:1220 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" -#: midx.c:1253 +#: midx.c:1245 msgid "Counting referenced objects" msgstr "" -#: midx.c:1263 +#: midx.c:1255 msgid "Finding and deleting unreferenced packfiles" msgstr "" -#: midx.c:1454 +#: midx.c:1446 msgid "could not start pack-objects" msgstr "" -#: midx.c:1474 +#: midx.c:1466 msgid "could not finish pack-objects" msgstr "" @@ -4841,16 +4858,16 @@ msgstr "" msgid "unable to get size of %s" msgstr "" -#: packfile.c:630 +#: packfile.c:615 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1922 +#: packfile.c:1907 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1926 +#: packfile.c:1911 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -5092,7 +5109,7 @@ 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 "" @@ -5139,7 +5156,7 @@ msgstr "" msgid "could not read `log` output" msgstr "" -#: range-diff.c:98 sequencer.c:5283 +#: range-diff.c:98 sequencer.c:5310 #, c-format msgid "could not parse commit '%s'" msgstr "" @@ -5156,11 +5173,11 @@ msgstr "" msgid "could not parse git header '%.*s'" msgstr "" -#: range-diff.c:301 +#: range-diff.c:299 msgid "failed to generate diff" msgstr "" -#: range-diff.c:534 range-diff.c:536 +#: range-diff.c:532 range-diff.c:534 #, c-format msgid "could not parse log for '%s'" msgstr "" @@ -5272,8 +5289,8 @@ 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 +#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" @@ -5329,12 +5346,12 @@ msgstr "" 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:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 +#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 #, c-format msgid "could not stat '%s'" msgstr "" @@ -5429,14 +5446,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:485 rerere.c:692 sequencer.c:3607 +#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270 #, 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:202 builtin/rebase.c:228 +#: builtin/rebase.c:252 #, c-format msgid "could not write '%s'." msgstr "" @@ -5459,9 +5476,9 @@ 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:2394 +#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239 +#: builtin/rebase.c:264 #, c-format msgid "could not read '%s'." msgstr "" @@ -5656,61 +5673,61 @@ msgstr "" msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1541 +#: ref-filter.c:1549 #, c-format msgid "no branch, rebasing %s" msgstr "" -#: ref-filter.c:1544 +#: ref-filter.c:1552 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "" -#: ref-filter.c:1547 +#: ref-filter.c:1555 #, c-format msgid "no branch, bisect started on %s" msgstr "" -#: ref-filter.c:1557 +#: ref-filter.c:1565 msgid "no branch" msgstr "" -#: ref-filter.c:1591 ref-filter.c:1800 +#: ref-filter.c:1599 ref-filter.c:1808 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1601 +#: ref-filter.c:1609 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:2054 +#: ref-filter.c:2062 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:2143 +#: ref-filter.c:2151 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:2148 refs.c:657 +#: ref-filter.c:2156 refs.c:660 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:2464 +#: ref-filter.c:2472 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2563 +#: ref-filter.c:2571 #, c-format msgid "malformed object name %s" msgstr "" -#: ref-filter.c:2568 +#: ref-filter.c:2576 #, c-format msgid "option `%s' must point to a commit" msgstr "" @@ -5720,65 +5737,65 @@ msgstr "" msgid "%s does not point to a valid object!" msgstr "" -#: refs.c:572 +#: refs.c:575 #, c-format msgid "could not retrieve `%s`" msgstr "" -#: refs.c:579 +#: refs.c:582 #, c-format msgid "invalid branch name: %s = %s" msgstr "" -#: refs.c:655 +#: refs.c:658 #, c-format msgid "ignoring dangling symref %s" msgstr "" -#: refs.c:892 +#: refs.c:895 #, c-format msgid "log for ref %s has gap after %s" msgstr "" -#: refs.c:898 +#: refs.c:901 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "" -#: refs.c:957 +#: refs.c:960 #, c-format msgid "log for %s is empty" msgstr "" -#: refs.c:1049 +#: refs.c:1052 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "" -#: refs.c:1120 +#: refs.c:1123 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "" -#: refs.c:1944 +#: refs.c:1947 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "" -#: refs.c:2024 +#: refs.c:2027 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs.c:2035 +#: refs.c:2038 msgid "ref updates aborted by hook" msgstr "" -#: refs.c:2135 refs.c:2165 +#: refs.c:2138 refs.c:2168 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "" -#: refs.c:2141 refs.c:2176 +#: refs.c:2144 refs.c:2179 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "" @@ -5799,7 +5816,7 @@ msgstr "" msgid "could not delete references: %s" msgstr "" -#: refspec.c:167 +#: refspec.c:170 #, c-format msgid "invalid refspec '%s'" msgstr "" @@ -5922,94 +5939,94 @@ msgstr "" msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1703 remote.c:1804 +#: remote.c:1714 remote.c:1815 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1712 +#: remote.c:1723 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1715 +#: remote.c:1726 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1721 +#: remote.c:1732 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1736 +#: remote.c:1747 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1748 +#: remote.c:1759 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1758 +#: remote.c:1769 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1771 +#: remote.c:1782 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1793 +#: remote.c:1804 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:1922 +#: remote.c:1933 #, c-format msgid "couldn't find remote ref %s" msgstr "" -#: remote.c:1935 +#: remote.c:1946 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2098 +#: remote.c:2109 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2102 +#: remote.c:2113 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2105 +#: remote.c:2116 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2109 +#: remote.c:2120 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "" -#: remote.c:2112 +#: remote.c:2123 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2116 +#: remote.c:2127 #, 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:2133 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2125 +#: remote.c:2136 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6017,11 +6034,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2133 +#: remote.c:2144 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2136 +#: remote.c:2147 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6032,11 +6049,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2146 +#: remote.c:2157 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: remote.c:2337 +#: remote.c:2348 #, c-format msgid "cannot parse expected object name '%s'" msgstr "" @@ -6114,7 +6131,7 @@ msgstr "" msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1992 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" @@ -6153,171 +6170,171 @@ 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:3460 #, c-format msgid "failed to find tree of %s" msgstr "" -#: revision.c:2344 +#: revision.c:2336 msgid "--unpacked=<packfile> no longer supported" msgstr "" -#: revision.c:2364 +#: revision.c:2356 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "" -#: revision.c:2702 +#: revision.c:2694 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2705 +#: revision.c:2697 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2915 +#: revision.c:2907 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" -#: run-command.c:763 +#: run-command.c:764 msgid "open /dev/null failed" msgstr "" -#: run-command.c:1270 +#: run-command.c:1271 #, c-format msgid "cannot create async thread: %s" msgstr "" -#: run-command.c:1334 +#: run-command.c:1335 #, 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:755 builtin/rebase.c:1596 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:3062 #, 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:2861 sequencer.c:3066 sequencer.c:3080 +#: sequencer.c:3337 sequencer.c:5326 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:2866 sequencer.c:3068 sequencer.c:3082 +#: sequencer.c:3345 #, 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:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "" @@ -6325,65 +6342,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:687 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:671 +#: sequencer.c:701 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:751 +#: sequencer.c:781 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:762 +#: sequencer.c:792 #, 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:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: sequencer.c:809 +#: sequencer.c:839 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:814 +#: sequencer.c:844 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:819 +#: sequencer.c:849 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:823 +#: sequencer.c:853 #, c-format msgid "unknown variable '%s'" msgstr "" -#: sequencer.c:828 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:830 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:832 +#: sequencer.c:862 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" -#: sequencer.c:897 +#: sequencer.c:927 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6400,11 +6417,11 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:1178 +#: sequencer.c:1208 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1184 +#: sequencer.c:1214 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 +6436,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1197 +#: sequencer.c:1227 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 +6450,354 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1239 +#: sequencer.c:1269 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1241 +#: sequencer.c:1271 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1287 +#: sequencer.c:1317 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1289 +#: sequencer.c:1319 msgid "detached HEAD" msgstr "" -#: sequencer.c:1293 +#: sequencer.c:1323 msgid " (root-commit)" msgstr "" -#: sequencer.c:1314 +#: sequencer.c:1344 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1316 +#: sequencer.c:1346 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 +#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1373 sequencer.c:2067 +#: sequencer.c:1403 sequencer.c:2100 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 +#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1417 sequencer.c:1535 +#: sequencer.c:1447 sequencer.c:1565 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1446 sequencer.c:1478 +#: sequencer.c:1476 sequencer.c:1508 #, c-format msgid "invalid author identity '%s'" msgstr "" -#: sequencer.c:1452 +#: sequencer.c:1482 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:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904 +#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1518 sequencer.c:4237 +#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:1567 +#: sequencer.c:1597 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1572 +#: sequencer.c:1602 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1655 sequencer.c:1766 +#: sequencer.c:1685 sequencer.c:1796 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1713 sequencer.c:1738 +#: sequencer.c:1743 sequencer.c:1768 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1723 +#: sequencer.c:1753 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1725 sequencer.c:3338 +#: sequencer.c:1755 sequencer.c:3372 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1727 +#: sequencer.c:1757 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1733 +#: sequencer.c:1763 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 +#: sequencer.c:1770 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1748 +#: sequencer.c:1778 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1755 +#: sequencer.c:1785 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1761 +#: sequencer.c:1791 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1849 +#: sequencer.c:1879 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1856 +#: sequencer.c:1886 msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:1875 +#: sequencer.c:1905 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1883 sequencer.c:1891 +#: sequencer.c:1913 sequencer.c:1921 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1897 +#: sequencer.c:1927 #, 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:1946 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1981 +#: sequencer.c:2011 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:2038 +#: sequencer.c:2071 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:2039 +#: sequencer.c:2072 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:2059 +#: sequencer.c:2092 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "" -#: sequencer.c:2117 +#: sequencer.c:2150 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:2124 +#: sequencer.c:2157 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:2201 +#: sequencer.c:2234 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:2210 +#: sequencer.c:2243 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:2241 +#: sequencer.c:2274 #, c-format msgid "could not parse '%s'" msgstr "" -#: sequencer.c:2302 +#: sequencer.c:2335 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2313 +#: sequencer.c:2346 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:2399 +#: sequencer.c:2432 msgid "cancelling a cherry picking in progress" msgstr "" -#: sequencer.c:2408 +#: sequencer.c:2441 msgid "cancelling a revert in progress" msgstr "" -#: sequencer.c:2452 +#: sequencer.c:2485 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2454 +#: sequencer.c:2487 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2459 +#: sequencer.c:2492 msgid "no commits parsed." msgstr "" -#: sequencer.c:2470 +#: sequencer.c:2503 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2472 +#: sequencer.c:2505 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:2550 +#: sequencer.c:2583 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2657 +#: sequencer.c:2690 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2677 +#: sequencer.c:2710 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2769 sequencer.c:4609 +#: sequencer.c:2803 sequencer.c:4636 msgid "empty commit set passed" msgstr "" -#: sequencer.c:2786 +#: sequencer.c:2820 msgid "revert is already in progress" msgstr "" -#: sequencer.c:2788 +#: sequencer.c:2822 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2791 +#: sequencer.c:2825 msgid "cherry-pick is already in progress" msgstr "" -#: sequencer.c:2793 +#: sequencer.c:2827 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2807 +#: sequencer.c:2841 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2822 +#: sequencer.c:2856 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2882 sequencer.c:4325 +#: sequencer.c:2916 sequencer.c:4371 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2884 sequencer.c:2895 +#: sequencer.c:2918 sequencer.c:2929 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2886 sequencer.c:2930 +#: sequencer.c:2920 sequencer.c:2964 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2916 builtin/grep.c:745 +#: sequencer.c:2950 builtin/grep.c:756 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2918 +#: sequencer.c:2952 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2919 +#: sequencer.c:2953 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2925 +#: sequencer.c:2959 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2936 +#: sequencer.c:2970 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:2977 +#: sequencer.c:3011 msgid "no revert in progress" msgstr "" -#: sequencer.c:2986 +#: sequencer.c:3020 msgid "no cherry-pick in progress" msgstr "" -#: sequencer.c:2996 +#: sequencer.c:3030 msgid "failed to skip the commit" msgstr "" -#: sequencer.c:3003 +#: sequencer.c:3037 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:3006 +#: sequencer.c:3040 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3168 sequencer.c:4217 +#: sequencer.c:3202 sequencer.c:4263 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:3185 +#: sequencer.c:3219 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "" -#: sequencer.c:3193 +#: sequencer.c:3227 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6792,27 +6809,27 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3203 +#: sequencer.c:3237 #, c-format msgid "Could not apply %s... %.*s" msgstr "" -#: sequencer.c:3210 +#: sequencer.c:3244 #, c-format msgid "Could not merge %.*s" msgstr "" -#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 +#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:3240 +#: sequencer.c:3274 #, c-format msgid "Executing: %s\n" msgstr "" -#: sequencer.c:3255 +#: sequencer.c:3289 #, c-format msgid "" "execution failed: %s\n" @@ -6822,11 +6839,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3261 +#: sequencer.c:3295 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:3267 +#: sequencer.c:3301 #, c-format msgid "" "execution succeeded: %s\n" @@ -6837,90 +6854,90 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3328 +#: sequencer.c:3362 #, c-format msgid "illegal label name: '%.*s'" msgstr "" -#: sequencer.c:3382 +#: sequencer.c:3416 msgid "writing fake root commit" msgstr "" -#: sequencer.c:3387 +#: sequencer.c:3421 msgid "writing squash-onto" msgstr "" -#: sequencer.c:3471 +#: sequencer.c:3505 #, c-format msgid "could not resolve '%s'" msgstr "" -#: sequencer.c:3502 +#: sequencer.c:3538 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:3524 +#: sequencer.c:3560 #, c-format msgid "unable to parse '%.*s'" msgstr "" -#: sequencer.c:3533 +#: sequencer.c:3569 #, c-format msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:3545 +#: sequencer.c:3581 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3561 +#: sequencer.c:3597 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:3730 +#: sequencer.c:3780 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:3746 +#: sequencer.c:3796 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:3820 +#: sequencer.c:3870 msgid "Cannot autostash" msgstr "" -#: sequencer.c:3823 +#: sequencer.c:3873 #, c-format msgid "Unexpected stash response: '%s'" msgstr "" -#: sequencer.c:3829 +#: sequencer.c:3879 #, c-format msgid "Could not create directory for '%s'" msgstr "" -#: sequencer.c:3832 +#: sequencer.c:3882 #, c-format msgid "Created autostash: %s\n" msgstr "" -#: sequencer.c:3836 +#: sequencer.c:3886 msgid "could not reset --hard" msgstr "" -#: sequencer.c:3861 +#: sequencer.c:3911 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3873 +#: sequencer.c:3923 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:3876 +#: sequencer.c:3926 #, c-format msgid "" "%s\n" @@ -6928,34 +6945,29 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:3881 +#: sequencer.c:3931 msgid "Applying autostash resulted in conflicts." msgstr "" -#: sequencer.c:3882 +#: sequencer.c:3932 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:4025 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "" -#: sequencer.c:3994 +#: sequencer.c:4040 #, c-format msgid "Stopped at HEAD\n" msgstr "" -#: sequencer.c:3996 +#: sequencer.c:4042 #, c-format msgid "Stopped at %s\n" msgstr "" -#: sequencer.c:4004 +#: sequencer.c:4050 #, c-format msgid "" "Could not execute the todo command\n" @@ -6968,113 +6980,108 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:4050 +#: sequencer.c:4096 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "" -#: sequencer.c:4095 +#: sequencer.c:4141 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:4166 +#: sequencer.c:4212 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:4225 +#: sequencer.c:4271 msgid "could not read orig-head" msgstr "" -#: sequencer.c:4230 +#: sequencer.c:4276 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:4244 +#: sequencer.c:4290 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4304 +#: sequencer.c:4350 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "" -#: sequencer.c:4337 +#: sequencer.c:4383 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4346 +#: sequencer.c:4392 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4348 +#: sequencer.c:4394 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4350 +#: sequencer.c:4396 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4353 +#: sequencer.c:4399 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:4435 sequencer.c:4474 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:4444 +#: sequencer.c:4490 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4451 +#: sequencer.c:4497 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4477 -#, c-format -msgid "invalid committer '%s'" -msgstr "" - -#: sequencer.c:4586 +#: sequencer.c:4613 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4590 +#: sequencer.c:4617 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4625 +#: sequencer.c:4652 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:5102 +#: sequencer.c:5129 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:5105 +#: sequencer.c:5132 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:5347 sequencer.c:5364 +#: sequencer.c:5374 sequencer.c:5391 msgid "nothing to do" msgstr "" -#: sequencer.c:5383 +#: sequencer.c:5410 msgid "could not skip unnecessary pick commands" msgstr "" -#: sequencer.c:5480 +#: sequencer.c:5504 msgid "the script was already rearranged." msgstr "" @@ -7226,256 +7233,256 @@ msgstr "" msgid "setsid failed" msgstr "" -#: sha1-file.c:470 +#: sha1-file.c:480 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -#: sha1-file.c:521 +#: sha1-file.c:531 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "" -#: sha1-file.c:593 +#: sha1-file.c:603 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: sha1-file.c:600 +#: sha1-file.c:610 #, c-format msgid "unable to normalize object directory: %s" msgstr "" -#: sha1-file.c:643 +#: sha1-file.c:653 msgid "unable to fdopen alternates lockfile" msgstr "" -#: sha1-file.c:661 +#: sha1-file.c:671 msgid "unable to read alternates file" msgstr "" -#: sha1-file.c:668 +#: sha1-file.c:678 msgid "unable to move new alternates file into place" msgstr "" -#: sha1-file.c:703 +#: sha1-file.c:713 #, c-format msgid "path '%s' does not exist" msgstr "" -#: sha1-file.c:724 +#: sha1-file.c:734 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: sha1-file.c:730 +#: sha1-file.c:740 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1-file.c:736 +#: sha1-file.c:746 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1-file.c:744 +#: sha1-file.c:754 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: sha1-file.c:804 +#: sha1-file.c:814 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "" -#: sha1-file.c:954 +#: sha1-file.c:964 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "" -#: sha1-file.c:975 +#: sha1-file.c:985 msgid "mmap failed" msgstr "" -#: sha1-file.c:1139 +#: sha1-file.c:1149 #, c-format msgid "object file %s is empty" msgstr "" -#: sha1-file.c:1274 sha1-file.c:2467 +#: sha1-file.c:1284 sha1-file.c:2477 #, c-format msgid "corrupt loose object '%s'" msgstr "" -#: sha1-file.c:1276 sha1-file.c:2471 +#: sha1-file.c:1286 sha1-file.c:2481 #, c-format msgid "garbage at end of loose object '%s'" msgstr "" -#: sha1-file.c:1318 +#: sha1-file.c:1328 msgid "invalid object type" msgstr "" -#: sha1-file.c:1402 +#: sha1-file.c:1412 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1405 +#: sha1-file.c:1415 #, c-format msgid "unable to unpack %s header" msgstr "" -#: sha1-file.c:1411 +#: sha1-file.c:1421 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1414 +#: sha1-file.c:1424 #, c-format msgid "unable to parse %s header" msgstr "" -#: sha1-file.c:1641 +#: sha1-file.c:1651 #, c-format msgid "failed to read object %s" msgstr "" -#: sha1-file.c:1645 +#: sha1-file.c:1655 #, c-format msgid "replacement %s not found for %s" msgstr "" -#: sha1-file.c:1649 +#: sha1-file.c:1659 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1653 +#: sha1-file.c:1663 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1758 +#: sha1-file.c:1768 #, c-format msgid "unable to write file %s" msgstr "" -#: sha1-file.c:1765 +#: sha1-file.c:1775 #, c-format msgid "unable to set permission to '%s'" msgstr "" -#: sha1-file.c:1772 +#: sha1-file.c:1782 msgid "file write error" msgstr "" -#: sha1-file.c:1792 +#: sha1-file.c:1802 msgid "error when closing loose object file" msgstr "" -#: sha1-file.c:1857 +#: sha1-file.c:1867 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: sha1-file.c:1859 +#: sha1-file.c:1869 msgid "unable to create temporary file" msgstr "" -#: sha1-file.c:1883 +#: sha1-file.c:1893 msgid "unable to write loose object file" msgstr "" -#: sha1-file.c:1889 +#: sha1-file.c:1899 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "" -#: sha1-file.c:1893 +#: sha1-file.c:1903 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "" -#: sha1-file.c:1897 +#: sha1-file.c:1907 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: sha1-file.c:1907 builtin/pack-objects.c:1086 +#: sha1-file.c:1917 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "" -#: sha1-file.c:1984 +#: sha1-file.c:1994 #, c-format msgid "cannot read object for %s" msgstr "" -#: sha1-file.c:2035 +#: sha1-file.c:2045 msgid "corrupt commit" msgstr "" -#: sha1-file.c:2043 +#: sha1-file.c:2053 msgid "corrupt tag" msgstr "" -#: sha1-file.c:2143 +#: sha1-file.c:2153 #, c-format msgid "read error while indexing %s" msgstr "" -#: sha1-file.c:2146 +#: sha1-file.c:2156 #, c-format msgid "short read while indexing %s" msgstr "" -#: sha1-file.c:2219 sha1-file.c:2229 +#: sha1-file.c:2229 sha1-file.c:2239 #, c-format msgid "%s: failed to insert into database" msgstr "" -#: sha1-file.c:2235 +#: sha1-file.c:2245 #, c-format msgid "%s: unsupported file type" msgstr "" -#: sha1-file.c:2259 +#: sha1-file.c:2269 #, c-format msgid "%s is not a valid object" msgstr "" -#: sha1-file.c:2261 +#: sha1-file.c:2271 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: sha1-file.c:2288 builtin/index-pack.c:192 +#: sha1-file.c:2298 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "" -#: sha1-file.c:2478 sha1-file.c:2531 +#: sha1-file.c:2488 sha1-file.c:2541 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: sha1-file.c:2502 +#: sha1-file.c:2512 #, c-format msgid "unable to mmap %s" msgstr "" -#: sha1-file.c:2507 +#: sha1-file.c:2517 #, c-format msgid "unable to unpack header of %s" msgstr "" -#: sha1-file.c:2513 +#: sha1-file.c:2523 #, c-format msgid "unable to parse header of %s" msgstr "" -#: sha1-file.c:2524 +#: sha1-file.c:2534 #, c-format msgid "unable to unpack contents of %s" msgstr "" @@ -7614,8 +7621,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:864 #, c-format msgid "could not open '%s' for writing" msgstr "" @@ -7835,7 +7842,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 "" @@ -7920,7 +7927,7 @@ msgstr "" msgid "error while running fast-import" msgstr "" -#: transport-helper.c:549 transport-helper.c:1226 +#: transport-helper.c:549 transport-helper.c:1236 #, c-format msgid "could not read ref %s" msgstr "" @@ -7938,7 +7945,7 @@ msgstr "" msgid "invalid remote service path" msgstr "" -#: transport-helper.c:661 transport.c:1428 +#: transport-helper.c:661 transport.c:1446 msgid "operation not supported by protocol" msgstr "" @@ -7956,106 +7963,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:1213 #, c-format msgid "unsupported object format '%s'" msgstr "" -#: transport-helper.c:1212 +#: transport-helper.c:1222 #, c-format msgid "malformed response in ref list: %s" msgstr "" -#: transport-helper.c:1364 +#: transport-helper.c:1374 #, c-format msgid "read(%s) failed" msgstr "" -#: transport-helper.c:1391 +#: transport-helper.c:1401 #, c-format msgid "write(%s) failed" msgstr "" -#: transport-helper.c:1440 +#: transport-helper.c:1450 #, c-format msgid "%s thread failed" msgstr "" -#: transport-helper.c:1444 +#: transport-helper.c:1454 #, c-format msgid "%s thread failed to join: %s" msgstr "" -#: transport-helper.c:1463 transport-helper.c:1467 +#: transport-helper.c:1473 transport-helper.c:1477 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1504 +#: transport-helper.c:1514 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1508 +#: transport-helper.c:1518 #, c-format msgid "%s process failed" msgstr "" -#: transport-helper.c:1526 transport-helper.c:1535 +#: transport-helper.c:1536 transport-helper.c:1545 msgid "can't start thread for copying data" msgstr "" @@ -8082,36 +8094,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,11 +8139,11 @@ msgid "" "\n" msgstr "" -#: transport.c:1152 +#: transport.c:1169 msgid "Aborting." msgstr "" -#: transport.c:1297 +#: transport.c:1315 msgid "failed to push all needed submodules" msgstr "" @@ -8348,7 +8360,7 @@ msgstr "" msgid "Updating index flags" msgstr "" -#: upload-pack.c:1516 +#: upload-pack.c:1550 msgid "expected flush after fetch arguments" msgstr "" @@ -8385,7 +8397,7 @@ msgstr "" msgid "Fetching objects" msgstr "" -#: worktree.c:236 builtin/am.c:2116 +#: worktree.c:236 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "" @@ -8963,7 +8975,7 @@ msgstr "" 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 "" @@ -8990,7 +9002,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:272 builtin/rev-parse.c:904 +#: builtin/add.c:272 builtin/rev-parse.c:908 msgid "Could not read the index" msgstr "" @@ -9026,8 +9038,8 @@ 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/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 "" @@ -9035,7 +9047,7 @@ msgstr "" msgid "interactive picking" msgstr "" -#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 +#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308 msgid "select hunks interactively" msgstr "" @@ -9146,13 +9158,13 @@ msgstr "" 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:507 builtin/checkout.c:1715 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502 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:514 builtin/checkout.c:1727 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "" @@ -9168,133 +9180,128 @@ msgid "" "\"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 +9309,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 +9356,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:558 builtin/prune-packed.c:16 +#: builtin/repack.c:335 builtin/stash.c:815 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:903 builtin/merge.c:260 #: 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/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350 +#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172 #: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 #: parse-options.h:316 msgid "n" msgstr "" -#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/am.c:2269 builtin/branch.c:659 builtin/bugreport.c:136 #: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 #: builtin/verify-tag.c:38 msgid "format" msgstr "" -#: builtin/am.c: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 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2303 +#: 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:297 builtin/pull.c:175 builtin/rebase.c:536 +#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "" -#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 +#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395 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 +9585,127 @@ msgid "git archive: expected a flush" msgstr "" #: builtin/bisect--helper.c:23 -msgid "git bisect--helper --next-all" -msgstr "" - -#: builtin/bisect--helper.c:24 -msgid "git bisect--helper --write-terms <bad_term> <good_term>" -msgstr "" - -#: builtin/bisect--helper.c:25 -msgid "git bisect--helper --bisect-clean-state" -msgstr "" - -#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:24 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" msgstr "" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" msgstr "" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" msgstr "" -#: builtin/bisect--helper.c:31 +#: builtin/bisect--helper.c:28 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 +#: builtin/bisect--helper.c:30 msgid "git bisect--helper --bisect-next" msgstr "" -#: builtin/bisect--helper.c:34 +#: builtin/bisect--helper.c:31 msgid "git bisect--helper --bisect-auto-next" msgstr "" -#: builtin/bisect--helper.c:35 -msgid "git bisect--helper --bisect-autostart" +#: builtin/bisect--helper.c:32 +msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" +msgstr "" + +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" msgstr "" -#: builtin/bisect--helper.c:97 +#: builtin/bisect--helper.c:108 #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "" -#: builtin/bisect--helper.c:104 +#: builtin/bisect--helper.c:115 #, c-format msgid "could not write to file '%s'" msgstr "" -#: builtin/bisect--helper.c:143 +#: builtin/bisect--helper.c:154 #, c-format msgid "'%s' is not a valid term" msgstr "" -#: builtin/bisect--helper.c:147 +#: builtin/bisect--helper.c:158 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:168 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:178 msgid "please use two different terms" msgstr "" -#: builtin/bisect--helper.c:207 +#: builtin/bisect--helper.c:194 #, c-format msgid "We are not bisecting.\n" msgstr "" -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:202 #, c-format msgid "'%s' is not a valid commit" msgstr "" -#: builtin/bisect--helper.c:224 +#: builtin/bisect--helper.c:211 #, 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:255 #, c-format msgid "Bad bisect_write argument: %s" msgstr "" -#: builtin/bisect--helper.c:273 +#: builtin/bisect--helper.c:260 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "" -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:272 #, c-format msgid "couldn't open the file '%s'" msgstr "" -#: builtin/bisect--helper.c:311 +#: builtin/bisect--helper.c:298 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "" -#: builtin/bisect--helper.c:338 +#: builtin/bisect--helper.c:325 #, 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:329 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9714,7 +9713,7 @@ msgid "" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:362 +#: builtin/bisect--helper.c:349 #, c-format msgid "bisecting only with a %s commit" msgstr "" @@ -9723,74 +9722,74 @@ msgstr "" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:370 +#: builtin/bisect--helper.c:357 msgid "Are you sure [Y/n]? " msgstr "" -#: builtin/bisect--helper.c:431 +#: builtin/bisect--helper.c:418 msgid "no terms defined" msgstr "" -#: builtin/bisect--helper.c:434 +#: builtin/bisect--helper.c:421 #, 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:431 #, 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:498 msgid "revision walk setup failed\n" msgstr "" -#: builtin/bisect--helper.c:533 +#: builtin/bisect--helper.c:520 #, c-format msgid "could not open '%s' for appending" msgstr "" -#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652 msgid "'' is not a valid term" msgstr "" -#: builtin/bisect--helper.c:674 +#: builtin/bisect--helper.c:662 #, c-format msgid "unrecognized option: '%s'" msgstr "" -#: builtin/bisect--helper.c:678 +#: builtin/bisect--helper.c:666 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "" -#: builtin/bisect--helper.c:709 +#: builtin/bisect--helper.c:697 msgid "bad HEAD - I need a HEAD" msgstr "" -#: builtin/bisect--helper.c:724 +#: builtin/bisect--helper.c:712 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" -#: builtin/bisect--helper.c:745 +#: builtin/bisect--helper.c:733 msgid "won't bisect on cg-seek'ed tree" msgstr "" -#: builtin/bisect--helper.c:748 +#: builtin/bisect--helper.c:736 msgid "bad HEAD - strange symbolic ref" msgstr "" -#: builtin/bisect--helper.c:775 +#: builtin/bisect--helper.c:756 #, c-format msgid "invalid ref: '%s'" msgstr "" -#: builtin/bisect--helper.c:827 +#: builtin/bisect--helper.c:814 msgid "You need to start by \"git bisect start\"\n" msgstr "" @@ -9798,106 +9797,92 @@ msgstr "" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:838 +#: builtin/bisect--helper.c:825 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:843 +msgid "Please call `--bisect-state` with at least one argument" msgstr "" -#: builtin/bisect--helper.c:868 -msgid "write the terms to .git/BISECT_TERMS" -msgstr "" - -#: builtin/bisect--helper.c:870 -msgid "cleanup the bisection state" +#: builtin/bisect--helper.c:856 +#, c-format +msgid "'git bisect %s' can take only one argument." msgstr "" -#: builtin/bisect--helper.c:872 -msgid "check for expected revs" +#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879 +#, c-format +msgid "Bad rev input: %s" msgstr "" -#: builtin/bisect--helper.c:874 +#: builtin/bisect--helper.c:924 msgid "reset the bisection state" msgstr "" -#: builtin/bisect--helper.c:876 +#: builtin/bisect--helper.c:926 msgid "write out the bisection state in BISECT_LOG" msgstr "" -#: builtin/bisect--helper.c:878 +#: builtin/bisect--helper.c:928 msgid "check and set terms in a bisection state" msgstr "" -#: builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:930 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:882 +#: builtin/bisect--helper.c:932 msgid "print out the bisect terms" msgstr "" -#: builtin/bisect--helper.c:884 +#: builtin/bisect--helper.c:934 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:886 +#: builtin/bisect--helper.c:936 msgid "find the next bisection commit" msgstr "" -#: builtin/bisect--helper.c:888 +#: builtin/bisect--helper.c:938 msgid "verify the next bisection state then checkout the next bisection commit" msgstr "" -#: builtin/bisect--helper.c:890 -msgid "start the bisection if it has not yet been started" +#: builtin/bisect--helper.c:940 +msgid "mark the state of ref (or refs)" msgstr "" -#: builtin/bisect--helper.c:892 +#: builtin/bisect--helper.c:942 msgid "no log for BISECT_WRITE" msgstr "" -#: builtin/bisect--helper.c:910 -msgid "--write-terms requires two arguments" -msgstr "" - -#: builtin/bisect--helper.c:914 -msgid "--bisect-clean-state requires no arguments" -msgstr "" - -#: builtin/bisect--helper.c:921 +#: builtin/bisect--helper.c:957 msgid "--bisect-reset requires either no argument or a commit" msgstr "" -#: builtin/bisect--helper.c:925 +#: builtin/bisect--helper.c:961 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "" -#: builtin/bisect--helper.c:931 +#: builtin/bisect--helper.c:967 msgid "--check-and-set-terms requires 3 arguments" msgstr "" -#: builtin/bisect--helper.c:937 +#: builtin/bisect--helper.c:973 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "" -#: builtin/bisect--helper.c:943 +#: builtin/bisect--helper.c:979 msgid "--bisect-terms requires 0 or 1 argument" msgstr "" -#: builtin/bisect--helper.c:952 +#: builtin/bisect--helper.c:988 msgid "--bisect-next requires 0 arguments" msgstr "" -#: builtin/bisect--helper.c:958 +#: builtin/bisect--helper.c:994 msgid "--bisect-auto-next requires 0 arguments" msgstr "" -#: builtin/bisect--helper.c:964 -msgid "--bisect-autostart does not accept arguments" -msgstr "" - #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "" @@ -9924,128 +9909,128 @@ msgstr "" msgid "invalid value for blame.coloring" msgstr "" -#: builtin/blame.c:845 +#: builtin/blame.c:847 #, c-format msgid "cannot find revision %s to ignore" msgstr "" -#: builtin/blame.c:867 +#: builtin/blame.c:869 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:868 +#: builtin/blame.c:870 msgid "Do not show object names of boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:869 +#: builtin/blame.c:871 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:870 +#: builtin/blame.c:872 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:871 +#: builtin/blame.c:873 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:872 +#: builtin/blame.c:874 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:873 +#: builtin/blame.c:875 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:874 +#: builtin/blame.c:876 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:875 +#: builtin/blame.c:877 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:876 +#: builtin/blame.c:878 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:877 +#: builtin/blame.c:879 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:878 +#: builtin/blame.c:880 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:879 +#: builtin/blame.c:881 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:880 +#: builtin/blame.c:882 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:881 +#: builtin/blame.c:883 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:882 +#: builtin/blame.c:884 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:883 builtin/log.c:1808 +#: builtin/blame.c:885 builtin/log.c:1813 msgid "rev" msgstr "" -#: builtin/blame.c:883 +#: builtin/blame.c:885 msgid "Ignore <rev> when blaming" msgstr "" -#: builtin/blame.c:884 +#: builtin/blame.c:886 msgid "Ignore revisions from <file>" msgstr "" -#: builtin/blame.c:885 +#: builtin/blame.c:887 msgid "color redundant metadata from previous line differently" msgstr "" -#: builtin/blame.c:886 +#: builtin/blame.c:888 msgid "color lines by age" msgstr "" -#: builtin/blame.c:887 +#: builtin/blame.c:889 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:888 +#: builtin/blame.c:890 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:889 +#: builtin/blame.c:891 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:890 builtin/blame.c:891 +#: builtin/blame.c:892 builtin/blame.c:893 msgid "score" msgstr "" -#: builtin/blame.c:890 +#: builtin/blame.c:892 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:891 +#: builtin/blame.c:893 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:892 -msgid "n,m" +#: builtin/blame.c:894 +msgid "range" msgstr "" -#: builtin/blame.c:892 -msgid "Process only line range n,m, counting from 1" +#: builtin/blame.c:895 +msgid "Process only line range <start>,<end> or function :<funcname>" msgstr "" -#: builtin/blame.c:944 +#: builtin/blame.c:947 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -10057,18 +10042,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:995 +#: builtin/blame.c:998 msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:1110 +#: builtin/blame.c:1114 #, 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:1159 msgid "Blaming lines" msgstr "" @@ -10268,7 +10253,7 @@ msgstr "" msgid "do not use" msgstr "" -#: builtin/branch.c:626 builtin/rebase.c:526 +#: builtin/branch.c:626 builtin/rebase.c:532 msgid "upstream" msgstr "" @@ -10379,7 +10364,7 @@ msgstr "" msgid "format to use for the output" msgstr "" -#: builtin/branch.c:682 builtin/clone.c:789 +#: builtin/branch.c:682 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "" @@ -10506,38 +10491,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 "" @@ -10595,11 +10580,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,7 +10693,7 @@ 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/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541 #: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "" @@ -10762,54 +10747,54 @@ msgstr "" msgid "no contacts specified" msgstr "" -#: builtin/checkout-index.c:131 +#: builtin/checkout-index.c:139 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/checkout-index.c:148 +#: builtin/checkout-index.c:156 msgid "stage should be between 1 and 3 or all" msgstr "" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:173 msgid "check out all files in the index" msgstr "" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:174 msgid "force overwrite of existing files" msgstr "" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:176 msgid "no warning for existing files and files not in index" msgstr "" -#: builtin/checkout-index.c:169 +#: builtin/checkout-index.c:178 msgid "don't checkout new files" msgstr "" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:180 msgid "update stat information in the index file" msgstr "" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:184 msgid "read list of paths from the standard input" msgstr "" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:186 msgid "write the content to temporary files" msgstr "" -#: builtin/checkout-index.c:178 builtin/column.c:31 +#: builtin/checkout-index.c:187 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:757 msgid "string" msgstr "" -#: builtin/checkout-index.c:179 +#: builtin/checkout-index.c:188 msgid "when creating files, prepend <string>" msgstr "" -#: builtin/checkout-index.c:181 +#: builtin/checkout-index.c:190 msgid "copy out the files from named stage" msgstr "" @@ -10911,66 +10896,66 @@ msgstr "" msgid "'%s' or '%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:528 builtin/checkout.c:535 +#: builtin/checkout.c:541 builtin/checkout.c:548 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:703 +#: builtin/checkout.c:716 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:757 +#: builtin/checkout.c:770 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:853 +#: builtin/checkout.c:866 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:895 +#: builtin/checkout.c:908 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:899 builtin/clone.c:720 +#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:903 +#: builtin/checkout.c:916 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:906 +#: builtin/checkout.c:919 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:910 +#: builtin/checkout.c:923 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:912 builtin/checkout.c:1338 +#: builtin/checkout.c:925 builtin/checkout.c:1356 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:914 +#: builtin/checkout.c:927 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:965 +#: builtin/checkout.c:978 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:971 +#: builtin/checkout.c:984 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10985,7 +10970,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:990 +#: builtin/checkout.c:1003 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11002,26 +10987,26 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1025 +#: builtin/checkout.c:1038 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:1029 +#: builtin/checkout.c:1042 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:1069 builtin/checkout.c:1333 +#: builtin/checkout.c:1082 builtin/checkout.c:1351 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1164 #, 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:1171 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 +11018,287 @@ msgid "" "checkout.defaultRemote=origin in your config." msgstr "" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1181 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "" -#: builtin/checkout.c:1229 +#: builtin/checkout.c:1247 msgid "only one reference expected" msgstr "" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1264 #, 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:1310 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1305 builtin/checkout.c:1671 +#: builtin/checkout.c:1323 builtin/checkout.c:1689 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1370 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "" -#: builtin/checkout.c:1354 +#: builtin/checkout.c:1372 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "" -#: builtin/checkout.c:1355 builtin/checkout.c:1363 +#: builtin/checkout.c:1373 builtin/checkout.c:1381 #, c-format msgid "a branch is expected, got '%s'" msgstr "" -#: builtin/checkout.c:1358 +#: builtin/checkout.c:1376 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "" -#: builtin/checkout.c:1374 +#: builtin/checkout.c:1392 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1378 +#: builtin/checkout.c:1396 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:1400 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1386 +#: builtin/checkout.c:1404 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:1408 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1394 +#: builtin/checkout.c:1412 msgid "you are switching branch while bisecting" msgstr "" -#: builtin/checkout.c:1401 +#: builtin/checkout.c:1419 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 +#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430 #, 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:1434 builtin/checkout.c:1437 builtin/checkout.c:1440 +#: builtin/checkout.c:1445 builtin/checkout.c:1450 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1429 +#: builtin/checkout.c:1447 #, c-format msgid "'%s' cannot take <start-point>" msgstr "" -#: builtin/checkout.c:1437 +#: builtin/checkout.c:1455 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1444 +#: builtin/checkout.c:1462 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 +#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296 +#: 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/checkout.c:1487 +#: builtin/checkout.c:1505 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:1506 builtin/log.c:1800 parse-options.h:322 msgid "style" msgstr "" -#: builtin/checkout.c:1489 +#: builtin/checkout.c:1507 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1501 builtin/worktree.c:558 +#: builtin/checkout.c:1519 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1502 +#: builtin/checkout.c:1520 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1504 +#: builtin/checkout.c:1522 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1524 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1524 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1508 builtin/merge.c:291 +#: builtin/checkout.c:1526 builtin/merge.c:300 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1511 +#: builtin/checkout.c:1529 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1524 +#: builtin/checkout.c:1542 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1545 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1531 +#: builtin/checkout.c:1549 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1586 +#: builtin/checkout.c:1604 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1590 +#: builtin/checkout.c:1608 msgid "-p and --overlay are mutually exclusive" msgstr "" -#: builtin/checkout.c:1627 +#: builtin/checkout.c:1645 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1632 +#: builtin/checkout.c:1650 #, c-format msgid "missing branch name; try -%c" msgstr "" -#: builtin/checkout.c:1664 +#: builtin/checkout.c:1682 #, c-format msgid "could not resolve %s" msgstr "" -#: builtin/checkout.c:1680 +#: builtin/checkout.c:1698 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1687 +#: builtin/checkout.c:1705 #, 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:1709 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1700 +#: builtin/checkout.c:1718 msgid "--pathspec-from-file is incompatible with --detach" msgstr "" -#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499 msgid "--pathspec-from-file is incompatible with --patch" msgstr "" -#: builtin/checkout.c:1716 +#: builtin/checkout.c:1734 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:1739 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/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816 +#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170 #: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 #: builtin/worktree.c:556 msgid "branch" msgstr "" -#: builtin/checkout.c:1748 +#: builtin/checkout.c:1766 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1768 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1751 +#: builtin/checkout.c:1769 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1753 +#: builtin/checkout.c:1771 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1772 msgid "use overlay mode (default)" msgstr "" -#: builtin/checkout.c:1799 +#: builtin/checkout.c:1817 msgid "create and switch to a new branch" msgstr "" -#: builtin/checkout.c:1801 +#: builtin/checkout.c:1819 msgid "create/reset and switch to a branch" msgstr "" -#: builtin/checkout.c:1803 +#: builtin/checkout.c:1821 msgid "second guess 'git switch <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1805 +#: builtin/checkout.c:1823 msgid "throw away local modifications" msgstr "" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1857 msgid "which tree-ish to checkout from" msgstr "" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1859 msgid "restore the index" msgstr "" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1861 msgid "restore the working tree (default)" msgstr "" -#: builtin/checkout.c:1845 +#: builtin/checkout.c:1863 msgid "ignore unmerged entries" msgstr "" -#: builtin/checkout.c:1846 +#: builtin/checkout.c:1864 msgid "use overlay mode" msgstr "" @@ -11352,7 +11337,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 +11346,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 +11359,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,7 +11423,7 @@ 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/grep.c:921 builtin/log.c:183 builtin/log.c:185 #: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" @@ -11476,342 +11461,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:553 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:550 msgid "template-directory" msgstr "" -#: builtin/clone.c:112 builtin/init-db.c:551 +#: builtin/clone.c:113 builtin/init-db.c:551 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c: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:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358 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:173 builtin/grep.c:860 #: 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:175 builtin/pack-objects.c:3535 #: 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:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317 msgid "revision" msgstr "" -#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 +#: builtin/clone.c:131 builtin/fetch.c:178 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:559 msgid "gitdir" msgstr "" -#: builtin/clone.c:138 builtin/init-db.c:560 +#: builtin/clone.c:139 builtin/init-db.c:560 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:195 builtin/ls-remote.c:76 +#: 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:195 builtin/ls-remote.c:76 +#: 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:196 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:198 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:992 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:974 +#: builtin/clone.c:996 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:987 +#: builtin/clone.c:1009 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:990 +#: builtin/clone.c:1012 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:1006 +#: builtin/clone.c:1025 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:1010 builtin/fetch.c:1841 +#: builtin/clone.c:1029 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:1020 +#: builtin/clone.c:1039 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:1026 +#: builtin/clone.c:1045 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:1040 +#: builtin/clone.c:1059 #, 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:1074 builtin/clone.c:1095 builtin/difftool.c:271 +#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:1060 +#: builtin/clone.c:1079 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:1080 +#: builtin/clone.c:1099 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:1082 +#: builtin/clone.c:1101 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1106 +#: builtin/clone.c:1125 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1170 +#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "" + +#: builtin/clone.c:1210 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1172 +#: builtin/clone.c:1212 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1174 +#: builtin/clone.c:1214 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1176 +#: builtin/clone.c:1216 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1179 +#: builtin/clone.c:1219 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1184 +#: builtin/clone.c:1224 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1268 builtin/clone.c:1276 +#: builtin/clone.c:1308 builtin/clone.c:1316 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1279 +#: builtin/clone.c:1319 msgid "You appear to have cloned an empty repository." msgstr "" @@ -11865,7 +11855,7 @@ 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:184 builtin/log.c:1769 msgid "dir" msgstr "" @@ -11957,7 +11947,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:555 #, c-format msgid "not a valid object name %s" msgstr "" @@ -11985,8 +11975,8 @@ 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/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470 #: builtin/tag.c:413 msgid "message" msgstr "" @@ -11999,7 +11989,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:298 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "" @@ -12134,7 +12124,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:729 builtin/shortlog.c:478 +#: builtin/commit.c:729 builtin/shortlog.c:425 #, c-format msgid "(reading log message from standard input)\n" msgstr "" @@ -12305,8 +12295,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:725 msgid "machine-readable output" msgstr "" @@ -12320,7 +12310,7 @@ 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:1205 builtin/rebase.c:1406 parse-options.h:336 msgid "mode" msgstr "" @@ -12372,7 +12362,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:285 builtin/tag.c:415 msgid "read message from file" msgstr "" @@ -12384,7 +12374,7 @@ msgstr "" msgid "override author for commit" msgstr "" -#: builtin/commit.c:1503 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:542 msgid "date" msgstr "" @@ -12417,9 +12407,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:1744 builtin/merge.c:301 #: 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 +12507,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 +12727,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 +12843,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 +13006,49 @@ msgstr "" msgid "--broken is incompatible with commit-ishes" msgstr "" +#: 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:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:241 +#: builtin/diff.c:258 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:358 +#: builtin/diff.c:375 #, c-format msgid "%s...%s: no merge base" msgstr "" -#: builtin/diff.c:468 +#: builtin/diff.c:485 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:513 +#: builtin/diff.c:530 builtin/grep.c:681 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:524 +#: builtin/diff.c:541 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:529 +#: builtin/diff.c:546 #, c-format msgid "unhandled object '%s' given." msgstr "" -#: builtin/diff.c:563 +#: builtin/diff.c:580 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "" @@ -13066,89 +13077,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 "" @@ -13236,7 +13247,7 @@ msgstr "" msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1223 builtin/log.c:1811 +#: builtin/fast-export.c:1223 builtin/log.c:1816 msgid "refspec" msgstr "" @@ -13276,31 +13287,31 @@ msgstr "" 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 "" @@ -13560,7 +13571,7 @@ msgstr "" msgid "[deleted]" msgstr "" -#: builtin/fetch.c:1195 builtin/remote.c:1113 +#: builtin/fetch.c:1195 builtin/remote.c:1118 msgid "(none)" msgstr "" @@ -13754,6 +13765,22 @@ msgstr "" msgid "print only refs which don't contain the commit" msgstr "" +#: 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:148 builtin/fsck.c:149 msgid "unknown" msgstr "" @@ -13995,31 +14022,31 @@ msgstr "" 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:94 #, c-format msgid "Failed to fstat %s: %s" msgstr "" -#: builtin/gc.c:127 +#: builtin/gc.c:130 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "" -#: builtin/gc.c:476 builtin/init-db.c:58 +#: builtin/gc.c:479 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:488 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/gc.c:492 +#: builtin/gc.c:495 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14029,111 +14056,190 @@ msgid "" "%s" msgstr "" -#: builtin/gc.c:540 +#: builtin/gc.c:543 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:542 +#: builtin/gc.c:545 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:543 +#: builtin/gc.c:546 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:546 +#: builtin/gc.c:549 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:549 +#: builtin/gc.c:552 msgid "repack all other packs except the largest pack" msgstr "" -#: builtin/gc.c:566 +#: builtin/gc.c:569 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "" -#: builtin/gc.c:577 +#: builtin/gc.c:580 #, c-format msgid "failed to parse prune expiry value %s" msgstr "" -#: builtin/gc.c:597 +#: builtin/gc.c:600 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:599 +#: builtin/gc.c:602 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:600 +#: builtin/gc.c:603 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:640 +#: builtin/gc.c:643 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:695 +#: builtin/gc.c:698 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:708 +msgid "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" +msgstr "" + +#: builtin/gc.c:738 +msgid "--no-schedule is not allowed" msgstr "" -#: builtin/gc.c:812 +#: builtin/gc.c:743 +#, c-format +msgid "unrecognized --schedule argument '%s'" +msgstr "" + +#: builtin/gc.c:862 msgid "failed to write commit-graph" msgstr "" -#: builtin/gc.c:905 +#: builtin/gc.c:901 +msgid "failed to fill remotes" +msgstr "" + +#: builtin/gc.c:1024 +msgid "failed to start 'git pack-objects' process" +msgstr "" + +#: builtin/gc.c:1041 +msgid "failed to finish 'git pack-objects' process" +msgstr "" + +#: builtin/gc.c:1093 +msgid "failed to write multi-pack-index" +msgstr "" + +#: builtin/gc.c:1111 +msgid "'git multi-pack-index expire' failed" +msgstr "" + +#: builtin/gc.c:1172 +msgid "'git multi-pack-index repack' failed" +msgstr "" + +#: builtin/gc.c:1181 +msgid "" +"skipping incremental-repack task because core.multiPackIndex is disabled" +msgstr "" + +#: builtin/gc.c:1279 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "" -#: builtin/gc.c:932 +#: builtin/gc.c:1309 #, c-format msgid "task '%s' failed" msgstr "" -#: builtin/gc.c:979 +#: builtin/gc.c:1389 #, c-format msgid "'%s' is not a valid task" msgstr "" -#: builtin/gc.c:984 +#: builtin/gc.c:1394 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "" -#: builtin/gc.c:999 +#: builtin/gc.c:1409 msgid "run tasks based on the state of the repository" msgstr "" -#: builtin/gc.c:1001 +#: builtin/gc.c:1410 +msgid "frequency" +msgstr "" + +#: builtin/gc.c:1411 +msgid "run tasks based on frequency" +msgstr "" + +#: builtin/gc.c:1414 msgid "do not report progress or other information over stderr" msgstr "" -#: builtin/gc.c:1002 +#: builtin/gc.c:1415 msgid "task" msgstr "" -#: builtin/gc.c:1003 +#: builtin/gc.c:1416 msgid "run a specific task" msgstr "" -#: builtin/gc.c:1026 -msgid "git maintenance run [<options>]" +#: builtin/gc.c:1433 +msgid "use at most one of --auto and --schedule=<frequency>" +msgstr "" + +#: builtin/gc.c:1467 +msgid "failed to run 'git config'" +msgstr "" + +#: builtin/gc.c:1512 +msgid "another process is scheduling background maintenance" +msgstr "" + +#: builtin/gc.c:1525 +msgid "failed to run 'crontab -l'; your system might not support 'cron'" +msgstr "" + +#: builtin/gc.c:1544 +msgid "failed to run 'crontab'; your system might not support 'cron'" +msgstr "" + +#: builtin/gc.c:1550 +msgid "failed to open stdin of 'crontab'" +msgstr "" + +#: builtin/gc.c:1592 +msgid "'crontab' died" +msgstr "" + +#: builtin/gc.c:1605 +msgid "failed to add repo to global config" +msgstr "" + +#: builtin/gc.c:1615 +msgid "git maintenance <subcommand> [<options>]" msgstr "" -#: builtin/gc.c:1037 +#: builtin/gc.c:1634 #, c-format msgid "invalid subcommand: %s" msgstr "" @@ -14172,242 +14278,242 @@ msgstr "" msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:725 +#: builtin/grep.c:736 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:824 +#: builtin/grep.c:835 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:826 +#: builtin/grep.c:837 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:830 +#: builtin/grep.c:841 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:835 +#: builtin/grep.c:846 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:837 +#: builtin/grep.c:848 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:841 +#: builtin/grep.c:852 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:846 +#: builtin/grep.c:857 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:848 +#: builtin/grep.c:859 msgid "search in subdirectories (default)" msgstr "" -#: builtin/grep.c:850 +#: builtin/grep.c:861 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:854 +#: builtin/grep.c:865 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:868 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:860 +#: builtin/grep.c:871 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:863 +#: builtin/grep.c:874 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:866 +#: builtin/grep.c:877 msgid "show line numbers" msgstr "" -#: builtin/grep.c:867 +#: builtin/grep.c:878 msgid "show column number of first match" msgstr "" -#: builtin/grep.c:868 +#: builtin/grep.c:879 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:869 +#: builtin/grep.c:880 msgid "show filenames" msgstr "" -#: builtin/grep.c:871 +#: builtin/grep.c:882 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:873 +#: builtin/grep.c:884 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:875 +#: builtin/grep.c:886 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:878 +#: builtin/grep.c:889 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:880 +#: builtin/grep.c:891 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:883 +#: builtin/grep.c:894 msgid "show only matching parts of a line" msgstr "" -#: builtin/grep.c:885 +#: builtin/grep.c:896 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:886 +#: builtin/grep.c:897 msgid "highlight matches" msgstr "" -#: builtin/grep.c:888 +#: builtin/grep.c:899 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:890 +#: builtin/grep.c:901 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:893 +#: builtin/grep.c:904 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:896 +#: builtin/grep.c:907 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:901 +#: builtin/grep.c:912 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:904 +#: builtin/grep.c:915 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:906 +#: builtin/grep.c:917 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:909 +#: builtin/grep.c:920 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:911 +#: builtin/grep.c:922 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:913 +#: builtin/grep.c:924 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:925 +#: builtin/grep.c:936 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:927 +#: builtin/grep.c:938 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:929 +#: builtin/grep.c:940 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:933 +#: builtin/grep.c:944 msgid "pager" msgstr "" -#: builtin/grep.c:933 +#: builtin/grep.c:944 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:937 +#: builtin/grep.c:948 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:1004 +#: builtin/grep.c:1014 msgid "no pattern given" msgstr "" -#: builtin/grep.c:1040 +#: builtin/grep.c:1050 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1048 +#: builtin/grep.c:1058 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1078 +#: builtin/grep.c:1088 msgid "--untracked not supported with --recurse-submodules" msgstr "" -#: builtin/grep.c:1082 +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1085 builtin/pack-objects.c:3655 +#: builtin/grep.c:1095 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 +#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1122 +#: builtin/grep.c:1132 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1148 +#: builtin/grep.c:1158 msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1154 +#: builtin/grep.c:1164 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1162 +#: builtin/grep.c:1172 msgid "both --cached and trees are given" msgstr "" @@ -14593,7 +14699,7 @@ msgstr "" msgid "pack exceeds maximum allowed size" msgstr "" -#: builtin/index-pack.c:342 builtin/repack.c:254 +#: builtin/index-pack.c:342 builtin/repack.c:286 #, c-format msgid "unable to create '%s'" msgstr "" @@ -15054,406 +15160,412 @@ msgstr "" msgid "no input file given for in-place editing" msgstr "" -#: builtin/log.c:56 +#: builtin/log.c:58 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/log.c:57 +#: builtin/log.c:59 msgid "git show [<options>] <object>..." msgstr "" -#: builtin/log.c:110 +#: builtin/log.c:112 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:177 +#: builtin/log.c:179 msgid "show source" msgstr "" -#: builtin/log.c:178 +#: builtin/log.c:180 msgid "Use mail map file" msgstr "" -#: builtin/log.c:181 +#: builtin/log.c:183 msgid "only decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:183 +#: builtin/log.c:185 msgid "do not decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:184 +#: builtin/log.c:186 msgid "decorate options" msgstr "" -#: builtin/log.c:187 -msgid "Process line range n,m in file, counting from 1" +#: builtin/log.c:189 +msgid "" +"Trace the evolution of line range <start>,<end> or function :<funcname> in " +"<file>" +msgstr "" + +#: builtin/log.c:212 +msgid "-L<range>:<file> cannot be used with pathspec" msgstr "" -#: builtin/log.c:297 +#: builtin/log.c:302 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:555 +#: builtin/log.c:564 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:570 builtin/log.c:665 +#: builtin/log.c:579 builtin/log.c:674 #, c-format msgid "could not read object %s" msgstr "" -#: builtin/log.c:690 +#: builtin/log.c:699 #, c-format msgid "unknown type: %d" msgstr "" -#: builtin/log.c:839 +#: builtin/log.c:848 #, c-format msgid "%s: invalid cover from description mode" msgstr "" -#: builtin/log.c:846 +#: builtin/log.c:855 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:984 #, c-format msgid "cannot open patch file %s" msgstr "" -#: builtin/log.c:998 +#: builtin/log.c:1001 msgid "need exactly one range" msgstr "" -#: builtin/log.c:1008 +#: builtin/log.c:1011 msgid "not a range" msgstr "" -#: builtin/log.c:1172 +#: builtin/log.c:1175 msgid "cover letter needs email format" msgstr "" -#: builtin/log.c:1178 +#: builtin/log.c:1181 msgid "failed to create cover-letter file" msgstr "" -#: builtin/log.c:1259 +#: builtin/log.c:1262 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1286 +#: builtin/log.c:1289 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1344 +#: builtin/log.c:1347 msgid "two output directories?" msgstr "" -#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 +#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332 #, c-format msgid "unknown commit %s" msgstr "" -#: builtin/log.c:1506 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1509 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:1518 msgid "could not find exact merge base" msgstr "" -#: builtin/log.c:1525 +#: builtin/log.c:1528 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:1551 msgid "failed to find exact merge base" msgstr "" -#: builtin/log.c:1565 +#: builtin/log.c:1568 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1575 +#: builtin/log.c:1578 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1633 +#: builtin/log.c:1636 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1690 +#: builtin/log.c:1693 msgid "failed to infer range-diff origin of current series" msgstr "" -#: builtin/log.c:1692 +#: builtin/log.c:1695 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "" -#: builtin/log.c:1736 +#: builtin/log.c:1739 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1739 +#: builtin/log.c:1742 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1743 +#: builtin/log.c:1746 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1745 +#: builtin/log.c:1748 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1747 +#: builtin/log.c:1750 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1748 +#: builtin/log.c:1751 msgid "sfx" msgstr "" -#: builtin/log.c:1749 +#: builtin/log.c:1752 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1751 +#: builtin/log.c:1754 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1753 +#: builtin/log.c:1756 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1755 +#: builtin/log.c:1758 +msgid "max length of output filename" +msgstr "" + +#: builtin/log.c:1760 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1758 +#: builtin/log.c:1763 msgid "cover-from-description-mode" msgstr "" -#: builtin/log.c:1759 +#: builtin/log.c:1764 msgid "generate parts of a cover letter based on a branch's description" msgstr "" -#: builtin/log.c:1761 +#: builtin/log.c:1766 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1764 +#: builtin/log.c:1769 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1767 +#: builtin/log.c:1772 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1770 +#: builtin/log.c:1775 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1772 +#: builtin/log.c:1777 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1774 +#: builtin/log.c:1779 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1776 +#: builtin/log.c:1781 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1778 +#: builtin/log.c:1783 msgid "Messaging" msgstr "" -#: builtin/log.c:1779 +#: builtin/log.c:1784 msgid "header" msgstr "" -#: builtin/log.c:1780 +#: builtin/log.c:1785 msgid "add email header" msgstr "" -#: builtin/log.c:1781 builtin/log.c:1782 +#: builtin/log.c:1786 builtin/log.c:1787 msgid "email" msgstr "" -#: builtin/log.c:1781 +#: builtin/log.c:1786 msgid "add To: header" msgstr "" -#: builtin/log.c:1782 +#: builtin/log.c:1787 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1783 +#: builtin/log.c:1788 msgid "ident" msgstr "" -#: builtin/log.c:1784 +#: builtin/log.c:1789 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1786 +#: builtin/log.c:1791 msgid "message-id" msgstr "" -#: builtin/log.c:1787 +#: builtin/log.c:1792 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1788 builtin/log.c:1791 +#: builtin/log.c:1793 builtin/log.c:1796 msgid "boundary" msgstr "" -#: builtin/log.c:1789 +#: builtin/log.c:1794 msgid "attach the patch" msgstr "" -#: builtin/log.c:1792 +#: builtin/log.c:1797 msgid "inline the patch" msgstr "" -#: builtin/log.c:1796 +#: builtin/log.c:1801 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1798 +#: builtin/log.c:1803 msgid "signature" msgstr "" -#: builtin/log.c:1799 +#: builtin/log.c:1804 msgid "add a signature" msgstr "" -#: builtin/log.c:1800 +#: builtin/log.c:1805 msgid "base-commit" msgstr "" -#: builtin/log.c:1801 +#: builtin/log.c:1806 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1804 +#: builtin/log.c:1809 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1805 +#: builtin/log.c:1810 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1807 +#: builtin/log.c:1812 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1809 +#: builtin/log.c:1814 msgid "show changes against <rev> in cover letter or single patch" msgstr "" -#: builtin/log.c:1812 +#: builtin/log.c:1817 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" -#: builtin/log.c:1814 +#: builtin/log.c:1819 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1896 +#: builtin/log.c:1905 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1911 +#: builtin/log.c:1920 msgid "-n and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1913 +#: builtin/log.c:1922 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1921 +#: builtin/log.c:1930 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1923 +#: builtin/log.c:1932 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1925 +#: builtin/log.c:1934 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1958 -msgid "standard output, or directory, which one?" +#: builtin/log.c:1956 +msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "" -#: builtin/log.c:2062 +#: builtin/log.c:2079 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:2066 +#: builtin/log.c:2083 msgid "Interdiff:" msgstr "" -#: builtin/log.c:2067 +#: builtin/log.c:2084 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:2073 +#: builtin/log.c:2090 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:2077 +#: builtin/log.c:2094 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:2085 +#: builtin/log.c:2102 msgid "Range-diff:" msgstr "" -#: builtin/log.c:2086 +#: builtin/log.c:2103 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:2097 +#: builtin/log.c:2114 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:2133 +#: builtin/log.c:2150 msgid "Generating patches" msgstr "" -#: builtin/log.c:2177 +#: builtin/log.c:2194 msgid "failed to create output files" msgstr "" -#: builtin/log.c:2236 +#: builtin/log.c:2253 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:2290 +#: builtin/log.c:2307 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -15574,7 +15686,7 @@ msgstr "" 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:60 builtin/ls-remote.c:62 builtin/rebase.c:1398 msgid "exec" msgstr "" @@ -15756,373 +15868,373 @@ msgstr "" msgid "Merging %s with %s\n" msgstr "" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge [<options>] [<commit>...]" msgstr "" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --abort" msgstr "" -#: builtin/merge.c:58 +#: builtin/merge.c:59 msgid "git merge --continue" msgstr "" -#: builtin/merge.c:120 +#: builtin/merge.c:122 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:143 +#: builtin/merge.c:145 #, c-format msgid "option `%s' requires a value" msgstr "" -#: builtin/merge.c:189 +#: builtin/merge.c:198 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:190 +#: builtin/merge.c:199 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:195 +#: builtin/merge.c:204 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:246 builtin/pull.c:133 +#: builtin/merge.c:255 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:258 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:259 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:252 builtin/pull.c:142 +#: builtin/merge.c:261 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:264 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:266 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:268 builtin/pull.c:154 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:261 +#: builtin/merge.c:270 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:263 builtin/pull.c:161 +#: builtin/merge.c:272 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:267 builtin/pull.c:164 +#: builtin/merge.c:276 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:277 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114 msgid "strategy" msgstr "" -#: builtin/merge.c:269 builtin/pull.c:169 +#: builtin/merge.c:278 builtin/pull.c:169 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:279 builtin/pull.c:172 msgid "option=value" msgstr "" -#: builtin/merge.c:271 builtin/pull.c:173 +#: builtin/merge.c:280 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:273 +#: builtin/merge.c:282 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:280 +#: builtin/merge.c:289 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:282 +#: builtin/merge.c:291 msgid "--abort but leave index and working tree alone" msgstr "" -#: builtin/merge.c:284 +#: builtin/merge.c:293 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:286 builtin/pull.c:180 +#: builtin/merge.c:295 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:293 +#: builtin/merge.c:302 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" -#: builtin/merge.c:310 +#: builtin/merge.c:319 msgid "could not run stash." msgstr "" -#: builtin/merge.c:315 +#: builtin/merge.c:324 msgid "stash failed" msgstr "" -#: builtin/merge.c:320 +#: builtin/merge.c:329 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:342 builtin/merge.c:359 +#: builtin/merge.c:351 builtin/merge.c:368 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:389 +#: builtin/merge.c:398 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:400 +#: builtin/merge.c:409 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:450 +#: builtin/merge.c:459 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:501 +#: builtin/merge.c:510 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:588 +#: builtin/merge.c:597 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:713 +#: builtin/merge.c:723 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:726 +#: builtin/merge.c:736 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:741 +#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:793 +#: builtin/merge.c:807 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:802 +#: builtin/merge.c:816 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:808 +#: builtin/merge.c:822 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:827 msgid "An empty message aborts the commit.\n" msgstr "" -#: builtin/merge.c:816 +#: builtin/merge.c:830 #, 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:883 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:884 +#: builtin/merge.c:898 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:945 +#: builtin/merge.c:959 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:984 +#: builtin/merge.c:998 msgid "No current branch." msgstr "" -#: builtin/merge.c:986 +#: builtin/merge.c:1000 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:988 +#: builtin/merge.c:1002 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:993 +#: builtin/merge.c:1007 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1050 +#: builtin/merge.c:1064 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1153 +#: builtin/merge.c:1167 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1187 +#: builtin/merge.c:1201 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1291 +#: builtin/merge.c:1311 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1295 +#: builtin/merge.c:1315 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1313 +#: builtin/merge.c:1333 msgid "--quit expects no arguments" msgstr "" -#: builtin/merge.c:1326 +#: builtin/merge.c:1346 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1330 +#: builtin/merge.c:1350 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1346 +#: builtin/merge.c:1366 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:1373 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:1376 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1370 +#: builtin/merge.c:1390 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1372 +#: builtin/merge.c:1392 msgid "You cannot combine --squash with --commit." msgstr "" -#: builtin/merge.c:1388 +#: builtin/merge.c:1408 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1405 +#: builtin/merge.c:1425 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1407 +#: builtin/merge.c:1427 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1412 +#: builtin/merge.c:1432 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1414 +#: builtin/merge.c:1434 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1495 +#: builtin/merge.c:1515 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1504 +#: builtin/merge.c:1524 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1514 +#: builtin/merge.c:1534 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1560 +#: builtin/merge.c:1580 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1567 +#: builtin/merge.c:1587 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1592 +#: builtin/merge.c:1612 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1598 +#: builtin/merge.c:1618 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1626 builtin/merge.c:1691 +#: builtin/merge.c:1646 builtin/merge.c:1711 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1630 +#: builtin/merge.c:1650 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1682 +#: builtin/merge.c:1702 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1684 +#: builtin/merge.c:1704 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1693 +#: builtin/merge.c:1713 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1707 +#: builtin/merge.c:1727 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -16263,7 +16375,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:484 #, c-format msgid "renaming '%s' failed" msgstr "" @@ -16703,7 +16815,7 @@ msgstr "" msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1034 builtin/stash.c:1605 +#: builtin/notes.c:1034 builtin/stash.c:1604 #, c-format msgid "unknown subcommand: %s" msgstr "" @@ -17130,7 +17242,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:490 builtin/revert.c:126 msgid "allow fast-forward" msgstr "" @@ -17197,15 +17309,15 @@ 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:469 builtin/rebase.c:1246 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:471 builtin/pull.c:486 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:473 builtin/pull.c:488 msgid "Please specify which branch you want to merge with." msgstr "" @@ -17214,20 +17326,19 @@ 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/rebase.c:1252 msgid "<remote>" msgstr "" #: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 -#: git-parse-remote.sh:65 msgid "<branch>" msgstr "" -#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1244 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:493 git-parse-remote.sh:95 +#: builtin/pull.c:493 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" @@ -17244,23 +17355,23 @@ msgstr "" msgid "unable to access commit %s" msgstr "" -#: builtin/pull.c:894 +#: builtin/pull.c:915 msgid "ignoring --verify-signatures for rebase" msgstr "" -#: builtin/pull.c:954 +#: builtin/pull.c:972 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:958 +#: builtin/pull.c:976 msgid "pull with rebase" msgstr "" -#: builtin/pull.c:959 +#: builtin/pull.c:977 msgid "please commit or stash them." msgstr "" -#: builtin/pull.c:984 +#: builtin/pull.c:1002 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17268,7 +17379,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:990 +#: builtin/pull.c:1008 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17279,15 +17390,15 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:1005 +#: builtin/pull.c:1023 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:1009 +#: builtin/pull.c:1027 msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/pull.c:1017 +#: builtin/pull.c:1041 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -17397,99 +17508,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,27 +17625,27 @@ 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 "" @@ -17661,193 +17784,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:193 builtin/rebase.c:217 builtin/rebase.c:244 #, c-format msgid "unusable todo list: '%s'" msgstr "" -#: builtin/rebase.c:304 +#: builtin/rebase.c:310 #, c-format msgid "could not create temporary %s" msgstr "" -#: builtin/rebase.c:310 +#: builtin/rebase.c:316 msgid "could not mark as interactive" msgstr "" -#: builtin/rebase.c:364 +#: builtin/rebase.c:369 msgid "could not generate todo list" msgstr "" -#: builtin/rebase.c:405 +#: builtin/rebase.c:411 msgid "a base commit must be provided with --upstream or --onto" msgstr "" -#: builtin/rebase.c:474 +#: builtin/rebase.c:480 msgid "git rebase--interactive [<options>]" msgstr "" -#: builtin/rebase.c:487 builtin/rebase.c:1382 +#: builtin/rebase.c:493 builtin/rebase.c:1388 msgid "keep commits which start empty" msgstr "" -#: builtin/rebase.c:491 builtin/revert.c:128 +#: builtin/rebase.c:497 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "" -#: builtin/rebase.c:493 +#: builtin/rebase.c:499 msgid "rebase merge commits" msgstr "" -#: builtin/rebase.c:495 +#: builtin/rebase.c:501 msgid "keep original branch points of cousins" msgstr "" -#: builtin/rebase.c:497 +#: builtin/rebase.c:503 msgid "move commits that begin with squash!/fixup!" msgstr "" -#: builtin/rebase.c:498 +#: builtin/rebase.c:504 msgid "sign commits" msgstr "" -#: builtin/rebase.c:500 builtin/rebase.c:1321 +#: builtin/rebase.c:506 builtin/rebase.c:1327 msgid "display a diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:502 +#: builtin/rebase.c:508 msgid "continue rebase" msgstr "" -#: builtin/rebase.c:504 +#: builtin/rebase.c:510 msgid "skip commit" msgstr "" -#: builtin/rebase.c:505 +#: builtin/rebase.c:511 msgid "edit the todo list" msgstr "" -#: builtin/rebase.c:507 +#: builtin/rebase.c:513 msgid "show the current patch" msgstr "" -#: builtin/rebase.c:510 +#: builtin/rebase.c:516 msgid "shorten commit ids in the todo list" msgstr "" -#: builtin/rebase.c:512 +#: builtin/rebase.c:518 msgid "expand commit ids in the todo list" msgstr "" -#: builtin/rebase.c:514 +#: builtin/rebase.c:520 msgid "check the todo list" msgstr "" -#: builtin/rebase.c:516 +#: builtin/rebase.c:522 msgid "rearrange fixup/squash lines" msgstr "" -#: builtin/rebase.c:518 +#: builtin/rebase.c:524 msgid "insert exec commands in todo list" msgstr "" -#: builtin/rebase.c:519 +#: builtin/rebase.c:525 msgid "onto" msgstr "" -#: builtin/rebase.c:522 +#: builtin/rebase.c:528 msgid "restrict-revision" msgstr "" -#: builtin/rebase.c:522 +#: builtin/rebase.c:528 msgid "restrict revision" msgstr "" -#: builtin/rebase.c:524 +#: builtin/rebase.c:530 msgid "squash-onto" msgstr "" -#: builtin/rebase.c:525 +#: builtin/rebase.c:531 msgid "squash onto" msgstr "" -#: builtin/rebase.c:527 +#: builtin/rebase.c:533 msgid "the upstream commit" msgstr "" -#: builtin/rebase.c:529 +#: builtin/rebase.c:535 msgid "head-name" msgstr "" -#: builtin/rebase.c:529 +#: builtin/rebase.c:535 msgid "head name" msgstr "" -#: builtin/rebase.c:534 +#: builtin/rebase.c:540 msgid "rebase strategy" msgstr "" -#: builtin/rebase.c:535 +#: builtin/rebase.c:541 msgid "strategy-opts" msgstr "" -#: builtin/rebase.c:536 +#: builtin/rebase.c:542 msgid "strategy options" msgstr "" -#: builtin/rebase.c:537 +#: builtin/rebase.c:543 msgid "switch-to" msgstr "" -#: builtin/rebase.c:538 +#: builtin/rebase.c:544 msgid "the branch or commit to checkout" msgstr "" -#: builtin/rebase.c:539 +#: builtin/rebase.c:545 msgid "onto-name" msgstr "" -#: builtin/rebase.c:539 +#: builtin/rebase.c:545 msgid "onto name" msgstr "" -#: builtin/rebase.c:540 +#: builtin/rebase.c:546 msgid "cmd" msgstr "" -#: builtin/rebase.c:540 +#: builtin/rebase.c:546 msgid "the command to run" msgstr "" -#: builtin/rebase.c:543 builtin/rebase.c:1415 +#: builtin/rebase.c:549 builtin/rebase.c:1421 msgid "automatically re-schedule any `exec` that fails" msgstr "" -#: builtin/rebase.c:559 +#: builtin/rebase.c:565 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "" -#: builtin/rebase.c:575 +#: builtin/rebase.c:581 #, c-format msgid "%s requires the merge backend" msgstr "" -#: builtin/rebase.c:618 +#: builtin/rebase.c:624 #, c-format msgid "could not get 'onto': '%s'" msgstr "" -#: builtin/rebase.c:635 +#: builtin/rebase.c:641 #, c-format msgid "invalid orig-head: '%s'" msgstr "" -#: builtin/rebase.c:660 +#: builtin/rebase.c:666 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "" -#: builtin/rebase.c:805 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:811 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 +17979,7 @@ msgid "" "abort\"." msgstr "" -#: builtin/rebase.c:888 +#: builtin/rebase.c:894 #, c-format msgid "" "\n" @@ -17868,14 +17991,14 @@ msgid "" "As a result, git cannot rebase them." msgstr "" -#: builtin/rebase.c:1214 +#: builtin/rebase.c:1220 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" "\"." msgstr "" -#: builtin/rebase.c:1232 +#: builtin/rebase.c:1238 #, c-format msgid "" "%s\n" @@ -17886,7 +18009,7 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1248 +#: builtin/rebase.c:1254 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17895,201 +18018,201 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1278 +#: builtin/rebase.c:1284 msgid "exec commands cannot contain newlines" msgstr "" -#: builtin/rebase.c:1282 +#: builtin/rebase.c:1288 msgid "empty exec command" msgstr "" -#: builtin/rebase.c:1312 +#: builtin/rebase.c:1318 msgid "rebase onto given branch instead of upstream" msgstr "" -#: builtin/rebase.c:1314 +#: builtin/rebase.c:1320 msgid "use the merge-base of upstream and branch as the current base" msgstr "" -#: builtin/rebase.c:1316 +#: builtin/rebase.c:1322 msgid "allow pre-rebase hook to run" msgstr "" -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1324 msgid "be quiet. implies --no-stat" msgstr "" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1330 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:1333 +msgid "add a Signed-off-by trailer to each commit" msgstr "" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1336 msgid "make committer date match author date" msgstr "" -#: builtin/rebase.c:1332 +#: builtin/rebase.c:1338 msgid "ignore author date and use current date" msgstr "" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1340 msgid "synonym of --reset-author-date" msgstr "" -#: builtin/rebase.c:1336 builtin/rebase.c:1340 +#: builtin/rebase.c:1342 builtin/rebase.c:1346 msgid "passed to 'git apply'" msgstr "" -#: builtin/rebase.c:1338 +#: builtin/rebase.c:1344 msgid "ignore changes in whitespace" msgstr "" -#: builtin/rebase.c:1342 builtin/rebase.c:1345 +#: builtin/rebase.c:1348 builtin/rebase.c:1351 msgid "cherry-pick all commits, even if unchanged" msgstr "" -#: builtin/rebase.c:1347 +#: builtin/rebase.c:1353 msgid "continue" msgstr "" -#: builtin/rebase.c:1350 +#: builtin/rebase.c:1356 msgid "skip current patch and continue" msgstr "" -#: builtin/rebase.c:1352 +#: builtin/rebase.c:1358 msgid "abort and check out the original branch" msgstr "" -#: builtin/rebase.c:1355 +#: builtin/rebase.c:1361 msgid "abort but keep HEAD where it is" msgstr "" -#: builtin/rebase.c:1356 +#: builtin/rebase.c:1362 msgid "edit the todo list during an interactive rebase" msgstr "" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1365 msgid "show the patch file being applied or merged" msgstr "" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1368 msgid "use apply strategies to rebase" msgstr "" -#: builtin/rebase.c:1366 +#: builtin/rebase.c:1372 msgid "use merging strategies to rebase" msgstr "" -#: builtin/rebase.c:1370 +#: builtin/rebase.c:1376 msgid "let the user edit the list of commits to rebase" msgstr "" -#: builtin/rebase.c:1374 +#: builtin/rebase.c:1380 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" -#: builtin/rebase.c:1379 +#: builtin/rebase.c:1385 msgid "how to handle commits that become empty" msgstr "" -#: builtin/rebase.c:1386 +#: builtin/rebase.c:1392 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" -#: builtin/rebase.c:1393 +#: builtin/rebase.c:1399 msgid "add exec lines after each commit of the editable list" msgstr "" -#: builtin/rebase.c:1397 +#: builtin/rebase.c:1403 msgid "allow rebasing commits with empty messages" msgstr "" -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1407 msgid "try to rebase merges instead of skipping them" msgstr "" -#: builtin/rebase.c:1404 +#: builtin/rebase.c:1410 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1412 msgid "use the given merge strategy" msgstr "" -#: builtin/rebase.c:1408 builtin/revert.c:115 +#: builtin/rebase.c:1414 builtin/revert.c:115 msgid "option" msgstr "" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1415 msgid "pass the argument through to the merge strategy" msgstr "" -#: builtin/rebase.c:1412 +#: builtin/rebase.c:1418 msgid "rebase all reachable commits up to the root(s)" msgstr "" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1423 msgid "apply all changes, even those already present upstream" msgstr "" -#: builtin/rebase.c:1434 +#: builtin/rebase.c:1440 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:1446 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1487 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" -#: builtin/rebase.c:1486 +#: builtin/rebase.c:1492 msgid "cannot combine '--keep-base' with '--onto'" msgstr "" -#: builtin/rebase.c:1488 +#: builtin/rebase.c:1494 msgid "cannot combine '--keep-base' with '--root'" msgstr "" -#: builtin/rebase.c:1492 +#: builtin/rebase.c:1498 msgid "cannot combine '--root' with '--fork-point'" msgstr "" -#: builtin/rebase.c:1495 +#: builtin/rebase.c:1501 msgid "No rebase in progress?" msgstr "" -#: builtin/rebase.c:1499 +#: builtin/rebase.c:1505 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: builtin/rebase.c:1522 +#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "" -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1540 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:1559 msgid "could not discard worktree changes" msgstr "" -#: builtin/rebase.c:1572 +#: builtin/rebase.c:1578 #, c-format msgid "could not move back to %s" msgstr "" -#: builtin/rebase.c:1618 +#: builtin/rebase.c:1624 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18102,131 +18225,131 @@ msgid "" "valuable there.\n" msgstr "" -#: builtin/rebase.c:1646 +#: builtin/rebase.c:1652 msgid "switch `C' expects a numerical value" msgstr "" -#: builtin/rebase.c:1688 +#: builtin/rebase.c:1694 #, c-format msgid "Unknown mode: %s" msgstr "" -#: builtin/rebase.c:1727 +#: builtin/rebase.c:1733 msgid "--strategy requires --merge or --interactive" msgstr "" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1763 msgid "cannot combine apply options with merge options" msgstr "" -#: builtin/rebase.c:1770 +#: builtin/rebase.c:1776 #, c-format msgid "Unknown rebase backend: %s" msgstr "" -#: builtin/rebase.c:1795 +#: builtin/rebase.c:1806 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "" -#: builtin/rebase.c:1815 +#: builtin/rebase.c:1826 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "" -#: builtin/rebase.c:1819 +#: builtin/rebase.c:1830 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" -#: builtin/rebase.c:1843 +#: builtin/rebase.c:1854 #, c-format msgid "invalid upstream '%s'" msgstr "" -#: builtin/rebase.c:1849 +#: builtin/rebase.c:1860 msgid "Could not create new root commit" msgstr "" -#: builtin/rebase.c:1875 +#: builtin/rebase.c:1886 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "" -#: builtin/rebase.c:1878 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "" -#: builtin/rebase.c:1886 +#: builtin/rebase.c:1897 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "" -#: builtin/rebase.c:1912 +#: builtin/rebase.c:1923 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "" -#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/rebase.c:1931 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:1942 msgid "Could not resolve HEAD to a revision" msgstr "" -#: builtin/rebase.c:1952 +#: builtin/rebase.c:1963 msgid "Please commit or stash them." msgstr "" -#: builtin/rebase.c:1988 +#: builtin/rebase.c:1999 #, c-format msgid "could not switch to %s" msgstr "" -#: builtin/rebase.c:1999 +#: builtin/rebase.c:2010 msgid "HEAD is up to date." msgstr "" -#: builtin/rebase.c:2001 +#: builtin/rebase.c:2012 #, c-format msgid "Current branch %s is up to date.\n" msgstr "" -#: builtin/rebase.c:2009 +#: builtin/rebase.c:2020 msgid "HEAD is up to date, rebase forced." msgstr "" -#: builtin/rebase.c:2011 +#: builtin/rebase.c:2022 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "" -#: builtin/rebase.c:2019 +#: builtin/rebase.c:2030 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: builtin/rebase.c:2026 +#: builtin/rebase.c:2037 #, c-format msgid "Changes to %s:\n" msgstr "" -#: builtin/rebase.c:2029 +#: builtin/rebase.c:2040 #, c-format msgid "Changes from %s to %s:\n" msgstr "" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:2065 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" -#: builtin/rebase.c:2063 +#: builtin/rebase.c:2074 msgid "Could not detach HEAD" msgstr "" -#: builtin/rebase.c:2072 +#: builtin/rebase.c:2083 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "" @@ -18235,7 +18358,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 +18375,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 +18387,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 "" @@ -18454,40 +18577,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 +18613,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 +18631,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 +18651,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,176 +18770,176 @@ 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 "" @@ -18839,121 +18957,114 @@ msgstr "" msgid "could not start pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:236 builtin/repack.c:421 +#: builtin/repack.c:268 builtin/repack.c:447 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -#: builtin/repack.c:260 +#: builtin/repack.c:295 msgid "could not finish pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:297 +#: builtin/repack.c:323 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:299 +#: builtin/repack.c:325 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:302 +#: builtin/repack.c:328 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:304 +#: builtin/repack.c:330 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:306 +#: builtin/repack.c:332 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:308 +#: builtin/repack.c:334 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:311 +#: builtin/repack.c:337 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:313 +#: builtin/repack.c:339 msgid "write bitmap index" msgstr "" -#: builtin/repack.c:315 +#: builtin/repack.c:341 msgid "pass --delta-islands to git-pack-objects" msgstr "" -#: builtin/repack.c:316 +#: builtin/repack.c:342 msgid "approxidate" msgstr "" -#: builtin/repack.c:317 +#: builtin/repack.c:343 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:319 +#: builtin/repack.c:345 msgid "with -a, repack unreachable objects" msgstr "" -#: builtin/repack.c:321 +#: builtin/repack.c:347 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:322 builtin/repack.c:328 +#: builtin/repack.c:348 builtin/repack.c:354 msgid "bytes" msgstr "" -#: builtin/repack.c:323 +#: builtin/repack.c:349 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:325 +#: builtin/repack.c:351 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:327 +#: builtin/repack.c:353 msgid "limits the maximum number of threads" msgstr "" -#: builtin/repack.c:329 +#: builtin/repack.c:355 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:331 +#: builtin/repack.c:357 msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:333 +#: builtin/repack.c:359 msgid "do not repack this pack" msgstr "" -#: builtin/repack.c:343 +#: builtin/repack.c:369 msgid "cannot delete packs in a precious-objects repo" msgstr "" -#: builtin/repack.c:347 +#: builtin/repack.c:373 msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:430 +#: builtin/repack.c:456 msgid "Nothing new to pack." msgstr "" #: builtin/repack.c:486 #, 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:488 #, c-format -msgid "failed to remove '%s'" +msgid "could not unlink: %s" msgstr "" #: builtin/replace.c:22 @@ -19273,8 +19384,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:520 builtin/stash.c:594 +#: builtin/stash.c:618 msgid "be quiet, only report errors" msgstr "" @@ -19471,11 +19582,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 +19674,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:135 msgid "using multiple --group options with stdin is not supported" msgstr "" -#: builtin/shortlog.c:144 +#: builtin/shortlog.c:145 msgid "using --group=trailer with stdin is not supported" msgstr "" -#: builtin/shortlog.c:388 +#: builtin/shortlog.c:335 #, c-format msgid "unknown group type: %s" msgstr "" -#: builtin/shortlog.c:416 +#: builtin/shortlog.c:363 msgid "Group by committer rather than author" msgstr "" -#: builtin/shortlog.c:419 +#: builtin/shortlog.c:366 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:421 +#: builtin/shortlog.c:368 msgid "Suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:423 +#: builtin/shortlog.c:370 msgid "Show the email address of each author" msgstr "" -#: builtin/shortlog.c:424 +#: builtin/shortlog.c:371 msgid "<w>[,<i1>[,<i2>]]" msgstr "" -#: builtin/shortlog.c:425 +#: builtin/shortlog.c:372 msgid "Linewrap output" msgstr "" -#: builtin/shortlog.c:427 +#: builtin/shortlog.c:374 msgid "field" msgstr "" -#: builtin/shortlog.c:428 +#: builtin/shortlog.c:375 msgid "Group by field" msgstr "" -#: builtin/shortlog.c:456 +#: builtin/shortlog.c:403 msgid "too many arguments given outside repository" msgstr "" @@ -19977,7 +20088,7 @@ msgid "could not generate diff %s^!." msgstr "" #: builtin/stash.c:422 -msgid "conflicts in index.Try without --index." +msgid "conflicts in index. Try without --index." msgstr "" #: builtin/stash.c:428 @@ -19997,120 +20108,120 @@ msgstr "" msgid "Index was not unstashed." msgstr "" -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:522 builtin/stash.c:620 msgid "attempt to recreate the index" msgstr "" -#: builtin/stash.c:555 +#: builtin/stash.c:566 #, c-format msgid "Dropped %s (%s)" msgstr "" -#: builtin/stash.c:558 +#: builtin/stash.c:569 #, c-format msgid "%s: Could not drop stash entry" msgstr "" -#: builtin/stash.c:583 +#: builtin/stash.c:582 #, c-format msgid "'%s' is not a stash reference" msgstr "" -#: builtin/stash.c:633 +#: builtin/stash.c:632 msgid "The stash entry is kept in case you need it again." msgstr "" -#: builtin/stash.c:656 +#: builtin/stash.c:655 msgid "No branch name specified" msgstr "" -#: builtin/stash.c:800 builtin/stash.c:837 +#: builtin/stash.c:799 builtin/stash.c:836 #, c-format msgid "Cannot update %s with %s" msgstr "" -#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536 msgid "stash message" msgstr "" -#: builtin/stash.c:828 +#: builtin/stash.c:827 msgid "\"git stash store\" requires one <commit> argument" msgstr "" -#: builtin/stash.c:1043 +#: builtin/stash.c:1042 msgid "No changes selected" msgstr "" -#: builtin/stash.c:1143 +#: builtin/stash.c:1142 msgid "You do not have the initial commit yet" msgstr "" -#: builtin/stash.c:1170 +#: builtin/stash.c:1169 msgid "Cannot save the current index state" msgstr "" -#: builtin/stash.c:1179 +#: builtin/stash.c:1178 msgid "Cannot save the untracked files" msgstr "" -#: builtin/stash.c:1190 builtin/stash.c:1199 +#: builtin/stash.c:1189 builtin/stash.c:1198 msgid "Cannot save the current worktree state" msgstr "" -#: builtin/stash.c:1227 +#: builtin/stash.c:1226 msgid "Cannot record working tree state" msgstr "" -#: builtin/stash.c:1276 +#: builtin/stash.c:1275 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" -#: builtin/stash.c:1292 +#: builtin/stash.c:1291 msgid "Did you forget to 'git add'?" msgstr "" -#: builtin/stash.c:1307 +#: builtin/stash.c:1306 msgid "No local changes to save" msgstr "" -#: builtin/stash.c:1314 +#: builtin/stash.c:1313 msgid "Cannot initialize stash" msgstr "" -#: builtin/stash.c:1329 +#: builtin/stash.c:1328 msgid "Cannot save the current status" msgstr "" -#: builtin/stash.c:1334 +#: builtin/stash.c:1333 #, c-format msgid "Saved working directory and index state %s" msgstr "" -#: builtin/stash.c:1424 +#: builtin/stash.c:1423 msgid "Cannot remove worktree changes" msgstr "" -#: builtin/stash.c:1463 builtin/stash.c:1528 +#: builtin/stash.c:1462 builtin/stash.c:1527 msgid "keep index" msgstr "" -#: builtin/stash.c:1465 builtin/stash.c:1530 +#: builtin/stash.c:1464 builtin/stash.c:1529 msgid "stash in patch mode" msgstr "" -#: builtin/stash.c:1466 builtin/stash.c:1531 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "quiet mode" msgstr "" -#: builtin/stash.c:1468 builtin/stash.c:1533 +#: builtin/stash.c:1467 builtin/stash.c:1532 msgid "include untracked files in stash" msgstr "" -#: builtin/stash.c:1470 builtin/stash.c:1535 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "include ignore files" msgstr "" -#: builtin/stash.c:1570 +#: builtin/stash.c:1569 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -20585,7 +20696,7 @@ 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 "" @@ -20623,7 +20734,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:438 git.c:711 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" @@ -20653,11 +20764,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 "" @@ -20786,7 +20897,7 @@ msgstr "" msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:422 builtin/update-ref.c:492 +#: builtin/tag.c:422 builtin/update-ref.c:505 msgid "create a reflog" msgstr "" @@ -21124,19 +21235,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 "" @@ -21228,7 +21339,7 @@ msgstr "" msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:60 builtin/worktree.c:970 +#: builtin/worktree.c:60 builtin/worktree.c:973 #, c-format msgid "failed to delete '%s'" msgstr "" @@ -21357,119 +21468,119 @@ msgstr "" msgid "--[no-]track can only be used if a new branch is created" msgstr "" -#: builtin/worktree.c:755 +#: builtin/worktree.c:758 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 -#: builtin/worktree.c:998 +#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877 +#: builtin/worktree.c:1001 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:769 builtin/worktree.c:802 +#: builtin/worktree.c:772 builtin/worktree.c:805 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:774 +#: builtin/worktree.c:777 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:776 +#: builtin/worktree.c:779 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:804 +#: builtin/worktree.c:807 #, c-format msgid "'%s' is not locked" msgstr "" -#: builtin/worktree.c:845 +#: builtin/worktree.c:848 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:853 +#: builtin/worktree.c:856 msgid "force move even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:876 builtin/worktree.c:1000 +#: builtin/worktree.c:879 builtin/worktree.c:1003 #, c-format msgid "'%s' is a main working tree" msgstr "" -#: builtin/worktree.c:881 +#: builtin/worktree.c:884 #, c-format msgid "could not figure out destination name from '%s'" msgstr "" -#: builtin/worktree.c:894 +#: builtin/worktree.c:897 #, 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:899 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:902 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:904 +#: builtin/worktree.c:907 #, c-format msgid "failed to move '%s' to '%s'" msgstr "" -#: builtin/worktree.c:950 +#: builtin/worktree.c:953 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "" -#: builtin/worktree.c:954 +#: builtin/worktree.c:957 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -#: builtin/worktree.c:959 +#: builtin/worktree.c:962 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" -#: builtin/worktree.c:982 +#: builtin/worktree.c:985 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:1005 +#: builtin/worktree.c:1008 #, 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:1010 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:1013 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" -#: builtin/worktree.c:1034 +#: builtin/worktree.c:1037 #, c-format msgid "repair: %s: %s" msgstr "" -#: builtin/worktree.c:1037 +#: builtin/worktree.c:1040 #, c-format msgid "error: %s: %s" msgstr "" @@ -21499,6 +21610,14 @@ msgstr "" msgid "not a git repository" 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" @@ -21603,29 +21722,29 @@ msgstr "" msgid "close failed on standard output" msgstr "" -#: git.c:819 +#: git.c:820 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" -#: git.c:869 +#: git.c:870 #, c-format msgid "cannot handle %s as a builtin" msgstr "" -#: git.c:882 +#: git.c:883 #, c-format msgid "" "usage: %s\n" "\n" msgstr "" -#: git.c:902 +#: git.c:903 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:914 +#: git.c:915 #, c-format msgid "failed to run command '%s': %s\n" msgstr "" @@ -21674,134 +21793,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 "" @@ -22072,171 +22191,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" 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 @@ -22547,71 +22666,56 @@ msgstr "" msgid "An overview of recommended workflows with Git" msgstr "" -#: git-bisect.sh:79 +#: git-bisect.sh:48 #, 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 +#: git-bisect.sh:82 msgid "No logfile given" msgstr "" -#: git-bisect.sh:150 +#: git-bisect.sh:83 #, sh-format msgid "cannot read $file for replaying" msgstr "" -#: git-bisect.sh:173 +#: git-bisect.sh:105 msgid "?? what are you talking about?" msgstr "" -#: git-bisect.sh:183 +#: git-bisect.sh:115 msgid "bisect run failed: no command provided." msgstr "" -#: git-bisect.sh:188 +#: git-bisect.sh:120 #, sh-format msgid "running $command" msgstr "" -#: git-bisect.sh:195 +#: git-bisect.sh:127 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -#: git-bisect.sh:221 +#: git-bisect.sh:152 msgid "bisect run cannot continue any more" msgstr "" -#: git-bisect.sh:227 +#: git-bisect.sh:158 #, 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:165 msgid "bisect run success" msgstr "" -#: git-bisect.sh:242 +#: git-bisect.sh:173 msgid "We are not bisecting." msgstr "" @@ -22653,46 +22757,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 +22807,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 +23235,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 +23288,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 +23302,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 +23311,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 +23320,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 +23329,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 +23338,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 +23347,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 +23356,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 +23365,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 +23378,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 +23472,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 "" |