diff options
Diffstat (limited to 'po/git.pot')
| -rw-r--r-- | po/git.pot | 7881 |
1 files changed, 4168 insertions, 3713 deletions
diff --git a/po/git.pot b/po/git.pot index 198b6e0a4a..6b5b503775 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-07-10 09:53+0800\n" +"POT-Creation-Date: 2020-12-21 07:10+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,232 +18,232 @@ 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:3142 -#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518 -#: builtin/rebase.c:1919 +#: 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:3336 +#: 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:4110 builtin/checkout.c:294 +#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: add-interactive.c:751 git-add--interactive.perl:655 +#: add-interactive.c:759 git-add--interactive.perl:653 msgid "Revert" msgstr "" -#: add-interactive.c:767 +#: add-interactive.c:775 msgid "Could not parse HEAD^{tree}" msgstr "" -#: add-interactive.c:805 git-add--interactive.perl:631 +#: add-interactive.c:813 git-add--interactive.perl:629 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "" msgstr[1] "" -#: add-interactive.c:856 git-add--interactive.perl:695 +#: add-interactive.c:864 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "" -#: add-interactive.c:860 git-add--interactive.perl:689 +#: add-interactive.c:868 git-add--interactive.perl:687 msgid "Add untracked" msgstr "" -#: add-interactive.c:887 git-add--interactive.perl:625 +#: add-interactive.c:895 git-add--interactive.perl:623 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "" msgstr[1] "" -#: add-interactive.c:917 +#: add-interactive.c:925 #, c-format msgid "ignoring unmerged: %s" msgstr "" -#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368 +#: 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:1689 git-add--interactive.perl:1370 +#: 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:1378 +#: add-interactive.c:943 git-add--interactive.perl:1379 msgid "Patch update" msgstr "" -#: add-interactive.c:974 git-add--interactive.perl:1771 +#: 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:1868 +#: 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:1865 +#: 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:4967 apply.c:4970 builtin/am.c:2250 -#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145 -#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 bugreport.c:135 +#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 +#: builtin/fetch.c: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 #: git-add--interactive.perl:213 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:1782 +#: 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:1430 +#: 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:1431 +#: 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:1432 +#: 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:1433 +#: 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:1436 +#: 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:1437 +#: 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:1438 +#: 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:1439 +#: 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:1442 +#: 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:1443 +#: 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:1444 +#: 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:1445 +#: 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:1448 +#: 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:1449 +#: 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:1450 +#: 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:1451 +#: 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:1454 -#: git-add--interactive.perl:1472 +#: 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:1455 -#: git-add--interactive.perl:1473 +#: 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:1456 -#: git-add--interactive.perl:1474 +#: 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:1457 -#: git-add--interactive.perl:1475 +#: 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:1460 +#: 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:1461 +#: 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:1462 +#: 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:1463 +#: 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:1466 +#: 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:1467 +#: 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:1468 +#: 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:1469 +#: 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 "" @@ -474,47 +474,47 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" -#: add-patch.c:328 +#: add-patch.c:342 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "" -#: add-patch.c:347 add-patch.c:351 +#: add-patch.c:361 add-patch.c:365 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "" -#: add-patch.c:405 +#: add-patch.c:419 msgid "could not parse diff" msgstr "" -#: add-patch.c:424 +#: add-patch.c:438 msgid "could not parse colored diff" msgstr "" -#: add-patch.c:438 +#: add-patch.c:452 #, c-format msgid "failed to run '%s'" msgstr "" -#: add-patch.c:602 +#: add-patch.c:611 msgid "mismatched output from interactive.diffFilter" msgstr "" -#: add-patch.c:603 +#: add-patch.c:612 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "" -#: add-patch.c:776 +#: add-patch.c:790 #, c-format msgid "" "expected context line #%d in\n" "%.*s" msgstr "" -#: add-patch.c:791 +#: add-patch.c:805 #, c-format msgid "" "hunks do not overlap:\n" @@ -523,11 +523,11 @@ msgid "" "%.*s" msgstr "" -#: add-patch.c:1067 git-add--interactive.perl:1114 +#: 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:1071 +#: 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:1085 git-add--interactive.perl:1128 +#: 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:1118 +#: add-patch.c:1132 msgid "could not parse hunk header" msgstr "" -#: add-patch.c:1163 +#: 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:1232 git-add--interactive.perl:1241 +#: 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:1275 +#: add-patch.c:1289 msgid "The selected hunks do not apply to the index!" msgstr "" -#: add-patch.c:1276 git-add--interactive.perl:1345 +#: add-patch.c:1290 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "" -#: add-patch.c:1283 git-add--interactive.perl:1348 +#: add-patch.c:1297 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "" -#: add-patch.c:1340 +#: 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:1463 add-patch.c:1473 +#: add-patch.c:1516 add-patch.c:1526 msgid "No previous hunk" msgstr "" -#: add-patch.c:1468 add-patch.c:1478 +#: add-patch.c:1521 add-patch.c:1531 msgid "No next hunk" msgstr "" -#: add-patch.c:1484 +#: add-patch.c:1537 msgid "No other hunks to goto" msgstr "" -#: add-patch.c:1495 git-add--interactive.perl:1594 +#: add-patch.c:1548 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "" -#: add-patch.c:1496 git-add--interactive.perl:1596 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "" -#: add-patch.c:1507 +#: add-patch.c:1560 #, c-format msgid "Invalid number: '%s'" msgstr "" -#: add-patch.c:1512 +#: 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:1521 +#: add-patch.c:1574 msgid "No other hunks to search" msgstr "" -#: add-patch.c:1527 git-add--interactive.perl:1640 +#: add-patch.c:1580 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "" -#: add-patch.c:1542 +#: add-patch.c:1595 #, c-format msgid "Malformed search regexp %s: %s" msgstr "" -#: add-patch.c:1559 +#: add-patch.c:1612 msgid "No hunk matches the given pattern" msgstr "" -#: add-patch.c:1566 +#: add-patch.c:1619 msgid "Sorry, cannot split this hunk" msgstr "" -#: add-patch.c:1570 +#: add-patch.c:1623 #, c-format msgid "Split into %d hunks." msgstr "" -#: add-patch.c:1574 +#: add-patch.c:1627 msgid "Sorry, cannot edit this hunk" msgstr "" -#: add-patch.c:1625 +#: 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:1353 +#: 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:61 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 "" @@ -999,7 +999,7 @@ msgstr "" msgid "%s: does not exist in index" msgstr "" -#: apply.c:3537 apply.c:3708 +#: apply.c:3537 apply.c:3708 apply.c:3952 #, c-format msgid "%s: does not match index" msgstr "" @@ -1047,360 +1047,355 @@ msgstr "" msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3936 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3939 +#: apply.c:3954 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3959 +#: apply.c:3974 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3964 +#: apply.c:3979 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3984 +#: apply.c:3999 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3988 +#: apply.c:4003 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:4003 +#: apply.c:4018 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4095 +#: apply.c:4110 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4102 +#: apply.c:4117 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4105 +#: apply.c:4120 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4114 +#: apply.c:4129 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4124 +#: apply.c:4139 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4262 +#: apply.c:4277 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4296 +#: apply.c:4311 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4302 +#: apply.c:4317 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4310 +#: apply.c:4325 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4316 apply.c:4461 +#: apply.c:4331 apply.c:4476 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4359 +#: apply.c:4374 builtin/bisect--helper.c:524 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4363 +#: apply.c:4378 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4433 +#: apply.c:4448 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4531 +#: apply.c:4546 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4539 +#: apply.c:4554 msgid "internal error" msgstr "" -#: apply.c:4542 +#: apply.c:4557 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4553 +#: apply.c:4568 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195 +#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4575 +#: apply.c:4590 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4579 +#: apply.c:4594 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4698 +#: apply.c:4718 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4706 +#: apply.c:4726 msgid "unrecognized input" msgstr "" -#: apply.c:4726 +#: apply.c:4746 msgid "unable to read index file" msgstr "" -#: apply.c:4883 +#: apply.c:4903 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4910 +#: apply.c:4930 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4916 apply.c:4931 +#: apply.c:4936 apply.c:4951 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4924 +#: apply.c:4944 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "" -#: apply.c:4968 +#: apply.c:4988 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4971 +#: apply.c:4991 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4973 builtin/am.c:2259 +#: apply.c:4993 builtin/am.c:2266 msgid "num" msgstr "" -#: apply.c:4974 +#: apply.c:4994 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: apply.c:4977 +#: apply.c:4997 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4979 +#: apply.c:4999 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4983 +#: apply.c:5003 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4985 +#: apply.c:5005 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4987 +#: apply.c:5007 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4989 +#: apply.c:5009 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4991 +#: apply.c:5011 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:4993 +#: apply.c:5013 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4995 +#: apply.c:5015 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4998 +#: apply.c:5018 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:5000 +#: apply.c:5020 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:5002 +#: apply.c:5022 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525 +#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:5007 +#: apply.c:5027 msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98 +#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3530 builtin/rebase.c:1332 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 msgid "action" msgstr "" -#: apply.c:5009 +#: apply.c:5029 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:5012 apply.c:5015 +#: apply.c:5032 apply.c:5035 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:5018 +#: apply.c:5038 msgid "apply the patch in reverse" msgstr "" -#: apply.c:5020 +#: apply.c:5040 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:5022 +#: apply.c:5042 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5024 +#: apply.c:5044 msgid "allow overlapping hunks" msgstr "" -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5045 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:2287 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" -#: apply.c:5027 +#: apply.c:5047 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5030 +#: apply.c:5050 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5032 builtin/am.c:2247 +#: apply.c:5052 builtin/am.c:2254 msgid "root" msgstr "" -#: apply.c:5033 +#: apply.c:5053 msgid "prepend <root> to all filenames" msgstr "" -#: archive-tar.c:125 archive-zip.c:351 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "" -#: archive-tar.c:266 archive-zip.c:369 +#: archive-tar.c:265 archive-zip.c:358 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "" -#: archive-tar.c:293 archive-zip.c:359 -#, c-format -msgid "cannot read %s" -msgstr "" - -#: archive-tar.c:465 +#: archive-tar.c:450 #, c-format msgid "unable to start '%s' filter" msgstr "" -#: archive-tar.c:468 +#: archive-tar.c:453 msgid "unable to redirect descriptor" msgstr "" -#: archive-tar.c:475 +#: archive-tar.c:460 #, c-format msgid "'%s' filter reported error" msgstr "" -#: archive-zip.c:319 +#: archive-zip.c:318 #, c-format msgid "path is not valid UTF-8: %s" msgstr "" -#: archive-zip.c:323 +#: archive-zip.c:322 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "" -#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246 +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 #, c-format msgid "deflate error (%d)" msgstr "" -#: archive-zip.c:615 +#: archive-zip.c:603 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "" @@ -1422,176 +1417,198 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "" + +#: 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 "" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:401 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "" -#: archive.c:407 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "" -#: archive.c:420 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "" -#: archive.c:432 +#: archive.c:485 msgid "current working directory is untracked" msgstr "" -#: archive.c:464 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "" + +#: archive.c:555 msgid "fmt" msgstr "" -#: archive.c:464 +#: archive.c:555 msgid "archive format" msgstr "" -#: archive.c:465 builtin/log.c:1674 +#: archive.c:556 builtin/log.c:1765 msgid "prefix" msgstr "" -#: archive.c:466 +#: archive.c:557 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208 -#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907 -#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 +#: 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:1207 builtin/fast-export.c:1209 +#: builtin/fast-export.c:1213 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:468 builtin/archive.c:90 +#: archive.c:559 +msgid "add untracked file to archive" +msgstr "" + +#: archive.c:562 builtin/archive.c:90 msgid "write the archive to this file" msgstr "" -#: archive.c:470 +#: archive.c:564 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:471 +#: archive.c:565 msgid "report archived files on stderr" msgstr "" -#: archive.c:472 -msgid "store only" -msgstr "" - -#: archive.c:473 -msgid "compress faster" -msgstr "" - -#: archive.c:481 -msgid "compress better" +#: archive.c:567 +msgid "set compression level" msgstr "" -#: archive.c:484 +#: archive.c:570 msgid "list supported archive formats" msgstr "" -#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 +#: 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:487 builtin/archive.c:92 +#: archive.c:573 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:488 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:489 builtin/archive.c:94 +#: archive.c:575 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:496 +#: archive.c:582 msgid "Unexpected option --remote" msgstr "" -#: archive.c:498 +#: archive.c:584 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:500 +#: archive.c:586 msgid "Unexpected option --output" msgstr "" -#: archive.c:522 +#: archive.c:588 +msgid "Options --add-file and --remote cannot be used together" +msgstr "" + +#: archive.c:610 #, c-format msgid "Unknown archive format '%s'" msgstr "" -#: archive.c:529 +#: 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:468 +#: bisect.c:489 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" -#: bisect.c:678 +#: bisect.c:699 #, c-format msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:745 +#: bisect.c:766 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:770 +#: 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:775 +#: 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:780 +#: 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:788 +#: bisect.c:809 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1599,7 +1616,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:801 +#: bisect.c:822 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1607,43 +1624,43 @@ msgid "" "We continue anyway." msgstr "" -#: bisect.c:840 +#: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:890 +#: bisect.c:911 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:920 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:966 builtin/merge.c:151 +#: bisect.c:987 builtin/merge.c:152 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:997 +#: bisect.c:1027 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:1019 +#: bisect.c:1057 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:1028 +#: bisect.c:1066 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:1057 +#: bisect.c:1095 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1653,7 +1670,7 @@ msgstr[1] "" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: 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" @@ -1672,11 +1689,11 @@ msgstr "" msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 -#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405 -#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235 -#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363 -#: builtin/shortlog.c:192 +#: 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 "" @@ -1819,88 +1836,104 @@ msgstr "" msgid "HEAD of working tree %s is not updated" msgstr "" -#: bundle.c:47 +#: bundle.c:41 #, c-format -msgid "'%s' does not look like a v2 bundle file" +msgid "unrecognized bundle hash algorithm: %s" msgstr "" -#: bundle.c:69 -msgid "unknown hash algorithm length" +#: bundle.c:45 +#, c-format +msgid "unknown capability '%s'" msgstr "" -#: bundle.c:84 +#: bundle.c:71 +#, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "" + +#: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034 +#: 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'" msgstr "" -#: bundle.c:163 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:166 +#: bundle.c:192 msgid "need a repository to verify a bundle" msgstr "" -#: bundle.c:217 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:224 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "" -#: bundle.c:226 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:293 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "" -#: bundle.c:300 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:311 +#: bundle.c:337 msgid "pack-objects died" msgstr "" -#: bundle.c:353 +#: bundle.c:379 msgid "rev-list died" msgstr "" -#: bundle.c:402 +#: bundle.c:428 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 +#: bundle.c:498 +#, c-format +msgid "unsupported bundle version %d" +msgstr "" + +#: bundle.c:500 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "" + +#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:489 +#: bundle.c:530 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:499 +#: bundle.c:540 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:524 +#: bundle.c:565 msgid "index-pack died" msgstr "" @@ -1909,267 +1942,254 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit-graph.c:238 +#: commit-graph.c:188 midx.c:47 +msgid "invalid hash version" +msgstr "" + +#: commit-graph.c:246 msgid "commit-graph file is too small" msgstr "" -#: commit-graph.c:303 +#: commit-graph.c:311 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "" -#: commit-graph.c:310 +#: commit-graph.c:318 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "" -#: commit-graph.c:317 +#: commit-graph.c:325 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" -#: commit-graph.c:339 -msgid "commit-graph chunk lookup table entry missing; file may be incomplete" +#: commit-graph.c:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" msgstr "" -#: commit-graph.c:349 +#: commit-graph.c:361 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "" -#: commit-graph.c:417 +#: commit-graph.c:433 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "" -#: commit-graph.c:491 +#: commit-graph.c:499 msgid "commit-graph has no base graphs chunk" msgstr "" -#: commit-graph.c:501 +#: commit-graph.c:509 msgid "commit-graph chain does not match" msgstr "" -#: commit-graph.c:549 +#: commit-graph.c:557 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" -#: commit-graph.c:573 +#: commit-graph.c:581 msgid "unable to find all commit-graph files" msgstr "" -#: commit-graph.c:706 commit-graph.c:770 +#: commit-graph.c:721 commit-graph.c:785 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" -#: commit-graph.c:727 +#: commit-graph.c:742 #, c-format msgid "could not find commit %s" msgstr "" -#: commit-graph.c:1009 builtin/am.c:1292 +#: commit-graph.c:1036 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "" -#: commit-graph.c:1157 -msgid "Writing changed paths Bloom filters index" -msgstr "" - -#: commit-graph.c:1182 -msgid "Writing changed paths Bloom filters data" -msgstr "" - -#: commit-graph.c:1221 builtin/pack-objects.c:2832 +#: commit-graph.c:1252 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:1257 +#: commit-graph.c:1283 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1274 +#: commit-graph.c:1300 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1294 +#: commit-graph.c:1320 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1313 +#: commit-graph.c:1339 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1367 +#: commit-graph.c:1406 msgid "Computing commit changed paths Bloom filters" msgstr "" -#: commit-graph.c:1423 +#: commit-graph.c:1483 msgid "Collecting referenced commits" msgstr "" -#: commit-graph.c:1447 +#: commit-graph.c:1508 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1460 +#: commit-graph.c:1521 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:1464 +#: commit-graph.c:1525 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:1503 +#: commit-graph.c:1562 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:1518 -msgid "Counting distinct commits in commit graph" -msgstr "" - -#: commit-graph.c:1550 +#: commit-graph.c:1580 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1599 +#: commit-graph.c:1628 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1633 midx.c:812 +#: commit-graph.c:1670 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: commit-graph.c:1646 +#: commit-graph.c:1683 msgid "unable to create temporary graph layer" msgstr "" -#: commit-graph.c:1651 +#: commit-graph.c:1688 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "" -#: commit-graph.c:1728 +#: commit-graph.c:1758 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1773 +#: commit-graph.c:1803 msgid "unable to open commit-graph chain file" msgstr "" -#: commit-graph.c:1789 +#: commit-graph.c:1819 msgid "failed to rename base commit-graph file" msgstr "" -#: commit-graph.c:1809 +#: commit-graph.c:1839 msgid "failed to rename temporary commit-graph file" msgstr "" -#: commit-graph.c:1935 +#: commit-graph.c:1965 msgid "Scanning merged commits" msgstr "" -#: commit-graph.c:1946 -#, c-format -msgid "unexpected duplicate commit id %s" -msgstr "" - -#: commit-graph.c:1969 +#: commit-graph.c:2009 msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:2156 -#, c-format -msgid "the commit graph format cannot write %d commits" +#: commit-graph.c:2115 +msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" -#: commit-graph.c:2167 +#: commit-graph.c:2214 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:2260 +#: commit-graph.c:2307 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:2270 +#: commit-graph.c:2317 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:2280 commit-graph.c:2295 +#: commit-graph.c:2327 commit-graph.c:2342 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:2287 +#: commit-graph.c:2334 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:2305 +#: commit-graph.c:2352 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2320 +#: commit-graph.c:2367 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2327 +#: commit-graph.c:2374 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2337 +#: commit-graph.c:2384 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2346 +#: commit-graph.c:2393 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2360 +#: commit-graph.c:2407 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2365 +#: commit-graph.c:2412 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2369 +#: commit-graph.c:2416 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2385 +#: commit-graph.c:2432 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" -#: commit-graph.c:2391 +#: commit-graph.c:2438 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" -#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2013 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 "" @@ -2255,7 +2275,7 @@ msgstr "" msgid "key does not contain variable name: %s" msgstr "" -#: config.c:408 sequencer.c:2456 +#: config.c:408 sequencer.c:2580 #, c-format msgid "invalid key: %s" msgstr "" @@ -2391,7 +2411,7 @@ msgstr "" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1533 builtin/pack-objects.c:3617 +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "" @@ -2420,101 +2440,101 @@ msgstr "" msgid "unable to parse command-line config" msgstr "" -#: config.c:2113 +#: config.c:2122 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2283 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2328 +#: config.c:2341 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2374 +#: config.c:2387 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2376 +#: config.c:2389 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2457 +#: config.c:2473 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2489 +#: config.c:2505 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2518 +#: config.c:2534 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2770 config.c:3094 +#: config.c:2786 config.c:3112 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2781 +#: config.c:2797 #, c-format msgid "opening %s" msgstr "" -#: config.c:2816 builtin/config.c:344 +#: config.c:2834 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:2841 +#: config.c:2859 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:2854 config.c:3107 +#: config.c:2872 config.c:3125 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2865 +#: config.c:2883 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:2874 config.c:3112 +#: config.c:2892 config.c:3130 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:2959 config.c:3209 +#: config.c:2977 config.c:3227 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:2993 +#: config.c:3011 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: 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:3085 +#: config.c:3103 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3252 +#: config.c:3270 #, c-format msgid "missing value for '%s'" msgstr "" @@ -2675,23 +2695,23 @@ msgstr "" msgid "strange pathname '%s' blocked" msgstr "" -#: connect.c:1407 +#: connect.c:1408 msgid "unable to fork" msgstr "" -#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "" -#: connected.c:121 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:141 +#: connected.c:144 msgid "failed write to rev-list" msgstr "" -#: connected.c:148 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "" @@ -2758,56 +2778,56 @@ msgstr "" msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" -#: convert.c:668 +#: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "" -#: convert.c:688 +#: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "" -#: convert.c:695 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "" -#: convert.c:730 convert.c:733 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "" -#: convert.c:736 convert.c:791 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "" -#: convert.c:840 +#: convert.c:837 msgid "unexpected filter type" msgstr "" -#: convert.c:851 +#: convert.c:848 msgid "path name too long for external filter" msgstr "" -#: convert.c:943 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1243 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" msgstr "" -#: convert.c:1431 convert.c:1465 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "" -#: convert.c:1511 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "" @@ -2825,17 +2845,17 @@ msgstr "" msgid "refusing to work with credential missing protocol field" msgstr "" -#: credential.c:396 +#: credential.c:394 #, c-format msgid "url contains a newline in its %s component: %s" msgstr "" -#: credential.c:440 +#: credential.c:438 #, c-format msgid "url has no scheme: %s" msgstr "" -#: credential.c:513 +#: credential.c:511 #, c-format msgid "credential url cannot be parsed: %s" msgstr "" @@ -2932,6 +2952,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 "" @@ -2983,523 +3023,532 @@ msgid "" "%s" msgstr "" -#: diff.c:4243 +#: diff.c:4276 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4589 +#: diff.c:4625 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4592 +#: diff.c:4628 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4670 +#: diff.c:4707 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4718 +#: diff.c:4755 #, c-format msgid "invalid --stat value: %s" msgstr "" -#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250 -#: parse-options.c:197 parse-options.c:201 +#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "" -#: diff.c:4755 +#: diff.c:4792 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4840 +#: diff.c:4877 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4864 +#: diff.c:4901 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4878 +#: diff.c:4915 #, c-format msgid "unable to resolve '%s'" msgstr "" -#: diff.c:4928 diff.c:4934 +#: diff.c:4965 diff.c:4971 #, c-format msgid "%s expects <n>/<m> form" msgstr "" -#: diff.c:4946 +#: diff.c:4983 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:4967 +#: diff.c:5004 #, c-format msgid "bad --color-moved argument: %s" msgstr "" -#: diff.c:4986 +#: diff.c:5023 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: diff.c:5026 +#: diff.c:5063 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5062 diff.c:5082 +#: diff.c:5099 diff.c:5119 #, c-format msgid "invalid argument to %s" msgstr "" -#: diff.c:5219 +#: diff.c:5223 +#, c-format +msgid "invalid regex given to -I: '%s'" +msgstr "" + +#: diff.c:5272 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5275 +#: diff.c:5328 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5298 +#: diff.c:5351 msgid "Diff output format options" msgstr "" -#: diff.c:5300 diff.c:5306 +#: diff.c:5353 diff.c:5359 msgid "generate patch" msgstr "" -#: diff.c:5303 builtin/log.c:177 +#: diff.c:5356 builtin/log.c:178 msgid "suppress diff output" msgstr "" -#: diff.c:5308 diff.c:5422 diff.c:5429 +#: diff.c:5361 diff.c:5475 diff.c:5482 msgid "<n>" msgstr "" -#: diff.c:5309 diff.c:5312 +#: diff.c:5362 diff.c:5365 msgid "generate diffs with <n> lines context" msgstr "" -#: diff.c:5314 +#: diff.c:5367 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5317 +#: diff.c:5370 msgid "synonym for '-p --raw'" msgstr "" -#: diff.c:5321 +#: diff.c:5374 msgid "synonym for '-p --stat'" msgstr "" -#: diff.c:5325 +#: diff.c:5378 msgid "machine friendly --stat" msgstr "" -#: diff.c:5328 +#: diff.c:5381 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5330 diff.c:5338 +#: diff.c:5383 diff.c:5391 msgid "<param1,param2>..." msgstr "" -#: diff.c:5331 +#: diff.c:5384 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5335 +#: diff.c:5388 msgid "synonym for --dirstat=cumulative" msgstr "" -#: diff.c:5339 +#: diff.c:5392 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5343 +#: diff.c:5396 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5346 +#: diff.c:5399 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5349 +#: diff.c:5402 msgid "show only names of changed files" msgstr "" -#: diff.c:5352 +#: diff.c:5405 msgid "show only names and status of changed files" msgstr "" -#: diff.c:5354 +#: diff.c:5407 msgid "<width>[,<name-width>[,<count>]]" msgstr "" -#: diff.c:5355 +#: diff.c:5408 msgid "generate diffstat" msgstr "" -#: diff.c:5357 diff.c:5360 diff.c:5363 +#: diff.c:5410 diff.c:5413 diff.c:5416 msgid "<width>" msgstr "" -#: diff.c:5358 +#: diff.c:5411 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5361 +#: diff.c:5414 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5364 +#: diff.c:5417 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5366 +#: diff.c:5419 msgid "<count>" msgstr "" -#: diff.c:5367 +#: diff.c:5420 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5370 +#: diff.c:5423 msgid "generate compact summary in diffstat" msgstr "" -#: diff.c:5373 +#: diff.c:5426 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5376 +#: diff.c:5429 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5378 +#: diff.c:5431 msgid "show colored diff" msgstr "" -#: diff.c:5379 +#: diff.c:5432 msgid "<kind>" msgstr "" -#: diff.c:5380 +#: diff.c:5433 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5383 +#: diff.c:5436 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498 +#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554 msgid "<prefix>" msgstr "" -#: diff.c:5387 +#: diff.c:5440 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5390 +#: diff.c:5443 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5393 +#: diff.c:5446 msgid "prepend an additional prefix to every line of output" msgstr "" -#: diff.c:5396 +#: diff.c:5449 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5399 +#: diff.c:5452 msgid "show context between diff hunks up to the specified number of lines" msgstr "" -#: diff.c:5403 diff.c:5408 diff.c:5413 +#: diff.c:5456 diff.c:5461 diff.c:5466 msgid "<char>" msgstr "" -#: diff.c:5404 +#: diff.c:5457 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5409 +#: diff.c:5462 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5414 +#: diff.c:5467 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5417 +#: diff.c:5470 msgid "Diff rename options" msgstr "" -#: diff.c:5418 +#: diff.c:5471 msgid "<n>[/<m>]" msgstr "" -#: diff.c:5419 +#: diff.c:5472 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5423 +#: diff.c:5476 msgid "detect renames" msgstr "" -#: diff.c:5427 +#: diff.c:5480 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5430 +#: diff.c:5483 msgid "detect copies" msgstr "" -#: diff.c:5434 +#: diff.c:5487 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5436 +#: diff.c:5489 msgid "disable rename detection" msgstr "" -#: diff.c:5439 +#: diff.c:5492 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5441 +#: diff.c:5494 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5444 +#: diff.c:5497 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5446 +#: diff.c:5499 msgid "Diff algorithm options" msgstr "" -#: diff.c:5448 +#: diff.c:5501 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5451 +#: diff.c:5504 msgid "ignore whitespace when comparing lines" msgstr "" -#: diff.c:5454 +#: diff.c:5507 msgid "ignore changes in amount of whitespace" msgstr "" -#: diff.c:5457 +#: diff.c:5510 msgid "ignore changes in whitespace at EOL" msgstr "" -#: diff.c:5460 +#: diff.c:5513 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5463 +#: diff.c:5516 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5466 +#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588 +msgid "<regex>" +msgstr "" + +#: diff.c:5519 +msgid "ignore changes whose all lines match <regex>" +msgstr "" + +#: diff.c:5522 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5469 +#: diff.c:5525 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5473 +#: diff.c:5529 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5475 +#: diff.c:5531 msgid "<algorithm>" msgstr "" -#: diff.c:5476 +#: diff.c:5532 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5478 +#: diff.c:5534 msgid "<text>" msgstr "" -#: diff.c:5479 +#: diff.c:5535 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5481 diff.c:5490 diff.c:5493 +#: diff.c:5537 diff.c:5546 diff.c:5549 msgid "<mode>" msgstr "" -#: diff.c:5482 +#: diff.c:5538 msgid "show word diff, using <mode> to delimit changed words" msgstr "" -#: diff.c:5484 diff.c:5487 diff.c:5532 -msgid "<regex>" -msgstr "" - -#: diff.c:5485 +#: diff.c:5541 msgid "use <regex> to decide what a word is" msgstr "" -#: diff.c:5488 +#: diff.c:5544 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" -#: diff.c:5491 +#: diff.c:5547 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5494 +#: diff.c:5550 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5497 +#: diff.c:5553 msgid "Other diff options" msgstr "" -#: diff.c:5499 +#: diff.c:5555 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5503 +#: diff.c:5559 msgid "treat all files as text" msgstr "" -#: diff.c:5505 +#: diff.c:5561 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5507 +#: diff.c:5563 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5509 +#: diff.c:5565 msgid "disable all output of the program" msgstr "" -#: diff.c:5511 +#: diff.c:5567 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5513 +#: diff.c:5569 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5515 +#: diff.c:5571 msgid "<when>" msgstr "" -#: diff.c:5516 +#: diff.c:5572 msgid "ignore changes to submodules in the diff generation" msgstr "" -#: diff.c:5519 +#: diff.c:5575 msgid "<format>" msgstr "" -#: diff.c:5520 +#: diff.c:5576 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5524 +#: diff.c:5580 msgid "hide 'git add -N' entries from the index" msgstr "" -#: diff.c:5527 +#: diff.c:5583 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5529 +#: diff.c:5585 msgid "<string>" msgstr "" -#: diff.c:5530 +#: diff.c:5586 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5533 +#: diff.c:5589 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5536 +#: diff.c:5592 msgid "show all changes in the changeset with -S or -G" msgstr "" -#: diff.c:5539 +#: diff.c:5595 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" -#: diff.c:5542 +#: diff.c:5598 msgid "control the order in which files appear in the output" msgstr "" -#: diff.c:5543 +#: diff.c:5599 msgid "<object-id>" msgstr "" -#: diff.c:5544 +#: diff.c:5600 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5546 +#: diff.c:5602 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5547 +#: diff.c:5603 msgid "select files by diff type" msgstr "" -#: diff.c:5549 +#: diff.c:5605 msgid "<file>" msgstr "" -#: diff.c:5550 +#: diff.c:5606 msgid "Output to a specific file" msgstr "" -#: diff.c:6205 +#: diff.c:6263 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:6208 +#: diff.c:6266 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:6211 +#: diff.c:6269 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3514,59 +3563,59 @@ msgstr "" msgid "Performing inexact rename detection" msgstr "" -#: dir.c:573 +#: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" -#: dir.c:713 dir.c:742 dir.c:755 +#: dir.c:718 dir.c:747 dir.c:760 #, c-format msgid "unrecognized pattern: '%s'" msgstr "" -#: dir.c:772 dir.c:786 +#: dir.c:777 dir.c:791 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "" -#: dir.c:804 +#: dir.c:809 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" -#: dir.c:814 +#: dir.c:819 msgid "disabling cone pattern matching" msgstr "" -#: dir.c:1191 +#: dir.c:1198 #, c-format msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:2296 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2596 +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2720 +#: dir.c:2729 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3502 +#: dir.c:3520 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3547 dir.c:3552 +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3581 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" @@ -3600,245 +3649,245 @@ msgstr "" msgid "too many args to run %s" msgstr "" -#: fetch-pack.c:152 +#: fetch-pack.c:177 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:155 +#: fetch-pack.c:180 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" -#: fetch-pack.c:166 +#: fetch-pack.c:191 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" -#: fetch-pack.c:186 +#: fetch-pack.c:211 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:197 +#: fetch-pack.c:222 msgid "unable to write to remote" msgstr "" -#: fetch-pack.c:259 +#: fetch-pack.c:283 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:358 fetch-pack.c:1408 +#: fetch-pack.c:378 fetch-pack.c:1406 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:364 fetch-pack.c:1414 +#: fetch-pack.c:384 fetch-pack.c:1412 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:366 fetch-pack.c:1416 +#: fetch-pack.c:386 fetch-pack.c:1414 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:369 fetch-pack.c:1419 +#: fetch-pack.c:389 fetch-pack.c:1417 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:371 fetch-pack.c:1421 +#: fetch-pack.c:391 fetch-pack.c:1419 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:374 fetch-pack.c:1425 +#: fetch-pack.c:394 fetch-pack.c:1423 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:416 +#: fetch-pack.c:434 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:433 +#: fetch-pack.c:451 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:464 +#: fetch-pack.c:482 msgid "giving up" msgstr "" -#: fetch-pack.c:477 progress.c:336 +#: fetch-pack.c:495 progress.c:339 msgid "done" msgstr "" -#: fetch-pack.c:489 +#: fetch-pack.c:507 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:535 +#: fetch-pack.c:543 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:756 +#: fetch-pack.c:758 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:821 +#: fetch-pack.c:827 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:829 +#: fetch-pack.c:835 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:910 +#: fetch-pack.c:919 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:927 +#: fetch-pack.c:937 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:929 +#: fetch-pack.c:939 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:976 +#: fetch-pack.c:982 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996 -#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012 -#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028 -#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050 +#: 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:983 +#: fetch-pack.c:992 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:1043 +#: fetch-pack.c:1052 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:1048 +#: fetch-pack.c:1057 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:1052 +#: fetch-pack.c:1061 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1054 +#: fetch-pack.c:1063 msgid "Server does not support this repository's object format" msgstr "" -#: fetch-pack.c:1071 +#: fetch-pack.c:1076 msgid "no common commits" msgstr "" -#: fetch-pack.c:1083 fetch-pack.c:1639 +#: fetch-pack.c:1088 fetch-pack.c:1628 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1211 +#: fetch-pack.c:1214 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "" -#: fetch-pack.c:1215 +#: fetch-pack.c:1218 #, c-format msgid "the server does not support algorithm '%s'" msgstr "" -#: fetch-pack.c:1235 +#: fetch-pack.c:1238 msgid "Server does not support shallow requests" msgstr "" -#: fetch-pack.c:1242 +#: fetch-pack.c:1245 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:1286 +#: fetch-pack.c:1284 msgid "unable to write request to remote" msgstr "" -#: fetch-pack.c:1304 +#: fetch-pack.c:1302 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1310 +#: fetch-pack.c:1308 #, c-format msgid "expected '%s', received '%s'" msgstr "" -#: fetch-pack.c:1371 +#: fetch-pack.c:1369 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1376 +#: fetch-pack.c:1374 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1386 +#: fetch-pack.c:1384 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1388 +#: fetch-pack.c:1386 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1430 +#: fetch-pack.c:1428 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1477 +#: fetch-pack.c:1475 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" -#: fetch-pack.c:1482 +#: fetch-pack.c:1480 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" -#: fetch-pack.c:1487 +#: fetch-pack.c:1485 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1517 +#: fetch-pack.c:1515 msgid "git fetch-pack: expected response end packet" msgstr "" -#: fetch-pack.c:1921 +#: fetch-pack.c:1897 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1944 builtin/clone.c:692 +#: fetch-pack.c:1920 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "" -#: fetch-pack.c:1971 +#: fetch-pack.c:1947 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1974 +#: fetch-pack.c:1950 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" @@ -3861,24 +3910,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 "" @@ -3935,72 +3984,72 @@ msgstr "" msgid "Low-level Commands / Internal Helpers" msgstr "" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "" -#: help.c:363 git.c:99 +#: help.c:365 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "" -#: help.c:403 -msgid "The common Git guides are:" +#: help.c:405 +msgid "The Git concept guides are:" msgstr "" -#: help.c:427 +#: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "" -#: help.c:432 +#: help.c:434 msgid "External commands" msgstr "" -#: help.c:447 +#: help.c:449 msgid "Command aliases" msgstr "" -#: help.c:511 +#: 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:570 +#: 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:592 +#: help.c:613 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -#: help.c:597 +#: help.c:618 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:602 +#: help.c:623 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:610 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "" - -#: help.c:614 +#: help.c:635 msgid "" "\n" "The most similar command is" @@ -4010,16 +4059,16 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: help.c:654 +#: help.c:675 msgid "git version [<options>]" msgstr "" -#: help.c:709 +#: help.c:730 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:713 +#: help.c:734 msgid "" "\n" "Did you mean this?" @@ -4029,7 +4078,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -4044,66 +4101,66 @@ msgid "" "\n" msgstr "" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "" -#: ident.c:421 +#: ident.c:439 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:436 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "" -#: list-objects-filter-options.c:58 +#: list-objects-filter-options.c:81 msgid "expected 'tree:<depth>'" msgstr "" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:96 msgid "sparse:path filters support has been dropped" msgstr "" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:109 #, c-format msgid "invalid filter-spec '%s'" msgstr "" -#: list-objects-filter-options.c:102 +#: list-objects-filter-options.c:125 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "" -#: list-objects-filter-options.c:144 +#: list-objects-filter-options.c:167 msgid "expected something after combine:" msgstr "" -#: list-objects-filter-options.c:226 +#: list-objects-filter-options.c:249 msgid "multiple filter-specs cannot be combined" msgstr "" -#: list-objects-filter-options.c:330 +#: list-objects-filter-options.c:361 msgid "unable to upgrade repository format to support partial clone" msgstr "" @@ -4153,6 +4210,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 "" @@ -4429,7 +4498,7 @@ msgstr "" msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:3101 git-submodule.sh:959 +#: merge-recursive.c:3101 msgid "submodule" msgstr "" @@ -4499,43 +4568,32 @@ msgstr "" msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3436 -msgid "Already up to date!" -msgstr "" - #: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3549 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "" -#: merge-recursive.c:3562 +#: merge-recursive.c:3563 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3612 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:3671 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" - -#: merge-recursive.c:3768 +#: merge-recursive.c:3769 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885 +#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 msgid "Unable to write index." msgstr "" @@ -4543,170 +4601,170 @@ msgstr "" msgid "failed to read the cache" msgstr "" -#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912 -#: builtin/checkout.c:559 builtin/checkout.c:822 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:68 +#: midx.c:80 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:84 +#: midx.c:96 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:89 +#: midx.c:101 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" -#: midx.c:94 +#: midx.c:106 #, c-format -msgid "hash version %u does not match" +msgid "multi-pack-index hash version %u does not match version %u" msgstr "" -#: midx.c:108 +#: midx.c:123 msgid "invalid chunk offset (too large)" msgstr "" -#: midx.c:132 +#: midx.c:147 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" -#: midx.c:145 +#: midx.c:160 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:147 +#: midx.c:162 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:149 +#: midx.c:164 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:151 +#: midx.c:166 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:165 +#: midx.c:180 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:208 +#: midx.c:223 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:258 +#: midx.c:273 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -#: midx.c:286 -msgid "error preparing packfile from multi-pack-index" -msgstr "" - -#: midx.c:470 +#: midx.c:480 #, c-format msgid "failed to add packfile '%s'" msgstr "" -#: midx.c:476 +#: midx.c:486 #, c-format msgid "failed to open pack-index '%s'" msgstr "" -#: midx.c:536 +#: midx.c:546 #, c-format msgid "failed to locate object %d in packfile" msgstr "" -#: midx.c:840 +#: midx.c:846 msgid "Adding packfiles to multi-pack-index" msgstr "" -#: midx.c:873 +#: midx.c:879 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:925 +#: midx.c:931 msgid "no pack files to index." msgstr "" -#: midx.c:977 +#: midx.c:982 msgid "Writing chunks to multi-pack-index" msgstr "" -#: midx.c:1056 +#: midx.c:1060 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" -#: midx.c:1112 +#: midx.c:1116 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "" + +#: midx.c:1124 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1127 +#: midx.c:1139 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -#: midx.c:1132 +#: midx.c:1144 msgid "the midx contains no oid" msgstr "" -#: midx.c:1141 +#: midx.c:1153 msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1150 +#: midx.c:1162 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1170 +#: midx.c:1182 msgid "Sorting objects by packfile" msgstr "" -#: midx.c:1177 +#: midx.c:1189 msgid "Verifying object offsets" msgstr "" -#: midx.c:1193 +#: midx.c:1205 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" -#: midx.c:1199 +#: midx.c:1211 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" -#: midx.c:1208 +#: midx.c:1220 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" -#: midx.c:1233 +#: midx.c:1245 msgid "Counting referenced objects" msgstr "" -#: midx.c:1243 +#: midx.c:1255 msgid "Finding and deleting unreferenced packfiles" msgstr "" -#: midx.c:1433 +#: midx.c:1446 msgid "could not start pack-objects" msgstr "" -#: midx.c:1452 +#: midx.c:1466 msgid "could not finish pack-objects" msgstr "" @@ -4786,21 +4844,21 @@ msgstr "" msgid "hash mismatch %s" msgstr "" -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 #, c-format msgid "unable to get size of %s" msgstr "" -#: packfile.c:630 +#: packfile.c:615 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1900 +#: packfile.c:1907 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1904 +#: packfile.c:1911 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -4820,7 +4878,7 @@ msgstr "" msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "" -#: parse-options-cb.c:130 parse-options-cb.c:147 +#: parse-options-cb.c:132 parse-options-cb.c:149 #, c-format msgid "malformed object name '%s'" msgstr "" @@ -4865,31 +4923,31 @@ msgstr "" msgid "did you mean `--%s` (with two dashes)?" msgstr "" -#: parse-options.c:663 parse-options.c:963 +#: parse-options.c:666 parse-options.c:971 #, c-format msgid "alias of --%s" msgstr "" -#: parse-options.c:854 +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "" -#: parse-options.c:856 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "" -#: parse-options.c:858 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "" -#: parse-options.c:882 +#: parse-options.c:890 msgid "..." msgstr "" -#: parse-options.c:901 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "" @@ -4897,17 +4955,17 @@ msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:907 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:910 +#: parse-options.c:918 #, c-format msgid " %s" msgstr "" -#: parse-options.c:949 +#: parse-options.c:957 msgid "-NUM" msgstr "" @@ -5042,7 +5100,7 @@ msgstr "" msgid "protocol error: bad line length %d" msgstr "" -#: pkt-line.c:373 +#: pkt-line.c:373 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "" @@ -5056,15 +5114,23 @@ msgstr "" msgid "unable to create threaded lstat: %s" msgstr "" -#: pretty.c:982 +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "" -#: promisor-remote.c:23 -msgid "Remote with no URL" +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" msgstr "" -#: promisor-remote.c:58 +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "" + +#: promisor-remote.c:53 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "" @@ -5081,7 +5147,7 @@ msgstr "" msgid "could not read `log` output" msgstr "" -#: range-diff.c:98 sequencer.c:5143 +#: range-diff.c:98 sequencer.c:5310 #, c-format msgid "could not parse commit '%s'" msgstr "" @@ -5098,205 +5164,205 @@ 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 "" -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "" -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" -#: read-cache.c:723 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "" -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "" -#: read-cache.c:1330 +#: read-cache.c:1318 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "" -#: read-cache.c:1536 +#: read-cache.c:1524 msgid "Refresh index" msgstr "" -#: read-cache.c:1651 +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1661 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1717 +#: read-cache.c:1705 #, c-format msgid "bad signature 0x%08x" msgstr "" -#: read-cache.c:1720 +#: read-cache.c:1708 #, c-format msgid "bad index version %d" msgstr "" -#: read-cache.c:1729 +#: read-cache.c:1717 msgid "bad index file sha1 signature" msgstr "" -#: read-cache.c:1759 +#: read-cache.c:1747 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1761 +#: read-cache.c:1749 #, c-format msgid "ignoring %.4s extension" msgstr "" -#: read-cache.c:1798 +#: read-cache.c:1786 #, c-format msgid "unknown index entry format 0x%08x" msgstr "" -#: read-cache.c:1814 +#: read-cache.c:1802 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1871 +#: read-cache.c:1859 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1874 +#: read-cache.c:1862 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "" -#: read-cache.c:1877 +#: read-cache.c:1865 #, c-format msgid "unordered stage entries for '%s'" msgstr "" -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 -#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290 +#: 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: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" msgstr "" -#: read-cache.c:2124 +#: read-cache.c:2115 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2137 +#: read-cache.c:2128 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2170 +#: read-cache.c:2161 #, c-format msgid "%s: index file open failed" msgstr "" -#: read-cache.c:2174 +#: read-cache.c:2165 #, c-format msgid "%s: cannot stat the open index" msgstr "" -#: read-cache.c:2178 +#: read-cache.c:2169 #, c-format msgid "%s: index file smaller than expected" msgstr "" -#: read-cache.c:2182 +#: read-cache.c:2173 #, c-format msgid "%s: unable to map index file" msgstr "" -#: read-cache.c:2224 +#: read-cache.c:2215 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2251 +#: read-cache.c:2242 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2283 +#: read-cache.c:2274 #, c-format msgid "could not freshen shared index '%s'" msgstr "" -#: read-cache.c:2330 +#: read-cache.c:2321 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130 +#: 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:3129 sequencer.c:2355 sequencer.c:4066 +#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:3142 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:3154 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "" -#: read-cache.c:3179 +#: read-cache.c:3170 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" -#: read-cache.c:3328 +#: read-cache.c:3319 #, c-format msgid "%s: cannot drop to stage #0" msgstr "" @@ -5343,19 +5409,19 @@ msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "" msgstr[1] "" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" msgstr "" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5364,21 +5430,21 @@ msgid "" "\n" msgstr "" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" msgstr "" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463 -#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258 +#: 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:190 builtin/rebase.c:216 -#: builtin/rebase.c:240 +#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228 +#: builtin/rebase.c:252 #, c-format msgid "could not write '%s'." msgstr "" @@ -5401,14 +5467,14 @@ msgid "" "\n" msgstr "" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274 -#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227 -#: builtin/rebase.c:252 +#: 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 "" -#: ref-filter.c:42 wt-status.c:1977 +#: ref-filter.c:42 wt-status.c:1973 msgid "gone" msgstr "" @@ -5427,237 +5493,232 @@ msgstr "" msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:165 +#: ref-filter.c:169 #, c-format msgid "expected format: %%(color:<color>)" msgstr "" -#: ref-filter.c:167 +#: ref-filter.c:171 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:189 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: ref-filter.c:193 +#: ref-filter.c:197 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:195 +#: ref-filter.c:199 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: ref-filter.c:250 +#: ref-filter.c:254 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "" -#: ref-filter.c:272 +#: ref-filter.c:276 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "" -#: ref-filter.c:280 +#: ref-filter.c:284 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "" -#: ref-filter.c:292 +#: ref-filter.c:296 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:301 +#: ref-filter.c:309 #, c-format -msgid "%%(subject) does not take arguments" +msgid "unrecognized %%(subject) argument: %s" msgstr "" -#: ref-filter.c:323 +#: ref-filter.c:330 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "" -#: ref-filter.c:352 +#: ref-filter.c:363 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:354 +#: ref-filter.c:365 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:369 +#: ref-filter.c:380 +#, c-format +msgid "positive value expected '%s' in %%(%s)" +msgstr "" + +#: ref-filter.c:384 #, c-format -msgid "positive value expected objectname:short=%s" +msgid "unrecognized argument '%s' in %%(%s)" msgstr "" -#: ref-filter.c:373 +#: ref-filter.c:398 #, c-format -msgid "unrecognized %%(objectname) argument: %s" +msgid "unrecognized email option: %s" msgstr "" -#: ref-filter.c:403 +#: ref-filter.c:428 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "" -#: ref-filter.c:415 +#: ref-filter.c:440 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:422 +#: ref-filter.c:447 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:431 +#: ref-filter.c:456 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:439 +#: ref-filter.c:464 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:457 +#: ref-filter.c:482 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:559 +#: ref-filter.c:584 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:586 +#: ref-filter.c:611 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:590 +#: ref-filter.c:615 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" -#: ref-filter.c:714 +#: ref-filter.c:739 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:777 +#: ref-filter.c:802 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:779 +#: ref-filter.c:804 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:781 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:809 +#: ref-filter.c:834 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:811 +#: ref-filter.c:836 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:813 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:828 +#: ref-filter.c:853 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:885 +#: ref-filter.c:910 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1486 +#: ref-filter.c:1549 #, c-format msgid "no branch, rebasing %s" msgstr "" -#: ref-filter.c:1489 +#: ref-filter.c:1552 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "" -#: ref-filter.c:1492 +#: ref-filter.c:1555 #, c-format msgid "no branch, bisect started on %s" msgstr "" -#: ref-filter.c:1502 +#: ref-filter.c:1565 msgid "no branch" msgstr "" -#: ref-filter.c:1538 ref-filter.c:1747 +#: ref-filter.c:1599 ref-filter.c:1808 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1548 +#: ref-filter.c:1609 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:2001 +#: ref-filter.c:2062 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:2090 +#: ref-filter.c:2151 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:2095 refs.c:657 +#: ref-filter.c:2156 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:2395 +#: ref-filter.c:2472 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2495 -#, c-format -msgid "option `%s' is incompatible with --merged" -msgstr "" - -#: ref-filter.c:2498 -#, c-format -msgid "option `%s' is incompatible with --no-merged" -msgstr "" - -#: ref-filter.c:2508 +#: ref-filter.c:2571 #, c-format msgid "malformed object name %s" msgstr "" -#: ref-filter.c:2513 +#: ref-filter.c:2576 #, c-format msgid "option `%s' must point to a commit" msgstr "" @@ -5667,172 +5728,149 @@ msgstr "" msgid "%s does not point to a valid object!" msgstr "" -#: refs.c:572 -#, c-format -msgid "could not retrieve `%s`" -msgstr "" - -#: refs.c:579 +#: refs.c:566 #, c-format -msgid "invalid branch name: %s = %s" -msgstr "" - -#: refs.c:655 -#, c-format -msgid "ignoring dangling symref %s" -msgstr "" - -#: refs.c:792 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "" - -#: refs.c:802 refs.c:853 -#, c-format -msgid "could not read ref '%s'" -msgstr "" - -#: refs.c:808 -#, c-format -msgid "ref '%s' already exists" -msgstr "" - -#: refs.c:813 -#, c-format -msgid "unexpected object ID when writing '%s'" +msgid "" +"Using '%s' as the name for the initial branch. This default branch name\n" +"is subject to change. To configure the initial branch name to use in all\n" +"of your new repositories, which will suppress this warning, call:\n" +"\n" +"\tgit config --global init.defaultBranch <name>\n" +"\n" +"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n" +"'development'. The just-created branch can be renamed via this command:\n" +"\n" +"\tgit branch -m <name>\n" msgstr "" -#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925 -#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168 -#: wrapper.c:628 +#: refs.c:588 #, c-format -msgid "could not write to '%s'" +msgid "could not retrieve `%s`" msgstr "" -#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719 -#: builtin/rebase.c:852 +#: refs.c:598 #, c-format -msgid "could not open '%s' for writing" +msgid "invalid branch name: %s = %s" msgstr "" -#: refs.c:855 +#: refs.c:674 #, c-format -msgid "unexpected object ID when deleting '%s'" +msgid "ignoring dangling symref %s" msgstr "" -#: refs.c:986 +#: refs.c:911 #, c-format msgid "log for ref %s has gap after %s" msgstr "" -#: refs.c:992 +#: refs.c:917 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "" -#: refs.c:1051 +#: refs.c:976 #, c-format msgid "log for %s is empty" msgstr "" -#: refs.c:1143 +#: refs.c:1068 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "" -#: refs.c:1219 +#: refs.c:1139 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "" -#: refs.c:2011 +#: refs.c:1963 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "" -#: refs.c:2098 +#: refs.c:2043 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs.c:2109 +#: refs.c:2054 msgid "ref updates aborted by hook" msgstr "" -#: refs.c:2209 refs.c:2239 +#: refs.c:2154 refs.c:2184 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "" -#: refs.c:2215 refs.c:2250 +#: refs.c:2160 refs.c:2195 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "" -#: refs/files-backend.c:1233 +#: refs/files-backend.c:1228 #, c-format msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 #, c-format msgid "could not delete references: %s" msgstr "" -#: refspec.c:137 +#: refspec.c:170 #, c-format msgid "invalid refspec '%s'" msgstr "" -#: remote.c:355 +#: remote.c:351 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" -#: remote.c:403 +#: remote.c:399 msgid "more than one receivepack given, using the first" msgstr "" -#: remote.c:411 +#: remote.c:407 msgid "more than one uploadpack given, using the first" msgstr "" -#: remote.c:594 +#: remote.c:590 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:598 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:602 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:670 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "" -#: remote.c:680 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "" -#: remote.c:986 +#: remote.c:1073 #, c-format msgid "src refspec %s does not match any" msgstr "" -#: remote.c:991 +#: remote.c:1078 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5841,7 +5879,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1006 +#: remote.c:1093 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5855,7 +5893,7 @@ msgid "" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -#: remote.c:1026 +#: remote.c:1113 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5863,7 +5901,7 @@ msgid "" "'%s:refs/heads/%s'?" msgstr "" -#: remote.c:1031 +#: remote.c:1118 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5871,7 +5909,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1036 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5879,7 +5917,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1041 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5887,114 +5925,114 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1077 +#: remote.c:1164 #, c-format msgid "%s cannot be resolved to branch" msgstr "" -#: remote.c:1088 +#: remote.c:1175 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "" -#: remote.c:1100 +#: remote.c:1187 #, c-format msgid "dst refspec %s matches more than one" msgstr "" -#: remote.c:1107 +#: remote.c:1194 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1610 remote.c:1711 +#: remote.c:1714 remote.c:1815 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1619 +#: remote.c:1723 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1622 +#: remote.c:1726 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1628 +#: remote.c:1732 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1643 +#: remote.c:1747 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1655 +#: remote.c:1759 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1665 +#: remote.c:1769 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1678 +#: remote.c:1782 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1700 +#: remote.c:1804 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:1826 +#: remote.c:1933 #, c-format msgid "couldn't find remote ref %s" msgstr "" -#: remote.c:1839 +#: remote.c:1946 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2002 +#: remote.c:2109 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2006 +#: remote.c:2113 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2009 +#: remote.c:2116 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2013 +#: remote.c:2120 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "" -#: remote.c:2016 +#: remote.c:2123 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2020 +#: 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:2026 +#: remote.c:2133 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2029 +#: remote.c:2136 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6002,11 +6040,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2037 +#: remote.c:2144 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2040 +#: remote.c:2147 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6017,11 +6055,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2050 +#: remote.c:2157 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: remote.c:2241 +#: remote.c:2349 #, c-format msgid "cannot parse expected object name '%s'" msgstr "" @@ -6041,11 +6079,6 @@ msgstr "" msgid "replace depth too high for object %s" msgstr "" -#: repository.c:94 builtin/init-db.c:188 -#, c-format -msgid "The hash algorithm %s is not supported in this build." -msgstr "" - #: rerere.c:217 rerere.c:226 rerere.c:229 msgid "corrupt MERGE_RR" msgstr "" @@ -6104,8 +6137,8 @@ msgstr "" msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1891 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 +#: 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'" msgstr "" @@ -6143,166 +6176,171 @@ msgstr "" msgid "could not determine HEAD revision" msgstr "" -#: reset.c:70 reset.c:76 sequencer.c:3318 +#: reset.c:70 reset.c:76 sequencer.c:3460 #, c-format msgid "failed to find tree of %s" msgstr "" -#: revision.c:2661 -msgid "your current branch appears to be broken" +#: revision.c:2336 +msgid "--unpacked=<packfile> no longer supported" msgstr "" -#: revision.c:2664 +#: revision.c:2356 #, c-format -msgid "your current branch '%s' does not have any commits yet" +msgid "unknown value for --diff-merges: %s" +msgstr "" + +#: revision.c:2694 +msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2873 -msgid "--first-parent is incompatible with --bisect" +#: revision.c:2697 +#, c-format +msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2877 +#: 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:1269 +#: run-command.c:1271 #, c-format msgid "cannot create async thread: %s" msgstr "" -#: run-command.c:1333 +#: 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:308 +#: send-pack.c:374 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:394 +#: send-pack.c:467 msgid "the receiving end does not support this repository's hash algorithm" msgstr "" -#: send-pack.c:403 +#: send-pack.c:476 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:405 +#: send-pack.c:478 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:417 +#: send-pack.c:490 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:422 +#: send-pack.c:495 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:192 +#: sequencer.c:195 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:297 +#: sequencer.c:323 #, c-format msgid "could not delete '%s'" msgstr "" -#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 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:326 +#: sequencer.c:353 msgid "revert" msgstr "" -#: sequencer.c:328 +#: sequencer.c:355 msgid "cherry-pick" msgstr "" -#: sequencer.c:330 +#: sequencer.c:357 msgid "rebase" msgstr "" -#: sequencer.c:332 +#: sequencer.c:359 #, c-format msgid "unknown action: %d" msgstr "" -#: sequencer.c:390 +#: sequencer.c:418 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:393 +#: 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:406 sequencer.c:2921 +#: sequencer.c:434 sequencer.c:3062 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:413 +#: 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 eol to '%s'" +msgid "could not write to '%s'" msgstr "" -#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941 -#: sequencer.c:3203 +#: sequencer.c:441 #, c-format -msgid "failed to finalize '%s'" +msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185 -#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128 +#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082 +#: sequencer.c:3345 #, c-format -msgid "could not read '%s'" +msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:457 +#: sequencer.c:485 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:461 +#: sequencer.c:489 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:493 +#: sequencer.c:521 #, c-format msgid "%s: fast-forward" msgstr "" -#: sequencer.c:532 builtin/tag.c:566 +#: sequencer.c:560 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "" @@ -6310,65 +6348,65 @@ msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:626 +#: sequencer.c:670 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:643 +#: sequencer.c:687 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:657 +#: sequencer.c:701 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:737 +#: sequencer.c:781 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:748 +#: sequencer.c:792 #, c-format msgid "unable to dequote value of '%s'" msgstr "" -#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896 +#: 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:795 +#: sequencer.c:839 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:800 +#: sequencer.c:844 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:805 +#: sequencer.c:849 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:809 +#: sequencer.c:853 #, c-format msgid "unknown variable '%s'" msgstr "" -#: sequencer.c:814 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:816 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:818 +#: sequencer.c:862 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" -#: sequencer.c:867 +#: sequencer.c:927 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6385,11 +6423,11 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:1141 +#: sequencer.c:1208 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1147 +#: 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" @@ -6404,7 +6442,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1160 +#: 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" @@ -6418,345 +6456,354 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1202 +#: sequencer.c:1269 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1204 +#: sequencer.c:1271 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1250 +#: sequencer.c:1317 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1252 +#: sequencer.c:1319 msgid "detached HEAD" msgstr "" -#: sequencer.c:1256 +#: sequencer.c:1323 msgid " (root-commit)" msgstr "" -#: sequencer.c:1277 +#: sequencer.c:1344 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1279 +#: sequencer.c:1346 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579 +#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1335 sequencer.c:1980 +#: sequencer.c:1403 sequencer.c:2100 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695 +#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1379 sequencer.c:1450 +#: sequencer.c:1447 sequencer.c:1565 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894 -#: builtin/merge.c:919 +#: sequencer.c:1476 sequencer.c:1508 +#, c-format +msgid "invalid author identity '%s'" +msgstr "" + +#: sequencer.c:1482 +msgid "corrupt author: missing date information" +msgstr "" + +#: 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:1433 sequencer.c:4118 +#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:1481 +#: sequencer.c:1597 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1486 +#: sequencer.c:1602 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1569 sequencer.c:1680 +#: sequencer.c:1685 sequencer.c:1796 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1627 sequencer.c:1652 +#: sequencer.c:1743 sequencer.c:1768 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1637 +#: sequencer.c:1753 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1639 sequencer.c:3230 +#: sequencer.c:1755 sequencer.c:3372 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1641 +#: sequencer.c:1757 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1647 +#: sequencer.c:1763 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1654 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1770 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1662 +#: sequencer.c:1778 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1669 +#: sequencer.c:1785 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1675 +#: sequencer.c:1791 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1763 +#: sequencer.c:1879 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1770 +#: sequencer.c:1886 msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:1789 +#: sequencer.c:1905 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1797 sequencer.c:1805 +#: sequencer.c:1913 sequencer.c:1921 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1811 +#: 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:1830 +#: sequencer.c:1946 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1895 +#: sequencer.c:2011 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1952 +#: sequencer.c:2071 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1953 +#: sequencer.c:2072 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:1972 +#: sequencer.c:2092 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "" -#: sequencer.c:2030 +#: sequencer.c:2150 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:2037 +#: sequencer.c:2157 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:2114 +#: sequencer.c:2234 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:2123 +#: sequencer.c:2243 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:2154 +#: sequencer.c:2274 #, c-format msgid "could not parse '%s'" msgstr "" -#: sequencer.c:2215 +#: sequencer.c:2335 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2226 +#: sequencer.c:2346 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:2310 +#: sequencer.c:2432 msgid "cancelling a cherry picking in progress" msgstr "" -#: sequencer.c:2317 +#: sequencer.c:2441 msgid "cancelling a revert in progress" msgstr "" -#: sequencer.c:2361 +#: sequencer.c:2485 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2363 +#: sequencer.c:2487 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2368 +#: sequencer.c:2492 msgid "no commits parsed." msgstr "" -#: sequencer.c:2379 +#: sequencer.c:2503 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2381 +#: sequencer.c:2505 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:2459 +#: sequencer.c:2583 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2556 +#: sequencer.c:2690 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2576 +#: sequencer.c:2710 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2664 sequencer.c:4469 +#: sequencer.c:2803 sequencer.c:4636 msgid "empty commit set passed" msgstr "" -#: sequencer.c:2680 +#: sequencer.c:2820 msgid "revert is already in progress" msgstr "" -#: sequencer.c:2682 +#: sequencer.c:2822 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2685 +#: sequencer.c:2825 msgid "cherry-pick is already in progress" msgstr "" -#: sequencer.c:2687 +#: sequencer.c:2827 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "" -#: sequencer.c:2701 +#: sequencer.c:2841 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2716 +#: sequencer.c:2856 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2776 sequencer.c:4206 +#: sequencer.c:2916 sequencer.c:4371 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2778 sequencer.c:2789 +#: sequencer.c:2918 sequencer.c:2929 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2780 sequencer.c:2824 +#: sequencer.c:2920 sequencer.c:2964 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2810 builtin/grep.c:744 +#: sequencer.c:2950 builtin/grep.c:756 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2812 +#: sequencer.c:2952 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2813 +#: sequencer.c:2953 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2819 +#: sequencer.c:2959 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2830 +#: sequencer.c:2970 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:2871 +#: sequencer.c:3011 msgid "no revert in progress" msgstr "" -#: sequencer.c:2879 +#: sequencer.c:3020 msgid "no cherry-pick in progress" msgstr "" -#: sequencer.c:2889 +#: sequencer.c:3030 msgid "failed to skip the commit" msgstr "" -#: sequencer.c:2896 +#: sequencer.c:3037 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:2899 +#: sequencer.c:3040 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3060 sequencer.c:4098 +#: sequencer.c:3202 sequencer.c:4263 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:3077 +#: sequencer.c:3219 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "" -#: sequencer.c:3085 +#: sequencer.c:3227 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6768,27 +6815,27 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3095 +#: sequencer.c:3237 #, c-format msgid "Could not apply %s... %.*s" msgstr "" -#: sequencer.c:3102 +#: sequencer.c:3244 #, c-format msgid "Could not merge %.*s" msgstr "" -#: sequencer.c:3116 sequencer.c:3120 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:3132 +#: sequencer.c:3274 #, c-format msgid "Executing: %s\n" msgstr "" -#: sequencer.c:3147 +#: sequencer.c:3289 #, c-format msgid "" "execution failed: %s\n" @@ -6798,11 +6845,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3153 +#: sequencer.c:3295 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:3159 +#: sequencer.c:3301 #, c-format msgid "" "execution succeeded: %s\n" @@ -6813,90 +6860,90 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3220 +#: sequencer.c:3362 #, c-format msgid "illegal label name: '%.*s'" msgstr "" -#: sequencer.c:3274 +#: sequencer.c:3416 msgid "writing fake root commit" msgstr "" -#: sequencer.c:3279 +#: sequencer.c:3421 msgid "writing squash-onto" msgstr "" -#: sequencer.c:3363 +#: sequencer.c:3505 #, c-format msgid "could not resolve '%s'" msgstr "" -#: sequencer.c:3394 +#: sequencer.c:3538 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:3416 +#: sequencer.c:3560 #, c-format msgid "unable to parse '%.*s'" msgstr "" -#: sequencer.c:3425 +#: sequencer.c:3569 #, c-format msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:3437 +#: sequencer.c:3581 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3453 +#: sequencer.c:3597 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:3613 +#: sequencer.c:3780 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:3629 +#: sequencer.c:3796 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:3703 +#: sequencer.c:3870 msgid "Cannot autostash" msgstr "" -#: sequencer.c:3706 +#: sequencer.c:3873 #, c-format msgid "Unexpected stash response: '%s'" msgstr "" -#: sequencer.c:3712 +#: sequencer.c:3879 #, c-format msgid "Could not create directory for '%s'" msgstr "" -#: sequencer.c:3715 +#: sequencer.c:3882 #, c-format msgid "Created autostash: %s\n" msgstr "" -#: sequencer.c:3719 +#: sequencer.c:3886 msgid "could not reset --hard" msgstr "" -#: sequencer.c:3744 +#: sequencer.c:3911 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3756 +#: sequencer.c:3923 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:3759 +#: sequencer.c:3926 #, c-format msgid "" "%s\n" @@ -6904,34 +6951,29 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:3764 +#: sequencer.c:3931 msgid "Applying autostash resulted in conflicts." msgstr "" -#: sequencer.c:3765 +#: sequencer.c:3932 msgid "Autostash exists; creating a new stash entry." msgstr "" -#: sequencer.c:3857 -#, c-format -msgid "%s: not a valid OID" -msgstr "" - -#: sequencer.c:3862 git-rebase--preserve-merges.sh:779 +#: sequencer.c:4025 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "" -#: sequencer.c:3877 +#: sequencer.c:4040 #, c-format msgid "Stopped at HEAD\n" msgstr "" -#: sequencer.c:3879 +#: sequencer.c:4042 #, c-format msgid "Stopped at %s\n" msgstr "" -#: sequencer.c:3887 +#: sequencer.c:4050 #, c-format msgid "" "Could not execute the todo command\n" @@ -6944,108 +6986,108 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3931 +#: sequencer.c:4096 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "" -#: sequencer.c:3976 +#: sequencer.c:4141 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:4047 +#: sequencer.c:4212 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:4106 +#: sequencer.c:4271 msgid "could not read orig-head" msgstr "" -#: sequencer.c:4111 +#: sequencer.c:4276 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:4125 +#: sequencer.c:4290 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:4185 +#: sequencer.c:4350 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "" -#: sequencer.c:4218 +#: sequencer.c:4383 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:4227 +#: sequencer.c:4392 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:4229 +#: sequencer.c:4394 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:4231 +#: sequencer.c:4396 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:4234 +#: 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:4270 sequencer.c:4309 +#: sequencer.c:4435 sequencer.c:4474 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:4324 +#: sequencer.c:4490 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:4331 +#: sequencer.c:4497 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:4446 +#: sequencer.c:4613 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:4450 +#: sequencer.c:4617 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:4485 +#: sequencer.c:4652 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:4962 +#: sequencer.c:5129 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:4965 +#: sequencer.c:5132 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:5206 sequencer.c:5223 +#: sequencer.c:5374 sequencer.c:5391 msgid "nothing to do" msgstr "" -#: sequencer.c:5242 +#: sequencer.c:5410 msgid "could not skip unnecessary pick commands" msgstr "" -#: sequencer.c:5336 +#: sequencer.c:5504 msgid "the script was already rearranged." msgstr "" @@ -7090,359 +7132,363 @@ msgstr "" msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:604 +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:612 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:631 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "" -#: setup.c:633 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" msgstr "" -#: setup.c:635 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "" -#: setup.c:637 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "" -#: setup.c:639 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "" -#: setup.c:641 +#: setup.c:710 #, c-format msgid "not a git repository: %s" msgstr "" -#: setup.c:743 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:757 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" msgstr "" -#: setup.c:786 setup.c:788 setup.c:819 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "" -#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "" -#: setup.c:918 +#: setup.c:987 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "" -#: setup.c:1156 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1165 setup.c:1171 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "" -#: setup.c:1176 +#: setup.c:1245 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:1182 +#: setup.c:1251 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -#: setup.c:1293 +#: setup.c:1362 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: setup.c:1340 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "" -#: setup.c:1355 +#: setup.c:1424 msgid "fork failed" msgstr "" -#: setup.c:1360 +#: setup.c:1429 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:2454 +#: sha1-file.c:1284 sha1-file.c:2477 #, c-format msgid "corrupt loose object '%s'" msgstr "" -#: sha1-file.c:1276 sha1-file.c:2458 +#: 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:1640 +#: sha1-file.c:1651 #, c-format msgid "failed to read object %s" msgstr "" -#: sha1-file.c:1644 +#: sha1-file.c:1655 #, c-format msgid "replacement %s not found for %s" msgstr "" -#: sha1-file.c:1648 +#: sha1-file.c:1659 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1652 +#: sha1-file.c:1663 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1757 +#: sha1-file.c:1768 #, c-format msgid "unable to write file %s" msgstr "" -#: sha1-file.c:1764 +#: sha1-file.c:1775 #, c-format msgid "unable to set permission to '%s'" msgstr "" -#: sha1-file.c:1771 +#: sha1-file.c:1782 msgid "file write error" msgstr "" -#: sha1-file.c:1791 +#: sha1-file.c:1802 msgid "error when closing loose object file" msgstr "" -#: sha1-file.c:1856 +#: sha1-file.c:1867 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: sha1-file.c:1858 +#: sha1-file.c:1869 msgid "unable to create temporary file" msgstr "" -#: sha1-file.c:1882 +#: sha1-file.c:1893 msgid "unable to write loose object file" msgstr "" -#: sha1-file.c:1888 +#: sha1-file.c:1899 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "" -#: sha1-file.c:1892 +#: sha1-file.c:1903 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "" -#: sha1-file.c:1896 +#: sha1-file.c:1907 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: sha1-file.c:1906 builtin/pack-objects.c:1085 +#: sha1-file.c:1917 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "" -#: sha1-file.c:1983 +#: sha1-file.c:1994 #, c-format msgid "cannot read object for %s" msgstr "" -#: sha1-file.c:2022 +#: sha1-file.c:2045 msgid "corrupt commit" msgstr "" -#: sha1-file.c:2030 +#: sha1-file.c:2053 msgid "corrupt tag" msgstr "" -#: sha1-file.c:2130 +#: sha1-file.c:2153 #, c-format msgid "read error while indexing %s" msgstr "" -#: sha1-file.c:2133 +#: sha1-file.c:2156 #, c-format msgid "short read while indexing %s" msgstr "" -#: sha1-file.c:2206 sha1-file.c:2216 +#: sha1-file.c:2229 sha1-file.c:2239 #, c-format msgid "%s: failed to insert into database" msgstr "" -#: sha1-file.c:2222 +#: sha1-file.c:2245 #, c-format msgid "%s: unsupported file type" msgstr "" -#: sha1-file.c:2246 +#: sha1-file.c:2269 #, c-format msgid "%s is not a valid object" msgstr "" -#: sha1-file.c:2248 +#: sha1-file.c:2271 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: sha1-file.c:2275 builtin/index-pack.c:155 +#: sha1-file.c:2298 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "" -#: sha1-file.c:2465 sha1-file.c:2518 +#: sha1-file.c:2488 sha1-file.c:2541 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: sha1-file.c:2489 +#: sha1-file.c:2512 #, c-format msgid "unable to mmap %s" msgstr "" -#: sha1-file.c:2494 +#: sha1-file.c:2517 #, c-format msgid "unable to unpack header of %s" msgstr "" -#: sha1-file.c:2500 +#: sha1-file.c:2523 #, c-format msgid "unable to parse header of %s" msgstr "" -#: sha1-file.c:2511 +#: sha1-file.c:2534 #, c-format msgid "unable to unpack contents of %s" msgstr "" @@ -7479,52 +7525,52 @@ msgstr "" msgid "log for '%.*s' only has %d entries" msgstr "" -#: sha1-name.c:1689 +#: sha1-name.c:1702 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "" -#: sha1-name.c:1695 +#: sha1-name.c:1708 #, c-format msgid "" "path '%s' exists, but not '%s'\n" "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" msgstr "" -#: sha1-name.c:1704 +#: sha1-name.c:1717 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "" -#: sha1-name.c:1732 +#: sha1-name.c:1745 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" "hint: Did you mean ':%d:%s'?" msgstr "" -#: sha1-name.c:1748 +#: sha1-name.c:1761 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" "hint: Did you mean ':%d:%s' aka ':%d:./%s'?" msgstr "" -#: sha1-name.c:1756 +#: sha1-name.c:1769 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "" -#: sha1-name.c:1758 +#: sha1-name.c:1771 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "" -#: sha1-name.c:1771 +#: sha1-name.c:1784 msgid "relative path syntax can't be used outside working tree" msgstr "" -#: sha1-name.c:1909 +#: sha1-name.c:1922 #, c-format msgid "invalid object name '%.*s'." msgstr "" @@ -7581,6 +7627,12 @@ msgid_plural "%u bytes/s" msgstr[0] "" msgstr[1] "" +#: 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 "" + #: strbuf.c:1175 #, c-format msgid "could not edit '%s'" @@ -7643,132 +7695,132 @@ msgstr "" msgid "bad --ignore-submodules argument: %s" msgstr "" -#: submodule.c:815 +#: submodule.c:816 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " "same. Skipping it." msgstr "" -#: submodule.c:910 +#: submodule.c:919 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" -#: submodule.c:995 +#: submodule.c:1004 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " "submodule %s" msgstr "" -#: submodule.c:1118 +#: submodule.c:1127 #, c-format msgid "process for submodule '%s' failed" msgstr "" -#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045 +#: submodule.c:1156 builtin/branch.c:680 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:1158 +#: submodule.c:1167 #, c-format msgid "Pushing submodule '%s'\n" msgstr "" -#: submodule.c:1161 +#: submodule.c:1170 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "" -#: submodule.c:1453 +#: submodule.c:1462 #, c-format msgid "Fetching submodule %s%s\n" msgstr "" -#: submodule.c:1483 +#: submodule.c:1492 #, c-format msgid "Could not access submodule '%s'\n" msgstr "" -#: submodule.c:1637 +#: submodule.c:1646 #, c-format msgid "" "Errors during submodule fetch:\n" "%s" msgstr "" -#: submodule.c:1662 +#: submodule.c:1671 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1679 +#: submodule.c:1688 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "" -#: submodule.c:1720 +#: submodule.c:1729 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "" -#: submodule.c:1800 +#: submodule.c:1804 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1813 +#: submodule.c:1817 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1828 +#: submodule.c:1832 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "" -#: submodule.c:1855 submodule.c:2165 +#: submodule.c:1859 submodule.c:2169 #, c-format msgid "could not recurse into submodule '%s'" msgstr "" -#: submodule.c:1876 +#: submodule.c:1880 msgid "could not reset submodule index" msgstr "" -#: submodule.c:1918 +#: submodule.c:1922 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:1970 +#: submodule.c:1974 #, c-format msgid "Submodule '%s' could not be updated." msgstr "" -#: submodule.c:2038 +#: submodule.c:2042 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "" -#: submodule.c:2059 +#: submodule.c:2063 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:2071 submodule.c:2130 +#: submodule.c:2075 submodule.c:2134 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:2075 +#: submodule.c:2079 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "" -#: submodule.c:2082 +#: submodule.c:2086 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7776,65 +7828,65 @@ msgid "" "'%s'\n" msgstr "" -#: submodule.c:2210 +#: submodule.c:2214 msgid "could not start ls-files in .." msgstr "" -#: submodule.c:2250 +#: submodule.c:2254 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" -#: trailer.c:238 +#: trailer.c:236 #, c-format msgid "running trailer command '%s' failed" msgstr "" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:539 trailer.c:544 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 "" -#: trailer.c:730 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "" -#: trailer.c:750 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "" -#: trailer.c:753 +#: trailer.c:751 msgid "could not read from stdin" msgstr "" -#: trailer.c:1011 wrapper.c:673 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "" -#: trailer.c:1013 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "" -#: trailer.c:1015 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "" -#: trailer.c:1027 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "" -#: trailer.c:1067 +#: trailer.c:1065 #, c-format msgid "could not rename temporary file to %s" msgstr "" @@ -7881,7 +7933,7 @@ msgstr "" msgid "error while running fast-import" msgstr "" -#: transport-helper.c:549 transport-helper.c:1156 +#: transport-helper.c:549 transport-helper.c:1236 #, c-format msgid "could not read ref %s" msgstr "" @@ -7899,7 +7951,7 @@ msgstr "" msgid "invalid remote service path" msgstr "" -#: transport-helper.c:661 transport.c:1347 +#: transport-helper.c:661 transport.c:1446 msgid "operation not supported by protocol" msgstr "" @@ -7908,111 +7960,120 @@ msgstr "" msgid "can't connect to subservice %s" msgstr "" -#: transport-helper.c:740 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "" + +#: transport-helper.c:788 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "" -#: transport-helper.c:793 +#: transport-helper.c:845 #, c-format msgid "helper reported unexpected status of %s" msgstr "" -#: transport-helper.c:854 +#: transport-helper.c:928 #, c-format msgid "helper %s does not support dry-run" msgstr "" -#: transport-helper.c:857 +#: transport-helper.c:931 #, c-format msgid "helper %s does not support --signed" msgstr "" -#: transport-helper.c:860 +#: transport-helper.c:934 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" -#: transport-helper.c:865 +#: transport-helper.c:939 #, c-format msgid "helper %s does not support --atomic" msgstr "" -#: transport-helper.c:871 +#: 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:970 +#: transport-helper.c:1050 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:975 +#: transport-helper.c:1055 #, c-format msgid "helper %s does not support 'force'" msgstr "" -#: transport-helper.c:1022 +#: transport-helper.c:1102 msgid "couldn't run fast-export" msgstr "" -#: transport-helper.c:1027 +#: transport-helper.c:1107 msgid "error while running fast-export" msgstr "" -#: transport-helper.c:1052 +#: 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:1133 +#: transport-helper.c:1213 #, c-format msgid "unsupported object format '%s'" msgstr "" -#: transport-helper.c:1142 +#: transport-helper.c:1222 #, c-format msgid "malformed response in ref list: %s" msgstr "" -#: transport-helper.c:1294 +#: transport-helper.c:1374 #, c-format msgid "read(%s) failed" msgstr "" -#: transport-helper.c:1321 +#: transport-helper.c:1401 #, c-format msgid "write(%s) failed" msgstr "" -#: transport-helper.c:1370 +#: transport-helper.c:1450 #, c-format msgid "%s thread failed" msgstr "" -#: transport-helper.c:1374 +#: transport-helper.c:1454 #, c-format msgid "%s thread failed to join: %s" msgstr "" -#: transport-helper.c:1393 transport-helper.c:1397 +#: transport-helper.c:1473 transport-helper.c:1477 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1434 +#: transport-helper.c:1514 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1438 +#: transport-helper.c:1518 #, c-format msgid "%s process failed" msgstr "" -#: transport-helper.c:1456 transport-helper.c:1465 +#: transport-helper.c:1536 transport-helper.c:1545 msgid "can't start thread for copying data" msgstr "" @@ -8031,44 +8092,44 @@ msgstr "" msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:272 +#: transport.c:269 msgid "see protocol.version in 'git help config' for more details" msgstr "" -#: transport.c:273 +#: transport.c:270 msgid "server options require protocol version 2 or later" msgstr "" -#: transport.c:631 +#: transport.c:727 msgid "could not parse transport.color.* config" msgstr "" -#: transport.c:704 +#: transport.c:802 msgid "support for protocol v2 not implemented yet" msgstr "" -#: transport.c:838 +#: transport.c:936 #, c-format msgid "unknown value for config '%s': %s" msgstr "" -#: transport.c:904 +#: transport.c:1002 #, c-format msgid "transport '%s' not allowed" msgstr "" -#: transport.c:957 +#: transport.c:1055 msgid "git-over-rsync is no longer supported" msgstr "" -#: transport.c:1059 +#: 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:1063 +#: transport.c:1161 #, c-format msgid "" "\n" @@ -8084,11 +8145,11 @@ msgid "" "\n" msgstr "" -#: transport.c:1071 +#: transport.c:1169 msgid "Aborting." msgstr "" -#: transport.c:1216 +#: transport.c:1315 msgid "failed to push all needed submodules" msgstr "" @@ -8305,7 +8366,7 @@ msgstr "" msgid "Updating index flags" msgstr "" -#: upload-pack.c:1415 +#: upload-pack.c:1550 msgid "expected flush after fetch arguments" msgstr "" @@ -8342,47 +8403,83 @@ msgstr "" msgid "Fetching objects" msgstr "" -#: worktree.c:248 builtin/am.c:2098 +#: worktree.c:236 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "" -#: worktree.c:295 +#: worktree.c:283 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:306 +#: worktree.c:294 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:318 +#: worktree.c:306 #, c-format msgid "'%s' does not exist" msgstr "" -#: worktree.c:324 +#: worktree.c:312 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "" -#: worktree.c:333 +#: worktree.c:321 #, c-format msgid "'%s' does not point back to '%s'" msgstr "" -#: wrapper.c:194 wrapper.c:364 +#: worktree.c:587 +msgid "not a directory" +msgstr "" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr "" + +#: worktree.c:598 +msgid ".git file broken" +msgstr "" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr "" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:395 wrapper.c:596 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:604 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "" @@ -8415,11 +8512,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:211 wt-status.c:1072 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:234 wt-status.c:1081 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" msgstr "" @@ -8445,100 +8542,100 @@ msgstr "" msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "" -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "" -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "" -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "" -#: wt-status.c:904 +#: wt-status.c:903 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "" msgstr[1] "" -#: wt-status.c:936 +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:938 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:1020 +#: wt-status.c:1018 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -#: wt-status.c:1112 +#: wt-status.c:1110 #, c-format msgid "" "\n" @@ -8546,247 +8643,247 @@ msgid "" "You can use '--no-ahead-behind' to avoid this.\n" msgstr "" -#: wt-status.c:1142 +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1145 +#: wt-status.c:1143 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1147 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1151 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1154 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1163 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1166 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "" -#: wt-status.c:1170 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1172 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1174 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1307 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "" -#: wt-status.c:1309 +#: wt-status.c:1307 msgid "No commands done." msgstr "" -#: wt-status.c:1312 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1323 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1328 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "" -#: wt-status.c:1331 +#: wt-status.c:1329 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1339 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1351 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1356 +#: wt-status.c:1354 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1369 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1373 +#: wt-status.c:1371 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1380 +#: wt-status.c:1378 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1384 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1389 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1392 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1396 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1401 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1404 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1406 +#: wt-status.c:1404 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1417 +#: wt-status.c:1415 msgid "Cherry-pick currently in progress." msgstr "" -#: wt-status.c:1420 +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1427 +#: wt-status.c:1425 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1430 +#: wt-status.c:1428 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr "" -#: wt-status.c:1433 +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1435 +#: wt-status.c:1433 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1437 +#: wt-status.c:1435 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1447 +#: wt-status.c:1445 msgid "Revert currently in progress." msgstr "" -#: wt-status.c:1450 +#: wt-status.c:1448 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1456 +#: wt-status.c:1454 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1459 +#: wt-status.c:1457 msgid " (run \"git revert --continue\" to continue)" msgstr "" -#: wt-status.c:1462 +#: wt-status.c:1460 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (use \"git revert --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1466 +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1476 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1480 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1483 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1494 +#: wt-status.c:1492 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "" -#: wt-status.c:1733 +#: wt-status.c:1731 msgid "On branch " msgstr "" -#: wt-status.c:1740 +#: wt-status.c:1738 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1742 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1752 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1769 +#: wt-status.c:1767 msgid "Initial commit" msgstr "" -#: wt-status.c:1770 +#: wt-status.c:1768 msgid "No commits yet" msgstr "" -#: wt-status.c:1784 +#: wt-status.c:1782 msgid "Untracked files" msgstr "" -#: wt-status.c:1786 +#: wt-status.c:1784 msgid "Ignored files" msgstr "" -#: wt-status.c:1790 +#: wt-status.c:1788 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8794,25 +8891,25 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1796 +#: wt-status.c:1794 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1798 +#: wt-status.c:1796 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1804 +#: wt-status.c:1802 msgid "No changes" msgstr "" -#: wt-status.c:1809 +#: wt-status.c:1807 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1812 +#: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" msgstr "" @@ -8824,67 +8921,67 @@ msgid "" "track)\n" msgstr "" -#: wt-status.c:1818 +#: wt-status.c:1819 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1821 +#: wt-status.c:1823 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1824 wt-status.c:1829 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1827 +#: wt-status.c:1830 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1831 +#: wt-status.c:1835 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1944 +#: wt-status.c:1940 msgid "No commits yet on " msgstr "" -#: wt-status.c:1948 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1979 +#: wt-status.c:1975 msgid "different" msgstr "" -#: wt-status.c:1981 wt-status.c:1989 +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " msgstr "" -#: wt-status.c:1984 wt-status.c:1987 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2509 +#: wt-status.c:2505 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2515 +#: wt-status.c:2511 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2517 +#: wt-status.c:2513 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#: compat/precompose_utf8.c:58 builtin/clone.c:457 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -8911,108 +9008,108 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:266 builtin/rev-parse.c:904 +#: builtin/add.c:272 builtin/rev-parse.c:908 msgid "Could not read the index" msgstr "" -#: builtin/add.c:277 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:281 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "" -#: builtin/add.c:284 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "" -#: builtin/add.c:287 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:289 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:294 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:302 +#: builtin/add.c:308 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" msgstr "" -#: builtin/add.c:325 +#: builtin/add.c:331 msgid "interactive picking" msgstr "" -#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308 +#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:327 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:328 +#: builtin/add.c:334 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:329 +#: builtin/add.c:335 msgid "update tracked files" msgstr "" -#: builtin/add.c:330 +#: builtin/add.c:336 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:331 +#: builtin/add.c:337 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:332 +#: builtin/add.c:338 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:335 +#: builtin/add.c:341 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:337 +#: builtin/add.c:343 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:338 +#: builtin/add.c:344 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:339 +#: builtin/add.c:345 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:341 builtin/update-index.c:1004 +#: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:343 +#: builtin/add.c:349 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:345 +#: builtin/add.c:351 msgid "backend for `git stash -p`" msgstr "" -#: builtin/add.c:363 +#: builtin/add.c:369 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9030,59 +9127,59 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:391 +#: builtin/add.c:397 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:410 +#: builtin/add.c:416 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" "\"git config advice.addIgnoredFile false\"" msgstr "" -#: builtin/add.c:419 +#: builtin/add.c:425 msgid "adding files failed" msgstr "" -#: builtin/add.c:447 builtin/commit.c:345 +#: builtin/add.c:453 builtin/commit.c:345 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "" -#: builtin/add.c:464 +#: builtin/add.c:470 msgid "--pathspec-from-file is incompatible with --edit" msgstr "" -#: builtin/add.c:476 +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:479 +#: builtin/add.c:485 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:483 +#: builtin/add.c:489 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:501 builtin/checkout.c:1701 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506 +#: 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:508 builtin/checkout.c:1713 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512 +#: 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 "" -#: builtin/add.c:512 +#: builtin/add.c:518 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:514 +#: builtin/add.c:520 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -9137,7 +9234,7 @@ msgstr "" msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:953 builtin/clone.c:409 +#: builtin/am.c:953 builtin/clone.c:410 #, c-format msgid "failed to create directory '%s'" msgstr "" @@ -9205,12 +9302,12 @@ msgstr "" msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1621 builtin/am.c:1625 +#: builtin/am.c:1626 builtin/am.c:1630 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1643 +#: builtin/am.c:1648 msgid "Commit Body is:" msgstr "" @@ -9218,46 +9315,46 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1653 +#: builtin/am.c:1658 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1699 builtin/commit.c:395 +#: builtin/am.c:1704 builtin/commit.c:395 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1703 +#: builtin/am.c:1708 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1743 builtin/am.c:1811 +#: builtin/am.c:1748 builtin/am.c:1816 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1760 +#: builtin/am.c:1765 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1766 +#: builtin/am.c:1771 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1770 +#: builtin/am.c:1775 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -#: builtin/am.c:1814 +#: 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:1821 +#: 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 " @@ -9265,197 +9362,197 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 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:1980 +#: builtin/am.c:1985 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2024 +#: 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:2131 +#: builtin/am.c:2136 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2171 +#: builtin/am.c:2178 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "" -#: builtin/am.c:2175 +#: builtin/am.c:2182 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "" -#: builtin/am.c:2206 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/am.c:2207 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2213 +#: builtin/am.c:2220 msgid "run interactively" msgstr "" -#: builtin/am.c:2215 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2217 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16 -#: builtin/repack.c:306 builtin/stash.c:816 +#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 +#: builtin/repack.c:335 builtin/stash.c:815 msgid "be quiet" msgstr "" -#: builtin/am.c:2220 -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:2223 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2225 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2227 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2229 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2231 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2234 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2237 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 -#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 -#: builtin/am.c:2266 +#: 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:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252 +#: 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:1329 builtin/repack.c:317 builtin/repack.c:321 -#: builtin/repack.c:323 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:2262 builtin/branch.c:659 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38 -#: bugreport.c:137 +#: builtin/am.c:2269 builtin/branch.c:661 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:2263 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2269 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2271 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2274 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2277 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2280 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2283 +#: builtin/am.c:2290 msgid "abort the patching operation but keep HEAD where it is." msgstr "" -#: builtin/am.c:2287 +#: builtin/am.c:2294 msgid "show the patch being applied" msgstr "" -#: builtin/am.c:2292 +#: builtin/am.c:2299 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2294 +#: builtin/am.c:2301 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517 -#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524 -#: builtin/rebase.c:1380 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:2297 builtin/rebase.c:525 builtin/rebase.c:1381 +#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2300 +#: builtin/am.c:2307 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2318 +#: 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:2325 +#: builtin/am.c:2332 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2340 +#: builtin/am.c:2347 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2364 +#: builtin/am.c:2371 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2370 +#: builtin/am.c:2377 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: builtin/am.c:2380 +#: builtin/am.c:2387 msgid "interactive mode requires patches on the command line" msgstr "" @@ -9493,117 +9590,128 @@ msgstr "" msgid "git archive: expected a flush" msgstr "" -#: builtin/bisect--helper.c:22 -msgid "git bisect--helper --next-all [--no-checkout]" -msgstr "" - #: builtin/bisect--helper.c:23 -msgid "git bisect--helper --write-terms <bad_term> <good_term>" -msgstr "" - -#: builtin/bisect--helper.c:24 -msgid "git bisect--helper --bisect-clean-state" -msgstr "" - -#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:24 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" msgstr "" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" msgstr "" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" msgstr "" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:28 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" +msgstr "" + +#: builtin/bisect--helper.c:30 +msgid "git bisect--helper --bisect-next" +msgstr "" + +#: builtin/bisect--helper.c:31 +msgid "git bisect--helper --bisect-auto-next" msgstr "" -#: builtin/bisect--helper.c:86 +#: 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:108 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "" + +#: builtin/bisect--helper.c:115 +#, c-format +msgid "could not write to file '%s'" +msgstr "" + +#: builtin/bisect--helper.c:154 #, c-format msgid "'%s' is not a valid term" msgstr "" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:158 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "" -#: builtin/bisect--helper.c:100 +#: builtin/bisect--helper.c:168 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "" -#: builtin/bisect--helper.c:111 +#: builtin/bisect--helper.c:178 msgid "please use two different terms" msgstr "" -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "" - -#: builtin/bisect--helper.c:155 +#: builtin/bisect--helper.c:194 #, c-format msgid "We are not bisecting.\n" msgstr "" -#: builtin/bisect--helper.c:163 +#: builtin/bisect--helper.c:202 #, c-format msgid "'%s' is not a valid commit" msgstr "" -#: builtin/bisect--helper.c:172 +#: 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:216 +#: builtin/bisect--helper.c:255 #, c-format msgid "Bad bisect_write argument: %s" msgstr "" -#: builtin/bisect--helper.c:221 +#: builtin/bisect--helper.c:260 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "" -#: builtin/bisect--helper.c:233 +#: builtin/bisect--helper.c:272 #, c-format msgid "couldn't open the file '%s'" msgstr "" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:298 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "" -#: builtin/bisect--helper.c:286 +#: 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:290 +#: builtin/bisect--helper.c:329 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9611,7 +9719,7 @@ msgid "" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:310 +#: builtin/bisect--helper.c:349 #, c-format msgid "bisecting only with a %s commit" msgstr "" @@ -9620,288 +9728,315 @@ msgstr "" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:318 +#: builtin/bisect--helper.c:357 msgid "Are you sure [Y/n]? " msgstr "" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:418 msgid "no terms defined" msgstr "" -#: builtin/bisect--helper.c:382 +#: 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:392 +#: 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:460 builtin/bisect--helper.c:473 +#: builtin/bisect--helper.c:498 +msgid "revision walk setup failed\n" +msgstr "" + +#: builtin/bisect--helper.c:520 +#, c-format +msgid "could not open '%s' for appending" +msgstr "" + +#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652 msgid "'' is not a valid term" msgstr "" -#: builtin/bisect--helper.c:483 +#: builtin/bisect--helper.c:662 #, c-format msgid "unrecognized option: '%s'" msgstr "" -#: builtin/bisect--helper.c:487 +#: builtin/bisect--helper.c:666 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "" -#: builtin/bisect--helper.c:519 +#: builtin/bisect--helper.c:697 msgid "bad HEAD - I need a HEAD" msgstr "" -#: builtin/bisect--helper.c:534 +#: builtin/bisect--helper.c:712 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" -#: builtin/bisect--helper.c:555 +#: builtin/bisect--helper.c:733 msgid "won't bisect on cg-seek'ed tree" msgstr "" -#: builtin/bisect--helper.c:558 +#: builtin/bisect--helper.c:736 msgid "bad HEAD - strange symbolic ref" msgstr "" -#: builtin/bisect--helper.c:582 +#: builtin/bisect--helper.c:756 #, c-format msgid "invalid ref: '%s'" msgstr "" -#: builtin/bisect--helper.c:638 -msgid "perform 'git bisect next'" +#: builtin/bisect--helper.c:814 +msgid "You need to start by \"git bisect start\"\n" msgstr "" -#: builtin/bisect--helper.c:640 -msgid "write the terms to .git/BISECT_TERMS" +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#. +#: builtin/bisect--helper.c:825 +msgid "Do you want me to do it for you [Y/n]? " msgstr "" -#: builtin/bisect--helper.c:642 -msgid "cleanup the bisection state" +#: builtin/bisect--helper.c:843 +msgid "Please call `--bisect-state` with at least one argument" msgstr "" -#: builtin/bisect--helper.c:644 -msgid "check for expected revs" +#: builtin/bisect--helper.c:856 +#, c-format +msgid "'git bisect %s' can take only one argument." msgstr "" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879 +#, c-format +msgid "Bad rev input: %s" +msgstr "" + +#: builtin/bisect--helper.c:924 msgid "reset the bisection state" msgstr "" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:926 msgid "write out the bisection state in BISECT_LOG" msgstr "" -#: builtin/bisect--helper.c:650 +#: builtin/bisect--helper.c:928 msgid "check and set terms in a bisection state" msgstr "" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:930 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:654 +#: builtin/bisect--helper.c:932 msgid "print out the bisect terms" msgstr "" -#: builtin/bisect--helper.c:656 +#: builtin/bisect--helper.c:934 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:658 -msgid "update BISECT_HEAD instead of checking out the current commit" +#: builtin/bisect--helper.c:936 +msgid "find the next bisection commit" msgstr "" -#: builtin/bisect--helper.c:660 -msgid "no log for BISECT_WRITE" +#: builtin/bisect--helper.c:938 +msgid "verify the next bisection state then checkout the next bisection commit" msgstr "" -#: builtin/bisect--helper.c:678 -msgid "--write-terms requires two arguments" +#: builtin/bisect--helper.c:940 +msgid "mark the state of ref (or refs)" msgstr "" -#: builtin/bisect--helper.c:682 -msgid "--bisect-clean-state requires no arguments" +#: builtin/bisect--helper.c:942 +msgid "no log for BISECT_WRITE" msgstr "" -#: builtin/bisect--helper.c:689 +#: builtin/bisect--helper.c:957 msgid "--bisect-reset requires either no argument or a commit" msgstr "" -#: builtin/bisect--helper.c:693 +#: builtin/bisect--helper.c:961 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "" -#: builtin/bisect--helper.c:699 +#: builtin/bisect--helper.c:967 msgid "--check-and-set-terms requires 3 arguments" msgstr "" -#: builtin/bisect--helper.c:705 +#: builtin/bisect--helper.c:973 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:979 msgid "--bisect-terms requires 0 or 1 argument" msgstr "" -#: builtin/blame.c:31 +#: builtin/bisect--helper.c:988 +msgid "--bisect-next requires 0 arguments" +msgstr "" + +#: builtin/bisect--helper.c:994 +msgid "--bisect-auto-next requires 0 arguments" +msgstr "" + +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "" -#: builtin/blame.c:729 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "" -#: builtin/blame.c:747 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "" -#: builtin/blame.c:822 +#: builtin/blame.c:847 #, c-format msgid "cannot find revision %s to ignore" msgstr "" -#: builtin/blame.c:844 +#: builtin/blame.c:869 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:845 -msgid "Show blank SHA-1 for boundary commits (Default: off)" +#: builtin/blame.c:870 +msgid "Do not show object names of boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:846 +#: builtin/blame.c:871 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:847 +#: builtin/blame.c:872 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:848 +#: builtin/blame.c:873 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:849 +#: builtin/blame.c:874 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:850 +#: builtin/blame.c:875 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:851 +#: builtin/blame.c:876 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:852 +#: builtin/blame.c:877 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:853 +#: builtin/blame.c:878 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:854 +#: builtin/blame.c:879 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:855 +#: builtin/blame.c:880 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:856 +#: builtin/blame.c:881 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:857 +#: builtin/blame.c:882 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:858 +#: builtin/blame.c:883 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:859 +#: builtin/blame.c:884 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:860 builtin/log.c:1721 +#: builtin/blame.c:885 builtin/log.c:1813 msgid "rev" msgstr "" -#: builtin/blame.c:860 +#: builtin/blame.c:885 msgid "Ignore <rev> when blaming" msgstr "" -#: builtin/blame.c:861 +#: builtin/blame.c:886 msgid "Ignore revisions from <file>" msgstr "" -#: builtin/blame.c:862 +#: builtin/blame.c:887 msgid "color redundant metadata from previous line differently" msgstr "" -#: builtin/blame.c:863 +#: builtin/blame.c:888 msgid "color lines by age" msgstr "" -#: builtin/blame.c:864 +#: builtin/blame.c:889 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:865 +#: builtin/blame.c:890 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:866 +#: builtin/blame.c:891 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:867 builtin/blame.c:868 +#: builtin/blame.c:892 builtin/blame.c:893 msgid "score" msgstr "" -#: builtin/blame.c:867 +#: builtin/blame.c:892 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:868 +#: builtin/blame.c:893 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:869 -msgid "n,m" +#: builtin/blame.c:894 +msgid "range" msgstr "" -#: builtin/blame.c:869 -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:921 +#: builtin/blame.c:947 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -9913,23 +10048,23 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:998 msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:1087 +#: 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:1133 +#: builtin/blame.c:1159 msgid "Blaming lines" msgstr "" #: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" msgstr "" #: builtin/branch.c:30 @@ -10065,38 +10200,38 @@ msgstr "" msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:542 +#: builtin/branch.c:544 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:544 +#: builtin/branch.c:546 msgid "Branch copy failed" msgstr "" -#: builtin/branch.c:548 +#: builtin/branch.c:550 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "" -#: builtin/branch.c:551 +#: builtin/branch.c:553 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:557 +#: builtin/branch.c:559 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:566 +#: builtin/branch.c:568 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:568 +#: builtin/branch.c:570 msgid "Branch is copied, but update of config-file failed" msgstr "" -#: builtin/branch.c:584 +#: builtin/branch.c:586 #, c-format msgid "" "Please edit the description for the branch\n" @@ -10104,220 +10239,300 @@ msgid "" "Lines starting with '%c' will be stripped.\n" msgstr "" -#: builtin/branch.c:618 +#: builtin/branch.c:620 msgid "Generic options" msgstr "" -#: builtin/branch.c:620 +#: builtin/branch.c:622 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:621 +#: builtin/branch.c:623 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:622 +#: builtin/branch.c:624 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:624 +#: builtin/branch.c:626 msgid "do not use" msgstr "" -#: builtin/branch.c:626 builtin/rebase.c:520 +#: builtin/branch.c:628 builtin/rebase.c:532 msgid "upstream" msgstr "" -#: builtin/branch.c:626 +#: builtin/branch.c:628 msgid "change the upstream info" msgstr "" -#: builtin/branch.c:627 +#: builtin/branch.c:629 msgid "unset the upstream info" msgstr "" -#: builtin/branch.c:628 +#: builtin/branch.c:630 msgid "use colored output" msgstr "" -#: builtin/branch.c:629 +#: builtin/branch.c:631 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:631 builtin/branch.c:633 +#: builtin/branch.c:633 builtin/branch.c:635 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:632 builtin/branch.c:634 +#: builtin/branch.c:634 builtin/branch.c:636 msgid "print only branches that don't contain the commit" msgstr "" -#: builtin/branch.c:637 +#: builtin/branch.c:639 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:638 +#: builtin/branch.c:640 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:640 +#: builtin/branch.c:642 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:641 +#: builtin/branch.c:643 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:642 +#: builtin/branch.c:644 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:643 +#: builtin/branch.c:645 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:644 +#: builtin/branch.c:646 msgid "copy a branch and its reflog" msgstr "" -#: builtin/branch.c:645 +#: builtin/branch.c:647 msgid "copy a branch, even if target exists" msgstr "" -#: builtin/branch.c:646 +#: builtin/branch.c:648 msgid "list branch names" msgstr "" -#: builtin/branch.c:647 +#: builtin/branch.c:649 msgid "show current branch name" msgstr "" -#: builtin/branch.c:648 +#: builtin/branch.c:650 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:650 +#: builtin/branch.c:652 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:651 +#: builtin/branch.c:653 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:652 +#: builtin/branch.c:654 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:653 +#: builtin/branch.c:655 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:654 +#: builtin/branch.c:656 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:658 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 #: builtin/tag.c:434 msgid "object" msgstr "" -#: builtin/branch.c:657 +#: builtin/branch.c:659 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 +#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:682 builtin/clone.c:789 +#: builtin/branch.c:684 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:706 +#: builtin/branch.c:708 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 +#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 msgid "branch name required" msgstr "" -#: builtin/branch.c:751 +#: builtin/branch.c:753 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:756 +#: builtin/branch.c:758 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:763 +#: builtin/branch.c:765 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:766 +#: builtin/branch.c:768 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:781 +#: builtin/branch.c:783 msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:790 +#: builtin/branch.c:792 msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:795 +#: builtin/branch.c:797 msgid "too many arguments to set new upstream" msgstr "" -#: builtin/branch.c:799 +#: builtin/branch.c:801 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:802 builtin/branch.c:825 +#: builtin/branch.c:804 builtin/branch.c:827 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:806 +#: builtin/branch.c:808 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:819 +#: builtin/branch.c:821 msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:823 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:829 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:839 +#: builtin/branch.c:841 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" msgstr "" -#: builtin/branch.c:843 +#: builtin/branch.c:845 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "" + +#: builtin/bugreport.c:21 +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "" + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "" + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" + +#: builtin/bugreport.c:135 +msgid "specify a destination for the bugreport file" +msgstr "" + +#: builtin/bugreport.c:137 +msgid "specify a strftime format suffix for the filename" +msgstr "" + +#: builtin/bugreport.c:159 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "" + +#: builtin/bugreport.c:166 +msgid "System Info" +msgstr "" + +#: builtin/bugreport.c:169 +msgid "Enabled Hooks" +msgstr "" + +#: builtin/bugreport.c:176 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "" + +#: builtin/bugreport.c:179 +#, c-format +msgid "unable to write to %s" +msgstr "" + +#: builtin/bugreport.c:189 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "" + #: builtin/bundle.c:15 builtin/bundle.c:23 msgid "git bundle create [<options>] <file> <git-rev-list args>" msgstr "" @@ -10334,44 +10549,48 @@ msgstr "" msgid "git bundle unbundle <file> [<refname>...]" msgstr "" -#: builtin/bundle.c:66 builtin/pack-objects.c:3448 +#: builtin/bundle.c:67 builtin/pack-objects.c:3480 msgid "do not show progress meter" msgstr "" -#: builtin/bundle.c:68 builtin/pack-objects.c:3450 +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 msgid "show progress meter" msgstr "" -#: builtin/bundle.c:70 builtin/pack-objects.c:3452 +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/bundle.c:73 builtin/pack-objects.c:3455 +#: builtin/bundle.c:74 builtin/pack-objects.c:3487 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/bundle.c:93 +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "" + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." msgstr "" -#: builtin/bundle.c:104 +#: builtin/bundle.c:107 msgid "do not show bundle details" msgstr "" -#: builtin/bundle.c:119 +#: builtin/bundle.c:122 #, c-format msgid "%s is okay\n" msgstr "" -#: builtin/bundle.c:160 +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "" -#: builtin/bundle.c:168 builtin/remote.c:1686 +#: builtin/bundle.c:171 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "" -#: builtin/bundle.c:190 builtin/remote.c:1717 +#: builtin/bundle.c:193 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -10420,7 +10639,7 @@ msgstr "" msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:648 git-submodule.sh:958 +#: builtin/cat-file.c:648 msgid "blob" msgstr "" @@ -10480,7 +10699,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537 +#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541 #: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "" @@ -10534,54 +10753,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/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:754 +#: 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: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 "" @@ -10616,133 +10835,133 @@ msgstr "" msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:256 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:274 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:290 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:395 +#: builtin/checkout.c:396 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:400 +#: builtin/checkout.c:401 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:407 +#: builtin/checkout.c:408 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436 -#: builtin/checkout.c:440 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:443 builtin/checkout.c:446 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:450 +#: builtin/checkout.c:451 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:454 +#: builtin/checkout.c:455 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "" -#: builtin/checkout.c:458 +#: builtin/checkout.c:459 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "" -#: builtin/checkout.c:463 builtin/checkout.c:468 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:527 builtin/checkout.c:534 +#: builtin/checkout.c:541 builtin/checkout.c:548 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:702 +#: builtin/checkout.c:716 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:756 +#: builtin/checkout.c:770 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:859 +#: builtin/checkout.c:866 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:901 +#: builtin/checkout.c:908 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:905 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:909 +#: builtin/checkout.c:916 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:912 +#: builtin/checkout.c:919 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:916 +#: builtin/checkout.c:923 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:918 builtin/checkout.c:1342 +#: builtin/checkout.c:925 builtin/checkout.c:1356 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:920 +#: builtin/checkout.c:927 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:971 +#: builtin/checkout.c:978 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:977 +#: builtin/checkout.c:984 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10757,7 +10976,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:996 +#: 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" @@ -10774,26 +10993,26 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:1031 +#: builtin/checkout.c:1038 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1042 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:1075 builtin/checkout.c:1337 +#: builtin/checkout.c:1082 builtin/checkout.c:1351 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:1150 +#: 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:1157 +#: 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" @@ -10805,287 +11024,287 @@ msgid "" "checkout.defaultRemote=origin in your config." msgstr "" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1181 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "" -#: builtin/checkout.c:1233 +#: builtin/checkout.c:1247 msgid "only one reference expected" msgstr "" -#: builtin/checkout.c:1250 +#: builtin/checkout.c:1264 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1296 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:1309 builtin/checkout.c:1675 +#: builtin/checkout.c:1323 builtin/checkout.c:1689 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1370 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "" -#: builtin/checkout.c:1358 +#: builtin/checkout.c:1372 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "" -#: builtin/checkout.c:1359 builtin/checkout.c:1367 +#: builtin/checkout.c:1373 builtin/checkout.c:1381 #, c-format msgid "a branch is expected, got '%s'" msgstr "" -#: builtin/checkout.c:1362 +#: builtin/checkout.c:1376 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "" -#: builtin/checkout.c:1378 +#: builtin/checkout.c:1392 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1382 +#: 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:1386 +#: builtin/checkout.c:1400 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1390 +#: 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:1394 +#: builtin/checkout.c:1408 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1398 +#: builtin/checkout.c:1412 msgid "you are switching branch while bisecting" msgstr "" -#: builtin/checkout.c:1405 +#: builtin/checkout.c:1419 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416 +#: 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:1420 builtin/checkout.c:1423 builtin/checkout.c:1426 -#: builtin/checkout.c:1431 builtin/checkout.c:1436 +#: 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:1433 +#: builtin/checkout.c:1447 #, c-format msgid "'%s' cannot take <start-point>" msgstr "" -#: builtin/checkout.c:1441 +#: builtin/checkout.c:1455 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1448 +#: builtin/checkout.c:1462 msgid "missing branch or commit argument" msgstr "" -#: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82 -#: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288 -#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561 -#: builtin/send-pack.c:173 +#: 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:1491 +#: builtin/checkout.c:1505 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322 +#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322 msgid "style" msgstr "" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1507 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1505 builtin/worktree.c:558 +#: builtin/checkout.c:1519 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1520 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1508 +#: builtin/checkout.c:1522 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1510 +#: builtin/checkout.c:1524 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1510 +#: builtin/checkout.c:1524 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1512 builtin/merge.c:292 +#: builtin/checkout.c:1526 builtin/merge.c:300 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1515 +#: builtin/checkout.c:1529 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1528 +#: builtin/checkout.c:1542 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1531 +#: builtin/checkout.c:1545 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1535 +#: builtin/checkout.c:1549 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1590 +#: builtin/checkout.c:1604 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1594 +#: builtin/checkout.c:1608 msgid "-p and --overlay are mutually exclusive" msgstr "" -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1645 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1636 +#: builtin/checkout.c:1650 #, c-format msgid "missing branch name; try -%c" msgstr "" -#: builtin/checkout.c:1668 +#: builtin/checkout.c:1682 #, c-format msgid "could not resolve %s" msgstr "" -#: builtin/checkout.c:1684 +#: builtin/checkout.c:1698 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1691 +#: 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:1695 +#: builtin/checkout.c:1709 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1704 +#: builtin/checkout.c:1718 msgid "--pathspec-from-file is incompatible with --detach" msgstr "" -#: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503 +#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499 msgid "--pathspec-from-file is incompatible with --patch" msgstr "" -#: builtin/checkout.c:1718 +#: 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:1723 +#: builtin/checkout.c:1739 msgid "you must specify path(s) to restore" msgstr "" -#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800 -#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554 +#: builtin/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:1750 +#: builtin/checkout.c:1766 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1752 +#: builtin/checkout.c:1768 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1753 +#: builtin/checkout.c:1769 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1755 +#: builtin/checkout.c:1771 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "" -#: builtin/checkout.c:1756 +#: builtin/checkout.c:1772 msgid "use overlay mode (default)" msgstr "" -#: builtin/checkout.c:1801 +#: builtin/checkout.c:1817 msgid "create and switch to a new branch" msgstr "" -#: builtin/checkout.c:1803 +#: builtin/checkout.c:1819 msgid "create/reset and switch to a branch" msgstr "" -#: builtin/checkout.c:1805 +#: builtin/checkout.c:1821 msgid "second guess 'git switch <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1807 +#: builtin/checkout.c:1823 msgid "throw away local modifications" msgstr "" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1857 msgid "which tree-ish to checkout from" msgstr "" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1859 msgid "restore the index" msgstr "" -#: builtin/checkout.c:1845 +#: builtin/checkout.c:1861 msgid "restore the working tree (default)" msgstr "" -#: builtin/checkout.c:1847 +#: builtin/checkout.c:1863 msgid "ignore unmerged entries" msgstr "" -#: builtin/checkout.c:1848 +#: builtin/checkout.c:1864 msgid "use overlay mode" msgstr "" @@ -11124,7 +11343,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" @@ -11133,7 +11352,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" @@ -11146,8 +11365,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 "" @@ -11210,7 +11429,7 @@ msgid "remove whole directories" msgstr "" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184 +#: 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" @@ -11248,337 +11467,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:554 +#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:104 +#: builtin/clone.c:105 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "pathspec" msgstr "" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:111 builtin/init-db.c:551 +#: builtin/clone.c:112 builtin/init-db.c:552 msgid "template-directory" msgstr "" -#: builtin/clone.c:112 builtin/init-db.c:552 +#: builtin/clone.c:113 builtin/init-db.c:553 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 +#: 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:1409 -#: builtin/submodule--helper.c:1914 +#: 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:562 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329 +#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 +#: 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:169 builtin/grep.c:848 +#: 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:171 builtin/pack-objects.c:3503 +#: 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:173 builtin/fetch.c:196 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304 +#: 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:174 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:1419 -#: builtin/submodule--helper.c:1928 +#: 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:560 +#: builtin/clone.c:138 builtin/init-db.c:561 msgid "gitdir" msgstr "" -#: builtin/clone.c:138 builtin/init-db.c:561 +#: builtin/clone.c:139 builtin/init-db.c:562 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "key=value" msgstr "" -#: builtin/clone.c:140 +#: builtin/clone.c:141 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 -#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171 +#: 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:191 builtin/ls-remote.c:76 -#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172 +#: 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:192 builtin/pull.c:234 -#: builtin/push.c:571 +#: 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:194 builtin/pull.c:237 -#: builtin/push.c:573 +#: 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:971 builtin/receive-pack.c:1982 +#: builtin/clone.c:992 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:975 +#: builtin/clone.c:996 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:988 +#: builtin/clone.c:1009 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:991 +#: builtin/clone.c:1012 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:1007 +#: builtin/clone.c:1025 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:1011 builtin/fetch.c:1794 +#: builtin/clone.c:1029 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:1021 +#: builtin/clone.c:1039 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:1033 +#: builtin/clone.c:1045 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "" + +#: builtin/clone.c:1059 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271 -#: builtin/log.c:1886 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:1053 +#: builtin/clone.c:1079 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:1073 +#: builtin/clone.c:1099 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:1075 +#: builtin/clone.c:1101 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1099 +#: builtin/clone.c:1125 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1164 +#: 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:1166 +#: builtin/clone.c:1212 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1168 +#: builtin/clone.c:1214 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1170 +#: builtin/clone.c:1216 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1173 +#: builtin/clone.c:1219 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1178 +#: builtin/clone.c:1224 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1262 builtin/clone.c:1270 +#: builtin/clone.c:1311 builtin/clone.c:1319 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1273 +#: builtin/clone.c:1322 msgid "You appear to have cloned an empty repository." msgstr "" @@ -11614,98 +11843,102 @@ msgstr "" msgid "--command must be the first argument" msgstr "" -#: builtin/commit-graph.c:13 builtin/commit-graph.c:21 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 msgid "" "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" msgstr "" -#: builtin/commit-graph.c:14 builtin/commit-graph.c:26 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:27 msgid "" "git commit-graph write [--object-dir <objdir>] [--append] [--" "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]progress] <split options>" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" msgstr "" -#: builtin/commit-graph.c:62 +#: builtin/commit-graph.c:64 #, c-format msgid "could not find object directory matching %s" msgstr "" -#: builtin/commit-graph.c:78 builtin/commit-graph.c:177 -#: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678 +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769 msgid "dir" msgstr "" -#: builtin/commit-graph.c:79 builtin/commit-graph.c:178 -#: builtin/commit-graph.c:277 +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 msgid "The object directory to store the graph" msgstr "" -#: builtin/commit-graph.c:81 +#: builtin/commit-graph.c:83 msgid "if the commit-graph is split, only verify the tip file" msgstr "" -#: builtin/commit-graph.c:104 +#: builtin/commit-graph.c:106 #, c-format msgid "Could not open commit-graph '%s'" msgstr "" -#: builtin/commit-graph.c:138 +#: builtin/commit-graph.c:142 #, c-format msgid "unrecognized --split argument, %s" msgstr "" -#: builtin/commit-graph.c:151 +#: builtin/commit-graph.c:155 #, c-format msgid "unexpected non-hex object ID: %s" msgstr "" -#: builtin/commit-graph.c:156 +#: builtin/commit-graph.c:160 #, c-format msgid "invalid object: %s" msgstr "" -#: builtin/commit-graph.c:180 +#: builtin/commit-graph.c:213 msgid "start walk at all refs" msgstr "" -#: builtin/commit-graph.c:182 +#: builtin/commit-graph.c:215 msgid "scan pack-indexes listed by stdin for commits" msgstr "" -#: builtin/commit-graph.c:184 +#: builtin/commit-graph.c:217 msgid "start walk at commits listed by stdin" msgstr "" -#: builtin/commit-graph.c:186 +#: builtin/commit-graph.c:219 msgid "include all commits already in the commit-graph file" msgstr "" -#: builtin/commit-graph.c:188 +#: builtin/commit-graph.c:221 msgid "enable computation for changed paths" msgstr "" -#: builtin/commit-graph.c:191 +#: builtin/commit-graph.c:224 msgid "allow writing an incremental commit-graph file" msgstr "" -#: builtin/commit-graph.c:195 +#: builtin/commit-graph.c:228 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" -#: builtin/commit-graph.c:197 +#: builtin/commit-graph.c:230 msgid "maximum ratio between two levels of a split commit-graph" msgstr "" -#: builtin/commit-graph.c:199 +#: builtin/commit-graph.c:232 msgid "only expire files older than a given date-time" msgstr "" -#: builtin/commit-graph.c:215 +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "" + +#: builtin/commit-graph.c:255 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" -#: builtin/commit-graph.c:245 +#: builtin/commit-graph.c:287 msgid "Collecting commits from input" msgstr "" @@ -11720,7 +11953,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:547 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555 #, c-format msgid "not a valid object name %s" msgstr "" @@ -11748,13 +11981,13 @@ msgstr "" msgid "id of a parent commit object" msgstr "" -#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474 +#: 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 "" -#: builtin/commit-tree.c:115 builtin/commit.c:1506 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "" @@ -11762,7 +11995,7 @@ msgstr "" msgid "read commit log message from file" msgstr "" -#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290 +#: 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 "" @@ -11892,12 +12125,12 @@ msgid "" "in the current commit message" msgstr "" -#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:729 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:425 #, c-format msgid "(reading log message from standard input)\n" msgstr "" @@ -11923,34 +12156,32 @@ msgstr "" msgid "could not write commit template" msgstr "" -#: builtin/commit.c:852 -#, c-format +#: builtin/commit.c:853 msgid "" "\n" "It looks like you may be committing a merge.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" -#: builtin/commit.c:857 -#, c-format +#: builtin/commit.c:858 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" -#: builtin/commit.c:870 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:878 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11958,320 +12189,320 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:895 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:903 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:910 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:928 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:999 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "" -#: builtin/commit.c:1013 builtin/tag.c:276 +#: builtin/commit.c:1011 builtin/tag.c:276 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1057 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1071 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "" -#: builtin/commit.c:1089 builtin/commit.c:1333 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1129 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1173 +#: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1182 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1185 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1187 +#: builtin/commit.c:1185 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1189 +#: builtin/commit.c:1187 msgid "You are in the middle of a rebase -- cannot amend." msgstr "" -#: builtin/commit.c:1192 +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1202 +#: builtin/commit.c:1200 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1204 +#: builtin/commit.c:1202 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1213 +#: builtin/commit.c:1211 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1231 +#: builtin/commit.c:1229 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1237 +#: builtin/commit.c:1235 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "" -#: builtin/commit.c:1368 builtin/commit.c:1529 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1370 builtin/commit.c:1531 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "" -#: builtin/commit.c:1372 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "" -#: builtin/commit.c:1374 builtin/commit.c:1533 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1376 +#: builtin/commit.c:1374 msgid "version" msgstr "" -#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549 -#: 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 "" -#: builtin/commit.c:1379 builtin/commit.c:1537 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1382 builtin/commit.c:1540 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543 -#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1198 builtin/fast-export.c:1201 +#: builtin/fast-export.c:1204 builtin/rebase.c:1406 parse-options.h:336 msgid "mode" msgstr "" -#: builtin/commit.c:1385 builtin/commit.c:1543 +#: builtin/commit.c:1383 builtin/commit.c:1541 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1389 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" -#: builtin/commit.c:1391 parse-options.h:192 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "" -#: builtin/commit.c:1392 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1394 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1395 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "" -#: builtin/commit.c:1397 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "" -#: builtin/commit.c:1417 +#: builtin/commit.c:1415 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1499 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1500 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1502 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415 +#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415 msgid "read message from file" msgstr "" -#: builtin/commit.c:1504 +#: builtin/commit.c:1502 msgid "author" msgstr "" -#: builtin/commit.c:1504 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1505 builtin/gc.c:538 +#: builtin/commit.c:1503 builtin/gc.c:542 msgid "date" msgstr "" -#: builtin/commit.c:1505 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509 -#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "" -#: builtin/commit.c:1507 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1508 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1509 +#: builtin/commit.c:1507 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1510 +#: builtin/commit.c:1508 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1511 +#: builtin/commit.c:1509 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293 +#: 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:1513 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1514 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1516 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1521 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1522 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1523 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1524 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1525 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1526 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1527 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1528 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1541 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1542 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1549 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1551 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1624 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1631 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1652 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1659 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1664 +#: builtin/commit.c:1662 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1698 +#: builtin/commit.c:1696 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -12282,209 +12513,217 @@ msgstr "" msgid "git config [<options>]" msgstr "" -#: builtin/config.c:104 builtin/env--helper.c:23 +#: builtin/config.c:109 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "" -#: builtin/config.c:116 +#: builtin/config.c:121 msgid "only one type at a time" msgstr "" -#: builtin/config.c:125 +#: builtin/config.c:130 msgid "Config file location" msgstr "" -#: builtin/config.c:126 +#: builtin/config.c:131 msgid "use global config file" msgstr "" -#: builtin/config.c:127 +#: builtin/config.c:132 msgid "use system config file" msgstr "" -#: builtin/config.c:128 +#: builtin/config.c:133 msgid "use repository config file" msgstr "" -#: builtin/config.c:129 +#: builtin/config.c:134 msgid "use per-worktree config file" msgstr "" -#: builtin/config.c:130 +#: builtin/config.c:135 msgid "use given config file" msgstr "" -#: builtin/config.c:131 +#: builtin/config.c:136 msgid "blob-id" msgstr "" -#: builtin/config.c:131 +#: builtin/config.c:136 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:132 +#: builtin/config.c:137 msgid "Action" msgstr "" -#: builtin/config.c:133 -msgid "get value: name [value-regex]" +#: builtin/config.c:138 +msgid "get value: name [value-pattern]" msgstr "" -#: builtin/config.c:134 -msgid "get all values: key [value-regex]" +#: builtin/config.c:139 +msgid "get all values: key [value-pattern]" msgstr "" -#: builtin/config.c:135 -msgid "get values for regexp: name-regex [value-regex]" +#: builtin/config.c:140 +msgid "get values for regexp: name-regex [value-pattern]" msgstr "" -#: builtin/config.c:136 +#: builtin/config.c:141 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:137 -msgid "replace all matching variables: name value [value_regex]" +#: builtin/config.c:142 +msgid "replace all matching variables: name value [value-pattern]" msgstr "" -#: builtin/config.c:138 +#: builtin/config.c:143 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:139 -msgid "remove a variable: name [value-regex]" +#: builtin/config.c:144 +msgid "remove a variable: name [value-pattern]" msgstr "" -#: builtin/config.c:140 -msgid "remove all matches: name [value-regex]" +#: builtin/config.c:145 +msgid "remove all matches: name [value-pattern]" msgstr "" -#: builtin/config.c:141 +#: builtin/config.c:146 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:142 +#: builtin/config.c:147 msgid "remove a section: name" msgstr "" -#: builtin/config.c:143 +#: builtin/config.c:148 msgid "list all" msgstr "" -#: builtin/config.c:144 +#: builtin/config.c:149 +msgid "use string equality when comparing values to 'value-pattern'" +msgstr "" + +#: builtin/config.c:150 msgid "open an editor" msgstr "" -#: builtin/config.c:145 +#: builtin/config.c:151 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:146 +#: builtin/config.c:152 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:147 +#: builtin/config.c:153 msgid "Type" msgstr "" -#: builtin/config.c:148 builtin/env--helper.c:38 +#: builtin/config.c:154 builtin/env--helper.c:43 msgid "value is given this type" msgstr "" -#: builtin/config.c:149 +#: builtin/config.c:155 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:150 +#: builtin/config.c:156 msgid "value is decimal number" msgstr "" -#: builtin/config.c:151 +#: builtin/config.c:157 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:152 +#: builtin/config.c:158 +msgid "value is --bool or string" +msgstr "" + +#: builtin/config.c:159 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:153 +#: builtin/config.c:160 msgid "value is an expiry date" msgstr "" -#: builtin/config.c:154 +#: builtin/config.c:161 msgid "Other" msgstr "" -#: builtin/config.c:155 +#: builtin/config.c:162 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:156 +#: builtin/config.c:163 msgid "show variable names only" msgstr "" -#: builtin/config.c:157 +#: builtin/config.c:164 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:158 +#: builtin/config.c:165 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" -#: builtin/config.c:159 +#: builtin/config.c:166 msgid "show scope of config (worktree, local, global, system, command)" msgstr "" -#: builtin/config.c:160 builtin/env--helper.c:40 +#: builtin/config.c:167 builtin/env--helper.c:45 msgid "value" msgstr "" -#: builtin/config.c:160 +#: builtin/config.c:167 msgid "with --get, use default value when missing entry" msgstr "" -#: builtin/config.c:174 +#: builtin/config.c:181 #, c-format msgid "wrong number of arguments, should be %d" msgstr "" -#: builtin/config.c:176 +#: builtin/config.c:183 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "" -#: builtin/config.c:324 +#: builtin/config.c:339 #, c-format msgid "invalid key pattern: %s" msgstr "" -#: builtin/config.c:360 +#: builtin/config.c:377 #, c-format msgid "failed to format default config value: %s" msgstr "" -#: builtin/config.c:417 +#: builtin/config.c:441 #, c-format msgid "cannot parse color '%s'" msgstr "" -#: builtin/config.c:459 +#: builtin/config.c:483 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:512 builtin/config.c:768 +#: builtin/config.c:536 builtin/config.c:833 msgid "not in a git directory" msgstr "" -#: builtin/config.c:515 +#: builtin/config.c:539 msgid "writing to stdin is not supported" msgstr "" -#: builtin/config.c:518 +#: builtin/config.c:542 msgid "writing config blobs is not supported" msgstr "" -#: builtin/config.c:603 +#: builtin/config.c:627 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12494,81 +12733,89 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:627 +#: builtin/config.c:652 msgid "only one config file at a time" msgstr "" -#: builtin/config.c:632 +#: builtin/config.c:658 msgid "--local can only be used inside a git repository" msgstr "" -#: builtin/config.c:635 +#: builtin/config.c:660 msgid "--blob can only be used inside a git repository" msgstr "" -#: builtin/config.c:655 +#: builtin/config.c:662 +msgid "--worktree can only be used inside a git repository" +msgstr "" + +#: builtin/config.c:684 msgid "$HOME not set" msgstr "" -#: builtin/config.c:679 +#: 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:714 +#: builtin/config.c:743 msgid "--get-color and variable type are incoherent" msgstr "" -#: builtin/config.c:719 +#: builtin/config.c:748 msgid "only one action at a time" msgstr "" -#: builtin/config.c:732 +#: builtin/config.c:761 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "" -#: builtin/config.c:738 +#: builtin/config.c:767 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" -#: builtin/config.c:744 +#: builtin/config.c:773 msgid "--default is only applicable to --get" msgstr "" -#: builtin/config.c:757 +#: 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:760 +#: builtin/config.c:825 msgid "error processing config file(s)" msgstr "" -#: builtin/config.c:770 +#: builtin/config.c:835 msgid "editing stdin is not supported" msgstr "" -#: builtin/config.c:772 +#: builtin/config.c:837 msgid "editing blobs is not supported" msgstr "" -#: builtin/config.c:786 +#: builtin/config.c:851 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:799 +#: 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:873 builtin/config.c:884 +#: builtin/config.c:943 builtin/config.c:954 #, c-format msgid "no such section: %s" msgstr "" @@ -12581,6 +12828,32 @@ msgstr "" msgid "print sizes in human readable format" msgstr "" +#: builtin/credential-cache--daemon.c:226 +#, c-format +msgid "" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" +msgstr "" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "" + +#: builtin/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 "" @@ -12739,41 +13012,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:242 +#: builtin/diff.c:258 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:359 +#: builtin/diff.c:375 #, c-format msgid "%s...%s: no merge base" msgstr "" -#: builtin/diff.c:469 +#: builtin/diff.c:485 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:514 +#: builtin/diff.c:530 builtin/grep.c:681 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:525 +#: builtin/diff.c:541 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:530 +#: builtin/diff.c:546 #, c-format msgid "unhandled object '%s' given." msgstr "" -#: builtin/diff.c:564 +#: builtin/diff.c:580 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "" @@ -12802,89 +13083,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 "" @@ -12892,24 +13173,24 @@ msgstr "" msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "" -#: builtin/env--helper.c:37 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 msgid "be quiet only use git_env_*() value as exit code" msgstr "" -#: builtin/env--helper.c:62 +#: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "" -#: builtin/env--helper.c:77 +#: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" @@ -12924,95 +13205,124 @@ msgstr "" msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "" -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1177 msgid "--anonymize-map token cannot be empty" msgstr "" -#: builtin/fast-export.c:1198 +#: builtin/fast-export.c:1197 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:1200 +#: builtin/fast-export.c:1199 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:1203 +#: builtin/fast-export.c:1202 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:1206 +#: builtin/fast-export.c:1205 msgid "select handling of commit messages in an alternate encoding" msgstr "" -#: builtin/fast-export.c:1209 +#: builtin/fast-export.c:1208 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:1211 +#: builtin/fast-export.c:1210 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:1215 +#: builtin/fast-export.c:1214 msgid "Import marks from this file if it exists" msgstr "" -#: builtin/fast-export.c:1217 +#: builtin/fast-export.c:1216 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:1219 +#: builtin/fast-export.c:1218 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:1221 +#: builtin/fast-export.c:1220 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:1222 +#: builtin/fast-export.c:1221 msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1223 builtin/log.c:1724 +#: builtin/fast-export.c:1222 builtin/log.c:1816 msgid "refspec" msgstr "" -#: builtin/fast-export.c:1224 +#: builtin/fast-export.c:1223 msgid "Apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c:1224 msgid "anonymize output" msgstr "" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1225 msgid "from:to" msgstr "" -#: builtin/fast-export.c:1227 +#: builtin/fast-export.c:1226 msgid "convert <from> to <to> in anonymized output" msgstr "" -#: builtin/fast-export.c:1230 +#: builtin/fast-export.c:1229 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" -#: builtin/fast-export.c:1232 +#: builtin/fast-export.c:1231 msgid "Show original object ids of blobs/commits" msgstr "" -#: builtin/fast-export.c:1234 +#: builtin/fast-export.c:1233 msgid "Label tags with mark ids" msgstr "" -#: builtin/fast-export.c:1257 +#: builtin/fast-export.c:1256 msgid "--anonymize-map without --anonymize does not make sense" msgstr "" -#: builtin/fast-export.c:1272 +#: builtin/fast-export.c:1271 msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "" -#: builtin/fetch-pack.c:245 +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "" + +#: builtin/fast-import.c:3090 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "" + +#: builtin/fast-import.c:3225 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "" + +#: builtin/fast-import.c:3230 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "" + +#: builtin/fast-import.c:3322 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "" + +#: builtin/fast-import.c:3377 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "" + +#: builtin/fetch-pack.c:241 #, c-format msgid "Lockfile created but not reported: %s" msgstr "" @@ -13033,188 +13343,196 @@ msgstr "" msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:117 +#: builtin/fetch.c:119 msgid "fetch.parallel cannot be negative" msgstr "" -#: builtin/fetch.c:140 builtin/pull.c:185 +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:142 builtin/pull.c:245 +#: builtin/fetch.c:144 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "" -#: builtin/fetch.c:144 builtin/pull.c:188 +#: builtin/fetch.c:146 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:146 builtin/pull.c:191 +#: builtin/fetch.c:148 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:147 +#: builtin/fetch.c:149 msgid "force overwrite of local reference" msgstr "" -#: builtin/fetch.c:149 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:151 builtin/pull.c:195 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:153 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:155 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:157 builtin/pull.c:198 +#: builtin/fetch.c:159 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:159 +#: builtin/fetch.c:161 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122 +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "" -#: builtin/fetch.c:161 +#: builtin/fetch.c:163 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:165 builtin/pull.c:206 +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:167 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:172 builtin/pull.c:212 +#: builtin/fetch.c:176 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:178 builtin/pull.c:221 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:181 +#: builtin/fetch.c:185 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:184 +#: builtin/fetch.c:188 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:188 builtin/pull.c:224 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:189 builtin/pull.c:226 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "" -#: builtin/fetch.c:190 builtin/pull.c:227 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:197 builtin/pull.c:240 +#: builtin/fetch.c:201 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "" -#: builtin/fetch.c:200 -msgid "run 'gc --auto' after fetching" +#: builtin/fetch.c:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" msgstr "" -#: builtin/fetch.c:202 builtin/pull.c:243 +#: builtin/fetch.c:208 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "" -#: builtin/fetch.c:204 +#: builtin/fetch.c:210 msgid "write the commit-graph after fetching" msgstr "" -#: builtin/fetch.c:514 +#: builtin/fetch.c:212 +msgid "accept refspecs from stdin" +msgstr "" + +#: builtin/fetch.c:523 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:654 +#: builtin/fetch.c:677 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:752 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:756 +#: builtin/fetch.c:779 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:770 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:780 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840 -#: builtin/fetch.c:852 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:785 +#: builtin/fetch.c:808 msgid "would clobber existing tag" msgstr "" -#: builtin/fetch.c:807 +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:810 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:813 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:852 +#: builtin/fetch.c:875 msgid "forced update" msgstr "" -#: builtin/fetch.c:857 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:878 +#: builtin/fetch.c:901 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" "flag or run 'git config fetch.showForcedUpdates true'." msgstr "" -#: builtin/fetch.c:882 +#: builtin/fetch.c:905 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13223,147 +13541,151 @@ msgid "" " to avoid this check.\n" msgstr "" -#: builtin/fetch.c:914 +#: builtin/fetch.c:939 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:935 +#: builtin/fetch.c:960 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:1020 builtin/fetch.c:1158 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:1031 +#: builtin/fetch.c:1064 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:1128 +#: builtin/fetch.c:1161 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:1129 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:1161 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:1162 builtin/remote.c:1112 +#: builtin/fetch.c:1195 builtin/remote.c:1118 msgid "(none)" msgstr "" -#: builtin/fetch.c:1185 +#: builtin/fetch.c:1218 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1204 +#: builtin/fetch.c:1237 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1207 +#: builtin/fetch.c:1240 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1415 +#: builtin/fetch.c:1448 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "" -#: builtin/fetch.c:1430 +#: builtin/fetch.c:1463 msgid "not setting upstream for a remote remote-tracking branch" msgstr "" -#: builtin/fetch.c:1432 +#: builtin/fetch.c:1465 msgid "not setting upstream for a remote tag" msgstr "" -#: builtin/fetch.c:1434 +#: builtin/fetch.c:1467 msgid "unknown branch type" msgstr "" -#: builtin/fetch.c:1436 +#: builtin/fetch.c:1469 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." msgstr "" -#: builtin/fetch.c:1562 builtin/fetch.c:1625 +#: builtin/fetch.c:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1584 +#: builtin/fetch.c:1620 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1724 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1724 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1778 +#: builtin/fetch.c:1825 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1827 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1785 +#: builtin/fetch.c:1832 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1834 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1800 +#: builtin/fetch.c:1851 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1802 +#: builtin/fetch.c:1853 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1811 +#: builtin/fetch.c:1862 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1818 +#: builtin/fetch.c:1869 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fetch.c:1836 +#: builtin/fetch.c:1887 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "" +#: builtin/fetch.c:1891 +msgid "--stdin can only be used when fetching from one remote" +msgstr "" + #: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" @@ -13398,7 +13720,7 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" msgstr "" #: builtin/for-each-ref.c:13 @@ -13449,6 +13771,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 "" @@ -13591,7 +13929,7 @@ msgstr "" msgid "Checking %s link" msgstr "" -#: builtin/fsck.c:696 builtin/index-pack.c:843 +#: builtin/fsck.c:696 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "" @@ -13676,7 +14014,7 @@ msgstr "" msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:847 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "" @@ -13690,31 +14028,31 @@ msgstr "" msgid "invalid parameter: expected sha1, got '%s'" msgstr "" -#: builtin/gc.c:35 +#: builtin/gc.c:39 msgid "git gc [<options>]" msgstr "" -#: builtin/gc.c:90 +#: builtin/gc.c:94 #, c-format msgid "Failed to fstat %s: %s" msgstr "" -#: builtin/gc.c:126 +#: builtin/gc.c:130 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "" -#: builtin/gc.c:475 builtin/init-db.c:57 +#: builtin/gc.c:479 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "" -#: builtin/gc.c:484 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:491 +#: builtin/gc.c:495 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -13724,62 +14062,194 @@ msgid "" "%s" msgstr "" -#: builtin/gc.c:539 +#: builtin/gc.c:543 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:541 +#: builtin/gc.c:545 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:542 +#: builtin/gc.c:546 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:545 +#: builtin/gc.c:549 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:548 +#: builtin/gc.c:552 msgid "repack all other packs except the largest pack" msgstr "" -#: builtin/gc.c:565 +#: builtin/gc.c:569 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "" -#: builtin/gc.c:576 +#: builtin/gc.c:580 #, c-format msgid "failed to parse prune expiry value %s" msgstr "" -#: builtin/gc.c:596 +#: builtin/gc.c:600 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:598 +#: builtin/gc.c:602 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:599 +#: builtin/gc.c:603 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:639 +#: builtin/gc.c:643 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:694 +#: builtin/gc.c:698 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" +#: 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:743 +#, c-format +msgid "unrecognized --schedule argument '%s'" +msgstr "" + +#: builtin/gc.c:862 +msgid "failed to write commit-graph" +msgstr "" + +#: 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:1309 +#, c-format +msgid "task '%s' failed" +msgstr "" + +#: builtin/gc.c:1389 +#, c-format +msgid "'%s' is not a valid task" +msgstr "" + +#: builtin/gc.c:1394 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "" + +#: builtin/gc.c:1409 +msgid "run tasks based on the state of the repository" +msgstr "" + +#: 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:1415 +msgid "task" +msgstr "" + +#: builtin/gc.c:1416 +msgid "run a specific task" +msgstr "" + +#: 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:1634 +#, c-format +msgid "invalid subcommand: %s" +msgstr "" + #: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" @@ -13798,8 +14268,8 @@ msgstr "" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2904 +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" msgstr "" @@ -13814,242 +14284,242 @@ msgstr "" msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:724 +#: builtin/grep.c:736 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:823 +#: builtin/grep.c:835 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:825 +#: builtin/grep.c:837 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:827 +#: builtin/grep.c:839 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:829 +#: builtin/grep.c:841 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:831 +#: builtin/grep.c:843 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:834 +#: builtin/grep.c:846 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:836 +#: builtin/grep.c:848 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:838 +#: builtin/grep.c:850 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:840 +#: builtin/grep.c:852 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:842 +#: builtin/grep.c:854 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:845 +#: builtin/grep.c:857 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:847 +#: builtin/grep.c:859 msgid "search in subdirectories (default)" msgstr "" -#: builtin/grep.c:849 +#: builtin/grep.c:861 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:853 +#: builtin/grep.c:865 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:856 +#: builtin/grep.c:868 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:859 +#: builtin/grep.c:871 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:874 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:865 +#: builtin/grep.c:877 msgid "show line numbers" msgstr "" -#: builtin/grep.c:866 +#: builtin/grep.c:878 msgid "show column number of first match" msgstr "" -#: builtin/grep.c:867 +#: builtin/grep.c:879 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:868 +#: builtin/grep.c:880 msgid "show filenames" msgstr "" -#: builtin/grep.c:870 +#: builtin/grep.c:882 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:872 +#: builtin/grep.c:884 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:874 +#: builtin/grep.c:886 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:877 +#: builtin/grep.c:889 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:879 +#: builtin/grep.c:891 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:882 +#: builtin/grep.c:894 msgid "show only matching parts of a line" msgstr "" -#: builtin/grep.c:884 +#: builtin/grep.c:896 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:885 +#: builtin/grep.c:897 msgid "highlight matches" msgstr "" -#: builtin/grep.c:887 +#: builtin/grep.c:899 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:889 +#: builtin/grep.c:901 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:892 +#: builtin/grep.c:904 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:895 +#: builtin/grep.c:907 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:897 +#: builtin/grep.c:909 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:899 +#: builtin/grep.c:911 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:900 +#: builtin/grep.c:912 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:903 +#: builtin/grep.c:915 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:905 +#: builtin/grep.c:917 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:908 +#: builtin/grep.c:920 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:910 +#: builtin/grep.c:922 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:912 +#: builtin/grep.c:924 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:924 +#: builtin/grep.c:936 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:926 +#: builtin/grep.c:938 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:928 +#: builtin/grep.c:940 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:932 +#: builtin/grep.c:944 msgid "pager" msgstr "" -#: builtin/grep.c:932 +#: builtin/grep.c:944 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:936 +#: builtin/grep.c:948 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:1003 +#: builtin/grep.c:1014 msgid "no pattern given" msgstr "" -#: builtin/grep.c:1039 +#: builtin/grep.c:1050 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1047 +#: builtin/grep.c:1058 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1077 +#: builtin/grep.c:1088 msgid "--untracked not supported with --recurse-submodules" msgstr "" -#: builtin/grep.c:1081 +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1084 builtin/pack-objects.c:3623 +#: builtin/grep.c:1095 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901 +#: 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:1121 +#: builtin/grep.c:1132 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1147 +#: builtin/grep.c:1158 msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1153 +#: builtin/grep.c:1164 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1161 +#: builtin/grep.c:1172 msgid "both --cached and trees are given" msgstr "" @@ -14179,7 +14649,7 @@ msgstr "" msgid "'%s' is aliased to '%s'" msgstr "" -#: builtin/help.c:534 git.c:367 +#: builtin/help.c:534 git.c:369 #, c-format msgid "bad alias.%s string: %s" msgstr "" @@ -14193,353 +14663,353 @@ msgstr "" msgid "'git help config' for more information" msgstr "" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:288 builtin/pack-objects.c:618 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "" -#: builtin/index-pack.c:306 builtin/repack.c:250 +#: builtin/index-pack.c:342 builtin/repack.c:286 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:612 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 -#: builtin/index-pack.c:804 builtin/index-pack.c:813 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:738 builtin/pack-objects.c:170 -#: builtin/pack-objects.c:230 builtin/pack-objects.c:325 +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:802 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "" -#: builtin/index-pack.c:810 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:827 builtin/index-pack.c:846 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:870 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:920 builtin/index-pack.c:951 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2665 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1288 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1304 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1405 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "" -#: builtin/index-pack.c:1462 +#: builtin/index-pack.c:1501 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1484 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1528 builtin/pack-objects.c:2912 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1592 +#: builtin/index-pack.c:1631 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1633 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1642 +#: builtin/index-pack.c:1681 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1649 +#: builtin/index-pack.c:1688 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1689 +#: builtin/index-pack.c:1728 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621 +#: builtin/index-pack.c:1806 builtin/init-db.c:392 builtin/init-db.c:625 #, c-format msgid "unknown hash algorithm '%s'" msgstr "" -#: builtin/index-pack.c:1782 +#: builtin/index-pack.c:1821 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1784 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1786 +#: builtin/index-pack.c:1825 msgid "--object-format cannot be used with --stdin" msgstr "" -#: builtin/index-pack.c:1792 +#: builtin/index-pack.c:1831 msgid "--verify with no packfile name given" msgstr "" -#: builtin/index-pack.c:1840 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "" -#: builtin/init-db.c:63 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "" -#: builtin/init-db.c:68 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:80 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:82 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:88 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:92 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:123 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "" -#: builtin/init-db.c:138 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:276 +#: builtin/init-db.c:275 #, c-format msgid "invalid initial branch name: '%s'" msgstr "" -#: builtin/init-db.c:368 +#: builtin/init-db.c:367 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:371 +#: builtin/init-db.c:370 #, c-format msgid "unable to move %s to %s" msgstr "" @@ -14553,79 +15023,87 @@ msgstr "" msgid "%s already exists" msgstr "" -#: builtin/init-db.c:444 +#: builtin/init-db.c:445 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "" -#: builtin/init-db.c:475 +#: builtin/init-db.c:476 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:476 +#: builtin/init-db.c:477 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:480 +#: builtin/init-db.c:481 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:530 +#: builtin/init-db.c:531 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -#: builtin/init-db.c:556 +#: builtin/init-db.c:557 msgid "permissions" msgstr "" -#: builtin/init-db.c:557 +#: builtin/init-db.c:558 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:563 +#: builtin/init-db.c:564 msgid "override the name of the initial branch" msgstr "" -#: builtin/init-db.c:564 +#: builtin/init-db.c:565 builtin/verify-pack.c:74 msgid "hash" msgstr "" -#: builtin/init-db.c:565 builtin/show-index.c:22 +#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "" -#: builtin/init-db.c:598 builtin/init-db.c:603 +#: builtin/init-db.c:573 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "" + +#: builtin/init-db.c:602 builtin/init-db.c:607 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:607 +#: builtin/init-db.c:611 builtin/init-db.c:666 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:634 +#: builtin/init-db.c:638 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:662 +#: builtin/init-db.c:690 #, c-format msgid "Cannot access work tree '%s'" msgstr "" +#: builtin/init-db.c:695 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -14688,401 +15166,412 @@ msgstr "" msgid "no input file given for in-place editing" msgstr "" -#: builtin/log.c:57 +#: builtin/log.c:58 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/log.c:58 +#: builtin/log.c:59 msgid "git show [<options>] <object>..." msgstr "" -#: builtin/log.c:111 +#: builtin/log.c:112 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:178 +#: builtin/log.c:179 msgid "show source" msgstr "" -#: builtin/log.c:179 +#: builtin/log.c:180 msgid "Use mail map file" msgstr "" -#: builtin/log.c:182 +#: builtin/log.c:183 msgid "only decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:184 +#: builtin/log.c:185 msgid "do not decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:185 +#: builtin/log.c:186 msgid "decorate options" msgstr "" -#: builtin/log.c:188 -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:298 +#: builtin/log.c:212 +msgid "-L<range>:<file> cannot be used with pathspec" +msgstr "" + +#: builtin/log.c:302 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:556 +#: builtin/log.c:564 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:571 builtin/log.c:666 +#: builtin/log.c:579 builtin/log.c:674 #, c-format msgid "could not read object %s" msgstr "" -#: builtin/log.c:691 +#: builtin/log.c:699 #, c-format msgid "unknown type: %d" msgstr "" -#: builtin/log.c:835 +#: builtin/log.c:848 #, c-format msgid "%s: invalid cover from description mode" msgstr "" -#: builtin/log.c:842 +#: builtin/log.c:855 msgid "format.headers without value" msgstr "" -#: builtin/log.c:957 -msgid "name of output directory is too long" -msgstr "" - -#: builtin/log.c:973 +#: builtin/log.c:984 #, c-format msgid "cannot open patch file %s" msgstr "" -#: builtin/log.c:990 +#: builtin/log.c:1001 msgid "need exactly one range" msgstr "" -#: builtin/log.c:1000 +#: builtin/log.c:1011 msgid "not a range" msgstr "" -#: builtin/log.c:1164 +#: builtin/log.c:1175 msgid "cover letter needs email format" msgstr "" -#: builtin/log.c:1170 +#: builtin/log.c:1181 msgid "failed to create cover-letter file" msgstr "" -#: builtin/log.c:1249 +#: builtin/log.c:1262 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1276 +#: builtin/log.c:1289 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1334 +#: builtin/log.c:1347 msgid "two output directories?" msgstr "" -#: builtin/log.c:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231 +#: 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:1455 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:1460 +#: builtin/log.c:1518 msgid "could not find exact merge base" msgstr "" -#: builtin/log.c:1464 +#: 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:1484 +#: builtin/log.c:1551 msgid "failed to find exact merge base" msgstr "" -#: builtin/log.c:1495 +#: builtin/log.c:1568 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1499 +#: builtin/log.c:1578 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1552 +#: builtin/log.c:1636 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1604 -msgid "failed to infer range-diff ranges" +#: builtin/log.c:1693 +msgid "failed to infer range-diff origin of current series" msgstr "" -#: builtin/log.c:1650 +#: builtin/log.c:1695 +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "" + +#: builtin/log.c:1739 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1653 +#: builtin/log.c:1742 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1657 +#: builtin/log.c:1746 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1659 +#: builtin/log.c:1748 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1661 +#: builtin/log.c:1750 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1662 +#: builtin/log.c:1751 msgid "sfx" msgstr "" -#: builtin/log.c:1663 +#: builtin/log.c:1752 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1665 +#: builtin/log.c:1754 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1667 +#: builtin/log.c:1756 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1669 +#: 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:1672 +#: builtin/log.c:1763 msgid "cover-from-description-mode" msgstr "" -#: builtin/log.c:1673 +#: builtin/log.c:1764 msgid "generate parts of a cover letter based on a branch's description" msgstr "" -#: builtin/log.c:1675 +#: builtin/log.c:1766 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1678 +#: builtin/log.c:1769 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1681 +#: builtin/log.c:1772 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1684 +#: builtin/log.c:1775 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1686 +#: builtin/log.c:1777 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1688 +#: builtin/log.c:1779 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1690 +#: builtin/log.c:1781 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1692 +#: builtin/log.c:1783 msgid "Messaging" msgstr "" -#: builtin/log.c:1693 +#: builtin/log.c:1784 msgid "header" msgstr "" -#: builtin/log.c:1694 +#: builtin/log.c:1785 msgid "add email header" msgstr "" -#: builtin/log.c:1695 builtin/log.c:1696 +#: builtin/log.c:1786 builtin/log.c:1787 msgid "email" msgstr "" -#: builtin/log.c:1695 +#: builtin/log.c:1786 msgid "add To: header" msgstr "" -#: builtin/log.c:1696 +#: builtin/log.c:1787 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1697 +#: builtin/log.c:1788 msgid "ident" msgstr "" -#: builtin/log.c:1698 +#: builtin/log.c:1789 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1700 +#: builtin/log.c:1791 msgid "message-id" msgstr "" -#: builtin/log.c:1701 +#: builtin/log.c:1792 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1702 builtin/log.c:1705 +#: builtin/log.c:1793 builtin/log.c:1796 msgid "boundary" msgstr "" -#: builtin/log.c:1703 +#: builtin/log.c:1794 msgid "attach the patch" msgstr "" -#: builtin/log.c:1706 +#: builtin/log.c:1797 msgid "inline the patch" msgstr "" -#: builtin/log.c:1710 +#: builtin/log.c:1801 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1712 +#: builtin/log.c:1803 msgid "signature" msgstr "" -#: builtin/log.c:1713 +#: builtin/log.c:1804 msgid "add a signature" msgstr "" -#: builtin/log.c:1714 +#: builtin/log.c:1805 msgid "base-commit" msgstr "" -#: builtin/log.c:1715 +#: builtin/log.c:1806 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1717 +#: builtin/log.c:1809 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1718 +#: builtin/log.c:1810 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1720 +#: builtin/log.c:1812 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1722 +#: builtin/log.c:1814 msgid "show changes against <rev> in cover letter or single patch" msgstr "" -#: builtin/log.c:1725 +#: builtin/log.c:1817 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" -#: builtin/log.c:1727 +#: builtin/log.c:1819 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1812 +#: builtin/log.c:1905 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1827 +#: builtin/log.c:1920 msgid "-n and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1829 +#: builtin/log.c:1922 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1837 +#: builtin/log.c:1930 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1839 +#: builtin/log.c:1932 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1841 +#: builtin/log.c:1934 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1874 -msgid "standard output, or directory, which one?" +#: builtin/log.c:1956 +msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "" -#: builtin/log.c:1978 +#: builtin/log.c:2079 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1982 +#: builtin/log.c:2083 msgid "Interdiff:" msgstr "" -#: builtin/log.c:1983 +#: builtin/log.c:2084 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:1989 +#: builtin/log.c:2090 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:1993 +#: builtin/log.c:2094 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:2001 +#: builtin/log.c:2102 msgid "Range-diff:" msgstr "" -#: builtin/log.c:2002 +#: builtin/log.c:2103 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:2013 +#: builtin/log.c:2114 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:2049 +#: builtin/log.c:2150 msgid "Generating patches" msgstr "" -#: builtin/log.c:2093 +#: builtin/log.c:2194 msgid "failed to create output files" msgstr "" -#: builtin/log.c:2152 +#: builtin/log.c:2253 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:2206 +#: builtin/log.c:2307 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -15203,7 +15692,7 @@ msgstr "" msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398 msgid "exec" msgstr "" @@ -15385,373 +15874,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:121 +#: builtin/merge.c:122 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:144 +#: builtin/merge.c:145 #, c-format msgid "option `%s' requires a value" msgstr "" -#: builtin/merge.c:190 +#: builtin/merge.c:198 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:191 +#: builtin/merge.c:199 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:196 +#: builtin/merge.c:204 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:247 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:250 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:251 builtin/pull.c:139 +#: builtin/merge.c:259 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:253 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:256 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:258 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:260 builtin/pull.c:154 +#: builtin/merge.c:268 builtin/pull.c:154 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:262 +#: builtin/merge.c:270 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:264 builtin/pull.c:161 +#: builtin/merge.c:272 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:268 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:269 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:527 builtin/rebase.c:1398 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:270 builtin/pull.c:169 +#: builtin/merge.c:278 builtin/pull.c:169 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:271 builtin/pull.c:172 +#: builtin/merge.c:279 builtin/pull.c:172 msgid "option=value" msgstr "" -#: builtin/merge.c:272 builtin/pull.c:173 +#: builtin/merge.c:280 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:274 +#: builtin/merge.c:282 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:281 +#: builtin/merge.c:289 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:283 +#: builtin/merge.c:291 msgid "--abort but leave index and working tree alone" msgstr "" -#: builtin/merge.c:285 +#: builtin/merge.c:293 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:287 builtin/pull.c:180 +#: builtin/merge.c:295 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:294 +#: builtin/merge.c:302 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" -#: builtin/merge.c:311 +#: builtin/merge.c:319 msgid "could not run stash." msgstr "" -#: builtin/merge.c:316 +#: builtin/merge.c:324 msgid "stash failed" msgstr "" -#: builtin/merge.c:321 +#: builtin/merge.c:329 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:343 builtin/merge.c:360 +#: builtin/merge.c:351 builtin/merge.c:368 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:390 +#: builtin/merge.c:398 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:401 +#: builtin/merge.c:409 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:451 +#: builtin/merge.c:459 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:502 +#: builtin/merge.c:510 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:589 +#: builtin/merge.c:597 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:716 +#: builtin/merge.c:723 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:730 +#: builtin/merge.c:736 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:745 +#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:797 +#: builtin/merge.c:807 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:806 +#: builtin/merge.c:816 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:812 +#: 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:817 +#: builtin/merge.c:827 msgid "An empty message aborts the commit.\n" msgstr "" -#: builtin/merge.c:820 +#: 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:873 +#: builtin/merge.c:883 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:888 +#: builtin/merge.c:898 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:949 +#: builtin/merge.c:959 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:988 +#: builtin/merge.c:998 msgid "No current branch." msgstr "" -#: builtin/merge.c:990 +#: builtin/merge.c:1000 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:992 +#: builtin/merge.c:1002 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:997 +#: builtin/merge.c:1007 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1054 +#: builtin/merge.c:1064 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1157 +#: builtin/merge.c:1167 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1191 +#: builtin/merge.c:1201 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1295 +#: builtin/merge.c:1311 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1299 +#: builtin/merge.c:1315 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1317 +#: builtin/merge.c:1333 msgid "--quit expects no arguments" msgstr "" -#: builtin/merge.c:1330 +#: builtin/merge.c:1346 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1334 +#: builtin/merge.c:1350 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1350 +#: 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:1357 +#: 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:1360 +#: builtin/merge.c:1376 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1374 +#: builtin/merge.c:1390 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1376 +#: builtin/merge.c:1392 msgid "You cannot combine --squash with --commit." msgstr "" -#: builtin/merge.c:1392 +#: builtin/merge.c:1408 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1409 +#: builtin/merge.c:1425 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1411 +#: builtin/merge.c:1427 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1416 +#: builtin/merge.c:1432 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1418 +#: builtin/merge.c:1434 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1499 +#: builtin/merge.c:1515 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1508 +#: builtin/merge.c:1524 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1518 +#: builtin/merge.c:1534 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1564 +#: builtin/merge.c:1580 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1571 +#: builtin/merge.c:1587 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1596 +#: builtin/merge.c:1612 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1602 +#: builtin/merge.c:1618 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1630 builtin/merge.c:1695 +#: builtin/merge.c:1646 builtin/merge.c:1711 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1634 +#: builtin/merge.c:1650 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1686 +#: builtin/merge.c:1702 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1688 +#: builtin/merge.c:1704 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1697 +#: builtin/merge.c:1713 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1711 +#: builtin/merge.c:1727 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -15827,68 +16316,72 @@ msgstr "" msgid "skip move/rename errors" msgstr "" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484 #, c-format msgid "renaming '%s' failed" msgstr "" @@ -15906,7 +16399,7 @@ msgid "git name-rev [<options>] --stdin" msgstr "" #: builtin/name-rev.c:524 -msgid "print only names (no SHA-1)" +msgid "print only ref-based names (no object names)" msgstr "" #: builtin/name-rev.c:525 @@ -16328,370 +16821,370 @@ msgstr "" msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1034 builtin/stash.c:1608 +#: builtin/notes.c:1034 builtin/stash.c:1604 #, c-format msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:442 +#: builtin/pack-objects.c:443 #, c-format msgid "bad packed object CRC for %s" msgstr "" -#: builtin/pack-objects.c:453 +#: builtin/pack-objects.c:454 #, c-format msgid "corrupt packed object for %s" msgstr "" -#: builtin/pack-objects.c:584 +#: builtin/pack-objects.c:585 #, c-format msgid "recursive delta detected for object %s" msgstr "" -#: builtin/pack-objects.c:795 +#: builtin/pack-objects.c:796 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1003 +#: builtin/pack-objects.c:1004 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:1016 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1077 builtin/update-index.c:90 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "" -#: builtin/pack-objects.c:1130 +#: builtin/pack-objects.c:1131 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1347 +#: builtin/pack-objects.c:1348 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:1774 +#: builtin/pack-objects.c:1796 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "" -#: builtin/pack-objects.c:1783 +#: builtin/pack-objects.c:1805 #, c-format msgid "delta base offset out of bound for %s" msgstr "" -#: builtin/pack-objects.c:2054 +#: builtin/pack-objects.c:2086 msgid "Counting objects" msgstr "" -#: builtin/pack-objects.c:2199 +#: builtin/pack-objects.c:2231 #, c-format msgid "unable to parse object header of %s" msgstr "" -#: builtin/pack-objects.c:2269 builtin/pack-objects.c:2285 -#: builtin/pack-objects.c:2295 +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 #, c-format msgid "object %s cannot be read" msgstr "" -#: builtin/pack-objects.c:2272 builtin/pack-objects.c:2299 +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" -#: builtin/pack-objects.c:2309 +#: builtin/pack-objects.c:2341 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2656 #, c-format msgid "Delta compression using up to %d threads" msgstr "" -#: builtin/pack-objects.c:2763 +#: builtin/pack-objects.c:2795 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" -#: builtin/pack-objects.c:2851 +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2857 +#: builtin/pack-objects.c:2889 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:2929 +#: builtin/pack-objects.c:2961 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" "hash> <uri>' (got '%s')" msgstr "" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:2964 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "" -#: builtin/pack-objects.c:2961 +#: builtin/pack-objects.c:2993 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2967 +#: builtin/pack-objects.c:2999 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:3065 +#: builtin/pack-objects.c:3097 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:3124 builtin/pack-objects.c:3232 +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 msgid "cannot open pack index" msgstr "" -#: builtin/pack-objects.c:3155 +#: builtin/pack-objects.c:3187 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3272 msgid "unable to force loose object" msgstr "" -#: builtin/pack-objects.c:3333 +#: builtin/pack-objects.c:3365 #, c-format msgid "not a rev '%s'" msgstr "" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3368 #, c-format msgid "bad revision '%s'" msgstr "" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3393 msgid "unable to add recent objects" msgstr "" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3446 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3418 +#: builtin/pack-objects.c:3450 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:3456 +#: builtin/pack-objects.c:3488 msgid "<version>[,<offset>]" msgstr "" -#: builtin/pack-objects.c:3457 +#: builtin/pack-objects.c:3489 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3460 +#: builtin/pack-objects.c:3492 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3462 +#: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3464 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3466 +#: builtin/pack-objects.c:3498 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3468 +#: builtin/pack-objects.c:3500 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3470 +#: builtin/pack-objects.c:3502 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3472 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3474 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3476 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3478 +#: builtin/pack-objects.c:3510 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3480 +#: builtin/pack-objects.c:3512 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3482 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3484 +#: builtin/pack-objects.c:3516 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3487 +#: builtin/pack-objects.c:3519 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3522 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3493 +#: builtin/pack-objects.c:3525 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3496 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3530 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3500 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3502 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3536 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:3507 +#: builtin/pack-objects.c:3539 msgid "use the sparse reachability algorithm" msgstr "" -#: builtin/pack-objects.c:3509 +#: builtin/pack-objects.c:3541 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3543 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:3513 +#: builtin/pack-objects.c:3545 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:3515 +#: builtin/pack-objects.c:3547 msgid "ignore this pack" msgstr "" -#: builtin/pack-objects.c:3517 +#: builtin/pack-objects.c:3549 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3551 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:3521 +#: builtin/pack-objects.c:3553 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:3523 +#: builtin/pack-objects.c:3555 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3559 msgid "write a bitmap index if possible" msgstr "" -#: builtin/pack-objects.c:3531 +#: builtin/pack-objects.c:3563 msgid "handling for missing objects" msgstr "" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3566 msgid "do not pack objects in promisor packfiles" msgstr "" -#: builtin/pack-objects.c:3536 +#: builtin/pack-objects.c:3568 msgid "respect islands during delta compression" msgstr "" -#: builtin/pack-objects.c:3538 +#: builtin/pack-objects.c:3570 msgid "protocol" msgstr "" -#: builtin/pack-objects.c:3539 +#: builtin/pack-objects.c:3571 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3600 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" -#: builtin/pack-objects.c:3573 +#: builtin/pack-objects.c:3605 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3659 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" -#: builtin/pack-objects.c:3629 +#: builtin/pack-objects.c:3661 msgid "minimum pack size limit is 1 MiB" msgstr "" -#: builtin/pack-objects.c:3634 +#: builtin/pack-objects.c:3666 msgid "--thin cannot be used to build an indexable pack" msgstr "" -#: builtin/pack-objects.c:3637 +#: builtin/pack-objects.c:3669 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "" -#: builtin/pack-objects.c:3643 +#: builtin/pack-objects.c:3675 msgid "cannot use --filter without --stdout" msgstr "" -#: builtin/pack-objects.c:3703 +#: builtin/pack-objects.c:3735 msgid "Enumerating objects" msgstr "" -#: builtin/pack-objects.c:3734 +#: builtin/pack-objects.c:3766 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -16755,7 +17248,7 @@ msgstr "" msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:158 builtin/rebase.c:478 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126 msgid "allow fast-forward" msgstr "" @@ -16780,7 +17273,7 @@ msgstr "" msgid "Invalid value for pull.ff: %s" msgstr "" -#: builtin/pull.c:349 +#: builtin/pull.c:348 msgid "" "Pulling without specifying how to reconcile divergent branches is\n" "discouraged. You can squelch this message by running one of the following\n" @@ -16797,24 +17290,24 @@ msgid "" "invocation.\n" msgstr "" -#: builtin/pull.c:459 +#: builtin/pull.c:458 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:461 +#: builtin/pull.c:460 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:462 +#: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:465 +#: builtin/pull.c:464 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16822,70 +17315,69 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:470 builtin/rebase.c:1234 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:472 builtin/pull.c:487 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:474 builtin/pull.c:489 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:475 builtin/pull.c:490 +#: builtin/pull.c:474 builtin/pull.c:489 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:477 builtin/pull.c:483 builtin/pull.c:492 -#: builtin/rebase.c:1240 git-parse-remote.sh:64 +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1252 msgid "<remote>" msgstr "" -#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497 -#: git-parse-remote.sh:65 +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 msgid "<branch>" msgstr "" -#: builtin/pull.c:485 builtin/rebase.c:1232 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:494 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 "" -#: builtin/pull.c:499 +#: builtin/pull.c:498 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" -#: builtin/pull.c:610 +#: builtin/pull.c:609 #, c-format msgid "unable to access commit %s" msgstr "" -#: builtin/pull.c:895 +#: builtin/pull.c:915 msgid "ignoring --verify-signatures for rebase" msgstr "" -#: builtin/pull.c:955 +#: builtin/pull.c:972 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:959 +#: builtin/pull.c:976 msgid "pull with rebase" msgstr "" -#: builtin/pull.c:960 +#: builtin/pull.c:977 msgid "please commit or stash them." msgstr "" -#: builtin/pull.c:985 +#: builtin/pull.c:1002 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16893,7 +17385,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:991 +#: builtin/pull.c:1008 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16904,15 +17396,15 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:1006 +#: builtin/pull.c:1023 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:1010 +#: builtin/pull.c:1027 msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/pull.c:1018 +#: builtin/pull.c:1041 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -16920,21 +17412,21 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/push.c:112 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "" -#: builtin/push.c:122 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "" -#: builtin/push.c:168 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:171 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -16949,7 +17441,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:186 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -16959,7 +17451,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:200 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -16968,12 +17460,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:208 +#: builtin/push.c:202 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:211 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -16981,12 +17473,12 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:270 +#: builtin/push.c:260 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:277 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -16994,7 +17486,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:283 +#: builtin/push.c:273 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -17002,7 +17494,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:289 +#: builtin/push.c:279 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -17011,110 +17503,122 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:296 +#: builtin/push.c:286 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:299 +#: builtin/push.c:289 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" -#: builtin/push.c:361 +#: 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:368 +#: builtin/push.c:371 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:542 +#: builtin/push.c:553 msgid "repository" msgstr "" -#: builtin/push.c:543 builtin/send-pack.c:164 +#: builtin/push.c:554 builtin/send-pack.c:189 msgid "push all refs" msgstr "" -#: builtin/push.c:544 builtin/send-pack.c:166 +#: builtin/push.c:555 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "" -#: builtin/push.c:546 +#: builtin/push.c:557 msgid "delete refs" msgstr "" -#: builtin/push.c:547 +#: builtin/push.c:558 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:550 builtin/send-pack.c:167 +#: builtin/push.c:561 builtin/send-pack.c:192 msgid "force updates" msgstr "" -#: builtin/push.c:551 builtin/send-pack.c:179 +#: builtin/push.c:562 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "" -#: builtin/push.c:552 builtin/send-pack.c:180 +#: builtin/push.c:563 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:555 +#: 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:556 builtin/send-pack.c:174 +#: builtin/push.c:570 builtin/send-pack.c:199 msgid "use thin pack" msgstr "" -#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: 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:559 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:562 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:564 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:565 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:567 builtin/send-pack.c:168 +#: builtin/push.c:581 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:569 builtin/send-pack.c:175 +#: builtin/push.c:583 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "" -#: builtin/push.c:587 +#: builtin/push.c:601 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:589 +#: builtin/push.c:603 msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/push.c:609 +#: builtin/push.c:623 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:610 +#: builtin/push.c:624 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -17127,27 +17631,27 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:625 +#: builtin/push.c:639 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:627 +#: builtin/push.c:641 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:631 +#: builtin/push.c:645 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:633 +#: builtin/push.c:647 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:636 +#: builtin/push.c:650 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:640 +#: builtin/push.c:657 msgid "push options must not have new line characters" msgstr "" @@ -17286,193 +17790,193 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "" -#: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232 +#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244 #, c-format msgid "unusable todo list: '%s'" msgstr "" -#: builtin/rebase.c:298 +#: builtin/rebase.c:310 #, c-format msgid "could not create temporary %s" msgstr "" -#: builtin/rebase.c:304 +#: builtin/rebase.c:316 msgid "could not mark as interactive" msgstr "" -#: builtin/rebase.c:358 +#: builtin/rebase.c:369 msgid "could not generate todo list" msgstr "" -#: builtin/rebase.c:399 +#: builtin/rebase.c:411 msgid "a base commit must be provided with --upstream or --onto" msgstr "" -#: builtin/rebase.c:468 +#: builtin/rebase.c:480 msgid "git rebase--interactive [<options>]" msgstr "" -#: builtin/rebase.c:481 builtin/rebase.c:1374 +#: builtin/rebase.c:493 builtin/rebase.c:1388 msgid "keep commits which start empty" msgstr "" -#: builtin/rebase.c:485 builtin/revert.c:128 +#: builtin/rebase.c:497 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "" -#: builtin/rebase.c:487 +#: builtin/rebase.c:499 msgid "rebase merge commits" msgstr "" -#: builtin/rebase.c:489 +#: builtin/rebase.c:501 msgid "keep original branch points of cousins" msgstr "" -#: builtin/rebase.c:491 +#: builtin/rebase.c:503 msgid "move commits that begin with squash!/fixup!" msgstr "" -#: builtin/rebase.c:492 +#: builtin/rebase.c:504 msgid "sign commits" msgstr "" -#: builtin/rebase.c:494 builtin/rebase.c:1314 +#: builtin/rebase.c:506 builtin/rebase.c:1327 msgid "display a diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:496 +#: builtin/rebase.c:508 msgid "continue rebase" msgstr "" -#: builtin/rebase.c:498 +#: builtin/rebase.c:510 msgid "skip commit" msgstr "" -#: builtin/rebase.c:499 +#: builtin/rebase.c:511 msgid "edit the todo list" msgstr "" -#: builtin/rebase.c:501 +#: builtin/rebase.c:513 msgid "show the current patch" msgstr "" -#: builtin/rebase.c:504 +#: builtin/rebase.c:516 msgid "shorten commit ids in the todo list" msgstr "" -#: builtin/rebase.c:506 +#: builtin/rebase.c:518 msgid "expand commit ids in the todo list" msgstr "" -#: builtin/rebase.c:508 +#: builtin/rebase.c:520 msgid "check the todo list" msgstr "" -#: builtin/rebase.c:510 +#: builtin/rebase.c:522 msgid "rearrange fixup/squash lines" msgstr "" -#: builtin/rebase.c:512 +#: builtin/rebase.c:524 msgid "insert exec commands in todo list" msgstr "" -#: builtin/rebase.c:513 +#: builtin/rebase.c:525 msgid "onto" msgstr "" -#: builtin/rebase.c:516 +#: builtin/rebase.c:528 msgid "restrict-revision" msgstr "" -#: builtin/rebase.c:516 +#: builtin/rebase.c:528 msgid "restrict revision" msgstr "" -#: builtin/rebase.c:518 +#: builtin/rebase.c:530 msgid "squash-onto" msgstr "" -#: builtin/rebase.c:519 +#: builtin/rebase.c:531 msgid "squash onto" msgstr "" -#: builtin/rebase.c:521 +#: builtin/rebase.c:533 msgid "the upstream commit" msgstr "" -#: builtin/rebase.c:523 +#: builtin/rebase.c:535 msgid "head-name" msgstr "" -#: builtin/rebase.c:523 +#: builtin/rebase.c:535 msgid "head name" msgstr "" -#: builtin/rebase.c:528 +#: builtin/rebase.c:540 msgid "rebase strategy" msgstr "" -#: builtin/rebase.c:529 +#: builtin/rebase.c:541 msgid "strategy-opts" msgstr "" -#: builtin/rebase.c:530 +#: builtin/rebase.c:542 msgid "strategy options" msgstr "" -#: builtin/rebase.c:531 +#: builtin/rebase.c:543 msgid "switch-to" msgstr "" -#: builtin/rebase.c:532 +#: builtin/rebase.c:544 msgid "the branch or commit to checkout" msgstr "" -#: builtin/rebase.c:533 +#: builtin/rebase.c:545 msgid "onto-name" msgstr "" -#: builtin/rebase.c:533 +#: builtin/rebase.c:545 msgid "onto name" msgstr "" -#: builtin/rebase.c:534 +#: builtin/rebase.c:546 msgid "cmd" msgstr "" -#: builtin/rebase.c:534 +#: builtin/rebase.c:546 msgid "the command to run" msgstr "" -#: builtin/rebase.c:537 builtin/rebase.c:1407 +#: builtin/rebase.c:549 builtin/rebase.c:1421 msgid "automatically re-schedule any `exec` that fails" msgstr "" -#: builtin/rebase.c:553 +#: builtin/rebase.c:565 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "" -#: builtin/rebase.c:569 +#: builtin/rebase.c:581 #, c-format msgid "%s requires the merge backend" msgstr "" -#: builtin/rebase.c:612 +#: builtin/rebase.c:624 #, c-format msgid "could not get 'onto': '%s'" msgstr "" -#: builtin/rebase.c:629 +#: builtin/rebase.c:641 #, c-format msgid "invalid orig-head: '%s'" msgstr "" -#: builtin/rebase.c:654 +#: builtin/rebase.c:666 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "" -#: builtin/rebase.c:799 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" @@ -17481,7 +17985,7 @@ msgid "" "abort\"." msgstr "" -#: builtin/rebase.c:882 +#: builtin/rebase.c:894 #, c-format msgid "" "\n" @@ -17493,14 +17997,14 @@ msgid "" "As a result, git cannot rebase them." msgstr "" -#: builtin/rebase.c:1208 +#: builtin/rebase.c:1220 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" "\"." msgstr "" -#: builtin/rebase.c:1226 +#: builtin/rebase.c:1238 #, c-format msgid "" "%s\n" @@ -17511,7 +18015,7 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1242 +#: builtin/rebase.c:1254 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17520,189 +18024,201 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1272 +#: builtin/rebase.c:1284 msgid "exec commands cannot contain newlines" msgstr "" -#: builtin/rebase.c:1276 +#: builtin/rebase.c:1288 msgid "empty exec command" msgstr "" -#: builtin/rebase.c:1305 +#: builtin/rebase.c:1318 msgid "rebase onto given branch instead of upstream" msgstr "" -#: builtin/rebase.c:1307 +#: builtin/rebase.c:1320 msgid "use the merge-base of upstream and branch as the current base" msgstr "" -#: builtin/rebase.c:1309 +#: builtin/rebase.c:1322 msgid "allow pre-rebase hook to run" msgstr "" -#: builtin/rebase.c:1311 +#: builtin/rebase.c:1324 msgid "be quiet. implies --no-stat" msgstr "" -#: builtin/rebase.c:1317 +#: builtin/rebase.c:1330 msgid "do not show diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:1320 -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:1322 builtin/rebase.c:1326 builtin/rebase.c:1328 -msgid "passed to 'git am'" +#: builtin/rebase.c:1336 +msgid "make committer date match author date" msgstr "" -#: builtin/rebase.c:1330 builtin/rebase.c:1332 +#: builtin/rebase.c:1338 +msgid "ignore author date and use current date" +msgstr "" + +#: builtin/rebase.c:1340 +msgid "synonym of --reset-author-date" +msgstr "" + +#: builtin/rebase.c:1342 builtin/rebase.c:1346 msgid "passed to 'git apply'" msgstr "" -#: builtin/rebase.c:1334 builtin/rebase.c:1337 +#: builtin/rebase.c:1344 +msgid "ignore changes in whitespace" +msgstr "" + +#: builtin/rebase.c:1348 builtin/rebase.c:1351 msgid "cherry-pick all commits, even if unchanged" msgstr "" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1353 msgid "continue" msgstr "" -#: builtin/rebase.c:1342 +#: builtin/rebase.c:1356 msgid "skip current patch and continue" msgstr "" -#: builtin/rebase.c:1344 +#: builtin/rebase.c:1358 msgid "abort and check out the original branch" msgstr "" -#: builtin/rebase.c:1347 +#: builtin/rebase.c:1361 msgid "abort but keep HEAD where it is" msgstr "" -#: builtin/rebase.c:1348 +#: builtin/rebase.c:1362 msgid "edit the todo list during an interactive rebase" msgstr "" -#: builtin/rebase.c:1351 +#: builtin/rebase.c:1365 msgid "show the patch file being applied or merged" msgstr "" -#: builtin/rebase.c:1354 +#: builtin/rebase.c:1368 msgid "use apply strategies to rebase" msgstr "" -#: builtin/rebase.c:1358 +#: builtin/rebase.c:1372 msgid "use merging strategies to rebase" msgstr "" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1376 msgid "let the user edit the list of commits to rebase" msgstr "" -#: builtin/rebase.c:1366 +#: builtin/rebase.c:1380 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" -#: builtin/rebase.c:1371 +#: builtin/rebase.c:1385 msgid "how to handle commits that become empty" msgstr "" -#: builtin/rebase.c:1378 +#: builtin/rebase.c:1392 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" -#: builtin/rebase.c:1385 +#: builtin/rebase.c:1399 msgid "add exec lines after each commit of the editable list" msgstr "" -#: builtin/rebase.c:1389 +#: builtin/rebase.c:1403 msgid "allow rebasing commits with empty messages" msgstr "" -#: builtin/rebase.c:1393 +#: builtin/rebase.c:1407 msgid "try to rebase merges instead of skipping them" msgstr "" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1410 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1412 msgid "use the given merge strategy" msgstr "" -#: builtin/rebase.c:1400 builtin/revert.c:115 +#: builtin/rebase.c:1414 builtin/revert.c:115 msgid "option" msgstr "" -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1415 msgid "pass the argument through to the merge strategy" msgstr "" -#: builtin/rebase.c:1404 +#: builtin/rebase.c:1418 msgid "rebase all reachable commits up to the root(s)" msgstr "" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1423 msgid "apply all changes, even those already present upstream" msgstr "" -#: builtin/rebase.c:1426 +#: 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:1432 +#: builtin/rebase.c:1446 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" -#: builtin/rebase.c:1473 +#: builtin/rebase.c:1487 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" -#: builtin/rebase.c:1478 +#: builtin/rebase.c:1492 msgid "cannot combine '--keep-base' with '--onto'" msgstr "" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1494 msgid "cannot combine '--keep-base' with '--root'" msgstr "" -#: builtin/rebase.c:1484 +#: builtin/rebase.c:1498 msgid "cannot combine '--root' with '--fork-point'" msgstr "" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1501 msgid "No rebase in progress?" msgstr "" -#: builtin/rebase.c:1491 +#: builtin/rebase.c:1505 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: builtin/rebase.c:1514 +#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "" -#: builtin/rebase.c:1526 +#: 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:1545 +#: builtin/rebase.c:1559 msgid "could not discard worktree changes" msgstr "" -#: builtin/rebase.c:1564 +#: builtin/rebase.c:1578 #, c-format msgid "could not move back to %s" msgstr "" -#: builtin/rebase.c:1610 +#: builtin/rebase.c:1624 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17715,131 +18231,131 @@ msgid "" "valuable there.\n" msgstr "" -#: builtin/rebase.c:1638 +#: builtin/rebase.c:1652 msgid "switch `C' expects a numerical value" msgstr "" -#: builtin/rebase.c:1680 +#: builtin/rebase.c:1694 #, c-format msgid "Unknown mode: %s" msgstr "" -#: builtin/rebase.c:1702 +#: builtin/rebase.c:1733 msgid "--strategy requires --merge or --interactive" msgstr "" -#: builtin/rebase.c:1732 +#: builtin/rebase.c:1763 msgid "cannot combine apply options with merge options" msgstr "" -#: builtin/rebase.c:1745 +#: builtin/rebase.c:1776 #, c-format msgid "Unknown rebase backend: %s" msgstr "" -#: builtin/rebase.c:1770 +#: builtin/rebase.c:1806 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "" -#: builtin/rebase.c:1790 +#: builtin/rebase.c:1826 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "" -#: builtin/rebase.c:1794 +#: builtin/rebase.c:1830 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" -#: builtin/rebase.c:1818 +#: builtin/rebase.c:1854 #, c-format msgid "invalid upstream '%s'" msgstr "" -#: builtin/rebase.c:1824 +#: builtin/rebase.c:1860 msgid "Could not create new root commit" msgstr "" -#: builtin/rebase.c:1850 +#: builtin/rebase.c:1886 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "" -#: builtin/rebase.c:1853 +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "" -#: builtin/rebase.c:1861 +#: builtin/rebase.c:1897 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "" -#: builtin/rebase.c:1887 +#: builtin/rebase.c:1923 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "" -#: builtin/rebase.c:1895 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 +#: 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:1906 +#: builtin/rebase.c:1942 msgid "Could not resolve HEAD to a revision" msgstr "" -#: builtin/rebase.c:1927 +#: builtin/rebase.c:1963 msgid "Please commit or stash them." msgstr "" -#: builtin/rebase.c:1963 +#: builtin/rebase.c:1999 #, c-format msgid "could not switch to %s" msgstr "" -#: builtin/rebase.c:1974 +#: builtin/rebase.c:2010 msgid "HEAD is up to date." msgstr "" -#: builtin/rebase.c:1976 +#: builtin/rebase.c:2012 #, c-format msgid "Current branch %s is up to date.\n" msgstr "" -#: builtin/rebase.c:1984 +#: builtin/rebase.c:2020 msgid "HEAD is up to date, rebase forced." msgstr "" -#: builtin/rebase.c:1986 +#: builtin/rebase.c:2022 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "" -#: builtin/rebase.c:1994 +#: builtin/rebase.c:2030 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: builtin/rebase.c:2001 +#: builtin/rebase.c:2037 #, c-format msgid "Changes to %s:\n" msgstr "" -#: builtin/rebase.c:2004 +#: builtin/rebase.c:2040 #, c-format msgid "Changes from %s to %s:\n" msgstr "" -#: builtin/rebase.c:2029 +#: builtin/rebase.c:2065 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" -#: builtin/rebase.c:2038 +#: builtin/rebase.c:2074 msgid "Could not detach HEAD" msgstr "" -#: builtin/rebase.c:2047 +#: builtin/rebase.c:2083 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "" @@ -17848,7 +18364,7 @@ msgstr "" msgid "git receive-pack <git-dir>" msgstr "" -#: builtin/receive-pack.c:844 +#: 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" @@ -17865,7 +18381,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -#: builtin/receive-pack.c:864 +#: 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" @@ -17877,11 +18393,11 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" -#: builtin/receive-pack.c:1970 +#: builtin/receive-pack.c:2481 msgid "quiet" msgstr "" -#: builtin/receive-pack.c:1984 +#: builtin/receive-pack.c:2495 msgid "You must specify a directory." msgstr "" @@ -18067,40 +18583,35 @@ msgstr "" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:195 builtin/remote.c:696 +#: builtin/remote.c:195 builtin/remote.c:700 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:199 builtin/remote.c:700 -#, 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:653 +#: builtin/remote.c:655 #, c-format msgid "could not set '%s'" msgstr "" -#: builtin/remote.c:658 +#: builtin/remote.c:660 #, c-format msgid "" "The %s configuration remote.pushDefault in:\n" @@ -18108,17 +18619,17 @@ msgid "" "now names the non-existent remote '%s'" msgstr "" -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 #, c-format msgid "No such remote: '%s'" msgstr "" -#: builtin/remote.c:706 +#: builtin/remote.c:710 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:726 +#: builtin/remote.c:730 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -18126,17 +18637,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:766 +#: builtin/remote.c:770 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:800 +#: builtin/remote.c:804 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:876 +#: builtin/remote.c:882 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18146,118 +18657,118 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:890 +#: builtin/remote.c:896 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:993 +#: builtin/remote.c:999 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:996 +#: builtin/remote.c:1002 msgid " tracked" msgstr "" -#: builtin/remote.c:998 +#: builtin/remote.c:1004 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:1000 +#: builtin/remote.c:1006 msgid " ???" msgstr "" -#: builtin/remote.c:1041 +#: builtin/remote.c:1047 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:1050 +#: builtin/remote.c:1056 #, c-format msgid "rebases interactively onto remote %s" msgstr "" -#: builtin/remote.c:1052 +#: builtin/remote.c:1058 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "" -#: builtin/remote.c:1055 +#: builtin/remote.c:1061 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:1059 +#: builtin/remote.c:1065 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:1062 +#: builtin/remote.c:1068 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:1065 +#: builtin/remote.c:1071 #, c-format msgid "%-*s and with remote %s\n" msgstr "" -#: builtin/remote.c:1108 +#: builtin/remote.c:1114 msgid "create" msgstr "" -#: builtin/remote.c:1111 +#: builtin/remote.c:1117 msgid "delete" msgstr "" -#: builtin/remote.c:1115 +#: builtin/remote.c:1121 msgid "up to date" msgstr "" -#: builtin/remote.c:1118 +#: builtin/remote.c:1124 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1121 +#: builtin/remote.c:1127 msgid "local out of date" msgstr "" -#: builtin/remote.c:1128 +#: builtin/remote.c:1134 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1131 +#: builtin/remote.c:1137 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1135 +#: builtin/remote.c:1141 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1138 +#: builtin/remote.c:1144 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1206 +#: builtin/remote.c:1212 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1233 +#: builtin/remote.c:1239 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1234 +#: builtin/remote.c:1240 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 +#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 msgid "(no URL)" msgstr "" @@ -18265,176 +18776,176 @@ msgstr "" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1249 builtin/remote.c:1251 +#: builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 +#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1253 +#: builtin/remote.c:1259 msgid "(not queried)" msgstr "" -#: builtin/remote.c:1255 +#: builtin/remote.c:1261 msgid "(unknown)" msgstr "" -#: builtin/remote.c:1259 +#: builtin/remote.c:1265 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1271 +#: builtin/remote.c:1277 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1274 builtin/remote.c:1300 +#: builtin/remote.c:1280 builtin/remote.c:1306 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1283 +#: 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:1291 +#: builtin/remote.c:1297 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1297 +#: 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:1318 +#: builtin/remote.c:1324 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1320 +#: builtin/remote.c:1326 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1335 +#: builtin/remote.c:1341 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1337 +#: builtin/remote.c:1343 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1347 +#: builtin/remote.c:1353 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1355 +#: builtin/remote.c:1361 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1357 +#: builtin/remote.c:1363 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1375 +#: builtin/remote.c:1381 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1376 +#: builtin/remote.c:1382 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1386 +#: builtin/remote.c:1392 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1387 +#: builtin/remote.c:1393 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1403 +#: builtin/remote.c:1409 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1406 +#: builtin/remote.c:1412 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1451 +#: builtin/remote.c:1457 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 +#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1530 +#: builtin/remote.c:1539 msgid "add branch" msgstr "" -#: builtin/remote.c:1537 +#: builtin/remote.c:1546 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1554 +#: builtin/remote.c:1563 msgid "query push URLs rather than fetch URLs" msgstr "" -#: builtin/remote.c:1556 +#: builtin/remote.c:1565 msgid "return all URLs" msgstr "" -#: builtin/remote.c:1584 +#: builtin/remote.c:1595 #, c-format msgid "no URLs configured for remote '%s'" msgstr "" -#: builtin/remote.c:1610 +#: builtin/remote.c:1621 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1612 +#: builtin/remote.c:1623 msgid "add URL" msgstr "" -#: builtin/remote.c:1614 +#: builtin/remote.c:1625 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1621 +#: builtin/remote.c:1632 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1660 +#: builtin/remote.c:1673 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1668 +#: builtin/remote.c:1681 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1670 +#: builtin/remote.c:1683 msgid "Will not delete all non-push URLs" msgstr "" @@ -18448,125 +18959,118 @@ msgid "" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -#: builtin/repack.c:193 +#: builtin/repack.c:197 msgid "could not start pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:232 builtin/repack.c:418 +#: builtin/repack.c:268 builtin/repack.c:447 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -#: builtin/repack.c:256 +#: builtin/repack.c:295 msgid "could not finish pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:294 +#: builtin/repack.c:323 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:296 +#: builtin/repack.c:325 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:299 +#: builtin/repack.c:328 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:301 +#: builtin/repack.c:330 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:303 +#: builtin/repack.c:332 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:305 +#: builtin/repack.c:334 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:308 +#: builtin/repack.c:337 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:310 +#: builtin/repack.c:339 msgid "write bitmap index" msgstr "" -#: builtin/repack.c:312 +#: builtin/repack.c:341 msgid "pass --delta-islands to git-pack-objects" msgstr "" -#: builtin/repack.c:313 +#: builtin/repack.c:342 msgid "approxidate" msgstr "" -#: builtin/repack.c:314 +#: builtin/repack.c:343 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:316 +#: builtin/repack.c:345 msgid "with -a, repack unreachable objects" msgstr "" -#: builtin/repack.c:318 +#: builtin/repack.c:347 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:319 builtin/repack.c:325 +#: builtin/repack.c:348 builtin/repack.c:354 msgid "bytes" msgstr "" -#: builtin/repack.c:320 +#: builtin/repack.c:349 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:322 +#: builtin/repack.c:351 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:324 +#: builtin/repack.c:353 msgid "limits the maximum number of threads" msgstr "" -#: builtin/repack.c:326 +#: builtin/repack.c:355 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:328 +#: builtin/repack.c:357 msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:330 +#: builtin/repack.c:359 msgid "do not repack this pack" msgstr "" -#: builtin/repack.c:340 +#: builtin/repack.c:369 msgid "cannot delete packs in a precious-objects repo" msgstr "" -#: builtin/repack.c:344 +#: builtin/repack.c:373 msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:427 +#: builtin/repack.c:456 msgid "Nothing new to pack." msgstr "" -#: builtin/repack.c:488 +#: 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:536 +#: builtin/repack.c:488 #, c-format -msgid "failed to remove '%s'" +msgid "could not unlink: %s" msgstr "" #: builtin/replace.c:22 @@ -18886,8 +19390,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 "" @@ -19084,11 +19588,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 "" @@ -19176,55 +19680,76 @@ msgid "" " --all and explicit <ref> specification are mutually exclusive." msgstr "" -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:188 msgid "remote name" msgstr "" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:201 msgid "use stateless RPC protocol" msgstr "" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:202 msgid "read refs from stdin" msgstr "" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:203 msgid "print status from remote helper" msgstr "" -#: builtin/shortlog.c:14 +#: builtin/shortlog.c:16 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:17 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "" -#: builtin/shortlog.c:264 +#: builtin/shortlog.c:135 +msgid "using multiple --group options with stdin is not supported" +msgstr "" + +#: builtin/shortlog.c:145 +msgid "using --group=trailer with stdin is not supported" +msgstr "" + +#: builtin/shortlog.c:335 +#, c-format +msgid "unknown group type: %s" +msgstr "" + +#: builtin/shortlog.c:363 msgid "Group by committer rather than author" msgstr "" -#: builtin/shortlog.c:266 +#: builtin/shortlog.c:366 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:268 +#: builtin/shortlog.c:368 msgid "Suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:370 msgid "Show the email address of each author" msgstr "" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:371 msgid "<w>[,<i1>[,<i2>]]" msgstr "" -#: builtin/shortlog.c:272 +#: builtin/shortlog.c:372 msgid "Linewrap output" msgstr "" -#: builtin/shortlog.c:301 +#: builtin/shortlog.c:374 +msgid "field" +msgstr "" + +#: builtin/shortlog.c:375 +msgid "Group by field" +msgstr "" + +#: builtin/shortlog.c:403 msgid "too many arguments given outside repository" msgstr "" @@ -19412,58 +19937,70 @@ msgstr "" msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "" -#: builtin/sparse-checkout.c:64 +#: builtin/sparse-checkout.c:50 +msgid "git sparse-checkout list" +msgstr "" + +#: builtin/sparse-checkout.c:76 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" -#: builtin/sparse-checkout.c:216 +#: builtin/sparse-checkout.c:228 msgid "failed to create directory for sparse-checkout file" msgstr "" -#: builtin/sparse-checkout.c:257 +#: builtin/sparse-checkout.c:269 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "" -#: builtin/sparse-checkout.c:259 +#: builtin/sparse-checkout.c:271 msgid "failed to set extensions.worktreeConfig setting" msgstr "" -#: builtin/sparse-checkout.c:276 +#: builtin/sparse-checkout.c:288 msgid "git sparse-checkout init [--cone]" msgstr "" -#: builtin/sparse-checkout.c:295 +#: builtin/sparse-checkout.c:307 msgid "initialize the sparse-checkout in cone mode" msgstr "" -#: builtin/sparse-checkout.c:332 +#: builtin/sparse-checkout.c:344 #, c-format msgid "failed to open '%s'" msgstr "" -#: builtin/sparse-checkout.c:389 +#: builtin/sparse-checkout.c:401 #, c-format msgid "could not normalize path %s" msgstr "" -#: builtin/sparse-checkout.c:401 +#: builtin/sparse-checkout.c:413 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "" -#: builtin/sparse-checkout.c:426 +#: builtin/sparse-checkout.c:438 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "" -#: builtin/sparse-checkout.c:480 builtin/sparse-checkout.c:504 +#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 msgid "unable to load existing sparse-checkout patterns" msgstr "" -#: builtin/sparse-checkout.c:549 +#: builtin/sparse-checkout.c:561 msgid "read patterns from standard in" msgstr "" -#: builtin/sparse-checkout.c:586 +#: builtin/sparse-checkout.c:576 +msgid "git sparse-checkout reapply" +msgstr "" + +#: builtin/sparse-checkout.c:595 +msgid "git sparse-checkout disable" +msgstr "" + +#: builtin/sparse-checkout.c:623 msgid "error while refreshing working directory" msgstr "" @@ -19557,7 +20094,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 @@ -19577,120 +20114,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:1475 builtin/stash.c:1540 +#: 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:1046 +#: builtin/stash.c:1042 msgid "No changes selected" msgstr "" -#: builtin/stash.c:1146 +#: builtin/stash.c:1142 msgid "You do not have the initial commit yet" msgstr "" -#: builtin/stash.c:1173 +#: builtin/stash.c:1169 msgid "Cannot save the current index state" msgstr "" -#: builtin/stash.c:1182 +#: builtin/stash.c:1178 msgid "Cannot save the untracked files" msgstr "" -#: builtin/stash.c:1193 builtin/stash.c:1202 +#: builtin/stash.c:1189 builtin/stash.c:1198 msgid "Cannot save the current worktree state" msgstr "" -#: builtin/stash.c:1230 +#: builtin/stash.c:1226 msgid "Cannot record working tree state" msgstr "" -#: builtin/stash.c:1279 +#: builtin/stash.c:1275 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" -#: builtin/stash.c:1295 +#: builtin/stash.c:1291 msgid "Did you forget to 'git add'?" msgstr "" -#: builtin/stash.c:1310 +#: builtin/stash.c:1306 msgid "No local changes to save" msgstr "" -#: builtin/stash.c:1317 +#: builtin/stash.c:1313 msgid "Cannot initialize stash" msgstr "" -#: builtin/stash.c:1332 +#: builtin/stash.c:1328 msgid "Cannot save the current status" msgstr "" -#: builtin/stash.c:1337 +#: builtin/stash.c:1333 #, c-format msgid "Saved working directory and index state %s" msgstr "" -#: builtin/stash.c:1427 +#: builtin/stash.c:1423 msgid "Cannot remove worktree changes" msgstr "" -#: builtin/stash.c:1466 builtin/stash.c:1531 +#: builtin/stash.c:1462 builtin/stash.c:1527 msgid "keep index" msgstr "" -#: builtin/stash.c:1468 builtin/stash.c:1533 +#: builtin/stash.c:1464 builtin/stash.c:1529 msgid "stash in patch mode" msgstr "" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "quiet mode" msgstr "" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1467 builtin/stash.c:1532 msgid "include untracked files in stash" msgstr "" -#: builtin/stash.c:1473 builtin/stash.c:1538 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "include ignore files" msgstr "" -#: builtin/stash.c:1573 +#: builtin/stash.c:1569 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -19712,7 +20249,7 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "" @@ -19726,7 +20263,7 @@ msgstr "" msgid "cannot strip one component off url '%s'" msgstr "" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "" @@ -19734,8 +20271,8 @@ msgstr "" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "" @@ -19764,7 +20301,7 @@ msgstr "" msgid "Suppress output of entering each submodule command" msgstr "" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 msgid "Recurse into nested submodules" msgstr "" @@ -19779,151 +20316,204 @@ msgid "" "authoritative upstream." msgstr "" -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:666 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:670 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:680 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:687 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:710 +#: builtin/submodule--helper.c:709 msgid "Suppress output for initializing a submodule" msgstr "" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "" -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:835 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "Suppress submodule status output" msgstr "" -#: builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:887 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" -#: builtin/submodule--helper.c:890 +#: builtin/submodule--helper.c:888 msgid "recurse into nested submodules" msgstr "" -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:919 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "" -#: builtin/submodule--helper.c:983 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "" + +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:1413 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:1427 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1014 +#: builtin/submodule--helper.c:1438 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1061 +#: builtin/submodule--helper.c:1485 msgid "Suppress output of synchronizing submodule url" msgstr "" -#: builtin/submodule--helper.c:1068 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "" -#: builtin/submodule--helper.c:1122 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " "really want to remove it including all of its history)" msgstr "" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1144 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1155 +#: builtin/submodule--helper.c:1579 #, c-format msgid "could not create empty submodule directory %s" msgstr "" -#: builtin/submodule--helper.c:1171 +#: builtin/submodule--helper.c:1595 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1200 +#: builtin/submodule--helper.c:1624 msgid "Remove submodule working trees even if they contain local changes" msgstr "" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1625 msgid "Unregister all submodules" msgstr "" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1644 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" -#: builtin/submodule--helper.c:1289 +#: builtin/submodule--helper.c:1713 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -19931,231 +20521,231 @@ msgid "" "'--reference-if-able' instead of '--reference'." msgstr "" -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 +#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "" -#: builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "" -#: builtin/submodule--helper.c:1398 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "" -#: builtin/submodule--helper.c:1401 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "" -#: builtin/submodule--helper.c:1404 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "" -#: builtin/submodule--helper.c:1412 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "" -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 msgid "disallow cloning into non-empty directory" msgstr "" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " "<url> --path <path>" msgstr "" -#: builtin/submodule--helper.c:1449 +#: builtin/submodule--helper.c:1873 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "" -#: builtin/submodule--helper.c:1460 +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" -#: builtin/submodule--helper.c:1464 +#: builtin/submodule--helper.c:1888 #, c-format msgid "directory not empty: '%s'" msgstr "" -#: builtin/submodule--helper.c:1476 +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1936 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:1516 +#: builtin/submodule--helper.c:1940 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:1617 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "" -#: builtin/submodule--helper.c:1621 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "" -#: builtin/submodule--helper.c:1651 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "" -#: builtin/submodule--helper.c:1680 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1830 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "" -#: builtin/submodule--helper.c:1841 +#: builtin/submodule--helper.c:2265 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "" -#: builtin/submodule--helper.c:1906 +#: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" msgstr "" -#: builtin/submodule--helper.c:1910 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "" -#: builtin/submodule--helper.c:1916 +#: builtin/submodule--helper.c:2340 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" -#: builtin/submodule--helper.c:1919 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:1921 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" -#: builtin/submodule--helper.c:1922 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "" -#: builtin/submodule--helper.c:1933 +#: builtin/submodule--helper.c:2357 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1946 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "" -#: builtin/submodule--helper.c:1994 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "" -#: builtin/submodule--helper.c:2117 +#: builtin/submodule--helper.c:2541 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:2150 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:2212 +#: builtin/submodule--helper.c:2636 msgid "check if it is safe to write to the .gitmodules file" msgstr "" -#: builtin/submodule--helper.c:2215 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "" -#: builtin/submodule--helper.c:2220 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "" -#: builtin/submodule--helper.c:2221 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "" -#: builtin/submodule--helper.c:2222 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "" -#: builtin/submodule--helper.c:2241 git-submodule.sh:176 +#: builtin/submodule--helper.c:2665 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" -#: builtin/submodule--helper.c:2257 +#: builtin/submodule--helper.c:2681 msgid "Suppress output for setting url of a submodule" msgstr "" -#: builtin/submodule--helper.c:2261 +#: builtin/submodule--helper.c:2685 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "" -#: builtin/submodule--helper.c:2294 +#: builtin/submodule--helper.c:2718 msgid "set the default tracking branch to master" msgstr "" -#: builtin/submodule--helper.c:2296 +#: builtin/submodule--helper.c:2720 msgid "set the default tracking branch" msgstr "" -#: builtin/submodule--helper.c:2300 +#: builtin/submodule--helper.c:2724 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "" -#: builtin/submodule--helper.c:2301 +#: builtin/submodule--helper.c:2725 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" -#: builtin/submodule--helper.c:2308 +#: builtin/submodule--helper.c:2732 msgid "--branch or --default required" msgstr "" -#: builtin/submodule--helper.c:2311 +#: builtin/submodule--helper.c:2735 msgid "--branch and --default are mutually exclusive" msgstr "" -#: builtin/submodule--helper.c:2367 git.c:436 git.c:683 +#: builtin/submodule--helper.c:2792 git.c:438 git.c:711 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" -#: builtin/submodule--helper.c:2373 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" @@ -20180,11 +20770,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 "" @@ -20202,7 +20792,8 @@ msgstr "" msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" #: builtin/tag.c:30 @@ -20312,7 +20903,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 "" @@ -20650,19 +21241,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 "" @@ -20706,15 +21297,15 @@ msgstr "" msgid "print raw gpg status output" msgstr "" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "" -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "" @@ -20754,7 +21345,7 @@ msgstr "" msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:60 builtin/worktree.c:972 +#: builtin/worktree.c:60 builtin/worktree.c:973 #, c-format msgid "failed to delete '%s'" msgstr "" @@ -20883,113 +21474,123 @@ 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:1000 +#: 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:1002 +#: 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:952 +#: builtin/worktree.c:953 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "" -#: builtin/worktree.c:956 +#: builtin/worktree.c:957 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -#: builtin/worktree.c:961 +#: builtin/worktree.c:962 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" -#: builtin/worktree.c:984 +#: builtin/worktree.c:985 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:1007 +#: 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:1009 +#: 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:1012 +#: builtin/worktree.c:1013 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" +#: builtin/worktree.c:1037 +#, c-format +msgid "repair: %s: %s" +msgstr "" + +#: builtin/worktree.c:1040 +#, c-format +msgid "error: %s: %s" +msgstr "" + #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "" @@ -21006,139 +21607,29 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: bugreport.c:15 -msgid "git version:\n" -msgstr "" - -#: bugreport.c:21 +#: http-fetch.c:114 #, c-format -msgid "uname() failed with error '%s' (%d)\n" -msgstr "" - -#: bugreport.c:31 -msgid "compiler info: " -msgstr "" - -#: bugreport.c:34 -msgid "libc info: " -msgstr "" - -#: bugreport.c:80 -msgid "not run from a git repository - no hooks to show\n" -msgstr "" - -#: bugreport.c:90 -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" -msgstr "" - -#: bugreport.c:97 -msgid "" -"Thank you for filling out a Git bug report!\n" -"Please answer the following questions to help us understand your issue.\n" -"\n" -"What did you do before the bug happened? (Steps to reproduce your issue)\n" -"\n" -"What did you expect to happen? (Expected behavior)\n" -"\n" -"What happened instead? (Actual behavior)\n" -"\n" -"What's different between what you expected and what actually happened?\n" -"\n" -"Anything else you want to add:\n" -"\n" -"Please review the rest of the bug report below.\n" -"You can delete any lines you don't wish to share.\n" -msgstr "" - -#: bugreport.c:136 -msgid "specify a destination for the bugreport file" -msgstr "" - -#: bugreport.c:138 -msgid "specify a strftime format suffix for the filename" -msgstr "" - -#: bugreport.c:162 -#, c-format -msgid "could not create leading directories for '%s'" -msgstr "" - -#: bugreport.c:169 -msgid "System Info" -msgstr "" - -#: bugreport.c:172 -msgid "Enabled Hooks" -msgstr "" - -#: bugreport.c:180 -#, c-format -msgid "couldn't create a new file at '%s'" -msgstr "" - -#: bugreport.c:184 -#, c-format -msgid "unable to write to %s" -msgstr "" - -#: bugreport.c:194 -#, c-format -msgid "Created new report at '%s'.\n" -msgstr "" - -#: fast-import.c:3100 -#, c-format -msgid "Missing from marks for submodule '%s'" -msgstr "" - -#: fast-import.c:3102 -#, c-format -msgid "Missing to marks for submodule '%s'" -msgstr "" - -#: fast-import.c:3237 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "" - -#: fast-import.c:3242 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "" - -#: fast-import.c:3334 -msgid "Expected format name:filename for submodule rewrite option" +msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "" -#: fast-import.c:3388 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" +#: http-fetch.c:122 +msgid "not a git repository" msgstr "" -#: http-fetch.c:111 -#, c-format -msgid "argument to --packfile must be a valid hash (got '%s')" +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" msgstr "" -#: credential-cache--daemon.c:223 -#, c-format -msgid "" -"The permissions on your socket directory are too loose; other\n" -"users may be able to read your cached credentials. Consider running:\n" -"\n" -"\tchmod 0700 %s" -msgstr "" - -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" +#: t/helper/test-fast-rebase.c:146 +msgid "error preparing revisions" msgstr "" -#: t/helper/test-reach.c:152 +#: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" msgstr "" -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" msgstr "" @@ -21203,63 +21694,63 @@ msgstr "" msgid "unknown option: %s\n" msgstr "" -#: git.c:362 +#: git.c:364 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "" -#: git.c:371 +#: git.c:373 #, c-format msgid "" "alias '%s' changes environment variables.\n" "You can use '!git' in the alias to do this" msgstr "" -#: git.c:378 +#: git.c:380 #, c-format msgid "empty alias for %s" msgstr "" -#: git.c:381 +#: git.c:383 #, c-format msgid "recursive alias: %s" msgstr "" -#: git.c:463 +#: git.c:465 msgid "write failure on standard output" msgstr "" -#: git.c:465 +#: git.c:467 msgid "unknown write failure on standard output" msgstr "" -#: git.c:467 +#: git.c:469 msgid "close failed on standard output" msgstr "" -#: git.c:792 +#: git.c:820 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" -#: git.c:842 +#: git.c:870 #, c-format msgid "cannot handle %s as a builtin" msgstr "" -#: git.c:855 +#: git.c:883 #, c-format msgid "" "usage: %s\n" "\n" msgstr "" -#: git.c:875 +#: git.c:903 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:887 +#: git.c:915 #, c-format msgid "failed to run command '%s': %s\n" msgstr "" @@ -21308,134 +21799,134 @@ msgid "" " redirect: %s" msgstr "" -#: remote-curl.c:168 +#: remote-curl.c:183 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "" -#: remote-curl.c:295 +#: remote-curl.c:307 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "" -#: remote-curl.c:396 +#: remote-curl.c:408 msgid "invalid server response; expected service, got flush packet" msgstr "" -#: remote-curl.c:427 +#: remote-curl.c:439 #, c-format msgid "invalid server response; got '%s'" msgstr "" -#: remote-curl.c:487 +#: remote-curl.c:499 #, c-format msgid "repository '%s' not found" msgstr "" -#: remote-curl.c:491 +#: remote-curl.c:503 #, c-format msgid "Authentication failed for '%s'" msgstr "" -#: remote-curl.c:495 +#: remote-curl.c:507 #, c-format msgid "unable to access '%s': %s" msgstr "" -#: remote-curl.c:501 +#: remote-curl.c:513 #, c-format msgid "redirecting to %s" msgstr "" -#: remote-curl.c:630 +#: remote-curl.c:642 msgid "shouldn't have EOF when not gentle on EOF" msgstr "" -#: remote-curl.c:642 +#: remote-curl.c:654 msgid "remote server sent stateless separator" msgstr "" -#: remote-curl.c:712 +#: remote-curl.c:724 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" -#: remote-curl.c:742 +#: remote-curl.c:754 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "" -#: remote-curl.c:744 +#: remote-curl.c:756 msgid "remote-curl: unexpected response end packet" msgstr "" -#: remote-curl.c:820 +#: remote-curl.c:832 #, c-format msgid "RPC failed; %s" msgstr "" -#: remote-curl.c:860 +#: remote-curl.c:872 msgid "cannot handle pushes this big" msgstr "" -#: remote-curl.c:975 +#: remote-curl.c:987 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" -#: remote-curl.c:979 +#: remote-curl.c:991 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "" -#: remote-curl.c:1029 +#: remote-curl.c:1041 #, c-format msgid "%d bytes of length header were received" msgstr "" -#: remote-curl.c:1031 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of body are still expected" msgstr "" -#: remote-curl.c:1120 +#: remote-curl.c:1132 msgid "dumb http transport does not support shallow capabilities" msgstr "" -#: remote-curl.c:1135 +#: remote-curl.c:1147 msgid "fetch failed." msgstr "" -#: remote-curl.c:1183 +#: remote-curl.c:1193 msgid "cannot fetch by sha1 over smart http" msgstr "" -#: remote-curl.c:1227 remote-curl.c:1233 +#: remote-curl.c:1237 remote-curl.c:1243 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "" -#: remote-curl.c:1245 remote-curl.c:1360 +#: remote-curl.c:1255 remote-curl.c:1373 #, c-format msgid "http transport does not support %s" msgstr "" -#: remote-curl.c:1281 +#: remote-curl.c:1291 msgid "git-http-push failed" msgstr "" -#: remote-curl.c:1466 +#: remote-curl.c:1479 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "" -#: remote-curl.c:1498 +#: remote-curl.c:1511 msgid "remote-curl: error reading command stream from git" msgstr "" -#: remote-curl.c:1505 +#: remote-curl.c:1518 msgid "remote-curl: fetch attempted without a local repo" msgstr "" -#: remote-curl.c:1546 +#: remote-curl.c:1559 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "" @@ -21448,11 +21939,11 @@ msgstr "" msgid "no libc information available\n" msgstr "" -#: list-objects-filter-options.h:85 +#: list-objects-filter-options.h:91 msgid "args" msgstr "" -#: list-objects-filter-options.h:86 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "" @@ -21473,7 +21964,7 @@ msgid "be more quiet" msgstr "" #: parse-options.h:317 -msgid "use <n> digits to display SHA-1s" +msgid "use <n> digits to display object names" msgstr "" #: parse-options.h:336 @@ -21489,11 +21980,11 @@ msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "key" msgstr "" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "field name to sort on" msgstr "" @@ -21706,545 +22197,531 @@ 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 "Join two or more development histories together" +msgid "Simple UNIX mbox splitter program" msgstr "" #: command-list.h:123 -msgid "Find as good common ancestors as possible for a merge" +msgid "Run tasks to optimize Git repository data" msgstr "" #: command-list.h:124 -msgid "Run a three-way file merge" +msgid "Join two or more development histories together" msgstr "" #: command-list.h:125 -msgid "Run a merge for files needing merging" +msgid "Find as good common ancestors as possible for a merge" msgstr "" #: command-list.h:126 -msgid "The standard helper program to use with git-merge-index" +msgid "Run a three-way file merge" msgstr "" #: command-list.h:127 -msgid "Run merge conflict resolution tools to resolve merge conflicts" +msgid "Run a merge for files needing merging" msgstr "" #: command-list.h:128 -msgid "Show three-way merge without touching index" +msgid "The standard helper program to use with git-merge-index" msgstr "" #: command-list.h:129 -msgid "Write and verify multi-pack-indexes" +msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" #: command-list.h:130 -msgid "Creates a tag object" +msgid "Show three-way merge without touching index" msgstr "" #: command-list.h:131 -msgid "Build a tree-object from ls-tree formatted text" +msgid "Write and verify multi-pack-indexes" msgstr "" #: command-list.h:132 -msgid "Move or rename a file, a directory, or a symlink" +msgid "Creates a tag object" msgstr "" #: command-list.h:133 -msgid "Find symbolic names for given revs" +msgid "Build a tree-object from ls-tree formatted text" msgstr "" #: command-list.h:134 -msgid "Add or inspect object notes" +msgid "Move or rename a file, a directory, or a symlink" msgstr "" #: command-list.h:135 -msgid "Import from and submit to Perforce repositories" +msgid "Find symbolic names for given revs" msgstr "" #: command-list.h:136 -msgid "Create a packed archive of objects" +msgid "Add or inspect object notes" msgstr "" #: command-list.h:137 -msgid "Find redundant pack files" +msgid "Import from and submit to Perforce repositories" msgstr "" #: command-list.h:138 -msgid "Pack heads and tags for efficient repository access" +msgid "Create a packed archive of objects" msgstr "" #: command-list.h:139 -msgid "Routines to help parsing remote repository access parameters" +msgid "Find redundant pack files" msgstr "" #: command-list.h:140 -msgid "Compute unique ID for a patch" +msgid "Pack heads and tags for efficient repository access" msgstr "" #: command-list.h:141 -msgid "Prune all unreachable objects from the object database" +msgid "Compute unique ID for a patch" msgstr "" #: command-list.h:142 -msgid "Remove extra objects that are already in pack files" +msgid "Prune all unreachable objects from the object database" msgstr "" #: command-list.h:143 -msgid "Fetch from and integrate with another repository or a local branch" +msgid "Remove extra objects that are already in pack files" msgstr "" #: command-list.h:144 -msgid "Update remote refs along with associated objects" +msgid "Fetch from and integrate with another repository or a local branch" msgstr "" #: command-list.h:145 -msgid "Applies a quilt patchset onto the current branch" +msgid "Update remote refs along with associated objects" msgstr "" #: command-list.h:146 -msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgid "Applies a quilt patchset onto the current branch" msgstr "" #: command-list.h:147 -msgid "Reads tree information into the index" +msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "" #: command-list.h:148 -msgid "Reapply commits on top of another base tip" +msgid "Reads tree information into the index" msgstr "" #: command-list.h:149 -msgid "Receive what is pushed into the repository" +msgid "Reapply commits on top of another base tip" msgstr "" #: command-list.h:150 -msgid "Manage reflog information" +msgid "Receive what is pushed into the repository" msgstr "" #: command-list.h:151 -msgid "Manage set of tracked repositories" +msgid "Manage reflog information" msgstr "" #: command-list.h:152 -msgid "Pack unpacked objects in a repository" +msgid "Manage set of tracked repositories" msgstr "" #: command-list.h:153 -msgid "Create, list, delete refs to replace objects" +msgid "Pack unpacked objects in a repository" msgstr "" #: command-list.h:154 -msgid "Generates a summary of pending changes" +msgid "Create, list, delete refs to replace objects" msgstr "" #: command-list.h:155 -msgid "Reuse recorded resolution of conflicted merges" +msgid "Generates a summary of pending changes" msgstr "" #: command-list.h:156 -msgid "Reset current HEAD to the specified state" +msgid "Reuse recorded resolution of conflicted merges" msgstr "" #: command-list.h:157 -msgid "Restore working tree files" +msgid "Reset current HEAD to the specified state" msgstr "" #: command-list.h:158 -msgid "Revert some existing commits" +msgid "Restore working tree files" msgstr "" #: command-list.h:159 -msgid "Lists commit objects in reverse chronological order" +msgid "Revert some existing commits" msgstr "" #: command-list.h:160 -msgid "Pick out and massage parameters" +msgid "Lists commit objects in reverse chronological order" msgstr "" #: command-list.h:161 -msgid "Remove files from the working tree and from the index" +msgid "Pick out and massage parameters" msgstr "" #: command-list.h:162 -msgid "Send a collection of patches as emails" +msgid "Remove files from the working tree and from the index" msgstr "" #: command-list.h:163 -msgid "Push objects over Git protocol to another repository" +msgid "Send a collection of patches as emails" msgstr "" #: command-list.h:164 -msgid "Restricted login shell for Git-only SSH access" +msgid "Push objects over Git protocol to another repository" msgstr "" #: command-list.h:165 -msgid "Summarize 'git log' output" +msgid "Restricted login shell for Git-only SSH access" msgstr "" #: command-list.h:166 -msgid "Show various types of objects" +msgid "Summarize 'git log' output" msgstr "" #: command-list.h:167 -msgid "Show branches and their commits" +msgid "Show various types of objects" msgstr "" #: command-list.h:168 -msgid "Show packed archive index" +msgid "Show branches and their commits" msgstr "" #: command-list.h:169 -msgid "List references in a local repository" +msgid "Show packed archive index" msgstr "" #: command-list.h:170 -msgid "Git's i18n setup code for shell scripts" +msgid "List references in a local repository" msgstr "" #: command-list.h:171 -msgid "Common Git shell script setup code" +msgid "Git's i18n setup code for shell scripts" msgstr "" #: command-list.h:172 -msgid "Initialize and modify the sparse-checkout" +msgid "Common Git shell script setup code" msgstr "" #: command-list.h:173 -msgid "Stash the changes in a dirty working directory away" +msgid "Initialize and modify the sparse-checkout" msgstr "" #: command-list.h:174 -msgid "Add file contents to the staging area" +msgid "Stash the changes in a dirty working directory away" msgstr "" #: command-list.h:175 -msgid "Show the working tree status" +msgid "Add file contents to the staging area" msgstr "" #: command-list.h:176 -msgid "Remove unnecessary whitespace" +msgid "Show the working tree status" msgstr "" #: command-list.h:177 -msgid "Initialize, update or inspect submodules" +msgid "Remove unnecessary whitespace" msgstr "" #: command-list.h:178 -msgid "Bidirectional operation between a Subversion repository and Git" +msgid "Initialize, update or inspect submodules" msgstr "" #: command-list.h:179 -msgid "Switch branches" +msgid "Bidirectional operation between a Subversion repository and Git" msgstr "" #: command-list.h:180 -msgid "Read, modify and delete symbolic refs" +msgid "Switch branches" msgstr "" #: command-list.h:181 -msgid "Create, list, delete or verify a tag object signed with GPG" +msgid "Read, modify and delete symbolic refs" msgstr "" #: command-list.h:182 -msgid "Creates a temporary file with a blob's contents" +msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" #: command-list.h:183 -msgid "Unpack objects from a packed archive" +msgid "Creates a temporary file with a blob's contents" msgstr "" #: command-list.h:184 -msgid "Register file contents in the working tree to the index" +msgid "Unpack objects from a packed archive" msgstr "" #: command-list.h:185 -msgid "Update the object name stored in a ref safely" +msgid "Register file contents in the working tree to the index" msgstr "" #: command-list.h:186 -msgid "Update auxiliary info file to help dumb servers" +msgid "Update the object name stored in a ref safely" msgstr "" #: command-list.h:187 -msgid "Send archive back to git-archive" +msgid "Update auxiliary info file to help dumb servers" msgstr "" #: command-list.h:188 -msgid "Send objects packed back to git-fetch-pack" +msgid "Send archive back to git-archive" msgstr "" #: command-list.h:189 -msgid "Show a Git logical variable" +msgid "Send objects packed back to git-fetch-pack" msgstr "" #: command-list.h:190 -msgid "Check the GPG signature of commits" +msgid "Show a Git logical variable" msgstr "" #: command-list.h:191 -msgid "Validate packed Git archive files" +msgid "Check the GPG signature of commits" msgstr "" #: command-list.h:192 -msgid "Check the GPG signature of tags" +msgid "Validate packed Git archive files" msgstr "" #: command-list.h:193 -msgid "Git web interface (web frontend to Git repositories)" +msgid "Check the GPG signature of tags" msgstr "" #: command-list.h:194 -msgid "Show logs with difference each commit introduces" +msgid "Git web interface (web frontend to Git repositories)" msgstr "" #: command-list.h:195 -msgid "Manage multiple working trees" +msgid "Show logs with difference each commit introduces" msgstr "" #: command-list.h:196 -msgid "Create a tree object from the current index" +msgid "Manage multiple working trees" msgstr "" #: command-list.h:197 -msgid "Defining attributes per path" +msgid "Create a tree object from the current index" msgstr "" #: command-list.h:198 -msgid "Git command-line interface and conventions" +msgid "Defining attributes per path" msgstr "" #: command-list.h:199 -msgid "A Git core tutorial for developers" +msgid "Git command-line interface and conventions" msgstr "" #: command-list.h:200 -msgid "Git for CVS users" +msgid "A Git core tutorial for developers" msgstr "" #: command-list.h:201 -msgid "Tweaking diff output" +msgid "Providing usernames and passwords to Git" msgstr "" #: command-list.h:202 -msgid "A useful minimum set of commands for Everyday Git" +msgid "Git for CVS users" msgstr "" #: command-list.h:203 -msgid "Frequently asked questions about using Git" +msgid "Tweaking diff output" msgstr "" #: command-list.h:204 -msgid "A Git Glossary" +msgid "A useful minimum set of commands for Everyday Git" msgstr "" #: command-list.h:205 -msgid "Hooks used by Git" +msgid "Frequently asked questions about using Git" msgstr "" #: command-list.h:206 -msgid "Specifies intentionally untracked files to ignore" +msgid "A Git Glossary" msgstr "" #: command-list.h:207 -msgid "Defining submodule properties" +msgid "Hooks used by Git" msgstr "" #: command-list.h:208 -msgid "Git namespaces" +msgid "Specifies intentionally untracked files to ignore" msgstr "" #: command-list.h:209 -msgid "Git Repository Layout" +msgid "Defining submodule properties" msgstr "" #: command-list.h:210 -msgid "Specifying revisions and ranges for Git" +msgid "Git namespaces" msgstr "" #: command-list.h:211 -msgid "Mounting one repository inside another" +msgid "Helper programs to interact with remote repositories" msgstr "" #: command-list.h:212 -msgid "A tutorial introduction to Git: part two" +msgid "Git Repository Layout" msgstr "" #: command-list.h:213 -msgid "A tutorial introduction to Git" +msgid "Specifying revisions and ranges for Git" msgstr "" #: command-list.h:214 -msgid "An overview of recommended workflows with Git" -msgstr "" - -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" -msgstr "" - -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:60 -msgid "Do you want me to do it for you [Y/n]? " +msgid "Mounting one repository inside another" msgstr "" -#: git-bisect.sh:101 -#, sh-format -msgid "Bad rev input: $arg" +#: command-list.h:215 +msgid "A tutorial introduction to Git: part two" msgstr "" -#: git-bisect.sh:121 -#, sh-format -msgid "Bad rev input: $bisected_head" +#: command-list.h:216 +msgid "A tutorial introduction to Git" msgstr "" -#: git-bisect.sh:130 -#, sh-format -msgid "Bad rev input: $rev" +#: command-list.h:217 +msgid "An overview of recommended workflows with Git" msgstr "" -#: git-bisect.sh:139 +#: git-bisect.sh:48 #, sh-format -msgid "'git bisect $TERM_BAD' can take only one argument." +msgid "Bad rev input: $arg" msgstr "" -#: git-bisect.sh:209 +#: git-bisect.sh:82 msgid "No logfile given" msgstr "" -#: git-bisect.sh:210 +#: git-bisect.sh:83 #, sh-format msgid "cannot read $file for replaying" msgstr "" -#: git-bisect.sh:233 +#: git-bisect.sh:105 msgid "?? what are you talking about?" msgstr "" -#: git-bisect.sh:243 +#: git-bisect.sh:115 msgid "bisect run failed: no command provided." msgstr "" -#: git-bisect.sh:248 +#: git-bisect.sh:120 #, sh-format msgid "running $command" msgstr "" -#: git-bisect.sh:255 +#: git-bisect.sh:127 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -#: git-bisect.sh:281 +#: git-bisect.sh:152 msgid "bisect run cannot continue any more" msgstr "" -#: git-bisect.sh:287 +#: 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:294 +#: git-bisect.sh:165 msgid "bisect run success" msgstr "" -#: git-bisect.sh:302 +#: git-bisect.sh:173 msgid "We are not bisecting." msgstr "" @@ -22286,46 +22763,46 @@ msgstr "" msgid "Simple merge did not work, trying automatic merge." msgstr "" -#: git-submodule.sh:205 +#: git-submodule.sh:179 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:215 +#: git-submodule.sh:189 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:234 +#: git-submodule.sh:208 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:237 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "" -#: git-submodule.sh:244 +#: git-submodule.sh:218 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "" -#: git-submodule.sh:275 +#: git-submodule.sh:249 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:277 +#: git-submodule.sh:251 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:285 +#: git-submodule.sh:259 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:287 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22336,131 +22813,102 @@ msgid "" "option." msgstr "" -#: git-submodule.sh:293 +#: git-submodule.sh:267 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:305 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:310 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:319 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:592 +#: git-submodule.sh:568 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:602 +#: git-submodule.sh:578 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:607 +#: git-submodule.sh:583 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" -#: git-submodule.sh:625 +#: git-submodule.sh:601 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "" -#: git-submodule.sh:631 +#: 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:638 +#: git-submodule.sh:614 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:639 +#: git-submodule.sh:615 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:643 +#: git-submodule.sh:619 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:644 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:649 +#: git-submodule.sh:625 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:650 +#: git-submodule.sh:626 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:655 +#: git-submodule.sh:631 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:656 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:687 +#: git-submodule.sh:663 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:852 -msgid "The --cached option cannot be used with the --files option" -msgstr "" - -#: git-submodule.sh:904 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "" - -#: git-submodule.sh:924 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_src" -msgstr "" - -#: git-submodule.sh:927 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_dst" -msgstr "" - -#: git-submodule.sh:930 -#, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr "" - -#: git-parse-remote.sh:89 -#, sh-format -msgid "See git-${cmd}(1) for details." -msgstr "" - #: git-rebase--preserve-merges.sh:109 msgid "Applied autostash." msgstr "" @@ -22482,7 +22930,7 @@ msgstr "" msgid "Rebasing ($new_count/$total)" msgstr "" -#: git-rebase--preserve-merges.sh:207 +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -22503,7 +22951,7 @@ msgid "" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" -#: git-rebase--preserve-merges.sh:270 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -22515,83 +22963,83 @@ msgid "" "\tgit rebase --continue" msgstr "" -#: git-rebase--preserve-merges.sh:295 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "" -#: git-rebase--preserve-merges.sh:334 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:364 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "" -#: git-rebase--preserve-merges.sh:415 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:426 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "" -#: git-rebase--preserve-merges.sh:431 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:449 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:458 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "" -#: git-rebase--preserve-merges.sh:467 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "" -#: git-rebase--preserve-merges.sh:472 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "" -#: git-rebase--preserve-merges.sh:483 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "" msgstr[1] "" -#: git-rebase--preserve-merges.sh:492 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "" -#: git-rebase--preserve-merges.sh:495 +#: git-rebase--preserve-merges.sh:485 msgid "This is a combination of 2 commits." msgstr "" -#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 -#: git-rebase--preserve-merges.sh:582 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "" -#: git-rebase--preserve-merges.sh:611 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -22601,31 +23049,31 @@ msgid "" "you are able to reword the commit." msgstr "" -#: git-rebase--preserve-merges.sh:626 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "" -#: git-rebase--preserve-merges.sh:641 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "" -#: git-rebase--preserve-merges.sh:683 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "" -#: git-rebase--preserve-merges.sh:691 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "" -#: git-rebase--preserve-merges.sh:693 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "" -#: git-rebase--preserve-merges.sh:695 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -22633,7 +23081,7 @@ msgid "" msgstr "" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -22643,25 +23091,25 @@ msgid "" "\tgit rebase --continue" msgstr "" -#: git-rebase--preserve-merges.sh:719 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "" -#: git-rebase--preserve-merges.sh:720 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "" -#: git-rebase--preserve-merges.sh:755 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "" -#: git-rebase--preserve-merges.sh:812 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "" -#: git-rebase--preserve-merges.sh:817 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -22679,54 +23127,54 @@ msgid "" " git rebase --continue\n" msgstr "" -#: git-rebase--preserve-merges.sh:834 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "" -#: git-rebase--preserve-merges.sh:839 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "" -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "" -#: git-rebase--preserve-merges.sh:900 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" msgstr "" -#: git-rebase--preserve-merges.sh:907 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "" -#: git-rebase--preserve-merges.sh:908 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "" -#: git-rebase--preserve-merges.sh:911 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "" -#: git-rebase--preserve-merges.sh:943 +#: git-rebase--preserve-merges.sh:933 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "" msgstr[1] "" -#: git-rebase--preserve-merges.sh:955 +#: git-rebase--preserve-merges.sh:945 msgid "Note that empty commits are commented out" msgstr "" -#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "" @@ -22793,51 +23241,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:1055 +#: 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:1058 +#: 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:1061 +#: 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:1064 git-add--interactive.perl:1073 -#: git-add--interactive.perl:1079 +#: 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:1067 git-add--interactive.perl:1070 -#: git-add--interactive.perl:1076 +#: 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:1113 +#: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "" -#: git-add--interactive.perl:1120 +#: git-add--interactive.perl:1121 #, perl-format msgid "" "---\n" @@ -22846,12 +23294,12 @@ msgid "" "Lines starting with %s will be removed.\n" msgstr "" -#: git-add--interactive.perl:1142 +#: git-add--interactive.perl:1143 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "" -#: git-add--interactive.perl:1250 +#: git-add--interactive.perl:1251 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -22860,7 +23308,7 @@ msgid "" "d - do not stage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1256 +#: git-add--interactive.perl:1257 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -22869,7 +23317,7 @@ msgid "" "d - do not stash this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1262 +#: git-add--interactive.perl:1263 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -22878,7 +23326,7 @@ msgid "" "d - do not unstage this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1268 +#: git-add--interactive.perl:1269 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -22887,7 +23335,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1274 git-add--interactive.perl:1292 +#: 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" @@ -22896,7 +23344,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1280 +#: 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" @@ -22905,7 +23353,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1286 +#: 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" @@ -22914,7 +23362,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1298 +#: git-add--interactive.perl:1299 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -22923,7 +23371,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" -#: git-add--interactive.perl:1313 +#: git-add--interactive.perl:1314 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -22936,90 +23384,90 @@ msgid "" "? - print help\n" msgstr "" -#: git-add--interactive.perl:1344 +#: git-add--interactive.perl:1345 msgid "The selected hunks do not apply to the index!\n" msgstr "" -#: git-add--interactive.perl:1359 +#: git-add--interactive.perl:1360 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "" -#: git-add--interactive.perl:1478 +#: git-add--interactive.perl:1479 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1479 +#: git-add--interactive.perl:1480 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1480 +#: git-add--interactive.perl:1481 #, perl-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1481 +#: git-add--interactive.perl:1482 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "" -#: git-add--interactive.perl:1587 +#: git-add--interactive.perl:1599 msgid "No other hunks to goto\n" msgstr "" -#: git-add--interactive.perl:1605 +#: git-add--interactive.perl:1617 #, perl-format msgid "Invalid number: '%s'\n" msgstr "" -#: git-add--interactive.perl:1610 +#: 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:1636 +#: git-add--interactive.perl:1657 msgid "No other hunks to search\n" msgstr "" -#: git-add--interactive.perl:1653 +#: git-add--interactive.perl:1674 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "" -#: git-add--interactive.perl:1663 +#: git-add--interactive.perl:1684 msgid "No hunk matches the given pattern\n" msgstr "" -#: git-add--interactive.perl:1675 git-add--interactive.perl:1697 +#: git-add--interactive.perl:1696 git-add--interactive.perl:1718 msgid "No previous hunk\n" msgstr "" -#: git-add--interactive.perl:1684 git-add--interactive.perl:1703 +#: git-add--interactive.perl:1705 git-add--interactive.perl:1724 msgid "No next hunk\n" msgstr "" -#: git-add--interactive.perl:1709 +#: git-add--interactive.perl:1730 msgid "Sorry, cannot split this hunk\n" msgstr "" -#: git-add--interactive.perl:1715 +#: 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:1725 +#: 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:1790 +#: git-add--interactive.perl:1811 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23030,19 +23478,19 @@ msgid "" "changes\n" msgstr "" -#: git-add--interactive.perl:1807 git-add--interactive.perl:1812 -#: git-add--interactive.perl:1815 git-add--interactive.perl:1822 -#: git-add--interactive.perl:1825 git-add--interactive.perl:1832 -#: git-add--interactive.perl:1836 git-add--interactive.perl:1842 +#: 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:1838 +#: git-add--interactive.perl:1866 #, perl-format msgid "unknown --patch mode: %s" msgstr "" -#: git-add--interactive.perl:1844 git-add--interactive.perl:1850 +#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 #, perl-format msgid "invalid argument %s, expecting --" msgstr "" @@ -23059,62 +23507,69 @@ msgstr "" msgid "the editor exited uncleanly, aborting everything" msgstr "" -#: git-send-email.perl:310 +#: git-send-email.perl:312 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" -#: git-send-email.perl:315 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "" -#: git-send-email.perl:408 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "" -#: git-send-email.perl:481 git-send-email.perl:683 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "" -#: git-send-email.perl:484 +#: git-send-email.perl:492 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "" -#: git-send-email.perl:497 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "" -#: git-send-email.perl:528 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "" -#: git-send-email.perl:556 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" -#: git-send-email.perl:558 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "" -#: git-send-email.perl:560 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" -#: git-send-email.perl:565 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "" -#: git-send-email.perl:649 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -23124,36 +23579,36 @@ msgid "" " * Giving --format-patch option if you mean a range.\n" msgstr "" -#: git-send-email.perl:670 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "" -#: git-send-email.perl:694 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" "warning: no patches were sent\n" msgstr "" -#: git-send-email.perl:705 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" "\n" msgstr "" -#: git-send-email.perl:718 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "" -#: git-send-email.perl:728 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "" -#: git-send-email.perl:739 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -23162,37 +23617,37 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "" -#: git-send-email.perl:763 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "" -#: git-send-email.perl:780 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "" -#: git-send-email.perl:823 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "" -#: git-send-email.perl:913 +#: git-send-email.perl:921 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" -#: git-send-email.perl:918 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "" -#: git-send-email.perl:926 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -23201,20 +23656,20 @@ msgid "" "want to send.\n" msgstr "" -#: git-send-email.perl:945 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "" -#: git-send-email.perl:963 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "" -#: git-send-email.perl:975 +#: git-send-email.perl:983 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -#: git-send-email.perl:1033 git-send-email.perl:1041 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "" @@ -23222,16 +23677,16 @@ msgstr "" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1045 +#: git-send-email.perl:1053 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" -#: git-send-email.perl:1362 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "" -#: git-send-email.perl:1445 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -23248,128 +23703,128 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1460 +#: git-send-email.perl:1468 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "" -#: git-send-email.perl:1463 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "" -#: git-send-email.perl:1491 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "" -#: git-send-email.perl:1538 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "" -#: git-send-email.perl:1543 git-send-email.perl:1547 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "" -#: git-send-email.perl:1556 +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -#: git-send-email.perl:1574 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "" -#: git-send-email.perl:1591 +#: git-send-email.perl:1599 msgid "Result: " msgstr "" -#: git-send-email.perl:1594 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "" -#: git-send-email.perl:1612 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "" -#: git-send-email.perl:1659 git-send-email.perl:1679 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1665 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1722 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1757 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1868 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "" -#: git-send-email.perl:1875 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "" -#: git-send-email.perl:1879 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "" -#: git-send-email.perl:1909 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "" -#: git-send-email.perl:1917 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "" -#: git-send-email.perl:1958 git-send-email.perl:2010 git-send-email.perl:2020 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "" -#: git-send-email.perl:1961 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "" -#: git-send-email.perl:1978 +#: git-send-email.perl:1986 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1982 +#: git-send-email.perl:1990 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "" |