From e13da2db28904ef70c15228fe16e25888820927c Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Tue, 6 Oct 2020 09:16:18 +0800 Subject: l10n: git.pot: v2.29.0 round 1 (124 new, 42 removed) Generate po/git.pot from v2.29.0-rc0 for git v2.29.0 l10n round 1. Signed-off-by: Jiang Xin --- po/git.pot | 7010 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 3680 insertions(+), 3330 deletions(-) (limited to 'po/git.pot') diff --git a/po/git.pot b/po/git.pot index 198b6e0a4a..1133c19e98 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 \n" -"POT-Creation-Date: 2020-07-10 09:53+0800\n" +"POT-Creation-Date: 2020-10-06 09:14+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,9 +23,9 @@ msgstr "" 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:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 +#: builtin/rebase.c:1944 msgid "could not read index" msgstr "" @@ -53,7 +53,7 @@ msgstr "" msgid "could not stage '%s'" msgstr "" -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336 +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444 msgid "could not write index" msgstr "" @@ -69,7 +69,7 @@ msgstr[1] "" msgid "note: %s is untracked now.\n" msgstr "" -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294 +#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" @@ -111,21 +111,21 @@ msgstr[1] "" msgid "ignoring unmerged: %s" msgstr "" -#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368 +#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371 #, c-format msgid "Only binary files changed.\n" msgstr "" -#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370 +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 #, c-format msgid "No changes.\n" msgstr "" -#: add-interactive.c:935 git-add--interactive.perl:1378 +#: add-interactive.c:935 git-add--interactive.perl:1381 msgid "Patch update" msgstr "" -#: add-interactive.c:974 git-add--interactive.perl:1771 +#: add-interactive.c:974 git-add--interactive.perl:1794 msgid "Review diff" msgstr "" @@ -193,11 +193,11 @@ msgstr "" msgid "(empty) select nothing" msgstr "" -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891 msgid "*** Commands ***" msgstr "" -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 msgid "What now" msgstr "" @@ -209,12 +209,12 @@ msgstr "" 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:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 #: git-add--interactive.perl:213 msgid "path" msgstr "" @@ -223,27 +223,27 @@ msgstr "" msgid "could not refresh index" msgstr "" -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805 #, c-format msgid "Bye.\n" msgstr "" -#: add-patch.c:34 git-add--interactive.perl:1430 +#: add-patch.c:34 git-add--interactive.perl:1433 #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:35 git-add--interactive.perl:1431 +#: add-patch.c:35 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:36 git-add--interactive.perl:1432 +#: add-patch.c:36 git-add--interactive.perl:1435 #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:37 git-add--interactive.perl:1433 +#: add-patch.c:37 git-add--interactive.perl:1436 #, 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:1439 #, 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:1440 #, 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:1441 #, 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:1442 #, 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:1445 #, 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:1446 #, 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:1447 #, 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:1448 #, 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:1451 #, c-format, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:104 git-add--interactive.perl:1449 +#: add-patch.c:104 git-add--interactive.perl:1452 #, c-format, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:105 git-add--interactive.perl:1450 +#: add-patch.c:105 git-add--interactive.perl:1453 #, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:106 git-add--interactive.perl:1451 +#: add-patch.c:106 git-add--interactive.perl:1454 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "" @@ -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:1457 +#: git-add--interactive.perl:1475 #, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:127 git-add--interactive.perl:1455 -#: git-add--interactive.perl:1473 +#: add-patch.c:127 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:128 git-add--interactive.perl:1456 -#: git-add--interactive.perl:1474 +#: add-patch.c:128 git-add--interactive.perl:1459 +#: git-add--interactive.perl:1477 #, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:129 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c:129 git-add--interactive.perl:1460 +#: git-add--interactive.perl:1478 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -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:1463 #, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 #, c-format, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 #, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -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:1469 #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 #, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 #, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -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:785 #, c-format msgid "" "expected context line #%d in\n" "%.*s" msgstr "" -#: add-patch.c:791 +#: add-patch.c:800 #, 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:1076 git-add--interactive.perl:1117 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" -#: add-patch.c:1071 +#: add-patch.c:1080 #, 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:1094 git-add--interactive.perl:1131 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "" -#: add-patch.c:1118 +#: add-patch.c:1127 msgid "could not parse hunk header" msgstr "" -#: add-patch.c:1163 +#: add-patch.c:1172 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:1241 git-add--interactive.perl:1244 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" -#: add-patch.c:1275 +#: add-patch.c:1284 msgid "The selected hunks do not apply to the index!" msgstr "" -#: add-patch.c:1276 git-add--interactive.perl:1345 +#: add-patch.c:1285 git-add--interactive.perl:1348 msgid "Apply them to the worktree anyway? " msgstr "" -#: add-patch.c:1283 git-add--interactive.perl:1348 +#: add-patch.c:1292 git-add--interactive.perl:1351 msgid "Nothing was applied.\n" msgstr "" -#: add-patch.c:1340 +#: add-patch.c:1349 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -594,69 +594,69 @@ msgid "" "? - print help\n" msgstr "" -#: add-patch.c:1463 add-patch.c:1473 +#: add-patch.c:1511 add-patch.c:1521 msgid "No previous hunk" msgstr "" -#: add-patch.c:1468 add-patch.c:1478 +#: add-patch.c:1516 add-patch.c:1526 msgid "No next hunk" msgstr "" -#: add-patch.c:1484 +#: add-patch.c:1532 msgid "No other hunks to goto" msgstr "" -#: add-patch.c:1495 git-add--interactive.perl:1594 +#: add-patch.c:1543 git-add--interactive.perl:1608 msgid "go to which hunk ( to see more)? " msgstr "" -#: add-patch.c:1496 git-add--interactive.perl:1596 +#: add-patch.c:1544 git-add--interactive.perl:1610 msgid "go to which hunk? " msgstr "" -#: add-patch.c:1507 +#: add-patch.c:1555 #, c-format msgid "Invalid number: '%s'" msgstr "" -#: add-patch.c:1512 +#: add-patch.c:1560 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "" msgstr[1] "" -#: add-patch.c:1521 +#: add-patch.c:1569 msgid "No other hunks to search" msgstr "" -#: add-patch.c:1527 git-add--interactive.perl:1640 +#: add-patch.c:1575 git-add--interactive.perl:1663 msgid "search for regex? " msgstr "" -#: add-patch.c:1542 +#: add-patch.c:1590 #, c-format msgid "Malformed search regexp %s: %s" msgstr "" -#: add-patch.c:1559 +#: add-patch.c:1607 msgid "No hunk matches the given pattern" msgstr "" -#: add-patch.c:1566 +#: add-patch.c:1614 msgid "Sorry, cannot split this hunk" msgstr "" -#: add-patch.c:1570 +#: add-patch.c:1618 #, c-format msgid "Split into %d hunks." msgstr "" -#: add-patch.c:1574 +#: add-patch.c:1622 msgid "Sorry, cannot edit this hunk" msgstr "" -#: add-patch.c:1625 +#: add-patch.c:1674 msgid "'git apply' failed" msgstr "" @@ -707,7 +707,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:278 builtin/merge.c:1353 +#: advice.c:278 builtin/merge.c:1349 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" @@ -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:72 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:3953 #, 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:3956 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3959 +#: apply.c:3976 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3964 +#: apply.c:3981 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3984 +#: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3988 +#: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:4003 +#: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4095 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4102 +#: apply.c:4119 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4105 +#: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4114 +#: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4124 +#: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4262 +#: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4296 +#: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4302 +#: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4310 +#: apply.c:4327 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4316 apply.c:4461 +#: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4359 +#: apply.c:4376 builtin/bisect--helper.c:537 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4363 +#: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4433 +#: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4531 +#: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4539 +#: apply.c:4556 msgid "internal error" msgstr "" -#: apply.c:4542 +#: apply.c:4559 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4553 +#: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4575 +#: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4579 +#: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4698 +#: apply.c:4715 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4706 +#: apply.c:4723 msgid "unrecognized input" msgstr "" -#: apply.c:4726 +#: apply.c:4743 msgid "unable to read index file" msgstr "" -#: apply.c:4883 +#: apply.c:4900 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4910 +#: apply.c:4927 #, 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:4933 apply.c:4948 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4924 +#: apply.c:4941 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "" -#: apply.c:4968 +#: apply.c:4985 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4971 +#: apply.c:4988 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4973 builtin/am.c:2259 +#: apply.c:4990 builtin/am.c:2279 msgid "num" msgstr "" -#: apply.c:4974 +#: apply.c:4991 msgid "remove leading slashes from traditional diff paths" msgstr "" -#: apply.c:4977 +#: apply.c:4994 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4979 +#: apply.c:4996 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4983 +#: apply.c:5000 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4985 +#: apply.c:5002 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4987 +#: apply.c:5004 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4989 +#: apply.c:5006 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4991 +#: apply.c:5008 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:4993 +#: apply.c:5010 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4995 +#: apply.c:5012 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4998 +#: apply.c:5015 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:5000 +#: apply.c:5017 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:5002 +#: apply.c:5019 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:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:5007 +#: apply.c:5024 msgid "ensure at least lines of context match" msgstr "" -#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3530 builtin/rebase.c:1332 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 msgid "action" msgstr "" -#: apply.c:5009 +#: apply.c:5026 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:5012 apply.c:5015 +#: apply.c:5029 apply.c:5032 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:5018 +#: apply.c:5035 msgid "apply the patch in reverse" msgstr "" -#: apply.c:5020 +#: apply.c:5037 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:5022 +#: apply.c:5039 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5024 +#: apply.c:5041 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:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "" -#: apply.c:5027 +#: apply.c:5044 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5030 +#: apply.c:5047 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5032 builtin/am.c:2247 +#: apply.c:5049 builtin/am.c:2267 msgid "root" msgstr "" -#: apply.c:5033 +#: apply.c:5050 msgid "prepend 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:449 #, c-format msgid "unable to start '%s' filter" msgstr "" -#: archive-tar.c:468 +#: archive-tar.c:452 msgid "unable to redirect descriptor" msgstr "" -#: archive-tar.c:475 +#: archive-tar.c:459 #, 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: %" msgstr "" @@ -1422,119 +1417,149 @@ msgstr "" msgid "git archive --remote [--exec ] --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:445 sequencer.c:1706 sequencer.c:2852 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 +#: builtin/merge.c:1124 +#, c-format +msgid "could not read '%s'" +msgstr "" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c: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:553 msgid "fmt" msgstr "" -#: archive.c:464 +#: archive.c:553 msgid "archive format" msgstr "" -#: archive.c:465 builtin/log.c:1674 +#: archive.c:554 builtin/log.c:1760 msgid "prefix" msgstr "" -#: archive.c:466 +#: archive.c:555 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:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "" -#: archive.c:468 builtin/archive.c:90 +#: archive.c:557 +msgid "add untracked file to archive" +msgstr "" + +#: archive.c:560 builtin/archive.c:90 msgid "write the archive to this file" msgstr "" -#: archive.c:470 +#: archive.c:562 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:471 +#: archive.c:563 msgid "report archived files on stderr" msgstr "" -#: archive.c:472 +#: archive.c:564 msgid "store only" msgstr "" -#: archive.c:473 +#: archive.c:565 msgid "compress faster" msgstr "" -#: archive.c:481 +#: archive.c:573 msgid "compress better" msgstr "" -#: archive.c:484 +#: archive.c:576 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:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "" -#: archive.c:487 builtin/archive.c:92 +#: archive.c:579 builtin/archive.c:92 msgid "retrieve the archive from remote repository " msgstr "" -#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "" -#: archive.c:489 builtin/archive.c:94 +#: archive.c:581 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:496 +#: archive.c:588 msgid "Unexpected option --remote" msgstr "" -#: archive.c:498 +#: archive.c:590 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:500 +#: archive.c:592 msgid "Unexpected option --output" msgstr "" -#: archive.c:522 +#: archive.c:594 +msgid "Options --add-file and --remote cannot be used together" +msgstr "" + +#: archive.c:616 #, c-format msgid "Unknown archive format '%s'" msgstr "" -#: archive.c:529 +#: archive.c:623 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "" @@ -1555,43 +1580,43 @@ msgid "" "Use '\\!' for literal leading exclamation." msgstr "" -#: bisect.c:468 +#: bisect.c:476 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" -#: bisect.c:678 +#: bisect.c:686 #, c-format msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:745 +#: bisect.c:753 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:770 +#: bisect.c:778 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" -#: bisect.c:775 +#: bisect.c:783 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:780 +#: bisect.c:788 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -#: bisect.c:788 +#: bisect.c:796 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1599,7 +1624,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:801 +#: bisect.c:809 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1607,43 +1632,43 @@ msgid "" "We continue anyway." msgstr "" -#: bisect.c:840 +#: bisect.c:848 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:890 +#: bisect.c:898 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:928 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:974 builtin/merge.c:150 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:997 +#: bisect.c:1014 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:1019 +#: bisect.c:1044 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:1028 +#: bisect.c:1053 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:1057 +#: bisect.c:1082 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1653,44 +1678,44 @@ msgstr[1] "" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: bisect.c:1088 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "" msgstr[1] "" -#: blame.c:2777 +#: blame.c:2778 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:2791 +#: blame.c:2792 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:2812 +#: blame.c:2813 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:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:320 msgid "revision walk setup failed" msgstr "" -#: blame.c:2839 +#: blame.c:2840 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:2850 +#: blame.c:2851 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:2861 +#: blame.c:2862 #, c-format msgid "cannot read blob %s for path %s" msgstr "" @@ -1819,88 +1844,104 @@ msgstr "" msgid "HEAD of working tree %s is not updated" msgstr "" -#: bundle.c:47 +#: bundle.c:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "" + +#: bundle.c:45 #, c-format -msgid "'%s' does not look like a v2 bundle file" +msgid "unknown capability '%s'" msgstr "" -#: bundle.c:69 -msgid "unknown hash algorithm length" +#: bundle.c:71 +#, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "" -#: bundle.c:84 +#: 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:2357 sequencer.c:3142 #: 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:207 builtin/log.c:1918 builtin/shortlog.c:461 #, 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 +1950,264 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit-graph.c:238 +#: commit-graph.c:188 midx.c:46 +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:1042 builtin/am.c:1306 #, 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:1265 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "" -#: commit-graph.c:1257 +#: commit-graph.c:1301 msgid "Loading known commits in commit graph" msgstr "" -#: commit-graph.c:1274 +#: commit-graph.c:1318 msgid "Expanding reachable commits in commit graph" msgstr "" -#: commit-graph.c:1294 +#: commit-graph.c:1338 msgid "Clearing commit marks in commit graph" msgstr "" -#: commit-graph.c:1313 +#: commit-graph.c:1357 msgid "Computing commit graph generation numbers" msgstr "" -#: commit-graph.c:1367 +#: commit-graph.c:1424 msgid "Computing commit changed paths Bloom filters" msgstr "" -#: commit-graph.c:1423 +#: commit-graph.c:1501 msgid "Collecting referenced commits" msgstr "" -#: commit-graph.c:1447 +#: commit-graph.c:1526 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1460 +#: commit-graph.c:1539 #, c-format msgid "error adding pack %s" msgstr "" -#: commit-graph.c:1464 +#: commit-graph.c:1543 #, c-format msgid "error opening index for %s" msgstr "" -#: commit-graph.c:1503 +#: commit-graph.c:1582 msgid "Finding commits for commit graph among packed objects" msgstr "" -#: commit-graph.c:1518 +#: commit-graph.c:1597 msgid "Counting distinct commits in commit graph" msgstr "" -#: commit-graph.c:1550 +#: commit-graph.c:1629 msgid "Finding extra edges in commit graph" msgstr "" -#: commit-graph.c:1599 +#: commit-graph.c:1678 msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1633 midx.c:812 +#: commit-graph.c:1720 midx.c:826 #, c-format msgid "unable to create leading directories of %s" msgstr "" -#: commit-graph.c:1646 +#: commit-graph.c:1733 msgid "unable to create temporary graph layer" msgstr "" -#: commit-graph.c:1651 +#: commit-graph.c:1738 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "" -#: commit-graph.c:1728 +#: commit-graph.c:1808 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "" msgstr[1] "" -#: commit-graph.c:1773 +#: commit-graph.c:1853 msgid "unable to open commit-graph chain file" msgstr "" -#: commit-graph.c:1789 +#: commit-graph.c:1869 msgid "failed to rename base commit-graph file" msgstr "" -#: commit-graph.c:1809 +#: commit-graph.c:1889 msgid "failed to rename temporary commit-graph file" msgstr "" -#: commit-graph.c:1935 +#: commit-graph.c:2015 msgid "Scanning merged commits" msgstr "" -#: commit-graph.c:1946 +#: commit-graph.c:2026 #, c-format msgid "unexpected duplicate commit id %s" msgstr "" -#: commit-graph.c:1969 +#: commit-graph.c:2049 msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:2156 +#: commit-graph.c:2259 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "" -#: commit-graph.c:2167 +#: commit-graph.c:2270 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:2260 +#: commit-graph.c:2363 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:2270 +#: commit-graph.c:2373 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:2280 commit-graph.c:2295 +#: commit-graph.c:2383 commit-graph.c:2398 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:2287 +#: commit-graph.c:2390 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "" -#: commit-graph.c:2305 +#: commit-graph.c:2408 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2320 +#: commit-graph.c:2423 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2327 +#: commit-graph.c:2430 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2337 +#: commit-graph.c:2440 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2346 +#: commit-graph.c:2449 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2360 +#: commit-graph.c:2463 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2365 +#: commit-graph.c:2468 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2369 +#: commit-graph.c:2472 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2385 +#: commit-graph.c:2488 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" -#: commit-graph.c:2391 +#: commit-graph.c:2494 #, c-format msgid "commit date for commit %s in commit-graph is % != %" 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:2845 builtin/am.c:373 builtin/am.c:417 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "" @@ -2255,7 +2293,7 @@ msgstr "" msgid "key does not contain variable name: %s" msgstr "" -#: config.c:408 sequencer.c:2456 +#: config.c:408 sequencer.c:2547 #, c-format msgid "invalid key: %s" msgstr "" @@ -2391,7 +2429,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 +2458,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:2470 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2489 +#: config.c:2502 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2518 +#: config.c:2531 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2770 config.c:3094 +#: config.c:2783 config.c:3107 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2781 +#: config.c:2794 #, c-format msgid "opening %s" msgstr "" -#: config.c:2816 builtin/config.c:344 +#: config.c:2829 builtin/config.c:354 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:2841 +#: config.c:2854 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:2854 config.c:3107 +#: config.c:2867 config.c:3120 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2865 +#: config.c:2878 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:2874 config.c:3112 +#: config.c:2887 config.c:3125 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:2959 config.c:3209 +#: config.c:2972 config.c:3222 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:2993 +#: config.c:3006 #, 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:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 #, c-format msgid "could not unset '%s'" msgstr "" -#: config.c:3085 +#: config.c:3098 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3252 +#: config.c:3265 #, c-format msgid "missing value for '%s'" msgstr "" @@ -2675,23 +2713,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 +2796,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 +2863,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 "" @@ -2983,523 +3021,523 @@ msgid "" "%s" msgstr "" -#: diff.c:4243 +#: diff.c:4269 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4589 +#: diff.c:4618 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4592 +#: diff.c:4621 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4670 +#: diff.c:4699 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4718 +#: diff.c:4747 #, 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:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "" -#: diff.c:4755 +#: diff.c:4784 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4840 +#: diff.c:4869 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4864 +#: diff.c:4893 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4878 +#: diff.c:4907 #, c-format msgid "unable to resolve '%s'" msgstr "" -#: diff.c:4928 diff.c:4934 +#: diff.c:4957 diff.c:4963 #, c-format msgid "%s expects / form" msgstr "" -#: diff.c:4946 +#: diff.c:4975 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:4967 +#: diff.c:4996 #, c-format msgid "bad --color-moved argument: %s" msgstr "" -#: diff.c:4986 +#: diff.c:5015 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: diff.c:5026 +#: diff.c:5055 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5062 diff.c:5082 +#: diff.c:5091 diff.c:5111 #, c-format msgid "invalid argument to %s" msgstr "" -#: diff.c:5219 +#: diff.c:5248 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5275 +#: diff.c:5304 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5298 +#: diff.c:5327 msgid "Diff output format options" msgstr "" -#: diff.c:5300 diff.c:5306 +#: diff.c:5329 diff.c:5335 msgid "generate patch" msgstr "" -#: diff.c:5303 builtin/log.c:177 +#: diff.c:5332 builtin/log.c:176 msgid "suppress diff output" msgstr "" -#: diff.c:5308 diff.c:5422 diff.c:5429 +#: diff.c:5337 diff.c:5451 diff.c:5458 msgid "" msgstr "" -#: diff.c:5309 diff.c:5312 +#: diff.c:5338 diff.c:5341 msgid "generate diffs with lines context" msgstr "" -#: diff.c:5314 +#: diff.c:5343 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5317 +#: diff.c:5346 msgid "synonym for '-p --raw'" msgstr "" -#: diff.c:5321 +#: diff.c:5350 msgid "synonym for '-p --stat'" msgstr "" -#: diff.c:5325 +#: diff.c:5354 msgid "machine friendly --stat" msgstr "" -#: diff.c:5328 +#: diff.c:5357 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5330 diff.c:5338 +#: diff.c:5359 diff.c:5367 msgid "..." msgstr "" -#: diff.c:5331 +#: diff.c:5360 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5335 +#: diff.c:5364 msgid "synonym for --dirstat=cumulative" msgstr "" -#: diff.c:5339 +#: diff.c:5368 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5343 +#: diff.c:5372 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5346 +#: diff.c:5375 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5349 +#: diff.c:5378 msgid "show only names of changed files" msgstr "" -#: diff.c:5352 +#: diff.c:5381 msgid "show only names and status of changed files" msgstr "" -#: diff.c:5354 +#: diff.c:5383 msgid "[,[,]]" msgstr "" -#: diff.c:5355 +#: diff.c:5384 msgid "generate diffstat" msgstr "" -#: diff.c:5357 diff.c:5360 diff.c:5363 +#: diff.c:5386 diff.c:5389 diff.c:5392 msgid "" msgstr "" -#: diff.c:5358 +#: diff.c:5387 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5361 +#: diff.c:5390 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5364 +#: diff.c:5393 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5366 +#: diff.c:5395 msgid "" msgstr "" -#: diff.c:5367 +#: diff.c:5396 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5370 +#: diff.c:5399 msgid "generate compact summary in diffstat" msgstr "" -#: diff.c:5373 +#: diff.c:5402 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5376 +#: diff.c:5405 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5378 +#: diff.c:5407 msgid "show colored diff" msgstr "" -#: diff.c:5379 +#: diff.c:5408 msgid "" msgstr "" -#: diff.c:5380 +#: diff.c:5409 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5383 +#: diff.c:5412 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:5415 diff.c:5418 diff.c:5421 diff.c:5527 msgid "" msgstr "" -#: diff.c:5387 +#: diff.c:5416 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5390 +#: diff.c:5419 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5393 +#: diff.c:5422 msgid "prepend an additional prefix to every line of output" msgstr "" -#: diff.c:5396 +#: diff.c:5425 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5399 +#: diff.c:5428 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:5432 diff.c:5437 diff.c:5442 msgid "" msgstr "" -#: diff.c:5404 +#: diff.c:5433 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5409 +#: diff.c:5438 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5414 +#: diff.c:5443 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5417 +#: diff.c:5446 msgid "Diff rename options" msgstr "" -#: diff.c:5418 +#: diff.c:5447 msgid "[/]" msgstr "" -#: diff.c:5419 +#: diff.c:5448 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5423 +#: diff.c:5452 msgid "detect renames" msgstr "" -#: diff.c:5427 +#: diff.c:5456 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5430 +#: diff.c:5459 msgid "detect copies" msgstr "" -#: diff.c:5434 +#: diff.c:5463 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5436 +#: diff.c:5465 msgid "disable rename detection" msgstr "" -#: diff.c:5439 +#: diff.c:5468 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5441 +#: diff.c:5470 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5444 +#: diff.c:5473 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5446 +#: diff.c:5475 msgid "Diff algorithm options" msgstr "" -#: diff.c:5448 +#: diff.c:5477 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5451 +#: diff.c:5480 msgid "ignore whitespace when comparing lines" msgstr "" -#: diff.c:5454 +#: diff.c:5483 msgid "ignore changes in amount of whitespace" msgstr "" -#: diff.c:5457 +#: diff.c:5486 msgid "ignore changes in whitespace at EOL" msgstr "" -#: diff.c:5460 +#: diff.c:5489 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5463 +#: diff.c:5492 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5466 +#: diff.c:5495 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5469 +#: diff.c:5498 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5473 +#: diff.c:5502 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5475 +#: diff.c:5504 msgid "" msgstr "" -#: diff.c:5476 +#: diff.c:5505 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5478 +#: diff.c:5507 msgid "" msgstr "" -#: diff.c:5479 +#: diff.c:5508 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5481 diff.c:5490 diff.c:5493 +#: diff.c:5510 diff.c:5519 diff.c:5522 msgid "" msgstr "" -#: diff.c:5482 +#: diff.c:5511 msgid "show word diff, using to delimit changed words" msgstr "" -#: diff.c:5484 diff.c:5487 diff.c:5532 +#: diff.c:5513 diff.c:5516 diff.c:5561 msgid "" msgstr "" -#: diff.c:5485 +#: diff.c:5514 msgid "use to decide what a word is" msgstr "" -#: diff.c:5488 +#: diff.c:5517 msgid "equivalent to --word-diff=color --word-diff-regex=" msgstr "" -#: diff.c:5491 +#: diff.c:5520 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5494 +#: diff.c:5523 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5497 +#: diff.c:5526 msgid "Other diff options" msgstr "" -#: diff.c:5499 +#: diff.c:5528 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5503 +#: diff.c:5532 msgid "treat all files as text" msgstr "" -#: diff.c:5505 +#: diff.c:5534 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5507 +#: diff.c:5536 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5509 +#: diff.c:5538 msgid "disable all output of the program" msgstr "" -#: diff.c:5511 +#: diff.c:5540 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5513 +#: diff.c:5542 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5515 +#: diff.c:5544 msgid "" msgstr "" -#: diff.c:5516 +#: diff.c:5545 msgid "ignore changes to submodules in the diff generation" msgstr "" -#: diff.c:5519 +#: diff.c:5548 msgid "" msgstr "" -#: diff.c:5520 +#: diff.c:5549 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5524 +#: diff.c:5553 msgid "hide 'git add -N' entries from the index" msgstr "" -#: diff.c:5527 +#: diff.c:5556 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5529 +#: diff.c:5558 msgid "" msgstr "" -#: diff.c:5530 +#: diff.c:5559 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5533 +#: diff.c:5562 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5536 +#: diff.c:5565 msgid "show all changes in the changeset with -S or -G" msgstr "" -#: diff.c:5539 +#: diff.c:5568 msgid "treat in -S as extended POSIX regular expression" msgstr "" -#: diff.c:5542 +#: diff.c:5571 msgid "control the order in which files appear in the output" msgstr "" -#: diff.c:5543 +#: diff.c:5572 msgid "" msgstr "" -#: diff.c:5544 +#: diff.c:5573 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5546 +#: diff.c:5575 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5547 +#: diff.c:5576 msgid "select files by diff type" msgstr "" -#: diff.c:5549 +#: diff.c:5578 msgid "" msgstr "" -#: diff.c:5550 +#: diff.c:5579 msgid "Output to a specific file" msgstr "" -#: diff.c:6205 +#: diff.c:6236 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:6208 +#: diff.c:6239 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:6211 +#: diff.c:6242 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3514,59 +3552,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 +3638,245 @@ msgstr "" msgid "too many args to run %s" msgstr "" -#: fetch-pack.c:152 +#: fetch-pack.c:176 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:155 +#: fetch-pack.c:179 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" -#: fetch-pack.c:166 +#: fetch-pack.c:190 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" -#: fetch-pack.c:186 +#: fetch-pack.c:210 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:197 +#: fetch-pack.c:221 msgid "unable to write to remote" msgstr "" -#: fetch-pack.c:259 +#: fetch-pack.c:282 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:358 fetch-pack.c:1408 +#: fetch-pack.c:375 fetch-pack.c:1397 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:364 fetch-pack.c:1414 +#: fetch-pack.c:381 fetch-pack.c:1403 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:366 fetch-pack.c:1416 +#: fetch-pack.c:383 fetch-pack.c:1405 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:369 fetch-pack.c:1419 +#: fetch-pack.c:386 fetch-pack.c:1408 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:371 fetch-pack.c:1421 +#: fetch-pack.c:388 fetch-pack.c:1410 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:374 fetch-pack.c:1425 +#: fetch-pack.c:391 fetch-pack.c:1414 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:416 +#: fetch-pack.c:431 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:433 +#: fetch-pack.c:448 #, c-format msgid "i