diff options
Diffstat (limited to 'po/git.pot')
| -rw-r--r-- | po/git.pot | 3967 |
1 files changed, 2070 insertions, 1897 deletions
diff --git a/po/git.pot b/po/git.pot index d4e46e5e74..e36d187970 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: 2017-10-17 09:44+0800\n" +"POT-Creation-Date: 2018-01-07 07:50+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c:58 +#: advice.c:62 #, c-format msgid "hint: %.*s\n" msgstr "" -#: advice.c:86 +#: advice.c:90 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:88 +#: advice.c:92 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:90 +#: advice.c:94 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:92 +#: advice.c:96 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:94 +#: advice.c:98 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:96 +#: advice.c:100 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:104 +#: advice.c:108 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:112 +#: advice.c:116 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:117 builtin/merge.c:1211 +#: advice.c:121 builtin/merge.c:1213 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:119 +#: advice.c:123 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:120 +#: advice.c:124 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:126 +#: advice.c:130 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -96,82 +96,82 @@ msgstr "" msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: apply.c:125 +#: apply.c:122 msgid "--reject and --3way cannot be used together." msgstr "" -#: apply.c:127 +#: apply.c:124 msgid "--cached and --3way cannot be used together." msgstr "" -#: apply.c:130 +#: apply.c:127 msgid "--3way outside a repository" msgstr "" -#: apply.c:141 +#: apply.c:138 msgid "--index outside a repository" msgstr "" -#: apply.c:144 +#: apply.c:141 msgid "--cached outside a repository" msgstr "" -#: apply.c:845 +#: apply.c:821 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: apply.c:854 +#: apply.c:830 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: apply.c:928 +#: apply.c:904 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: apply.c:966 +#: apply.c:942 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: apply.c:972 +#: apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: apply.c:973 +#: apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: apply.c:978 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: apply.c:1007 +#: apply.c:983 #, c-format msgid "invalid mode on line %d: %s" msgstr "" -#: apply.c:1325 +#: apply.c:1301 #, c-format msgid "inconsistent header lines %d and %d" msgstr "" -#: apply.c:1497 +#: apply.c:1473 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: apply.c:1566 +#: apply.c:1542 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: apply.c:1586 +#: apply.c:1562 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -182,521 +182,522 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apply.c:1599 +#: apply.c:1575 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1787 +#: apply.c:1763 msgid "new file depends on old contents" msgstr "" -#: apply.c:1789 +#: apply.c:1765 msgid "deleted file still has contents" msgstr "" -#: apply.c:1823 +#: apply.c:1799 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1860 +#: apply.c:1836 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1862 +#: apply.c:1838 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1865 +#: apply.c:1841 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: apply.c:2012 +#: apply.c:1988 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: apply.c:2049 +#: apply.c:2025 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: apply.c:2209 +#: apply.c:2185 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: apply.c:2295 +#: apply.c:2271 #, c-format msgid "unable to read symlink %s" msgstr "" -#: apply.c:2299 +#: apply.c:2275 #, c-format msgid "unable to open or read %s" msgstr "" -#: apply.c:2958 +#: apply.c:2934 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3077 +#: apply.c:3055 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: apply.c:3089 +#: apply.c:3067 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3095 +#: apply.c:3073 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3117 +#: apply.c:3095 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3125 +#: apply.c:3103 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3171 +#: apply.c:3149 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3181 +#: apply.c:3159 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3189 +#: apply.c:3167 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3207 +#: apply.c:3185 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3220 +#: apply.c:3198 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3226 +#: apply.c:3204 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3247 +#: apply.c:3225 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3369 +#: apply.c:3347 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3426 +#: apply.c:3404 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3455 apply.c:3695 +#: apply.c:3433 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3538 apply.c:3709 +#: apply.c:3516 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3547 apply.c:3717 +#: apply.c:3525 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3582 +#: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3585 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3601 apply.c:3605 +#: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3617 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3631 +#: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3636 +#: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3662 +#: apply.c:3640 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3734 +#: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3736 +#: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3886 apply.c:3888 +#: apply.c:3864 apply.c:3866 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3944 +#: apply.c:3922 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3947 +#: apply.c:3925 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3967 +#: apply.c:3945 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3972 +#: apply.c:3950 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3992 +#: apply.c:3970 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3996 +#: apply.c:3974 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:4011 +#: apply.c:3989 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4102 +#: apply.c:4080 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4109 +#: apply.c:4087 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4112 +#: apply.c:4090 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148 +#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: apply.c:4121 +#: apply.c:4099 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4131 +#: apply.c:4109 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4269 +#: apply.c:4247 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4304 +#: apply.c:4282 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4310 +#: apply.c:4288 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4318 +#: apply.c:4296 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4324 apply.c:4468 +#: apply.c:4302 apply.c:4446 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4365 +#: apply.c:4343 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4369 +#: apply.c:4347 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4439 +#: apply.c:4417 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4537 +#: apply.c:4515 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4545 +#: apply.c:4523 msgid "internal error" msgstr "" -#: apply.c:4548 +#: apply.c:4526 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4559 +#: apply.c:4537 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010 +#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4581 +#: apply.c:4559 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4585 +#: apply.c:4563 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4695 +#: apply.c:4673 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4703 +#: apply.c:4681 msgid "unrecognized input" msgstr "" -#: apply.c:4722 +#: apply.c:4700 msgid "unable to read index file" msgstr "" -#: apply.c:4859 +#: apply.c:4837 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4886 +#: apply.c:4864 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4892 apply.c:4907 +#: apply.c:4870 apply.c:4885 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4900 +#: apply.c:4878 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390 +#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "" -#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259 -#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187 -#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622 -#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992 -#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212 +#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223 +#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193 +#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860 +#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230 +#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450 #: git-add--interactive.perl:197 msgid "path" msgstr "" -#: apply.c:4948 +#: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4951 +#: apply.c:4925 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4953 builtin/am.c:2265 +#: apply.c:4927 builtin/am.c:2229 msgid "num" msgstr "" -#: apply.c:4954 +#: apply.c:4928 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: apply.c:4957 +#: apply.c:4931 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4959 +#: apply.c:4933 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4963 +#: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4965 +#: apply.c:4939 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4967 +#: apply.c:4941 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4969 +#: apply.c:4943 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4971 +#: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4973 +#: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4975 +#: apply.c:4949 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:4977 +#: apply.c:4951 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:4979 +#: apply.c:4953 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513 +#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:4984 +#: apply.c:4958 msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95 +#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 +#: builtin/pack-objects.c:3009 msgid "action" msgstr "" -#: apply.c:4986 +#: apply.c:4960 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:4989 apply.c:4992 +#: apply.c:4963 apply.c:4966 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:4995 +#: apply.c:4969 msgid "apply the patch in reverse" msgstr "" -#: apply.c:4997 +#: apply.c:4971 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:4999 +#: apply.c:4973 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:5001 +#: apply.c:4975 msgid "allow overlapping hunks" msgstr "" -#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21 -#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640 -#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21 +#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640 +#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "" -#: apply.c:5004 +#: apply.c:4978 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:5007 +#: apply.c:4981 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:5009 builtin/am.c:2253 +#: apply.c:4983 builtin/am.c:2217 msgid "root" msgstr "" -#: apply.c:5010 +#: apply.c:4984 msgid "prepend <root> to all filenames" msgstr "" @@ -717,7 +718,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299 +#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -730,7 +731,7 @@ msgstr "" msgid "archive format" msgstr "" -#: archive.c:437 builtin/log.c:1452 +#: archive.c:437 builtin/log.c:1459 msgid "prefix" msgstr "" @@ -738,9 +739,9 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859 -#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550 +#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861 +#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 #: parse-options.h:153 msgid "file" @@ -775,7 +776,7 @@ msgid "list supported archive formats" msgstr "" #: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 -#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239 msgid "repo" msgstr "" @@ -824,43 +825,43 @@ msgid "" "Use '\\!' for literal leading exclamation." msgstr "" -#: bisect.c:447 +#: bisect.c:458 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" -#: bisect.c:655 +#: bisect.c:666 #, c-format msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:708 +#: bisect.c:720 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:732 +#: bisect.c:744 #, 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:737 +#: bisect.c:749 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:742 +#: bisect.c:754 #, 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:750 +#: bisect.c:762 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -868,7 +869,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:763 +#: bisect.c:775 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -876,43 +877,43 @@ msgid "" "We continue anyway." msgstr "" -#: bisect.c:798 +#: bisect.c:810 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:850 +#: bisect.c:862 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234 +#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:918 +#: bisect.c:930 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:948 +#: bisect.c:960 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:968 +#: bisect.c:979 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:976 +#: bisect.c:987 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:995 +#: bisect.c:1006 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -922,7 +923,7 @@ msgstr[1] "" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1001 +#: bisect.c:1012 #, 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" @@ -941,9 +942,9 @@ msgstr "" msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168 -#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911 -#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369 +#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177 +#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918 +#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369 #: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "" @@ -1026,31 +1027,31 @@ msgstr "" msgid "Not tracking: ambiguous information for ref %s" msgstr "" -#: branch.c:185 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "" -#: branch.c:190 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "" -#: branch.c:197 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "" -#: branch.c:217 +#: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -#: branch.c:219 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" -#: branch.c:221 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1062,27 +1063,27 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:264 +#: branch.c:280 #, c-format msgid "Not a valid object name: '%s'." msgstr "" -#: branch.c:284 +#: branch.c:300 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" -#: branch.c:289 +#: branch.c:305 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:343 +#: branch.c:359 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" -#: branch.c:366 +#: branch.c:382 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "" @@ -1097,9 +1098,8 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500 -#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807 -#: sequencer.c:2949 builtin/commit.c:782 +#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637 +#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782 #, c-format msgid "could not open '%s'" msgstr "" @@ -1143,7 +1143,7 @@ msgstr "" msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296 +#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -1166,8 +1166,8 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1467 builtin/am.c:2105 +#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1434 builtin/am.c:2069 #, c-format msgid "could not parse %s" msgstr "" @@ -1177,172 +1177,177 @@ msgstr "" msgid "%s %s is not a commit!" msgstr "" -#: commit.c:1517 +#: commit.c:1524 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" -#: compat/obstack.c:406 compat/obstack.c:408 +#: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "" -#: config.c:187 +#: config.c:186 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:721 +#: config.c:720 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:725 +#: config.c:724 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:729 +#: config.c:728 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:733 +#: config.c:732 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:737 +#: config.c:736 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:741 +#: config.c:740 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:869 +#: config.c:868 msgid "out of range" msgstr "" -#: config.c:869 +#: config.c:868 msgid "invalid unit" msgstr "" -#: config.c:875 +#: config.c:874 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:880 +#: config.c:879 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:883 +#: config.c:882 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:886 +#: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:889 +#: config.c:888 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:892 +#: config.c:891 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:895 +#: config.c:894 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:990 +#: config.c:989 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:1085 config.c:1096 +#: config.c:998 +#, c-format +msgid "'%s' for '%s' is not a valid timestamp" +msgstr "" + +#: config.c:1094 config.c:1105 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1213 +#: config.c:1222 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1372 +#: config.c:1378 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1568 +#: config.c:1574 msgid "unable to parse command-line config" msgstr "" -#: config.c:1900 +#: config.c:1906 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2087 +#: config.c:2093 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2130 +#: config.c:2136 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" -#: config.c:2156 +#: config.c:2162 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2167 +#: config.c:2187 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2169 +#: config.c:2189 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2228 +#: config.c:2248 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2571 config.c:2789 +#: config.c:2591 config.c:2808 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2678 +#: config.c:2698 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2680 builtin/remote.c:776 +#: config.c:2700 builtin/remote.c:776 #, c-format msgid "could not unset '%s'" msgstr "" -#: connect.c:50 +#: connect.c:52 msgid "The remote end hung up upon initial contact" msgstr "" -#: connect.c:52 +#: connect.c:54 msgid "" "Could not read from remote repository.\n" "\n" @@ -1463,7 +1468,7 @@ msgstr[1] "" msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:536 +#: diffcore-rename.c:535 msgid "Performing inexact rename detection" msgstr "" @@ -1493,75 +1498,80 @@ msgstr "" msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:398 +#: diff.c:401 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:3861 +#: diff.c:3799 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4189 +#: diff.c:4127 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4279 +#: diff.c:4215 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4445 +#: diff.c:4381 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4459 +#: diff.c:4395 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5505 +#: diff.c:5446 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:5508 +#: diff.c:5449 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:5511 +#: diff.c:5452 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:1983 +#: dir.c:2100 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2102 +#: dir.c:2219 msgid "Untracked cache is disabled on this system or location." msgstr "" -#: dir.c:2885 dir.c:2890 +#: dir.c:3002 dir.c:3007 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:2915 +#: dir.c:3032 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" -#: entry.c:176 +#: editor.c:61 +#, c-format +msgid "hint: Waiting for your editor to close the file...%c" +msgstr "" + +#: entry.c:177 msgid "Filtering content" msgstr "" -#: entry.c:433 +#: entry.c:435 #, c-format msgid "could not stat file '%s'" msgstr "" @@ -1632,7 +1642,7 @@ msgstr "" msgid "giving up" msgstr "" -#: fetch-pack.c:534 progress.c:242 +#: fetch-pack.c:534 progress.c:229 msgid "done" msgstr "" @@ -1646,104 +1656,104 @@ msgstr "" msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:776 +#: fetch-pack.c:777 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:814 +#: fetch-pack.c:815 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:822 +#: fetch-pack.c:823 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:878 +#: fetch-pack.c:879 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:894 +#: fetch-pack.c:895 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:896 +#: fetch-pack.c:897 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:923 +#: fetch-pack.c:924 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:927 +#: fetch-pack.c:928 msgid "Server supports multi_ack_detailed" msgstr "" -#: fetch-pack.c:930 +#: fetch-pack.c:931 msgid "Server supports no-done" msgstr "" -#: fetch-pack.c:936 +#: fetch-pack.c:937 msgid "Server supports multi_ack" msgstr "" -#: fetch-pack.c:940 +#: fetch-pack.c:941 msgid "Server supports side-band-64k" msgstr "" -#: fetch-pack.c:944 +#: fetch-pack.c:945 msgid "Server supports side-band" msgstr "" -#: fetch-pack.c:948 +#: fetch-pack.c:949 msgid "Server supports allow-tip-sha1-in-want" msgstr "" -#: fetch-pack.c:952 +#: fetch-pack.c:953 msgid "Server supports allow-reachable-sha1-in-want" msgstr "" -#: fetch-pack.c:962 +#: fetch-pack.c:963 msgid "Server supports ofs-delta" msgstr "" -#: fetch-pack.c:969 +#: fetch-pack.c:970 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:975 +#: fetch-pack.c:976 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:979 +#: fetch-pack.c:980 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:981 +#: fetch-pack.c:982 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:992 +#: fetch-pack.c:993 msgid "no common commits" msgstr "" -#: fetch-pack.c:1004 +#: fetch-pack.c:1005 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1166 +#: fetch-pack.c:1167 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1188 +#: fetch-pack.c:1189 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1191 +#: fetch-pack.c:1192 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" @@ -1766,17 +1776,17 @@ msgstr "" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:1970 +#: grep.c:2017 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:1998 +#: grep.c:2045 #, c-format msgid "'%s': short read" msgstr "" @@ -1839,12 +1849,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "" -#: help.c:456 +#: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:460 +#: help.c:466 msgid "" "\n" "Did you mean this?" @@ -1902,6 +1912,15 @@ msgstr "" msgid "invalid date format: %s" msgstr "" +#: list-objects-filter-options.c:30 +msgid "multiple object filter types cannot be combined" +msgstr "" + +#: list-objects-filter-options.c:41 list-objects-filter-options.c:68 +#, c-format +msgid "invalid filter-spec expression '%s'" +msgstr "" + #: lockfile.c:151 #, c-format msgid "" @@ -1919,12 +1938,12 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "" -#: merge.c:41 +#: merge.c:74 msgid "failed to read the cache" msgstr "" -#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380 -#: builtin/checkout.c:595 builtin/clone.c:754 +#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379 +#: builtin/checkout.c:600 builtin/clone.c:754 msgid "unable to write new index file" msgstr "" @@ -2107,7 +2126,7 @@ msgstr "" msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1775 git-submodule.sh:944 +#: merge-recursive.c:1775 git-submodule.sh:932 msgid "submodule" msgstr "" @@ -2129,46 +2148,51 @@ msgstr "" msgid "directory/file" msgstr "" -#: merge-recursive.c:1908 +#: merge-recursive.c:1909 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1917 +#: merge-recursive.c:1918 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1954 +#: merge-recursive.c:1958 +#, c-format +msgid "Dirty index: cannot merge (dirty: %s)" +msgstr "" + +#: merge-recursive.c:1962 msgid "Already up to date!" msgstr "" -#: merge-recursive.c:1963 +#: merge-recursive.c:1971 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:2060 +#: merge-recursive.c:2068 msgid "Merging:" msgstr "" -#: merge-recursive.c:2073 +#: merge-recursive.c:2081 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:2112 +#: merge-recursive.c:2120 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2175 +#: merge-recursive.c:2183 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814 +#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815 msgid "Unable to write index." msgstr "" @@ -2329,13 +2353,7 @@ msgstr "" msgid "%s: pathspec magic not supported by this command: %s" msgstr "" -#: pathspec.c:571 -msgid "" -"empty strings as pathspecs will be made invalid in upcoming releases. please " -"use . instead if you meant to match all paths" -msgstr "" - -#: pathspec.c:595 +#: pathspec.c:592 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" @@ -2344,66 +2362,66 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "" -#: read-cache.c:1443 +#: read-cache.c:1472 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1453 +#: read-cache.c:1482 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:2316 builtin/merge.c:1046 +#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077 +#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:2407 +#: read-cache.c:2455 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:2419 +#: read-cache.c:2467 #, c-format msgid "unable to unlink: %s" msgstr "" -#: refs.c:638 +#: refs.c:706 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: refs.c:1792 +#: refs.c:1850 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs/files-backend.c:1136 +#: refs/files-backend.c:1189 #, c-format msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1150 refs/packed-backend.c:1430 -#: refs/packed-backend.c:1440 +#: refs/files-backend.c:1203 refs/packed-backend.c:1524 +#: refs/packed-backend.c:1534 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1153 refs/packed-backend.c:1443 +#: refs/files-backend.c:1206 refs/packed-backend.c:1537 #, c-format msgid "could not delete references: %s" msgstr "" -#: ref-filter.c:35 wt-status.c:1811 +#: ref-filter.c:35 wt-status.c:1816 msgid "gone" msgstr "" @@ -2422,157 +2440,157 @@ msgstr "" msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:105 +#: ref-filter.c:107 #, c-format msgid "expected format: %%(color:<color>)" msgstr "" -#: ref-filter.c:107 +#: ref-filter.c:109 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:127 +#: ref-filter.c:129 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: ref-filter.c:131 +#: ref-filter.c:133 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:133 +#: ref-filter.c:135 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: ref-filter.c:173 +#: ref-filter.c:184 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:180 +#: ref-filter.c:191 #, c-format msgid "%%(subject) does not take arguments" msgstr "" -#: ref-filter.c:198 +#: ref-filter.c:209 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "" -#: ref-filter.c:221 +#: ref-filter.c:232 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:223 +#: ref-filter.c:234 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:236 +#: ref-filter.c:247 #, c-format msgid "positive value expected objectname:short=%s" msgstr "" -#: ref-filter.c:240 +#: ref-filter.c:251 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "" -#: ref-filter.c:267 +#: ref-filter.c:278 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "" -#: ref-filter.c:279 +#: ref-filter.c:290 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:283 +#: ref-filter.c:294 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:289 +#: ref-filter.c:300 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:293 +#: ref-filter.c:304 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:308 +#: ref-filter.c:319 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:398 +#: ref-filter.c:409 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:424 +#: ref-filter.c:435 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:536 +#: ref-filter.c:547 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:596 +#: ref-filter.c:607 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:598 +#: ref-filter.c:609 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:600 +#: ref-filter.c:611 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:626 +#: ref-filter.c:637 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:628 +#: ref-filter.c:639 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:630 +#: ref-filter.c:641 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:643 +#: ref-filter.c:654 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:698 +#: ref-filter.c:709 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1283 +#: ref-filter.c:1313 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: ref-filter.c:1286 +#: ref-filter.c:1316 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" @@ -2580,7 +2598,7 @@ msgstr "" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1294 +#: ref-filter.c:1324 #, c-format msgid "(HEAD detached at %s)" msgstr "" @@ -2588,137 +2606,137 @@ msgstr "" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1301 +#: ref-filter.c:1331 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: ref-filter.c:1305 +#: ref-filter.c:1335 msgid "(no branch)" msgstr "" -#: ref-filter.c:1454 ref-filter.c:1485 +#: ref-filter.c:1488 ref-filter.c:1519 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1457 ref-filter.c:1488 +#: ref-filter.c:1491 ref-filter.c:1522 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:1788 +#: ref-filter.c:1822 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:1855 +#: ref-filter.c:1889 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:1860 +#: ref-filter.c:1894 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:2122 +#: ref-filter.c:2156 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2216 +#: ref-filter.c:2250 #, c-format msgid "malformed object name %s" msgstr "" -#: remote.c:750 +#: remote.c:780 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:754 +#: remote.c:784 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:758 +#: remote.c:788 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:766 +#: remote.c:796 msgid "Internal error" msgstr "" -#: remote.c:1681 remote.c:1783 +#: remote.c:1711 remote.c:1813 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1690 +#: remote.c:1720 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1693 +#: remote.c:1723 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1699 +#: remote.c:1729 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1714 +#: remote.c:1744 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1726 +#: remote.c:1756 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1737 +#: remote.c:1767 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1750 +#: remote.c:1780 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1772 +#: remote.c:1802 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:2076 +#: remote.c:2106 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2080 +#: remote.c:2110 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2083 +#: remote.c:2113 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2087 +#: remote.c:2117 #, 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:2093 +#: remote.c:2123 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2096 +#: remote.c:2126 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2726,11 +2744,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2104 +#: remote.c:2134 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2107 +#: remote.c:2137 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2741,56 +2759,63 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2117 +#: remote.c:2147 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: revision.c:2256 +#: revision.c:2268 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2259 +#: revision.c:2271 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2453 +#: revision.c:2465 msgid "--first-parent is incompatible with --bisect" msgstr "" -#: run-command.c:644 +#: run-command.c:645 msgid "open /dev/null failed" msgstr "" -#: send-pack.c:151 +#: run-command.c:1188 +#, c-format +msgid "" +"The '%s' hook was ignored because it's not set as executable.\n" +"You can disable this warning with `git config advice.ignoredHook false`." +msgstr "" + +#: send-pack.c:141 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:153 +#: send-pack.c:143 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:316 +#: send-pack.c:306 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:429 +#: send-pack.c:419 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:431 +#: send-pack.c:421 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:443 +#: send-pack.c:433 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:448 +#: send-pack.c:438 msgid "the receiving end does not support push options" msgstr "" @@ -2824,13 +2849,13 @@ msgid "" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:297 sequencer.c:1704 +#: sequencer.c:297 sequencer.c:1718 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723 -#: sequencer.c:2733 sequencer.c:2749 +#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737 +#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "" @@ -2840,13 +2865,13 @@ msgstr "" msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711 +#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725 #, c-format msgid "failed to finalize '%s'." msgstr "" -#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259 -#: builtin/commit.c:754 builtin/merge.c:1044 +#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259 +#: builtin/commit.c:754 builtin/merge.c:1046 #, c-format msgid "could not read '%s'" msgstr "" @@ -2868,20 +2893,20 @@ msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:474 +#: sequencer.c:477 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:493 -msgid "could not resolve HEAD commit\n" +#: sequencer.c:496 +msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:513 -msgid "unable to update cache tree\n" +#: sequencer.c:516 +msgid "unable to update cache tree" msgstr "" -#: sequencer.c:597 +#: sequencer.c:600 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2898,17 +2923,17 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:699 +#: sequencer.c:702 #, c-format -msgid "could not parse commit %s\n" +msgid "could not parse commit %s" msgstr "" -#: sequencer.c:704 +#: sequencer.c:707 #, c-format -msgid "could not parse parent commit %s\n" +msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:826 +#: sequencer.c:836 #, c-format msgid "" "unexpected 1st line of squash message:\n" @@ -2916,7 +2941,7 @@ msgid "" "\t%.*s" msgstr "" -#: sequencer.c:832 +#: sequencer.c:842 #, c-format msgid "" "invalid 1st line of squash message:\n" @@ -2924,230 +2949,240 @@ msgid "" "\t%.*s" msgstr "" -#: sequencer.c:838 sequencer.c:863 +#: sequencer.c:848 sequencer.c:873 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:847 sequencer.c:2681 +#: sequencer.c:857 sequencer.c:2748 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:849 +#: sequencer.c:859 msgid "could not read HEAD" msgstr "" -#: sequencer.c:851 +#: sequencer.c:861 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:857 +#: sequencer.c:867 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:866 git-rebase--interactive.sh:446 +#: sequencer.c:876 git-rebase--interactive.sh:446 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:874 +#: sequencer.c:884 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:881 +#: sequencer.c:891 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:886 +#: sequencer.c:896 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:891 +#: sequencer.c:901 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:957 +#: sequencer.c:967 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:975 +#: sequencer.c:986 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:983 +#: sequencer.c:994 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:987 +#: sequencer.c:998 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" -#: sequencer.c:993 +#: sequencer.c:1004 #, 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:1014 +#: sequencer.c:1023 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1077 sequencer.c:1853 +#: sequencer.c:1086 sequencer.c:1867 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1128 +#: sequencer.c:1137 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1129 +#: sequencer.c:1138 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:1171 +#: sequencer.c:1180 msgid "empty commit set passed" msgstr "" -#: sequencer.c:1181 +#: sequencer.c:1190 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:1188 +#: sequencer.c:1196 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:1308 +#: sequencer.c:1270 +#, c-format +msgid "%s does not accept arguments: '%s'" +msgstr "" + +#: sequencer.c:1279 +#, c-format +msgid "missing arguments for %s" +msgstr "" + +#: sequencer.c:1322 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:1316 +#: sequencer.c:1330 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614 -#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951 +#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642 +#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859 #, c-format msgid "could not read '%s'." msgstr "" -#: sequencer.c:1361 +#: sequencer.c:1375 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:1363 +#: sequencer.c:1377 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:1368 +#: sequencer.c:1382 msgid "no commits parsed." msgstr "" -#: sequencer.c:1379 +#: sequencer.c:1393 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:1381 +#: sequencer.c:1395 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:1448 +#: sequencer.c:1462 #, c-format msgid "invalid key: %s" msgstr "" -#: sequencer.c:1451 +#: sequencer.c:1465 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:1517 +#: sequencer.c:1531 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:1555 +#: sequencer.c:1569 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:1556 +#: sequencer.c:1570 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:1559 +#: sequencer.c:1573 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:1574 +#: sequencer.c:1588 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:1632 sequencer.c:2211 +#: sequencer.c:1646 sequencer.c:2230 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:1634 +#: sequencer.c:1648 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:1636 sequencer.c:1671 +#: sequencer.c:1650 sequencer.c:1685 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:1657 builtin/grep.c:711 +#: sequencer.c:1671 builtin/grep.c:713 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:1659 +#: sequencer.c:1673 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:1660 +#: sequencer.c:1674 msgid "unexpected end of file" msgstr "" -#: sequencer.c:1666 +#: sequencer.c:1680 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:1677 +#: sequencer.c:1691 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:1818 sequencer.c:2109 +#: sequencer.c:1832 sequencer.c:2128 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:1858 builtin/difftool.c:640 +#: sequencer.c:1872 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:1874 +#: sequencer.c:1891 msgid "could not read index" msgstr "" -#: sequencer.c:1879 +#: sequencer.c:1896 #, c-format msgid "" "execution failed: %s\n" @@ -3157,11 +3192,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:1885 +#: sequencer.c:1902 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:1891 +#: sequencer.c:1908 #, c-format msgid "" "execution succeeded: %s\n" @@ -3172,17 +3207,17 @@ msgid "" "\n" msgstr "" -#: sequencer.c:1948 +#: sequencer.c:1967 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:1960 +#: sequencer.c:1979 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:1963 git-rebase.sh:175 +#: sequencer.c:1982 git-rebase.sh:175 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3190,113 +3225,108 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:2045 +#: sequencer.c:2064 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:2087 +#: sequencer.c:2106 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:2117 +#: sequencer.c:2136 msgid "could not read orig-head" msgstr "" -#: sequencer.c:2122 sequencer.c:2678 +#: sequencer.c:2141 sequencer.c:2745 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:2129 +#: sequencer.c:2148 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:2136 +#: sequencer.c:2155 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:2220 +#: sequencer.c:2239 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:2225 +#: sequencer.c:2244 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:2234 +#: sequencer.c:2253 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:2236 +#: sequencer.c:2255 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:2238 +#: sequencer.c:2257 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:2241 +#: sequencer.c:2260 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:2251 +#: sequencer.c:2270 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:2331 +#: sequencer.c:2350 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:2335 +#: sequencer.c:2354 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:2368 +#: sequencer.c:2387 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:2471 +#: sequencer.c:2492 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:2474 +#: sequencer.c:2495 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:2510 +#: sequencer.c:2529 sequencer.c:2564 #, c-format msgid "unusable todo list: '%s'" msgstr "" -#: sequencer.c:2516 -#, c-format -msgid "unable to open '%s' for writing" -msgstr "" - -#: sequencer.c:2561 +#: sequencer.c:2615 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -#: sequencer.c:2641 +#: sequencer.c:2695 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -#: sequencer.c:2648 +#: sequencer.c:2702 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3307,7 +3337,7 @@ msgid "" "\n" msgstr "" -#: sequencer.c:2660 +#: sequencer.c:2714 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3315,31 +3345,21 @@ msgid "" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" -#: sequencer.c:2708 -#, c-format -msgid "could not parse commit '%s'" -msgstr "" - -#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:775 +#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "" -#: sequencer.c:2756 +#: sequencer.c:2775 #, c-format -msgid "could not truncate '%s'" +msgid "could not parse commit '%s'" msgstr "" -#: sequencer.c:2848 +#: sequencer.c:2897 msgid "the script was already rearranged." msgstr "" -#: sequencer.c:2953 -#, c-format -msgid "could not finish '%s'" -msgstr "" - #: setup.c:171 #, c-format msgid "" @@ -3363,82 +3383,82 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" -#: setup.c:499 +#: setup.c:501 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:507 +#: setup.c:509 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:806 +#: setup.c:811 #, c-format msgid "Not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:808 builtin/index-pack.c:1653 +#: setup.c:813 builtin/index-pack.c:1653 msgid "Cannot come back to cwd" msgstr "" -#: setup.c:1046 +#: setup.c:1052 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1058 setup.c:1064 +#: setup.c:1064 setup.c:1070 #, c-format msgid "Cannot change to '%s'" msgstr "" -#: setup.c:1077 +#: setup.c:1083 #, 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:1159 +#: setup.c:1167 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: sha1_file.c:528 +#: sha1_file.c:598 #, c-format msgid "path '%s' does not exist" msgstr "" -#: sha1_file.c:554 +#: sha1_file.c:624 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: sha1_file.c:560 +#: sha1_file.c:630 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1_file.c:566 +#: sha1_file.c:636 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1_file.c:574 +#: sha1_file.c:644 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: sha1_name.c:420 +#: sha1_name.c:422 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: sha1_name.c:431 +#: sha1_name.c:433 msgid "The candidates are:" msgstr "" -#: sha1_name.c:590 +#: sha1_name.c:693 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -3451,86 +3471,86 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: submodule.c:93 submodule.c:127 +#: submodule.c:96 submodule.c:130 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: submodule.c:97 submodule.c:131 +#: submodule.c:100 submodule.c:134 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule.c:105 +#: submodule.c:108 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#: submodule.c:138 +#: submodule.c:141 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:149 +#: submodule.c:152 msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:309 +#: submodule.c:312 #, c-format msgid "in unpopulated submodule '%s'" msgstr "" -#: submodule.c:340 +#: submodule.c:343 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#: submodule.c:799 +#: submodule.c:833 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" -#: submodule.c:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:1304 +#: submodule.c:1370 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1442 +#: submodule.c:1508 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1455 +#: submodule.c:1521 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1548 +#: submodule.c:1614 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:1809 +#: submodule.c:1876 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:1821 submodule.c:1877 +#: submodule.c:1888 submodule.c:1944 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:1825 builtin/submodule--helper.c:671 -#: builtin/submodule--helper.c:681 +#: submodule.c:1892 builtin/submodule--helper.c:909 +#: builtin/submodule--helper.c:919 #, c-format msgid "could not create directory '%s'" msgstr "" -#: submodule.c:1828 +#: submodule.c:1895 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3538,20 +3558,20 @@ msgid "" "'%s'\n" msgstr "" -#: submodule.c:1912 +#: submodule.c:1979 #, c-format msgid "could not recurse into submodule '%s'" msgstr "" -#: submodule.c:1956 +#: submodule.c:2023 msgid "could not start ls-files in .." msgstr "" -#: submodule.c:1976 +#: submodule.c:2043 msgid "BUG: returned path string doesn't match cwd?" msgstr "" -#: submodule.c:1995 +#: submodule.c:2062 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" @@ -3619,24 +3639,24 @@ msgstr "" msgid "could not rename temporary file to %s" msgstr "" -#: transport.c:62 +#: transport.c:63 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "" -#: transport.c:151 +#: transport.c:152 #, c-format msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:888 +#: transport.c:904 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:892 +#: transport.c:908 #, c-format msgid "" "\n" @@ -3652,11 +3672,11 @@ msgid "" "\n" msgstr "" -#: transport.c:900 +#: transport.c:916 msgid "Aborting." msgstr "" -#: transport-helper.c:1071 +#: transport-helper.c:1074 #, c-format msgid "Could not read ref %s" msgstr "" @@ -3677,98 +3697,98 @@ msgstr "" msgid "too-short tree file" msgstr "" -#: unpack-trees.c:106 +#: unpack-trees.c:107 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -#: unpack-trees.c:108 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:111 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -#: unpack-trees.c:113 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:116 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" -#: unpack-trees.c:118 +#: unpack-trees.c:119 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:123 +#: unpack-trees.c:124 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:127 +#: unpack-trees.c:128 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:129 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:132 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:134 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:137 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:139 +#: unpack-trees.c:140 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:144 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3776,7 +3796,7 @@ msgid "" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:146 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3784,47 +3804,47 @@ msgid "" "%%s" msgstr "" -#: unpack-trees.c:149 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:151 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:154 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:156 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:163 +#: unpack-trees.c:164 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:166 +#: unpack-trees.c:167 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -#: unpack-trees.c:168 +#: unpack-trees.c:169 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3832,7 +3852,7 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:170 +#: unpack-trees.c:171 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3840,19 +3860,19 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:172 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:249 +#: unpack-trees.c:250 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:331 +#: unpack-trees.c:332 msgid "Checking out files" msgstr "" @@ -3895,8 +3915,8 @@ msgstr "" msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766 -#: builtin/am.c:858 builtin/merge.c:1041 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 +#: builtin/am.c:862 builtin/merge.c:1043 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -3910,16 +3930,6 @@ msgstr "" msgid "unable to get current working directory" msgstr "" -#: wrapper.c:656 -#, c-format -msgid "could not write to %s" -msgstr "" - -#: wrapper.c:658 -#, c-format -msgid "could not close %s" -msgstr "" - #: wt-status.c:150 msgid "Unmerged paths:" msgstr "" @@ -3945,11 +3955,11 @@ msgstr "" msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:198 wt-status.c:979 +#: wt-status.c:198 wt-status.c:984 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:216 wt-status.c:988 +#: wt-status.c:216 wt-status.c:993 msgid "Changes not staged for commit:" msgstr "" @@ -4047,247 +4057,247 @@ msgstr "" msgid "untracked content, " msgstr "" -#: wt-status.c:819 +#: wt-status.c:824 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "" msgstr[1] "" -#: wt-status.c:851 +#: wt-status.c:856 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:853 +#: wt-status.c:858 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:935 +#: wt-status.c:940 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -#: wt-status.c:1048 +#: wt-status.c:1053 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1051 +#: wt-status.c:1056 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1053 +#: wt-status.c:1058 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1058 +#: wt-status.c:1063 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1061 +#: wt-status.c:1066 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1071 +#: wt-status.c:1076 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1074 +#: wt-status.c:1079 msgid "The current patch is empty." msgstr "" -#: wt-status.c:1078 +#: wt-status.c:1083 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1080 +#: wt-status.c:1085 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1082 +#: wt-status.c:1087 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1214 +#: wt-status.c:1219 msgid "git-rebase-todo is missing." msgstr "" -#: wt-status.c:1216 +#: wt-status.c:1221 msgid "No commands done." msgstr "" -#: wt-status.c:1219 +#: wt-status.c:1224 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1230 +#: wt-status.c:1235 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1235 +#: wt-status.c:1240 msgid "No commands remaining." msgstr "" -#: wt-status.c:1238 +#: wt-status.c:1243 #, 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:1246 +#: wt-status.c:1251 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1259 +#: wt-status.c:1264 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1264 +#: wt-status.c:1269 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1278 +#: wt-status.c:1283 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1280 +#: wt-status.c:1285 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1282 +#: wt-status.c:1287 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1288 +#: wt-status.c:1293 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1292 +#: wt-status.c:1297 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1297 +#: wt-status.c:1302 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1300 +#: wt-status.c:1305 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1304 +#: wt-status.c:1309 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1309 +#: wt-status.c:1314 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1312 +#: wt-status.c:1317 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1314 +#: wt-status.c:1319 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1324 +#: wt-status.c:1329 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1329 +#: wt-status.c:1334 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1332 +#: wt-status.c:1337 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1334 +#: wt-status.c:1339 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1343 +#: wt-status.c:1348 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1348 +#: wt-status.c:1353 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1351 +#: wt-status.c:1356 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1353 +#: wt-status.c:1358 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1364 +#: wt-status.c:1369 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1368 +#: wt-status.c:1373 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1376 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1568 +#: wt-status.c:1573 msgid "On branch " msgstr "" -#: wt-status.c:1574 +#: wt-status.c:1579 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1576 +#: wt-status.c:1581 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1581 +#: wt-status.c:1586 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1583 +#: wt-status.c:1588 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1586 +#: wt-status.c:1591 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1606 +#: wt-status.c:1611 msgid "Initial commit" msgstr "" -#: wt-status.c:1607 +#: wt-status.c:1612 msgid "No commits yet" msgstr "" -#: wt-status.c:1621 +#: wt-status.c:1626 msgid "Untracked files" msgstr "" -#: wt-status.c:1623 +#: wt-status.c:1628 msgid "Ignored files" msgstr "" -#: wt-status.c:1627 +#: wt-status.c:1632 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4295,88 +4305,88 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1633 +#: wt-status.c:1638 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1635 +#: wt-status.c:1640 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1641 +#: wt-status.c:1646 msgid "No changes" msgstr "" -#: wt-status.c:1646 +#: wt-status.c:1651 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1649 +#: wt-status.c:1654 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1652 +#: wt-status.c:1657 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1655 +#: wt-status.c:1660 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1658 +#: wt-status.c:1663 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1661 wt-status.c:1666 +#: wt-status.c:1666 wt-status.c:1671 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1664 +#: wt-status.c:1669 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1668 +#: wt-status.c:1673 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1780 +#: wt-status.c:1785 msgid "No commits yet on " msgstr "" -#: wt-status.c:1784 +#: wt-status.c:1789 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1813 wt-status.c:1821 +#: wt-status.c:1818 wt-status.c:1826 msgid "behind " msgstr "" -#: wt-status.c:1816 wt-status.c:1819 +#: wt-status.c:1821 wt-status.c:1824 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2311 +#: wt-status.c:2318 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2317 +#: wt-status.c:2324 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2319 +#: wt-status.c:2326 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" @@ -4390,122 +4400,126 @@ msgstr "" msgid "git add [<options>] [--] <pathspec>..." msgstr "" -#: builtin/add.c:82 +#: builtin/add.c:83 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:87 builtin/commit.c:291 +#: builtin/add.c:88 builtin/commit.c:291 msgid "updating files failed" msgstr "" -#: builtin/add.c:97 +#: builtin/add.c:98 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:153 +#: builtin/add.c:173 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:213 builtin/rev-parse.c:888 +#: builtin/add.c:233 builtin/rev-parse.c:888 msgid "Could not read the index" msgstr "" -#: builtin/add.c:224 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:228 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "" -#: builtin/add.c:231 +#: builtin/add.c:251 msgid "editing patch failed" msgstr "" -#: builtin/add.c:234 +#: builtin/add.c:254 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:236 +#: builtin/add.c:256 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:241 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:251 +#: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124 -#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124 +#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "" -#: builtin/add.c:274 +#: builtin/add.c:294 msgid "interactive picking" msgstr "" -#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310 +#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:276 +#: builtin/add.c:296 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:277 +#: builtin/add.c:297 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:278 +#: builtin/add.c:298 msgid "update tracked files" msgstr "" -#: builtin/add.c:279 +#: builtin/add.c:299 +msgid "renormalize EOL of tracked files (implies -u)" +msgstr "" + +#: builtin/add.c:300 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:280 +#: builtin/add.c:301 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:283 +#: builtin/add.c:304 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:285 +#: builtin/add.c:306 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:286 +#: builtin/add.c:307 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:287 +#: builtin/add.c:308 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:288 builtin/update-index.c:954 +#: builtin/add.c:309 builtin/update-index.c:964 msgid "(+/-)x" msgstr "" -#: builtin/add.c:288 builtin/update-index.c:955 +#: builtin/add.c:309 builtin/update-index.c:965 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:290 +#: builtin/add.c:311 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:305 +#: builtin/add.c:326 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4523,47 +4537,47 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:333 +#: builtin/add.c:354 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:351 +#: builtin/add.c:372 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:359 +#: builtin/add.c:380 msgid "adding files failed" msgstr "" -#: builtin/add.c:396 +#: builtin/add.c:417 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:403 +#: builtin/add.c:424 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:407 +#: builtin/add.c:428 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:422 +#: builtin/add.c:443 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:423 +#: builtin/add.c:444 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282 -#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350 -#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271 -#: builtin/submodule--helper.c:243 +#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281 +#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350 +#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249 +#: builtin/rm.c:271 builtin/submodule--helper.c:311 msgid "index file corrupt" msgstr "" @@ -4590,118 +4604,118 @@ msgstr "" msgid "fseek failed" msgstr "" -#: builtin/am.c:786 +#: builtin/am.c:790 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:851 +#: builtin/am.c:855 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:899 +#: builtin/am.c:903 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:904 builtin/am.c:916 +#: builtin/am.c:908 builtin/am.c:920 msgid "invalid Date line" msgstr "" -#: builtin/am.c:911 +#: builtin/am.c:915 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:1004 +#: builtin/am.c:1008 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:1009 builtin/clone.c:402 +#: builtin/am.c:1013 builtin/clone.c:402 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:1013 +#: builtin/am.c:1017 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1142 builtin/commit.c:376 +#: builtin/am.c:1146 builtin/commit.c:376 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1193 +#: builtin/am.c:1160 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1194 +#: builtin/am.c:1161 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1195 +#: builtin/am.c:1162 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1302 +#: builtin/am.c:1269 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1368 +#: builtin/am.c:1335 #, c-format msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1390 +#: builtin/am.c:1357 #, c-format msgid "unable to parse commit %s" msgstr "" -#: builtin/am.c:1584 +#: builtin/am.c:1550 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1586 +#: builtin/am.c:1552 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1605 +#: builtin/am.c:1571 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1611 +#: builtin/am.c:1577 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1636 +#: builtin/am.c:1602 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1660 builtin/merge.c:641 +#: builtin/am.c:1626 builtin/merge.c:642 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/am.c:1667 +#: builtin/am.c:1633 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824 -#: builtin/merge.c:849 +#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825 +#: builtin/merge.c:850 msgid "failed to write commit object" msgstr "" -#: builtin/am.c:1713 builtin/am.c:1717 +#: builtin/am.c:1679 builtin/am.c:1683 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1733 +#: builtin/am.c:1699 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: builtin/am.c:1738 +#: builtin/am.c:1704 msgid "Commit Body is:" msgstr "" @@ -4709,42 +4723,42 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1748 +#: builtin/am.c:1714 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1798 +#: builtin/am.c:1764 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1838 builtin/am.c:1910 +#: builtin/am.c:1804 builtin/am.c:1876 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1854 +#: builtin/am.c:1820 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1862 +#: builtin/am.c:1828 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1868 +#: builtin/am.c:1834 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "" -#: builtin/am.c:1913 +#: builtin/am.c:1879 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:1920 +#: builtin/am.c:1886 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -4752,171 +4766,171 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332 +#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332 #: builtin/reset.c:340 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:2081 +#: builtin/am.c:2045 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2116 +#: builtin/am.c:2080 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2179 +#: builtin/am.c:2143 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2212 +#: builtin/am.c:2176 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "" -#: builtin/am.c:2213 +#: builtin/am.c:2177 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2219 +#: builtin/am.c:2183 msgid "run interactively" msgstr "" -#: builtin/am.c:2221 +#: builtin/am.c:2185 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2223 +#: builtin/am.c:2187 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:180 msgid "be quiet" msgstr "" -#: builtin/am.c:2226 +#: builtin/am.c:2190 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2229 +#: builtin/am.c:2193 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2231 +#: builtin/am.c:2195 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2233 +#: builtin/am.c:2197 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2235 +#: builtin/am.c:2199 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2237 +#: builtin/am.c:2201 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2240 +#: builtin/am.c:2204 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2243 +#: builtin/am.c:2207 msgid "strip everything before a scissors line" msgstr "" -#: 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:2263 builtin/am.c:2266 -#: builtin/am.c:2272 +#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 +#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230 +#: builtin/am.c:2236 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667 -#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197 +#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 +#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203 #: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195 #: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "" -#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38 +#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38 #: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 msgid "format" msgstr "" -#: builtin/am.c:2269 +#: builtin/am.c:2233 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2275 +#: builtin/am.c:2239 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2277 +#: builtin/am.c:2241 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2280 +#: builtin/am.c:2244 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2283 +#: builtin/am.c:2247 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2286 +#: builtin/am.c:2250 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2290 +#: builtin/am.c:2254 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2292 +#: builtin/am.c:2256 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236 -#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392 +#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392 msgid "key-id" msgstr "" -#: builtin/am.c:2295 +#: builtin/am.c:2259 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2298 +#: builtin/am.c:2262 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2316 +#: builtin/am.c:2280 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:2323 +#: builtin/am.c:2287 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2338 +#: builtin/am.c:2302 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2362 +#: builtin/am.c:2326 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2368 +#: builtin/am.c:2332 msgid "Resolve operation not in progress, we are not resuming." msgstr "" @@ -4954,18 +4968,69 @@ msgstr "" msgid "git archive: expected a flush" msgstr "" -#: builtin/bisect--helper.c:7 +#: builtin/bisect--helper.c:12 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "" -#: builtin/bisect--helper.c:17 +#: builtin/bisect--helper.c:13 +msgid "git bisect--helper --write-terms <bad_term> <good_term>" +msgstr "" + +#: builtin/bisect--helper.c:14 +msgid "git bisect--helper --bisect-clean-state" +msgstr "" + +#: builtin/bisect--helper.c:46 +#, c-format +msgid "'%s' is not a valid term" +msgstr "" + +#: builtin/bisect--helper.c:50 +#, c-format +msgid "can't use the builtin command '%s' as a term" +msgstr "" + +#: builtin/bisect--helper.c:60 +#, c-format +msgid "can't change the meaning of the term '%s'" +msgstr "" + +#: builtin/bisect--helper.c:71 +msgid "please use two different terms" +msgstr "" + +#: builtin/bisect--helper.c:78 +msgid "could not open the file BISECT_TERMS" +msgstr "" + +#: builtin/bisect--helper.c:120 msgid "perform 'git bisect next'" msgstr "" -#: builtin/bisect--helper.c:19 +#: builtin/bisect--helper.c:122 +msgid "write the terms to .git/BISECT_TERMS" +msgstr "" + +#: builtin/bisect--helper.c:124 +msgid "cleanup the bisection state" +msgstr "" + +#: builtin/bisect--helper.c:126 +msgid "check for expected revs" +msgstr "" + +#: builtin/bisect--helper.c:128 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "" +#: builtin/bisect--helper.c:143 +msgid "--write-terms requires two arguments" +msgstr "" + +#: builtin/bisect--helper.c:147 +msgid "--bisect-clean-state requires no arguments" +msgstr "" + #: builtin/blame.c:27 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "" @@ -5216,51 +5281,51 @@ msgstr "" msgid "Branch %s is being bisected at %s" msgstr "" -#: builtin/branch.c:470 +#: builtin/branch.c:471 msgid "cannot copy the current branch while not on any." msgstr "" -#: builtin/branch.c:472 +#: builtin/branch.c:473 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:483 +#: builtin/branch.c:484 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:504 +#: builtin/branch.c:511 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:506 +#: builtin/branch.c:513 msgid "Branch copy failed" msgstr "" -#: builtin/branch.c:510 +#: builtin/branch.c:517 #, c-format -msgid "Copied a misnamed branch '%s' away" +msgid "Created a copy of a misnamed branch '%s'" msgstr "" -#: builtin/branch.c:513 +#: builtin/branch.c:520 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:519 +#: builtin/branch.c:526 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:528 +#: builtin/branch.c:535 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:530 +#: builtin/branch.c:537 msgid "Branch is copied, but update of config-file failed" msgstr "" -#: builtin/branch.c:546 +#: builtin/branch.c:553 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5268,221 +5333,217 @@ msgid "" "Lines starting with '%c' will be stripped.\n" msgstr "" -#: builtin/branch.c:579 +#: builtin/branch.c:586 msgid "Generic options" msgstr "" -#: builtin/branch.c:581 +#: builtin/branch.c:588 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:582 +#: builtin/branch.c:589 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:583 +#: builtin/branch.c:590 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:585 +#: builtin/branch.c:592 msgid "do not use" msgstr "" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "upstream" msgstr "" -#: builtin/branch.c:587 +#: builtin/branch.c:594 msgid "change the upstream info" msgstr "" -#: builtin/branch.c:588 +#: builtin/branch.c:595 msgid "Unset the upstream info" msgstr "" -#: builtin/branch.c:589 +#: builtin/branch.c:596 msgid "use colored output" msgstr "" -#: builtin/branch.c:590 +#: builtin/branch.c:597 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:592 builtin/branch.c:594 +#: builtin/branch.c:599 builtin/branch.c:601 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:593 builtin/branch.c:595 +#: builtin/branch.c:600 builtin/branch.c:602 msgid "print only branches that don't contain the commit" msgstr "" -#: builtin/branch.c:598 +#: builtin/branch.c:605 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:599 +#: builtin/branch.c:606 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:601 +#: builtin/branch.c:608 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:602 +#: builtin/branch.c:609 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:603 +#: builtin/branch.c:610 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:604 +#: builtin/branch.c:611 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:605 +#: builtin/branch.c:612 msgid "copy a branch and its reflog" msgstr "" -#: builtin/branch.c:606 +#: builtin/branch.c:613 msgid "copy a branch, even if target exists" msgstr "" -#: builtin/branch.c:607 +#: builtin/branch.c:614 msgid "list branch names" msgstr "" -#: builtin/branch.c:608 +#: builtin/branch.c:615 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:610 +#: builtin/branch.c:617 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:611 +#: builtin/branch.c:618 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:612 +#: builtin/branch.c:619 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:613 +#: builtin/branch.c:620 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:614 +#: builtin/branch.c:621 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405 msgid "key" msgstr "" -#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406 msgid "field name to sort on" msgstr "" -#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 #: builtin/tag.c:408 msgid "object" msgstr "" -#: builtin/branch.c:619 +#: builtin/branch.c:626 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:645 builtin/clone.c:729 +#: builtin/branch.c:652 builtin/clone.c:730 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:668 +#: builtin/branch.c:675 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741 +#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 msgid "branch name required" msgstr "" -#: builtin/branch.c:708 +#: builtin/branch.c:718 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:713 +#: builtin/branch.c:723 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:720 +#: builtin/branch.c:730 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:723 +#: builtin/branch.c:733 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:738 +#: builtin/branch.c:748 msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:747 +#: builtin/branch.c:757 msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:752 +#: builtin/branch.c:762 msgid "too many arguments to set new upstream" msgstr "" -#: builtin/branch.c:756 +#: builtin/branch.c:766 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800 +#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:763 +#: builtin/branch.c:773 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:775 +#: builtin/branch.c:785 msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:779 +#: builtin/branch.c:789 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:785 +#: builtin/branch.c:795 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:797 -msgid "it does not make sense to create 'HEAD' manually" -msgstr "" - -#: builtin/branch.c:803 +#: builtin/branch.c:810 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:806 +#: builtin/branch.c:813 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -5541,7 +5602,7 @@ msgstr "" msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:569 git-submodule.sh:943 +#: builtin/cat-file.c:569 git-submodule.sh:931 msgid "blob" msgstr "" @@ -5597,7 +5658,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358 msgid "suppress progress reporting" msgstr "" @@ -5654,160 +5715,160 @@ msgstr "" msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/checkout-index.c:145 +#: builtin/checkout-index.c:143 msgid "stage should be between 1 and 3 or all" msgstr "" -#: builtin/checkout-index.c:161 +#: builtin/checkout-index.c:159 msgid "check out all files in the index" msgstr "" -#: builtin/checkout-index.c:162 +#: builtin/checkout-index.c:160 msgid "force overwrite of existing files" msgstr "" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:162 msgid "no warning for existing files and files not in index" msgstr "" -#: builtin/checkout-index.c:166 +#: builtin/checkout-index.c:164 msgid "don't checkout new files" msgstr "" -#: builtin/checkout-index.c:168 +#: builtin/checkout-index.c:166 msgid "update stat information in the index file" msgstr "" -#: builtin/checkout-index.c:172 +#: builtin/checkout-index.c:170 msgid "read list of paths from the standard input" msgstr "" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:172 msgid "write the content to temporary files" msgstr "" -#: builtin/checkout-index.c:175 builtin/column.c:31 -#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631 -#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999 -#: builtin/worktree.c:498 +#: builtin/checkout-index.c:173 builtin/column.c:31 +#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869 +#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237 +#: builtin/worktree.c:552 msgid "string" msgstr "" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:174 msgid "when creating files, prepend <string>" msgstr "" -#: builtin/checkout-index.c:178 +#: builtin/checkout-index.c:176 msgid "copy out the files from named stage" msgstr "" -#: builtin/checkout.c:26 +#: builtin/checkout.c:27 msgid "git checkout [<options>] <branch>" msgstr "" -#: builtin/checkout.c:27 +#: builtin/checkout.c:28 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "" -#: builtin/checkout.c:135 builtin/checkout.c:168 +#: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:137 builtin/checkout.c:170 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:153 +#: builtin/checkout.c:154 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:197 +#: builtin/checkout.c:198 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:214 +#: builtin/checkout.c:215 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:231 +#: builtin/checkout.c:232 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 -#: builtin/checkout.c:262 +#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260 +#: builtin/checkout.c:263 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:265 builtin/checkout.c:268 +#: builtin/checkout.c:266 builtin/checkout.c:269 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:271 +#: builtin/checkout.c:272 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:342 builtin/checkout.c:349 +#: builtin/checkout.c:341 builtin/checkout.c:348 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:501 +#: builtin/checkout.c:506 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:632 +#: builtin/checkout.c:637 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:673 +#: builtin/checkout.c:678 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:677 builtin/clone.c:683 +#: builtin/checkout.c:682 builtin/clone.c:684 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:681 +#: builtin/checkout.c:686 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:684 +#: builtin/checkout.c:689 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:688 +#: builtin/checkout.c:693 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:690 builtin/checkout.c:1086 +#: builtin/checkout.c:695 builtin/checkout.c:1051 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:692 +#: builtin/checkout.c:697 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:743 +#: builtin/checkout.c:748 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:749 +#: builtin/checkout.c:754 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5822,7 +5883,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:768 +#: builtin/checkout.c:773 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5839,160 +5900,160 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:809 +#: builtin/checkout.c:814 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:813 +#: builtin/checkout.c:818 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:843 builtin/checkout.c:1081 +#: builtin/checkout.c:848 builtin/checkout.c:1046 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:987 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1027 builtin/worktree.c:233 +#: builtin/checkout.c:992 builtin/worktree.c:247 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1021 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1095 +#: builtin/checkout.c:1060 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1098 builtin/checkout.c:1102 +#: builtin/checkout.c:1063 builtin/checkout.c:1067 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114 -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079 +#: builtin/checkout.c:1082 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1087 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346 -#: builtin/worktree.c:348 +#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369 +#: builtin/worktree.c:371 msgid "branch" msgstr "" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1120 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1122 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1123 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1159 builtin/worktree.c:350 +#: builtin/checkout.c:1124 builtin/worktree.c:373 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1125 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1127 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1128 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1165 +#: builtin/checkout.c:1130 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1132 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1133 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1169 builtin/merge.c:238 +#: builtin/checkout.c:1134 builtin/merge.c:238 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251 +#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251 msgid "style" msgstr "" -#: builtin/checkout.c:1171 +#: builtin/checkout.c:1136 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1174 +#: builtin/checkout.c:1139 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1141 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1178 +#: builtin/checkout.c:1143 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136 -#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544 +#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137 +#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556 #: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1177 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1229 +#: builtin/checkout.c:1194 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1234 +#: builtin/checkout.c:1199 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1270 +#: builtin/checkout.c:1235 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1277 +#: builtin/checkout.c:1242 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1281 +#: builtin/checkout.c:1246 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1285 +#: builtin/checkout.c:1250 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6028,7 +6089,7 @@ msgstr "" msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:301 git-add--interactive.perl:572 +#: builtin/clean.c:302 git-add--interactive.perl:572 #, c-format msgid "" "Prompt help:\n" @@ -6037,7 +6098,7 @@ msgid "" " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:305 git-add--interactive.perl:581 +#: builtin/clean.c:306 git-add--interactive.perl:581 #, c-format msgid "" "Prompt help:\n" @@ -6050,38 +6111,38 @@ msgid "" " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:521 git-add--interactive.perl:547 +#: builtin/clean.c:522 git-add--interactive.perl:547 #: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" -#: builtin/clean.c:663 +#: builtin/clean.c:664 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:700 +#: builtin/clean.c:701 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:721 +#: builtin/clean.c:722 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:763 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:787 git-add--interactive.perl:1616 +#: builtin/clean.c:788 git-add--interactive.perl:1616 #, c-format msgid "Bye.\n" msgstr "" -#: builtin/clean.c:795 +#: builtin/clean.c:796 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6092,69 +6153,70 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:822 git-add--interactive.perl:1692 +#: builtin/clean.c:823 git-add--interactive.perl:1692 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:823 git-add--interactive.perl:1689 +#: builtin/clean.c:824 git-add--interactive.perl:1689 msgid "What now" msgstr "" -#: builtin/clean.c:831 +#: builtin/clean.c:832 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:847 +#: builtin/clean.c:848 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:909 +#: builtin/clean.c:910 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "force" msgstr "" -#: builtin/clean.c:912 +#: builtin/clean.c:913 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:914 +#: builtin/clean.c:915 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465 -#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397 -#: builtin/name-rev.c:399 builtin/show-ref.c:176 +#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532 +#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157 +#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 +#: builtin/show-ref.c:176 msgid "pattern" msgstr "" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:917 +#: builtin/clean.c:918 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:919 +#: builtin/clean.c:920 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:937 +#: builtin/clean.c:938 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:941 +#: builtin/clean.c:942 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:944 +#: builtin/clean.c:945 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -6208,8 +6270,8 @@ msgstr "" msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635 -#: builtin/submodule--helper.c:1002 +#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873 +#: builtin/submodule--helper.c:1240 msgid "reference repository" msgstr "" @@ -6233,8 +6295,8 @@ msgstr "" msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804 -#: builtin/pull.c:205 +#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806 +#: builtin/pull.c:211 msgid "depth" msgstr "" @@ -6242,7 +6304,7 @@ msgstr "" msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938 +#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991 #: parse-options.h:142 msgid "time" msgstr "" @@ -6251,11 +6313,11 @@ msgstr "" msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:122 builtin/fetch.c:141 +#: builtin/clone.c:122 builtin/fetch.c:142 msgid "revision" msgstr "" -#: builtin/clone.c:123 builtin/fetch.c:142 +#: builtin/clone.c:123 builtin/fetch.c:143 msgid "deepen history of shallow clone, excluding rev" msgstr "" @@ -6287,11 +6349,13 @@ msgstr "" msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555 +#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224 +#: builtin/push.c:567 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557 +#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227 +#: builtin/push.c:569 msgid "use IPv6 addresses only" msgstr "" @@ -6331,33 +6395,33 @@ msgstr "" msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:483 +#: builtin/clone.c:484 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:560 +#: builtin/clone.c:561 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:655 +#: builtin/clone.c:656 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:671 +#: builtin/clone.c:672 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:720 +#: builtin/clone.c:721 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" @@ -6377,7 +6441,7 @@ msgstr "" msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:894 builtin/receive-pack.c:1944 +#: builtin/clone.c:894 builtin/receive-pack.c:1945 msgid "Too many arguments." msgstr "" @@ -6399,7 +6463,7 @@ msgstr "" msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:933 builtin/fetch.c:1360 +#: builtin/clone.c:933 builtin/fetch.c:1358 #, c-format msgid "depth %s is not a positive number" msgstr "" @@ -6415,7 +6479,7 @@ msgid "working tree '%s' already exists." msgstr "" #: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 -#: builtin/worktree.c:240 builtin/worktree.c:270 +#: builtin/worktree.c:253 builtin/worktree.c:283 #, c-format msgid "could not create leading directories of '%s'" msgstr "" @@ -6461,17 +6525,12 @@ msgstr "" msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1087 -#, c-format -msgid "Don't know how to clone %s" -msgstr "" - -#: builtin/clone.c:1142 builtin/clone.c:1150 +#: builtin/clone.c:1139 builtin/clone.c:1147 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1153 +#: builtin/clone.c:1150 msgid "You appear to have cloned an empty repository." msgstr "" @@ -6634,7 +6693,7 @@ msgid "" "in the current commit message" msgstr "" -#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100 +#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114 #, c-format msgid "could not lookup commit %s" msgstr "" @@ -6719,323 +6778,338 @@ msgstr "" msgid "Cannot read index" msgstr "" -#: builtin/commit.c:958 +#: builtin/commit.c:959 msgid "Error building trees" msgstr "" -#: builtin/commit.c:972 builtin/tag.c:252 +#: builtin/commit.c:973 builtin/tag.c:252 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1075 +#: builtin/commit.c:1076 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1090 builtin/commit.c:1335 +#: builtin/commit.c:1090 +#, c-format +msgid "Invalid ignored mode '%s'" +msgstr "" + +#: builtin/commit.c:1104 builtin/commit.c:1349 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1128 +#: builtin/commit.c:1142 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1158 +#: builtin/commit.c:1172 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1167 +#: builtin/commit.c:1181 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1170 +#: builtin/commit.c:1184 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1172 +#: builtin/commit.c:1186 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1175 +#: builtin/commit.c:1189 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1185 +#: builtin/commit.c:1199 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1187 +#: builtin/commit.c:1201 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1195 +#: builtin/commit.c:1209 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1212 +#: builtin/commit.c:1226 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1214 +#: builtin/commit.c:1228 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1226 builtin/tag.c:535 +#: builtin/commit.c:1240 builtin/tag.c:535 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1231 +#: builtin/commit.c:1245 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1349 builtin/commit.c:1626 +#: builtin/commit.c:1363 builtin/commit.c:1648 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1351 builtin/commit.c:1628 +#: builtin/commit.c:1365 builtin/commit.c:1650 msgid "show branch information" msgstr "" -#: builtin/commit.c:1353 +#: builtin/commit.c:1367 msgid "show stash information" msgstr "" -#: builtin/commit.c:1355 +#: builtin/commit.c:1369 msgid "version" msgstr "" -#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530 -#: builtin/worktree.c:469 +#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542 +#: builtin/worktree.c:523 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1358 builtin/commit.c:1632 +#: builtin/commit.c:1372 builtin/commit.c:1654 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1361 builtin/commit.c:1635 +#: builtin/commit.c:1375 builtin/commit.c:1657 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999 -#: builtin/fast-export.c:1002 builtin/tag.c:390 +#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660 +#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390 msgid "mode" msgstr "" -#: builtin/commit.c:1364 builtin/commit.c:1638 +#: builtin/commit.c:1378 builtin/commit.c:1660 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1367 -msgid "show ignored files" +#: builtin/commit.c:1382 +msgid "" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" msgstr "" -#: builtin/commit.c:1368 parse-options.h:155 +#: builtin/commit.c:1384 parse-options.h:155 msgid "when" msgstr "" -#: builtin/commit.c:1369 +#: builtin/commit.c:1385 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1371 +#: builtin/commit.c:1387 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1449 +#: builtin/commit.c:1406 +msgid "Unsupported combination of ignored and untracked-files arguments" +msgstr "" + +#: builtin/commit.c:1469 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1451 +#: builtin/commit.c:1471 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1496 +#: builtin/commit.c:1516 +msgid "unable to resolve HEAD after creating commit" +msgstr "" + +#: builtin/commit.c:1518 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1499 +#: builtin/commit.c:1521 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1596 +#: builtin/commit.c:1618 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1597 +#: builtin/commit.c:1619 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1599 +#: builtin/commit.c:1621 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1600 builtin/tag.c:388 +#: builtin/commit.c:1622 builtin/tag.c:388 msgid "read message from file" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "author" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1623 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1602 builtin/gc.c:359 +#: builtin/commit.c:1624 builtin/gc.c:359 msgid "date" msgstr "" -#: builtin/commit.c:1602 +#: builtin/commit.c:1624 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402 +#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402 #: builtin/notes.c:565 builtin/tag.c:386 msgid "message" msgstr "" -#: builtin/commit.c:1603 +#: builtin/commit.c:1625 msgid "commit message" msgstr "" -#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606 -#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92 +#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628 +#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92 msgid "commit" msgstr "" -#: builtin/commit.c:1604 +#: builtin/commit.c:1626 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1605 +#: builtin/commit.c:1627 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1606 +#: builtin/commit.c:1628 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1607 +#: builtin/commit.c:1629 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1608 +#: builtin/commit.c:1630 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239 -#: builtin/revert.c:105 +#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239 +#: builtin/pull.c:149 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1610 +#: builtin/commit.c:1632 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1611 +#: builtin/commit.c:1633 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1612 +#: builtin/commit.c:1634 msgid "default" msgstr "" -#: builtin/commit.c:1612 builtin/tag.c:391 +#: builtin/commit.c:1634 builtin/tag.c:391 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1613 +#: builtin/commit.c:1635 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173 +#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1618 +#: builtin/commit.c:1640 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1619 +#: builtin/commit.c:1641 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1620 +#: builtin/commit.c:1642 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1621 +#: builtin/commit.c:1643 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1622 +#: builtin/commit.c:1644 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1623 +#: builtin/commit.c:1645 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1624 +#: builtin/commit.c:1646 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1625 +#: builtin/commit.c:1647 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1636 +#: builtin/commit.c:1658 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1637 +#: builtin/commit.c:1659 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1642 +#: builtin/commit.c:1664 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1644 +#: builtin/commit.c:1666 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1674 +#: builtin/commit.c:1696 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1719 +#: builtin/commit.c:1741 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1726 +#: builtin/commit.c:1748 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1745 +#: builtin/commit.c:1767 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1756 +#: builtin/commit.c:1778 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1761 +#: builtin/commit.c:1783 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1809 +#: builtin/commit.c:1831 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7046,139 +7120,143 @@ msgstr "" msgid "git config [<options>]" msgstr "" -#: builtin/config.c:57 +#: builtin/config.c:58 msgid "Config file location" msgstr "" -#: builtin/config.c:58 +#: builtin/config.c:59 msgid "use global config file" msgstr "" -#: builtin/config.c:59 +#: builtin/config.c:60 msgid "use system config file" msgstr "" -#: builtin/config.c:60 +#: builtin/config.c:61 msgid "use repository config file" msgstr "" -#: builtin/config.c:61 +#: builtin/config.c:62 msgid "use given config file" msgstr "" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "blob-id" msgstr "" -#: builtin/config.c:62 +#: builtin/config.c:63 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:63 +#: builtin/config.c:64 msgid "Action" msgstr "" -#: builtin/config.c:64 +#: builtin/config.c:65 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:65 +#: builtin/config.c:66 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:66 +#: builtin/config.c:67 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:67 +#: builtin/config.c:68 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:68 +#: builtin/config.c:69 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:69 +#: builtin/config.c:70 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:70 +#: builtin/config.c:71 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:71 +#: builtin/config.c:72 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:72 +#: builtin/config.c:73 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:73 +#: builtin/config.c:74 msgid "remove a section: name" msgstr "" -#: builtin/config.c:74 +#: builtin/config.c:75 msgid "list all" msgstr "" -#: builtin/config.c:75 +#: builtin/config.c:76 msgid "open an editor" msgstr "" -#: builtin/config.c:76 +#: builtin/config.c:77 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:77 +#: builtin/config.c:78 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:78 +#: builtin/config.c:79 msgid "Type" msgstr "" -#: builtin/config.c:79 +#: builtin/config.c:80 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:80 +#: builtin/config.c:81 msgid "value is decimal number" msgstr "" -#: builtin/config.c:81 +#: builtin/config.c:82 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:82 +#: builtin/config.c:83 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:83 +#: builtin/config.c:84 +msgid "value is an expiry date" +msgstr "" + +#: builtin/config.c:85 msgid "Other" msgstr "" -#: builtin/config.c:84 +#: builtin/config.c:86 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:85 +#: builtin/config.c:87 msgid "show variable names only" msgstr "" -#: builtin/config.c:86 +#: builtin/config.c:88 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:87 +#: builtin/config.c:89 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" -#: builtin/config.c:327 +#: builtin/config.c:335 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:471 +#: builtin/config.c:479 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7188,16 +7266,16 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:499 +#: builtin/config.c:507 msgid "--local can only be used inside a git repository" msgstr "" -#: builtin/config.c:624 +#: builtin/config.c:632 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:637 +#: builtin/config.c:645 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -7212,161 +7290,166 @@ msgstr "" msgid "print sizes in human readable format" msgstr "" -#: builtin/describe.c:19 +#: builtin/describe.c:22 msgid "git describe [<options>] [<commit-ish>...]" msgstr "" -#: builtin/describe.c:20 +#: builtin/describe.c:23 msgid "git describe [<options>] --dirty" msgstr "" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "head" msgstr "" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "lightweight" msgstr "" -#: builtin/describe.c:54 +#: builtin/describe.c:57 msgid "annotated" msgstr "" -#: builtin/describe.c:264 +#: builtin/describe.c:267 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:268 +#: builtin/describe.c:271 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:270 +#: builtin/describe.c:273 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:297 builtin/log.c:493 -#, c-format -msgid "Not a valid object name %s" -msgstr "" - -#: builtin/describe.c:300 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "" - -#: builtin/describe.c:317 +#: builtin/describe.c:314 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:319 +#: builtin/describe.c:316 #, c-format -msgid "searching to describe %s\n" +msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:366 +#: builtin/describe.c:363 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:393 +#: builtin/describe.c:389 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:397 +#: builtin/describe.c:393 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:427 +#: builtin/describe.c:423 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:430 +#: builtin/describe.c:426 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:452 +#: builtin/describe.c:494 +#, c-format +msgid "describe %s\n" +msgstr "" + +#: builtin/describe.c:497 builtin/log.c:500 +#, c-format +msgid "Not a valid object name %s" +msgstr "" + +#: builtin/describe.c:505 +#, c-format +msgid "%s is neither a commit nor blob" +msgstr "" + +#: builtin/describe.c:519 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:453 +#: builtin/describe.c:520 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:454 +#: builtin/describe.c:521 msgid "use any ref" msgstr "" -#: builtin/describe.c:455 +#: builtin/describe.c:522 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:456 +#: builtin/describe.c:523 msgid "always use long format" msgstr "" -#: builtin/describe.c:457 +#: builtin/describe.c:524 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:460 +#: builtin/describe.c:527 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:462 +#: builtin/describe.c:529 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:464 +#: builtin/describe.c:531 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:466 +#: builtin/describe.c:533 msgid "do not consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:468 builtin/name-rev.c:406 +#: builtin/describe.c:535 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:469 builtin/describe.c:472 +#: builtin/describe.c:536 builtin/describe.c:539 msgid "mark" msgstr "" -#: builtin/describe.c:470 +#: builtin/describe.c:537 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:473 +#: builtin/describe.c:540 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" -#: builtin/describe.c:491 +#: builtin/describe.c:558 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:520 +#: builtin/describe.c:587 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:563 +#: builtin/describe.c:637 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/describe.c:565 +#: builtin/describe.c:639 msgid "--broken is incompatible with commit-ishes" msgstr "" @@ -7375,26 +7458,26 @@ msgstr "" msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:235 +#: builtin/diff.c:234 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:357 +#: builtin/diff.c:356 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:400 +#: builtin/diff.c:399 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:409 +#: builtin/diff.c:408 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:414 +#: builtin/diff.c:413 #, c-format msgid "unhandled object '%s' given." msgstr "" @@ -7429,71 +7512,71 @@ msgid "" "directory diff mode('-d' and '--dir-diff')." msgstr "" -#: builtin/difftool.c:633 +#: builtin/difftool.c:632 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "" -#: builtin/difftool.c:635 +#: builtin/difftool.c:634 msgid "working tree file has been left." msgstr "" -#: builtin/difftool.c:646 +#: builtin/difftool.c:645 #, c-format msgid "temporary files exist in '%s'." msgstr "" -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 msgid "you may want to cleanup or recover these." msgstr "" -#: builtin/difftool.c:696 +#: builtin/difftool.c:695 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "" -#: builtin/difftool.c:698 +#: builtin/difftool.c:697 msgid "perform a full-directory diff" msgstr "" -#: builtin/difftool.c:700 +#: builtin/difftool.c:699 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:715 +#: builtin/difftool.c:714 msgid "<command>" msgstr "" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "" -#: builtin/difftool.c:740 +#: builtin/difftool.c:739 msgid "no <tool> given for --tool=<tool>" msgstr "" -#: builtin/difftool.c:747 +#: builtin/difftool.c:746 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "" @@ -7549,277 +7632,272 @@ msgstr "" msgid "anonymize output" msgstr "" -#: builtin/fetch.c:23 +#: builtin/fetch.c:24 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:24 +#: builtin/fetch.c:25 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:26 +#: builtin/fetch.c:27 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:112 builtin/pull.c:182 +#: builtin/fetch.c:113 builtin/pull.c:188 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:114 builtin/pull.c:185 +#: builtin/fetch.c:115 builtin/pull.c:191 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:116 builtin/pull.c:188 +#: builtin/fetch.c:117 builtin/pull.c:194 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:117 builtin/pull.c:190 +#: builtin/fetch.c:118 builtin/pull.c:196 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:119 +#: builtin/fetch.c:120 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:121 builtin/pull.c:192 +#: builtin/fetch.c:122 builtin/pull.c:198 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:123 +#: builtin/fetch.c:124 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:125 +#: builtin/fetch.c:126 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:127 builtin/pull.c:195 +#: builtin/fetch.c:128 builtin/pull.c:201 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123 +#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126 msgid "on-demand" msgstr "" -#: builtin/fetch.c:129 +#: builtin/fetch.c:130 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:133 builtin/pull.c:203 +#: builtin/fetch.c:134 builtin/pull.c:209 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:135 +#: builtin/fetch.c:136 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206 +#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:140 +#: builtin/fetch.c:141 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:146 builtin/pull.c:209 +#: builtin/fetch.c:147 builtin/pull.c:215 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:148 builtin/log.c:1456 +#: builtin/fetch.c:149 builtin/log.c:1463 msgid "dir" msgstr "" -#: builtin/fetch.c:149 +#: builtin/fetch.c:150 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:152 +#: builtin/fetch.c:153 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:156 builtin/pull.c:212 +#: builtin/fetch.c:157 builtin/pull.c:218 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:157 builtin/pull.c:214 +#: builtin/fetch.c:158 builtin/pull.c:220 msgid "refmap" msgstr "" -#: builtin/fetch.c:158 builtin/pull.c:215 +#: builtin/fetch.c:159 builtin/pull.c:221 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:416 +#: builtin/fetch.c:417 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:534 +#: builtin/fetch.c:535 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:627 +#: builtin/fetch.c:628 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:631 +#: builtin/fetch.c:632 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:644 builtin/fetch.c:724 +#: builtin/fetch.c:645 builtin/fetch.c:725 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:645 +#: builtin/fetch.c:646 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:654 +#: builtin/fetch.c:655 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704 -#: builtin/fetch.c:719 +#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705 +#: builtin/fetch.c:720 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:674 +#: builtin/fetch.c:675 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:677 +#: builtin/fetch.c:678 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:680 +#: builtin/fetch.c:681 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:719 +#: builtin/fetch.c:720 msgid "forced update" msgstr "" -#: builtin/fetch.c:724 +#: builtin/fetch.c:725 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:769 +#: builtin/fetch.c:770 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:789 +#: builtin/fetch.c:790 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:877 builtin/fetch.c:973 +#: builtin/fetch.c:878 builtin/fetch.c:974 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:888 +#: builtin/fetch.c:889 #, 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:943 +#: builtin/fetch.c:944 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:944 +#: builtin/fetch.c:945 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:976 +#: builtin/fetch.c:977 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:977 builtin/remote.c:1024 +#: builtin/fetch.c:978 builtin/remote.c:1024 msgid "(none)" msgstr "" -#: builtin/fetch.c:1000 +#: builtin/fetch.c:1001 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1019 +#: builtin/fetch.c:1020 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1022 +#: builtin/fetch.c:1023 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1098 -#, c-format -msgid "Don't know how to fetch from %s" -msgstr "" - -#: builtin/fetch.c:1258 +#: builtin/fetch.c:1256 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1260 builtin/remote.c:97 +#: builtin/fetch.c:1258 builtin/remote.c:97 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1278 +#: builtin/fetch.c:1276 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:1301 +#: builtin/fetch.c:1299 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1344 +#: builtin/fetch.c:1342 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1346 +#: builtin/fetch.c:1344 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1349 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1353 +#: builtin/fetch.c:1351 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1364 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1368 +#: builtin/fetch.c:1366 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1379 +#: builtin/fetch.c:1377 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1387 +#: builtin/fetch.c:1385 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -7828,23 +7906,23 @@ msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:665 +#: builtin/fmt-merge-msg.c:666 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:668 +#: builtin/fmt-merge-msg.c:669 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:672 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:673 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:674 msgid "file to read from" msgstr "" @@ -8057,241 +8135,241 @@ msgstr "" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693 +#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613 +#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:628 +#: builtin/grep.c:630 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:694 +#: builtin/grep.c:696 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:781 +#: builtin/grep.c:783 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:783 +#: builtin/grep.c:785 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:785 +#: builtin/grep.c:787 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:787 +#: builtin/grep.c:789 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:789 +#: builtin/grep.c:791 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:792 +#: builtin/grep.c:794 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:794 +#: builtin/grep.c:796 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:796 +#: builtin/grep.c:798 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:798 +#: builtin/grep.c:800 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:800 +#: builtin/grep.c:802 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:803 +#: builtin/grep.c:805 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:805 +#: builtin/grep.c:807 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:809 +#: builtin/grep.c:811 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:812 +#: builtin/grep.c:814 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:818 +#: builtin/grep.c:820 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:821 +#: builtin/grep.c:823 msgid "show line numbers" msgstr "" -#: builtin/grep.c:822 +#: builtin/grep.c:824 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:823 +#: builtin/grep.c:825 msgid "show filenames" msgstr "" -#: builtin/grep.c:825 +#: builtin/grep.c:827 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:827 +#: builtin/grep.c:829 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:829 +#: builtin/grep.c:831 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:834 +#: builtin/grep.c:836 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:836 +#: builtin/grep.c:838 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "highlight matches" msgstr "" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:841 +#: builtin/grep.c:843 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:844 +#: builtin/grep.c:846 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:847 +#: builtin/grep.c:849 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:851 +#: builtin/grep.c:853 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:859 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:864 +#: builtin/grep.c:866 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:876 +#: builtin/grep.c:878 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:878 +#: builtin/grep.c:880 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:880 +#: builtin/grep.c:882 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "pager" msgstr "" -#: builtin/grep.c:884 +#: builtin/grep.c:886 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:950 +#: builtin/grep.c:952 msgid "no pattern given." msgstr "" -#: builtin/grep.c:982 +#: builtin/grep.c:984 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:989 +#: builtin/grep.c:991 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1023 builtin/index-pack.c:1491 +#: builtin/grep.c:1026 builtin/index-pack.c:1491 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1028 +#: builtin/grep.c:1031 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1052 +#: builtin/grep.c:1055 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1075 +#: builtin/grep.c:1078 msgid "option not supported with --recurse-submodules." msgstr "" -#: builtin/grep.c:1081 +#: builtin/grep.c:1084 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:1087 +#: builtin/grep.c:1090 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:1095 +#: builtin/grep.c:1098 msgid "both --cached and trees are given." msgstr "" @@ -8568,8 +8646,8 @@ msgstr "" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:752 builtin/pack-objects.c:168 -#: builtin/pack-objects.c:262 +#: builtin/index-pack.c:752 builtin/pack-objects.c:179 +#: builtin/pack-objects.c:273 #, c-format msgid "unable to read %s" msgstr "" @@ -8729,21 +8807,21 @@ msgstr[1] "" msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1705 builtin/index-pack.c:1708 -#: builtin/index-pack.c:1724 builtin/index-pack.c:1728 +#: builtin/index-pack.c:1700 builtin/index-pack.c:1703 +#: builtin/index-pack.c:1719 builtin/index-pack.c:1723 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1744 +#: builtin/index-pack.c:1739 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1746 +#: builtin/index-pack.c:1741 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1754 +#: builtin/index-pack.c:1749 msgid "--verify with no packfile name given" msgstr "" @@ -8934,427 +9012,439 @@ msgstr "" msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:148 +#: builtin/log.c:151 msgid "suppress diff output" msgstr "" -#: builtin/log.c:149 +#: builtin/log.c:152 msgid "show source" msgstr "" -#: builtin/log.c:150 +#: builtin/log.c:153 msgid "Use mail map file" msgstr "" -#: builtin/log.c:151 +#: builtin/log.c:155 +msgid "only decorate refs that match <pattern>" +msgstr "" + +#: builtin/log.c:157 +msgid "do not decorate refs that match <pattern>" +msgstr "" + +#: builtin/log.c:158 msgid "decorate options" msgstr "" -#: builtin/log.c:154 +#: builtin/log.c:161 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:250 +#: builtin/log.c:257 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:501 +#: builtin/log.c:508 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:516 builtin/log.c:610 +#: builtin/log.c:523 builtin/log.c:617 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:634 +#: builtin/log.c:641 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:755 +#: builtin/log.c:762 msgid "format.headers without value" msgstr "" -#: builtin/log.c:856 +#: builtin/log.c:863 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:872 +#: builtin/log.c:879 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:889 +#: builtin/log.c:896 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:899 +#: builtin/log.c:906 msgid "Not a range." msgstr "" -#: builtin/log.c:1005 +#: builtin/log.c:1012 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:1085 +#: builtin/log.c:1092 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1112 +#: builtin/log.c:1119 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1162 +#: builtin/log.c:1169 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934 +#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516 +#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/log.c:1284 +#: builtin/log.c:1291 msgid "Could not find exact merge base." msgstr "" -#: builtin/log.c:1288 +#: builtin/log.c:1295 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:1308 +#: builtin/log.c:1315 msgid "Failed to find exact merge base" msgstr "" -#: builtin/log.c:1319 +#: builtin/log.c:1326 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1323 +#: builtin/log.c:1330 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1372 +#: builtin/log.c:1379 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1431 +#: builtin/log.c:1438 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1434 +#: builtin/log.c:1441 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1438 +#: builtin/log.c:1445 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1442 +#: builtin/log.c:1449 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "sfx" msgstr "" -#: builtin/log.c:1444 +#: builtin/log.c:1451 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1446 +#: builtin/log.c:1453 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1453 +#: builtin/log.c:1460 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1456 +#: builtin/log.c:1463 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1459 +#: builtin/log.c:1466 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1462 +#: builtin/log.c:1469 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1464 +#: builtin/log.c:1471 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1466 +#: builtin/log.c:1473 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1468 +#: builtin/log.c:1475 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1470 +#: builtin/log.c:1477 msgid "Messaging" msgstr "" -#: builtin/log.c:1471 +#: builtin/log.c:1478 msgid "header" msgstr "" -#: builtin/log.c:1472 +#: builtin/log.c:1479 msgid "add email header" msgstr "" -#: builtin/log.c:1473 builtin/log.c:1475 +#: builtin/log.c:1480 builtin/log.c:1482 msgid "email" msgstr "" -#: builtin/log.c:1473 +#: builtin/log.c:1480 msgid "add To: header" msgstr "" -#: builtin/log.c:1475 +#: builtin/log.c:1482 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1477 +#: builtin/log.c:1484 msgid "ident" msgstr "" -#: builtin/log.c:1478 +#: builtin/log.c:1485 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1480 +#: builtin/log.c:1487 msgid "message-id" msgstr "" -#: builtin/log.c:1481 +#: builtin/log.c:1488 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1482 builtin/log.c:1485 +#: builtin/log.c:1489 builtin/log.c:1492 msgid "boundary" msgstr "" -#: builtin/log.c:1483 +#: builtin/log.c:1490 msgid "attach the patch" msgstr "" -#: builtin/log.c:1486 +#: builtin/log.c:1493 msgid "inline the patch" msgstr "" -#: builtin/log.c:1490 +#: builtin/log.c:1497 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1492 +#: builtin/log.c:1499 msgid "signature" msgstr "" -#: builtin/log.c:1493 +#: builtin/log.c:1500 msgid "add a signature" msgstr "" -#: builtin/log.c:1494 +#: builtin/log.c:1501 msgid "base-commit" msgstr "" -#: builtin/log.c:1495 +#: builtin/log.c:1502 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1497 +#: builtin/log.c:1504 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1498 +#: builtin/log.c:1505 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1500 +#: builtin/log.c:1507 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1575 +#: builtin/log.c:1582 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1590 +#: builtin/log.c:1597 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1592 +#: builtin/log.c:1599 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1600 +#: builtin/log.c:1607 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1604 +#: builtin/log.c:1611 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1634 +#: builtin/log.c:1641 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1636 +#: builtin/log.c:1643 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1729 +#: builtin/log.c:1736 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1761 +#: builtin/log.c:1768 msgid "Generating patches" msgstr "" -#: builtin/log.c:1805 +#: builtin/log.c:1812 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1855 +#: builtin/log.c:1862 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1909 +#: builtin/log.c:1916 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "" -#: builtin/ls-files.c:515 +#: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:521 +msgid "use lowercase letters for 'fsmonitor clean' files" +msgstr "" + +#: builtin/ls-files.c:523 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:525 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:527 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:529 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:531 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:534 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:536 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:538 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:540 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:542 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:545 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:547 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:549 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:552 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:555 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:557 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:560 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:563 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:565 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:562 +#: builtin/ls-files.c:566 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:567 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:569 msgid "show debugging data" msgstr "" @@ -9473,31 +9563,31 @@ msgstr "" msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:200 builtin/pull.c:134 +#: builtin/merge.c:200 builtin/pull.c:137 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:203 builtin/pull.c:137 +#: builtin/merge.c:203 builtin/pull.c:140 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:204 builtin/pull.c:140 +#: builtin/merge.c:204 builtin/pull.c:143 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:206 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:146 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:209 builtin/pull.c:146 +#: builtin/merge.c:209 builtin/pull.c:152 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:211 builtin/pull.c:149 +#: builtin/merge.c:211 builtin/pull.c:155 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:213 builtin/pull.c:152 +#: builtin/merge.c:213 builtin/pull.c:158 msgid "edit message before committing" msgstr "" @@ -9505,28 +9595,28 @@ msgstr "" msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:216 builtin/pull.c:158 +#: builtin/merge.c:216 builtin/pull.c:164 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:220 builtin/pull.c:161 +#: builtin/merge.c:220 builtin/pull.c:167 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165 +#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171 #: builtin/revert.c:109 msgid "strategy" msgstr "" -#: builtin/merge.c:222 builtin/pull.c:166 +#: builtin/merge.c:222 builtin/pull.c:172 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:223 builtin/pull.c:169 +#: builtin/merge.c:223 builtin/pull.c:175 msgid "option=value" msgstr "" -#: builtin/merge.c:224 builtin/pull.c:170 +#: builtin/merge.c:224 builtin/pull.c:176 msgid "option for selected merge strategy" msgstr "" @@ -9542,7 +9632,7 @@ msgstr "" msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:234 builtin/pull.c:177 +#: builtin/merge.c:234 builtin/pull.c:183 msgid "allow merging unrelated histories" msgstr "" @@ -9581,41 +9671,41 @@ msgstr "" msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:456 +#: builtin/merge.c:455 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:546 +#: builtin/merge.c:545 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:666 +#: builtin/merge.c:667 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:680 +#: builtin/merge.c:681 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:695 +#: builtin/merge.c:696 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:747 +#: builtin/merge.c:748 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:756 +#: builtin/merge.c:757 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:762 +#: builtin/merge.c:763 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9625,185 +9715,185 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:798 +#: builtin/merge.c:799 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:818 +#: builtin/merge.c:819 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:871 +#: builtin/merge.c:872 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:910 +#: builtin/merge.c:911 msgid "No current branch." msgstr "" -#: builtin/merge.c:912 +#: builtin/merge.c:913 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:914 +#: builtin/merge.c:915 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:919 +#: builtin/merge.c:920 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:972 +#: builtin/merge.c:973 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1073 +#: builtin/merge.c:1075 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1107 +#: builtin/merge.c:1109 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1172 +#: builtin/merge.c:1174 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1176 +#: builtin/merge.c:1178 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1188 +#: builtin/merge.c:1190 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1192 +#: builtin/merge.c:1194 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1208 +#: builtin/merge.c:1210 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1215 +#: builtin/merge.c:1217 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1218 +#: builtin/merge.c:1220 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1227 +#: builtin/merge.c:1229 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1235 +#: builtin/merge.c:1237 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1252 +#: builtin/merge.c:1254 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1254 +#: builtin/merge.c:1256 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1259 +#: builtin/merge.c:1261 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1261 +#: builtin/merge.c:1263 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1295 +#: builtin/merge.c:1297 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1298 +#: builtin/merge.c:1300 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1301 +#: builtin/merge.c:1303 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1304 +#: builtin/merge.c:1306 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1366 +#: builtin/merge.c:1368 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1375 +#: builtin/merge.c:1377 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1385 +#: builtin/merge.c:1387 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1426 +#: builtin/merge.c:1428 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1433 +#: builtin/merge.c:1435 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1458 +#: builtin/merge.c:1460 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1464 +#: builtin/merge.c:1466 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1487 builtin/merge.c:1566 +#: builtin/merge.c:1489 builtin/merge.c:1568 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1491 +#: builtin/merge.c:1493 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1557 +#: builtin/merge.c:1559 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1559 +#: builtin/merge.c:1561 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1568 +#: builtin/merge.c:1570 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1580 +#: builtin/merge.c:1582 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -9828,23 +9918,23 @@ msgstr "" msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:220 msgid "output all common ancestors" msgstr "" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:222 msgid "find ancestors for a single n-way merge" msgstr "" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:224 msgid "list revs not reachable from others" msgstr "" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:226 msgid "is the first one ancestor of the other?" msgstr "" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:228 msgid "find where <commit> forked from reflog of <ref>" msgstr "" @@ -10115,7 +10205,7 @@ msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "" #: builtin/notes.c:36 -msgid "git notes [--ref <notes-ref>] prune [-n | -v]" +msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" msgstr "" #: builtin/notes.c:37 @@ -10444,7 +10534,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146 +#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158 msgid "do not remove, show only" msgstr "" @@ -10465,184 +10555,192 @@ msgstr "" msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:31 +#: builtin/pack-objects.c:33 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:32 +#: builtin/pack-objects.c:34 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:181 builtin/pack-objects.c:184 +#: builtin/pack-objects.c:192 builtin/pack-objects.c:195 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:777 +#: builtin/pack-objects.c:788 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:790 +#: builtin/pack-objects.c:801 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:1081 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2440 +#: builtin/pack-objects.c:2451 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2599 +msgid "invalid value for --missing" +msgstr "" + +#: builtin/pack-objects.c:2902 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2853 +#: builtin/pack-objects.c:2906 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2936 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2885 +#: builtin/pack-objects.c:2938 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2887 +#: builtin/pack-objects.c:2940 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2890 +#: builtin/pack-objects.c:2943 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2891 +#: builtin/pack-objects.c:2944 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2892 +#: builtin/pack-objects.c:2945 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2895 +#: builtin/pack-objects.c:2948 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2897 +#: builtin/pack-objects.c:2950 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2899 +#: builtin/pack-objects.c:2952 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2901 +#: builtin/pack-objects.c:2954 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2903 +#: builtin/pack-objects.c:2956 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2905 +#: builtin/pack-objects.c:2958 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2907 +#: builtin/pack-objects.c:2960 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2909 +#: builtin/pack-objects.c:2962 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2911 +#: builtin/pack-objects.c:2964 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2913 +#: builtin/pack-objects.c:2966 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2915 +#: builtin/pack-objects.c:2968 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2917 +#: builtin/pack-objects.c:2970 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2919 +#: builtin/pack-objects.c:2972 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2922 +#: builtin/pack-objects.c:2975 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2925 +#: builtin/pack-objects.c:2978 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:2981 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2931 +#: builtin/pack-objects.c:2984 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2933 +#: builtin/pack-objects.c:2986 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2935 +#: builtin/pack-objects.c:2988 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2937 +#: builtin/pack-objects.c:2990 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:2939 +#: builtin/pack-objects.c:2992 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2942 +#: builtin/pack-objects.c:2995 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2944 +#: builtin/pack-objects.c:2997 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:2946 +#: builtin/pack-objects.c:2999 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:3001 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:3003 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2952 +#: builtin/pack-objects.c:3005 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2954 +#: builtin/pack-objects.c:3007 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:3081 +#: builtin/pack-objects.c:3010 +msgid "handling for missing objects" +msgstr "" + +#: builtin/pack-objects.c:3144 msgid "Counting objects" msgstr "" @@ -10667,7 +10765,7 @@ msgid "Removing duplicate objects" msgstr "" #: builtin/prune.c:11 -msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" +msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "" #: builtin/prune.c:106 @@ -10691,57 +10789,57 @@ msgstr "" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/pull.c:124 +#: builtin/pull.c:127 msgid "control for recursive fetching of submodules" msgstr "" -#: builtin/pull.c:128 +#: builtin/pull.c:131 msgid "Options related to merging" msgstr "" -#: builtin/pull.c:131 +#: builtin/pull.c:134 msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121 +#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121 msgid "allow fast-forward" msgstr "" -#: builtin/pull.c:164 +#: builtin/pull.c:170 msgid "automatically stash/stash pop before and after rebase" msgstr "" -#: builtin/pull.c:180 +#: builtin/pull.c:186 msgid "Options related to fetching" msgstr "" -#: builtin/pull.c:198 +#: builtin/pull.c:204 msgid "number of submodules pulled in parallel" msgstr "" -#: builtin/pull.c:287 +#: builtin/pull.c:299 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "" -#: builtin/pull.c:403 +#: builtin/pull.c:415 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:405 +#: builtin/pull.c:417 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:406 +#: builtin/pull.c:418 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:409 +#: builtin/pull.c:421 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -10749,69 +10847,69 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:414 git-parse-remote.sh:73 +#: builtin/pull.c:426 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "" -#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79 +#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" -#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82 +#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:419 builtin/pull.c:434 +#: builtin/pull.c:431 builtin/pull.c:446 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436 +#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "" -#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466 +#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "" -#: builtin/pull.c:429 git-parse-remote.sh:75 +#: builtin/pull.c:441 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:438 git-parse-remote.sh:95 +#: builtin/pull.c:450 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" -#: builtin/pull.c:443 +#: builtin/pull.c:455 #, 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:796 +#: builtin/pull.c:817 msgid "ignoring --verify-signatures for rebase" msgstr "" -#: builtin/pull.c:844 +#: builtin/pull.c:865 msgid "--[no-]autostash option is only valid with --rebase." msgstr "" -#: builtin/pull.c:852 +#: builtin/pull.c:873 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:855 +#: builtin/pull.c:876 msgid "pull with rebase" msgstr "" -#: builtin/pull.c:856 +#: builtin/pull.c:877 msgid "please commit or stash them." msgstr "" -#: builtin/pull.c:881 +#: builtin/pull.c:902 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -10819,7 +10917,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:886 +#: builtin/pull.c:907 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -10830,15 +10928,15 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:901 +#: builtin/pull.c:922 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:905 +#: builtin/pull.c:926 msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/pull.c:912 +#: builtin/pull.c:933 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -10846,21 +10944,21 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/push.c:90 +#: builtin/push.c:92 msgid "tag shorthand without <tag>" msgstr "" -#: builtin/push.c:100 +#: builtin/push.c:102 msgid "--delete only accepts plain target ref names" msgstr "" -#: builtin/push.c:144 +#: builtin/push.c:146 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" -#: builtin/push.c:147 +#: builtin/push.c:149 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -10875,7 +10973,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:162 +#: builtin/push.c:164 #, c-format msgid "" "You are not currently on a branch.\n" @@ -10885,7 +10983,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" -#: builtin/push.c:176 +#: builtin/push.c:178 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -10894,12 +10992,12 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" -#: builtin/push.c:184 +#: builtin/push.c:186 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -#: builtin/push.c:187 +#: builtin/push.c:189 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -10907,12 +11005,12 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:246 +#: builtin/push.c:248 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:253 +#: builtin/push.c:255 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -10920,7 +11018,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:259 +#: builtin/push.c:261 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" @@ -10928,7 +11026,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:265 +#: builtin/push.c:267 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" @@ -10937,33 +11035,33 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:272 +#: builtin/push.c:274 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" -#: builtin/push.c:275 +#: builtin/push.c:277 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:335 +#: builtin/push.c:337 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:339 +#: builtin/push.c:341 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:370 +#: builtin/push.c:372 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:371 +#: builtin/push.c:373 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -10976,112 +11074,112 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:389 +#: builtin/push.c:391 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:390 +#: builtin/push.c:392 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:395 +#: builtin/push.c:397 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:396 +#: builtin/push.c:398 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:401 +#: builtin/push.c:403 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:523 +#: builtin/push.c:535 msgid "repository" msgstr "" -#: builtin/push.c:524 builtin/send-pack.c:163 +#: builtin/push.c:536 builtin/send-pack.c:163 msgid "push all refs" msgstr "" -#: builtin/push.c:525 builtin/send-pack.c:165 +#: builtin/push.c:537 builtin/send-pack.c:165 msgid "mirror all refs" msgstr "" -#: builtin/push.c:527 +#: builtin/push.c:539 msgid "delete refs" msgstr "" -#: builtin/push.c:528 +#: builtin/push.c:540 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:531 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "force updates" msgstr "" -#: builtin/push.c:533 builtin/send-pack.c:180 +#: builtin/push.c:545 builtin/send-pack.c:180 msgid "refname>:<expect" msgstr "" -#: builtin/push.c:534 builtin/send-pack.c:181 +#: builtin/push.c:546 builtin/send-pack.c:181 msgid "require old value of ref to be at this value" msgstr "" -#: builtin/push.c:537 +#: builtin/push.c:549 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:539 builtin/send-pack.c:174 +#: builtin/push.c:551 builtin/send-pack.c:174 msgid "use thin pack" msgstr "" -#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160 +#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 #: builtin/send-pack.c:161 msgid "receive pack program" msgstr "" -#: builtin/push.c:542 +#: builtin/push.c:554 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:545 +#: builtin/push.c:557 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:547 +#: builtin/push.c:559 msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:548 +#: builtin/push.c:560 msgid "push missing but relevant tags" msgstr "" -#: builtin/push.c:551 builtin/send-pack.c:168 +#: builtin/push.c:563 builtin/send-pack.c:168 msgid "GPG sign the push" msgstr "" -#: builtin/push.c:553 builtin/send-pack.c:175 +#: builtin/push.c:565 builtin/send-pack.c:175 msgid "request atomic transaction on remote side" msgstr "" -#: builtin/push.c:554 builtin/send-pack.c:171 +#: builtin/push.c:566 builtin/send-pack.c:171 msgid "server-specific" msgstr "" -#: builtin/push.c:554 builtin/send-pack.c:172 +#: builtin/push.c:566 builtin/send-pack.c:172 msgid "option to transmit" msgstr "" -#: builtin/push.c:568 +#: builtin/push.c:583 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:570 +#: builtin/push.c:585 msgid "--delete doesn't make sense without any refs" msgstr "" -#: builtin/push.c:589 +#: builtin/push.c:604 msgid "push options must not have new line characters" msgstr "" @@ -11160,47 +11258,51 @@ msgstr "" msgid "git rebase--helper [<options>]" msgstr "" -#: builtin/rebase--helper.c:22 +#: builtin/rebase--helper.c:24 msgid "keep empty commits" msgstr "" -#: builtin/rebase--helper.c:23 +#: builtin/rebase--helper.c:25 msgid "continue rebase" msgstr "" -#: builtin/rebase--helper.c:25 +#: builtin/rebase--helper.c:27 msgid "abort rebase" msgstr "" -#: builtin/rebase--helper.c:28 -msgid "make rebase script" -msgstr "" - #: builtin/rebase--helper.c:30 -msgid "shorten SHA-1s in the todo list" +msgid "make rebase script" msgstr "" #: builtin/rebase--helper.c:32 -msgid "expand SHA-1s in the todo list" +msgid "shorten commit ids in the todo list" msgstr "" #: builtin/rebase--helper.c:34 -msgid "check the todo list" +msgid "expand commit ids in the todo list" msgstr "" #: builtin/rebase--helper.c:36 -msgid "skip unnecessary picks" +msgid "check the todo list" msgstr "" #: builtin/rebase--helper.c:38 +msgid "skip unnecessary picks" +msgstr "" + +#: builtin/rebase--helper.c:40 msgid "rearrange fixup/squash lines" msgstr "" -#: builtin/receive-pack.c:29 +#: builtin/rebase--helper.c:42 +msgid "insert exec commands in todo list" +msgstr "" + +#: builtin/receive-pack.c:30 msgid "git receive-pack <git-dir>" msgstr "" -#: builtin/receive-pack.c:839 +#: builtin/receive-pack.c:840 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" @@ -11217,7 +11319,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -#: builtin/receive-pack.c:859 +#: builtin/receive-pack.c:860 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" @@ -11229,20 +11331,15 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" -#: builtin/receive-pack.c:1932 +#: builtin/receive-pack.c:1933 msgid "quiet" msgstr "" -#: builtin/receive-pack.c:1946 +#: builtin/receive-pack.c:1947 msgid "You must specify a directory." msgstr "" -#: builtin/reflog.c:424 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "" - -#: builtin/reflog.c:541 builtin/reflog.c:546 +#: builtin/reflog.c:531 builtin/reflog.c:536 #, c-format msgid "'%s' is not a valid timestamp" msgstr "" @@ -11830,7 +11927,7 @@ msgstr "" msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:406 builtin/worktree.c:134 +#: builtin/repack.c:406 builtin/worktree.c:146 #, c-format msgid "failed to remove '%s'" msgstr "" @@ -12052,10 +12149,23 @@ msgstr "" msgid "Could not write new index file." msgstr "" -#: builtin/rev-list.c:361 +#: builtin/rev-list.c:399 +msgid "object filtering requires --objects" +msgstr "" + +#: builtin/rev-list.c:402 +#, c-format +msgid "invalid sparse value '%s'" +msgstr "" + +#: builtin/rev-list.c:442 msgid "rev-list does not support display of notes" msgstr "" +#: builtin/rev-list.c:445 +msgid "cannot combine --use-bitmap-index with object filtering" +msgstr "" + #: builtin/rev-parse.c:402 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "" @@ -12479,215 +12589,243 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094 +#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332 #, c-format msgid "No such ref: %s" msgstr "" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103 +#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341 #, c-format msgid "Expecting a full ref name, got %s" msgstr "" -#: builtin/submodule--helper.c:71 +#: builtin/submodule--helper.c:81 #, c-format msgid "cannot strip one component off url '%s'" msgstr "" -#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623 +#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861 msgid "alternative anchor for relative paths" msgstr "" -#: builtin/submodule--helper.c:307 +#: builtin/submodule--helper.c:375 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374 +#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "" -#: builtin/submodule--helper.c:389 +#: builtin/submodule--helper.c:464 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "" -#: builtin/submodule--helper.c:400 +#: builtin/submodule--helper.c:475 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:404 +#: builtin/submodule--helper.c:479 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:489 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" -#: builtin/submodule--helper.c:421 +#: builtin/submodule--helper.c:496 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:437 +#: builtin/submodule--helper.c:518 msgid "Suppress output for initializing a submodule" msgstr "" -#: builtin/submodule--helper.c:442 +#: builtin/submodule--helper.c:523 msgid "git submodule--helper init [<path>]" msgstr "" -#: builtin/submodule--helper.c:470 -msgid "git submodule--helper name <path>" +#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713 +#, c-format +msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" -#: builtin/submodule--helper.c:475 +#: builtin/submodule--helper.c:626 #, c-format -msgid "no submodule mapping found in .gitmodules for path '%s'" +msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561 +#: builtin/submodule--helper.c:653 +#, c-format +msgid "failed to recurse into submodule '%s'" +msgstr "" + +#: builtin/submodule--helper.c:677 +msgid "Suppress submodule status output" +msgstr "" + +#: builtin/submodule--helper.c:678 +msgid "" +"Use commit stored in the index instead of the one stored in the submodule " +"HEAD" +msgstr "" + +#: builtin/submodule--helper.c:679 +msgid "recurse into nested submodules" +msgstr "" + +#: builtin/submodule--helper.c:684 +msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" +msgstr "" + +#: builtin/submodule--helper.c:708 +msgid "git submodule--helper name <path>" +msgstr "" + +#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:835 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" -#: builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:842 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "" -#: builtin/submodule--helper.c:626 +#: builtin/submodule--helper.c:864 msgid "where the new submodule will be cloned to" msgstr "" -#: builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:867 msgid "name of the new submodule" msgstr "" -#: builtin/submodule--helper.c:632 +#: builtin/submodule--helper.c:870 msgid "url where to clone the submodule from" msgstr "" -#: builtin/submodule--helper.c:638 +#: builtin/submodule--helper.c:876 msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012 +#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250 msgid "force cloning progress" msgstr "" -#: builtin/submodule--helper.c:646 +#: builtin/submodule--helper.c:884 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" -#: builtin/submodule--helper.c:677 +#: builtin/submodule--helper.c:915 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" -#: builtin/submodule--helper.c:692 +#: builtin/submodule--helper.c:930 #, c-format msgid "could not get submodule directory for '%s'" msgstr "" -#: builtin/submodule--helper.c:757 +#: builtin/submodule--helper.c:995 #, c-format msgid "Submodule path '%s' not initialized" msgstr "" -#: builtin/submodule--helper.c:761 +#: builtin/submodule--helper.c:999 msgid "Maybe you want to use 'update --init'?" msgstr "" -#: builtin/submodule--helper.c:790 +#: builtin/submodule--helper.c:1028 #, c-format msgid "Skipping unmerged submodule %s" msgstr "" -#: builtin/submodule--helper.c:819 +#: builtin/submodule--helper.c:1057 #, c-format msgid "Skipping submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:952 +#: builtin/submodule--helper.c:1190 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "" -#: builtin/submodule--helper.c:963 +#: builtin/submodule--helper.c:1201 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" -#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213 +#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451 msgid "path into the working tree" msgstr "" -#: builtin/submodule--helper.c:996 +#: builtin/submodule--helper.c:1234 msgid "path into the working tree, across nested submodule boundaries" msgstr "" -#: builtin/submodule--helper.c:1000 +#: builtin/submodule--helper.c:1238 msgid "rebase, merge, checkout or none" msgstr "" -#: builtin/submodule--helper.c:1004 +#: builtin/submodule--helper.c:1242 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" -#: builtin/submodule--helper.c:1007 +#: builtin/submodule--helper.c:1245 msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:1009 +#: builtin/submodule--helper.c:1247 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" -#: builtin/submodule--helper.c:1010 +#: builtin/submodule--helper.c:1248 msgid "don't print cloning progress" msgstr "" -#: builtin/submodule--helper.c:1017 +#: builtin/submodule--helper.c:1255 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1030 +#: builtin/submodule--helper.c:1268 msgid "bad value for update parameter" msgstr "" -#: builtin/submodule--helper.c:1098 +#: builtin/submodule--helper.c:1336 #, 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:1214 +#: builtin/submodule--helper.c:1452 msgid "recurse into submodules" msgstr "" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1458 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1278 +#: builtin/submodule--helper.c:1517 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" -#: builtin/submodule--helper.c:1284 +#: builtin/submodule--helper.c:1523 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" @@ -12914,217 +13052,250 @@ msgstr "" msgid "Unpacking objects" msgstr "" -#: builtin/update-index.c:80 +#: builtin/update-index.c:82 #, c-format msgid "failed to create directory %s" msgstr "" -#: builtin/update-index.c:86 +#: builtin/update-index.c:88 #, c-format msgid "failed to stat %s" msgstr "" -#: builtin/update-index.c:96 +#: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" msgstr "" -#: builtin/update-index.c:104 +#: builtin/update-index.c:106 #, c-format msgid "failed to delete file %s" msgstr "" -#: builtin/update-index.c:111 builtin/update-index.c:217 +#: builtin/update-index.c:113 builtin/update-index.c:219 #, c-format msgid "failed to delete directory %s" msgstr "" -#: builtin/update-index.c:136 +#: builtin/update-index.c:138 #, c-format msgid "Testing mtime in '%s' " msgstr "" -#: builtin/update-index.c:150 +#: builtin/update-index.c:152 msgid "directory stat info does not change after adding a new file" msgstr "" -#: builtin/update-index.c:163 +#: builtin/update-index.c:165 msgid "directory stat info does not change after adding a new directory" msgstr "" -#: builtin/update-index.c:176 +#: builtin/update-index.c:178 msgid "directory stat info changes after updating a file" msgstr "" -#: builtin/update-index.c:187 +#: builtin/update-index.c:189 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" -#: builtin/update-index.c:198 +#: builtin/update-index.c:200 msgid "directory stat info does not change after deleting a file" msgstr "" -#: builtin/update-index.c:211 +#: builtin/update-index.c:213 msgid "directory stat info does not change after deleting a directory" msgstr "" -#: builtin/update-index.c:218 +#: builtin/update-index.c:220 msgid " OK" msgstr "" -#: builtin/update-index.c:571 +#: builtin/update-index.c:579 msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:926 +#: builtin/update-index.c:936 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:929 +#: builtin/update-index.c:939 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:932 +#: builtin/update-index.c:942 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:934 +#: builtin/update-index.c:944 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:936 +#: builtin/update-index.c:946 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:938 +#: builtin/update-index.c:948 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:941 +#: builtin/update-index.c:951 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:945 +#: builtin/update-index.c:955 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:949 +#: builtin/update-index.c:959 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:950 +#: builtin/update-index.c:960 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:959 +#: builtin/update-index.c:969 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:962 +#: builtin/update-index.c:972 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:965 +#: builtin/update-index.c:975 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:968 +#: builtin/update-index.c:978 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:971 +#: builtin/update-index.c:981 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:973 +#: builtin/update-index.c:983 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:975 +#: builtin/update-index.c:985 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:977 +#: builtin/update-index.c:987 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:981 +#: builtin/update-index.c:991 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:985 +#: builtin/update-index.c:995 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:989 +#: builtin/update-index.c:999 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:993 +#: builtin/update-index.c:1003 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:996 +#: builtin/update-index.c:1006 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1008 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:1002 +#: builtin/update-index.c:1012 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1014 msgid "enable or disable split index" msgstr "" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1016 msgid "enable/disable untracked cache" msgstr "" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1018 msgid "test if the filesystem supports untracked cache" msgstr "" -#: builtin/update-index.c:1010 +#: builtin/update-index.c:1020 msgid "enable untracked cache without testing the filesystem" msgstr "" -#: builtin/update-index.c:1107 +#: builtin/update-index.c:1022 +msgid "write out the index even if is not flagged as changed" +msgstr "" + +#: builtin/update-index.c:1024 +msgid "enable or disable file system monitor" +msgstr "" + +#: builtin/update-index.c:1026 +msgid "mark files as fsmonitor valid" +msgstr "" + +#: builtin/update-index.c:1029 +msgid "clear fsmonitor valid bit" +msgstr "" + +#: builtin/update-index.c:1127 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" -#: builtin/update-index.c:1116 +#: builtin/update-index.c:1136 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1147 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1151 msgid "Untracked cache disabled" msgstr "" -#: builtin/update-index.c:1139 +#: builtin/update-index.c:1159 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" msgstr "" -#: builtin/update-index.c:1143 +#: builtin/update-index.c:1163 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "" +#: builtin/update-index.c:1171 +msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" +msgstr "" + +#: builtin/update-index.c:1175 +msgid "fsmonitor enabled" +msgstr "" + +#: builtin/update-index.c:1178 +msgid "" +"core.fsmonitor is set; remove it if you really want to disable fsmonitor" +msgstr "" + +#: builtin/update-index.c:1182 +msgid "fsmonitor disabled" +msgstr "" + #: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "" @@ -13193,129 +13364,141 @@ msgstr "" msgid "print tag contents" msgstr "" -#: builtin/worktree.c:16 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<branch>]" msgstr "" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree prune [<options>]" msgstr "" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:46 +#: builtin/worktree.c:58 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "" -#: builtin/worktree.c:52 +#: builtin/worktree.c:64 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "" -#: builtin/worktree.c:57 builtin/worktree.c:66 +#: builtin/worktree.c:69 builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" -#: builtin/worktree.c:76 +#: builtin/worktree.c:88 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " "%<PRIuMAX>)" msgstr "" -#: builtin/worktree.c:84 +#: builtin/worktree.c:96 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "" -#: builtin/worktree.c:100 +#: builtin/worktree.c:112 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" -#: builtin/worktree.c:147 +#: builtin/worktree.c:159 msgid "report pruned working trees" msgstr "" -#: builtin/worktree.c:149 +#: builtin/worktree.c:161 msgid "expire working trees older than <time>" msgstr "" -#: builtin/worktree.c:223 +#: builtin/worktree.c:236 #, c-format msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:254 +#: builtin/worktree.c:267 #, c-format msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:293 +#: builtin/worktree.c:306 #, c-format msgid "Preparing %s (identifier %s)" msgstr "" -#: builtin/worktree.c:345 +#: builtin/worktree.c:368 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:347 +#: builtin/worktree.c:370 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:349 +#: builtin/worktree.c:372 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:351 +#: builtin/worktree.c:374 msgid "populate the new working tree" msgstr "" -#: builtin/worktree.c:352 +#: builtin/worktree.c:375 msgid "keep the new working tree locked" msgstr "" -#: builtin/worktree.c:360 +#: builtin/worktree.c:377 +msgid "set up tracking mode (see git-branch(1))" +msgstr "" + +#: builtin/worktree.c:380 +msgid "try to match the new branch name with a remote-tracking branch" +msgstr "" + +#: builtin/worktree.c:388 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" -#: builtin/worktree.c:499 +#: builtin/worktree.c:453 +msgid "--[no-]track can only be used if a new branch is created" +msgstr "" + +#: builtin/worktree.c:553 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:511 builtin/worktree.c:544 +#: builtin/worktree.c:565 builtin/worktree.c:598 #, c-format msgid "'%s' is not a working tree" msgstr "" -#: builtin/worktree.c:513 builtin/worktree.c:546 +#: builtin/worktree.c:567 builtin/worktree.c:600 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:518 +#: builtin/worktree.c:572 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:520 +#: builtin/worktree.c:574 #, c-format msgid "'%s' is already locked" msgstr "" -#: builtin/worktree.c:548 +#: builtin/worktree.c:602 #, c-format msgid "'%s' is not locked" msgstr "" @@ -13336,23 +13519,23 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: upload-pack.c:23 +#: upload-pack.c:24 msgid "git upload-pack [<options>] <dir>" msgstr "" -#: upload-pack.c:1040 +#: upload-pack.c:1041 msgid "quit after a single request/response exchange" msgstr "" -#: upload-pack.c:1042 +#: upload-pack.c:1043 msgid "exit immediately after initial ref advertisement" msgstr "" -#: upload-pack.c:1044 +#: upload-pack.c:1045 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "" -#: upload-pack.c:1046 +#: upload-pack.c:1047 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "" @@ -13376,20 +13559,20 @@ msgid "" "to read about a specific subcommand or concept." msgstr "" -#: http.c:338 +#: http.c:339 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "" -#: http.c:359 +#: http.c:360 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "" -#: http.c:368 +#: http.c:369 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" -#: http.c:1768 +#: http.c:1791 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -13402,6 +13585,14 @@ msgstr "" msgid "redirecting to %s" msgstr "" +#: list-objects-filter-options.h:54 +msgid "args" +msgstr "" + +#: list-objects-filter-options.h:55 +msgid "object filtering" +msgstr "" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "" @@ -13574,27 +13765,27 @@ msgstr "" msgid "Bad bisect_write argument: $state" msgstr "" -#: git-bisect.sh:262 +#: git-bisect.sh:246 #, sh-format msgid "Bad rev input: $arg" msgstr "" -#: git-bisect.sh:281 +#: git-bisect.sh:265 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "" -#: git-bisect.sh:290 +#: git-bisect.sh:274 #, sh-format msgid "Bad rev input: $rev" msgstr "" -#: git-bisect.sh:299 +#: git-bisect.sh:283 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "" -#: git-bisect.sh:322 +#: git-bisect.sh:306 #, sh-format msgid "Warning: bisecting only with a $TERM_BAD commit." msgstr "" @@ -13602,18 +13793,18 @@ 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:328 +#: git-bisect.sh:312 msgid "Are you sure [Y/n]? " msgstr "" -#: git-bisect.sh:340 +#: git-bisect.sh:324 #, sh-format msgid "" "You need to give me at least one $bad_syn and one $good_syn revision.\n" "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" -#: git-bisect.sh:343 +#: git-bisect.sh:327 #, sh-format msgid "" "You need to start by \"git bisect start\".\n" @@ -13621,91 +13812,76 @@ msgid "" "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" -#: git-bisect.sh:414 git-bisect.sh:546 +#: git-bisect.sh:398 git-bisect.sh:512 msgid "We are not bisecting." msgstr "" -#: git-bisect.sh:421 +#: git-bisect.sh:405 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "" -#: git-bisect.sh:430 +#: git-bisect.sh:414 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" "Try 'git bisect reset <commit>'." msgstr "" -#: git-bisect.sh:458 +#: git-bisect.sh:422 msgid "No logfile given" msgstr "" -#: git-bisect.sh:459 +#: git-bisect.sh:423 #, sh-format msgid "cannot read $file for replaying" msgstr "" -#: git-bisect.sh:480 +#: git-bisect.sh:444 msgid "?? what are you talking about?" msgstr "" -#: git-bisect.sh:492 +#: git-bisect.sh:453 +msgid "bisect run failed: no command provided." +msgstr "" + +#: git-bisect.sh:458 #, sh-format msgid "running $command" msgstr "" -#: git-bisect.sh:499 +#: git-bisect.sh:465 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -#: git-bisect.sh:525 +#: git-bisect.sh:491 msgid "bisect run cannot continue any more" msgstr "" -#: git-bisect.sh:531 +#: git-bisect.sh:497 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" -#: git-bisect.sh:538 +#: git-bisect.sh:504 msgid "bisect run success" msgstr "" -#: git-bisect.sh:565 -msgid "please use two different terms" -msgstr "" - -#: git-bisect.sh:575 -#, sh-format -msgid "'$term' is not a valid term" -msgstr "" - -#: git-bisect.sh:578 -#, sh-format -msgid "can't use the builtin command '$term' as a term" -msgstr "" - -#: git-bisect.sh:587 git-bisect.sh:593 -#, sh-format -msgid "can't change the meaning of term '$term'" -msgstr "" - -#: git-bisect.sh:606 +#: git-bisect.sh:533 #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "" -#: git-bisect.sh:636 +#: git-bisect.sh:567 msgid "no terms defined" msgstr "" -#: git-bisect.sh:653 +#: git-bisect.sh:584 #, sh-format msgid "" "invalid argument $arg for 'git bisect terms'.\n" @@ -13778,7 +13954,7 @@ msgid "The pre-rebase hook refused to rebase." msgstr "" #: git-rebase.sh:219 -msgid "It looks like git-am is in progress. Cannot rebase." +msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" #: git-rebase.sh:363 @@ -13814,7 +13990,7 @@ msgstr "" #: git-rebase.sh:480 #, sh-format -msgid "invalid upstream $upstream_name" +msgid "invalid upstream '$upstream_name'" msgstr "" #: git-rebase.sh:504 @@ -13832,44 +14008,54 @@ msgstr "" msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:539 +#: git-rebase.sh:542 #, sh-format -msgid "fatal: no such branch: $branch_name" +msgid "fatal: no such branch/commit '$branch_name'" msgstr "" -#: git-rebase.sh:572 +#: git-rebase.sh:575 msgid "Cannot autostash" msgstr "" -#: git-rebase.sh:577 +#: git-rebase.sh:580 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "" -#: git-rebase.sh:581 +#: git-rebase.sh:584 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:601 +#: git-rebase.sh:607 +#, sh-format +msgid "HEAD is up to date." +msgstr "" + +#: git-rebase.sh:609 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:605 +#: git-rebase.sh:617 +#, sh-format +msgid "HEAD is up to date, rebase forced." +msgstr "" + +#: git-rebase.sh:619 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:616 +#: git-rebase.sh:631 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" -#: git-rebase.sh:625 +#: git-rebase.sh:640 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:635 +#: git-rebase.sh:650 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -13878,157 +14064,145 @@ msgstr "" msgid "git stash clear with parameters is unimplemented" msgstr "" -#: git-stash.sh:102 +#: git-stash.sh:108 msgid "You do not have the initial commit yet" msgstr "" -#: git-stash.sh:117 +#: git-stash.sh:123 msgid "Cannot save the current index state" msgstr "" -#: git-stash.sh:132 +#: git-stash.sh:138 msgid "Cannot save the untracked files" msgstr "" -#: git-stash.sh:152 git-stash.sh:165 +#: git-stash.sh:158 git-stash.sh:171 msgid "Cannot save the current worktree state" msgstr "" -#: git-stash.sh:169 +#: git-stash.sh:175 msgid "No changes selected" msgstr "" -#: git-stash.sh:172 +#: git-stash.sh:178 msgid "Cannot remove temporary index (can't happen)" msgstr "" -#: git-stash.sh:185 +#: git-stash.sh:191 msgid "Cannot record working tree state" msgstr "" -#: git-stash.sh:217 +#: git-stash.sh:229 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" -#. TRANSLATORS: $option is an invalid option, like -#. `--blah-blah'. The 7 spaces at the beginning of the -#. second line correspond to "error: ". So you should line -#. up the second line with however many characters the -#. translation of "error: " takes in your language. E.g. in -#. English this is: -#. -#. $ git stash save --blah-blah 2>&1 | head -n 2 -#. error: unknown option for 'stash save': --blah-blah -#. To provide a message, use git stash save -- '--blah-blah' -#: git-stash.sh:273 +#: git-stash.sh:281 #, sh-format -msgid "" -"error: unknown option for 'stash save': $option\n" -" To provide a message, use git stash save -- '$option'" +msgid "error: unknown option for 'stash push': $option" msgstr "" -#: git-stash.sh:288 +#: git-stash.sh:295 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" -#: git-stash.sh:296 +#: git-stash.sh:303 msgid "No local changes to save" msgstr "" -#: git-stash.sh:301 +#: git-stash.sh:308 msgid "Cannot initialize stash" msgstr "" -#: git-stash.sh:305 +#: git-stash.sh:312 msgid "Cannot save the current status" msgstr "" -#: git-stash.sh:306 +#: git-stash.sh:313 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "" -#: git-stash.sh:334 +#: git-stash.sh:341 msgid "Cannot remove worktree changes" msgstr "" -#: git-stash.sh:482 +#: git-stash.sh:489 #, sh-format msgid "unknown option: $opt" msgstr "" -#: git-stash.sh:495 +#: git-stash.sh:502 msgid "No stash entries found." msgstr "" -#: git-stash.sh:502 +#: git-stash.sh:509 #, sh-format msgid "Too many revisions specified: $REV" msgstr "" -#: git-stash.sh:517 +#: git-stash.sh:524 #, sh-format msgid "$reference is not a valid reference" msgstr "" -#: git-stash.sh:545 +#: git-stash.sh:552 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "" -#: git-stash.sh:556 +#: git-stash.sh:563 #, sh-format msgid "'$args' is not a stash reference" msgstr "" -#: git-stash.sh:564 +#: git-stash.sh:571 msgid "unable to refresh index" msgstr "" -#: git-stash.sh:568 +#: git-stash.sh:575 msgid "Cannot apply a stash in the middle of a merge" msgstr "" -#: git-stash.sh:576 +#: git-stash.sh:583 msgid "Conflicts in index. Try without --index." msgstr "" -#: git-stash.sh:578 +#: git-stash.sh:585 msgid "Could not save index tree" msgstr "" -#: git-stash.sh:587 +#: git-stash.sh:594 msgid "Could not restore untracked files from stash entry" msgstr "" -#: git-stash.sh:612 +#: git-stash.sh:619 msgid "Cannot unstage modified files" msgstr "" -#: git-stash.sh:627 +#: git-stash.sh:634 msgid "Index was not unstashed." msgstr "" -#: git-stash.sh:641 +#: git-stash.sh:648 msgid "The stash entry is kept in case you need it again." msgstr "" -#: git-stash.sh:650 +#: git-stash.sh:657 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "" -#: git-stash.sh:651 +#: git-stash.sh:658 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "" -#: git-stash.sh:659 +#: git-stash.sh:666 msgid "No branch name specified" msgstr "" -#: git-stash.sh:738 +#: git-stash.sh:745 msgid "(To restore them type \"git stash apply\")" msgstr "" @@ -14233,36 +14407,31 @@ msgstr "" msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:840 +#: git-submodule.sh:828 msgid "The --cached option cannot be used with the --files option" msgstr "" -#: git-submodule.sh:892 +#: git-submodule.sh:880 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:912 +#: git-submodule.sh:900 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:915 +#: git-submodule.sh:903 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:918 +#: git-submodule.sh:906 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:1064 -#, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" -msgstr "" - -#: git-submodule.sh:1136 +#: git-submodule.sh:1077 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "" @@ -14458,15 +14627,15 @@ msgstr "" msgid "Successfully rebased and updated $head_name." msgstr "" -#: git-rebase--interactive.sh:749 +#: git-rebase--interactive.sh:728 msgid "could not detach HEAD" msgstr "" -#: git-rebase--interactive.sh:784 +#: git-rebase--interactive.sh:763 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "" -#: git-rebase--interactive.sh:789 +#: git-rebase--interactive.sh:768 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -14484,21 +14653,21 @@ msgid "" " git rebase --continue\n" msgstr "" -#: git-rebase--interactive.sh:806 +#: git-rebase--interactive.sh:785 msgid "Error trying to find the author identity to amend commit" msgstr "" -#: git-rebase--interactive.sh:811 +#: git-rebase--interactive.sh:790 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820 +#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799 msgid "Could not commit staged changes." msgstr "" -#: git-rebase--interactive.sh:848 +#: git-rebase--interactive.sh:827 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -14507,47 +14676,51 @@ msgid "" "\n" msgstr "" -#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015 +#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995 msgid "Could not execute editor" msgstr "" -#: git-rebase--interactive.sh:869 +#: git-rebase--interactive.sh:848 #, sh-format msgid "Could not checkout $switch_to" msgstr "" -#: git-rebase--interactive.sh:874 +#: git-rebase--interactive.sh:853 msgid "No HEAD?" msgstr "" -#: git-rebase--interactive.sh:875 +#: git-rebase--interactive.sh:854 #, sh-format msgid "Could not create temporary $state_dir" msgstr "" -#: git-rebase--interactive.sh:877 +#: git-rebase--interactive.sh:856 msgid "Could not mark as interactive" msgstr "" -#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892 +#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871 msgid "Could not init rewritten commits" msgstr "" -#: git-rebase--interactive.sh:993 +#: git-rebase--interactive.sh:897 +msgid "Could not generate todo list" +msgstr "" + +#: git-rebase--interactive.sh:973 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "" msgstr[1] "" -#: git-rebase--interactive.sh:998 +#: git-rebase--interactive.sh:978 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" msgstr "" -#: git-rebase--interactive.sh:1005 +#: git-rebase--interactive.sh:985 msgid "Note that empty commits are commented out" msgstr "" @@ -15211,7 +15384,7 @@ msgstr "" msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -#: git-send-email.perl:927 git-send-email.perl:935 +#: git-send-email.perl:929 git-send-email.perl:937 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "" @@ -15219,16 +15392,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:939 +#: git-send-email.perl:941 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" -#: git-send-email.perl:1260 +#: git-send-email.perl:1262 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "" -#: git-send-email.perl:1335 +#: git-send-email.perl:1337 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -15245,128 +15418,128 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1350 +#: git-send-email.perl:1352 msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " msgstr "" -#: git-send-email.perl:1353 +#: git-send-email.perl:1355 msgid "Send this email reply required" msgstr "" -#: git-send-email.perl:1379 +#: git-send-email.perl:1381 msgid "The required SMTP server is not properly defined." msgstr "" -#: git-send-email.perl:1426 +#: git-send-email.perl:1428 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "" -#: git-send-email.perl:1431 git-send-email.perl:1435 +#: git-send-email.perl:1433 git-send-email.perl:1437 #, perl-format msgid "STARTTLS failed! %s" msgstr "" -#: git-send-email.perl:1445 +#: git-send-email.perl:1447 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -#: git-send-email.perl:1463 +#: git-send-email.perl:1465 #, perl-format msgid "Failed to send %s\n" msgstr "" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Dry-Sent %s\n" msgstr "" -#: git-send-email.perl:1466 +#: git-send-email.perl:1468 #, perl-format msgid "Sent %s\n" msgstr "" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "Dry-OK. Log says:\n" msgstr "" -#: git-send-email.perl:1468 +#: git-send-email.perl:1470 msgid "OK. Log says:\n" msgstr "" -#: git-send-email.perl:1480 +#: git-send-email.perl:1482 msgid "Result: " msgstr "" -#: git-send-email.perl:1483 +#: git-send-email.perl:1485 msgid "Result: OK\n" msgstr "" -#: git-send-email.perl:1496 +#: git-send-email.perl:1498 #, perl-format msgid "can't open file %s" msgstr "" -#: git-send-email.perl:1543 git-send-email.perl:1563 +#: git-send-email.perl:1545 git-send-email.perl:1565 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1549 +#: git-send-email.perl:1551 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1597 +#: git-send-email.perl:1599 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1622 +#: git-send-email.perl:1624 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1728 +#: git-send-email.perl:1730 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "" -#: git-send-email.perl:1735 +#: git-send-email.perl:1737 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "" -#: git-send-email.perl:1739 +#: git-send-email.perl:1741 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "" -#: git-send-email.perl:1766 +#: git-send-email.perl:1768 msgid "cannot send message as 7bit" msgstr "" -#: git-send-email.perl:1774 +#: git-send-email.perl:1776 msgid "invalid transfer encoding" msgstr "" -#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873 +#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875 #, perl-format msgid "unable to open %s: %s\n" msgstr "" -#: git-send-email.perl:1815 +#: git-send-email.perl:1817 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "" -#: git-send-email.perl:1831 +#: git-send-email.perl:1833 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1835 +#: git-send-email.perl:1837 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "" |