diff options
| -rw-r--r-- | po/git.pot | 3078 |
1 files changed, 1722 insertions, 1356 deletions
diff --git a/po/git.pot b/po/git.pot index 72ef798cde..c9be5dfebe 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: 2016-03-16 00:16+0800\n" +"POT-Creation-Date: 2016-05-24 23:42+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" @@ -29,7 +29,7 @@ msgid "" "as appropriate to mark resolution and make a commit." msgstr "" -#: advice.c:101 builtin/merge.c:1226 +#: advice.c:101 builtin/merge.c:1238 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" @@ -71,7 +71,7 @@ msgstr "" msgid "archive format" msgstr "" -#: archive.c:430 builtin/log.c:1232 +#: archive.c:430 builtin/log.c:1395 msgid "prefix" msgstr "" @@ -79,9 +79,9 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548 +#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987 +#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153 msgid "file" @@ -115,7 +115,8 @@ msgstr "" msgid "list supported archive formats" msgstr "" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 +#: builtin/submodule--helper.c:776 msgid "repo" msgstr "" @@ -251,11 +252,16 @@ msgstr "" msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:344 +#: branch.c:345 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" +#: branch.c:364 +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "" + #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -266,7 +272,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:87 builtin/commit.c:766 +#: bundle.c:87 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "" @@ -275,10 +281,10 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358 -#: builtin/shortlog.c:170 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875 +#: builtin/merge.c:361 builtin/shortlog.c:170 msgid "revision walk setup failed" msgstr "" @@ -317,21 +323,21 @@ msgstr "" msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:449 +#: bundle.c:451 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:459 +#: bundle.c:463 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:480 +#: bundle.c:491 msgid "index-pack died" msgstr "" @@ -340,8 +346,8 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505 -#: builtin/am.c:2135 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504 +#: builtin/am.c:2134 #, c-format msgid "could not parse %s" msgstr "" @@ -375,21 +381,21 @@ msgstr "" msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:758 config.c:769 +#: config.c:761 config.c:772 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:891 +#: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1220 +#: config.c:1228 msgid "unable to parse command-line config" msgstr "" -#: config.c:1281 +#: config.c:1284 msgid "unknown error occured while reading the configuration files" msgstr "" @@ -408,9 +414,14 @@ msgstr "" msgid "%s has multiple values" msgstr "" +#: config.c:2224 +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "" + #: config.c:2226 #, c-format -msgid "Could not set '%s' to '%s'" +msgid "could not unset '%s'" msgstr "" #: connected.c:69 @@ -418,13 +429,11 @@ msgid "Could not run 'git rev-list'" msgstr "" #: connected.c:89 -#, c-format -msgid "failed write to rev-list: %s" +msgid "failed write to rev-list" msgstr "" -#: connected.c:97 -#, c-format -msgid "failed to close rev-list's stdin: %s" +#: connected.c:96 +msgid "failed to close rev-list's stdin" msgstr "" #: date.c:95 @@ -500,62 +509,62 @@ msgstr[1] "" msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:536 +#: diffcore-rename.c:538 msgid "Performing inexact rename detection" msgstr "" -#: diff.c:115 +#: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:120 +#: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:215 +#: diff.c:225 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:267 +#: diff.c:277 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:2997 +#: diff.c:3007 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:3393 +#: diff.c:3405 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:3556 +#: diff.c:3568 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3570 +#: diff.c:3582 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: dir.c:2004 +#: dir.c:1823 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2123 +#: dir.c:1942 msgid "Untracked cache is disabled on this system or location." msgstr "" -#: gpg-interface.c:166 gpg-interface.c:237 +#: gpg-interface.c:166 gpg-interface.c:235 msgid "could not run gpg." msgstr "" @@ -569,12 +578,12 @@ msgstr "" #: gpg-interface.c:222 #, c-format -msgid "could not create temporary file '%s': %s" +msgid "could not create temporary file '%s'" msgstr "" -#: gpg-interface.c:225 +#: gpg-interface.c:224 #, c-format -msgid "failed writing detached signature to '%s': %s" +msgid "failed writing detached signature to '%s'" msgstr "" #: grep.c:1718 @@ -582,14 +591,14 @@ msgstr "" msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1735 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "'%s': %s" +msgid "failed to stat '%s'" msgstr "" #: grep.c:1746 #, c-format -msgid "'%s': short read %s" +msgid "'%s': short read" msgstr "" #: help.c:205 @@ -648,12 +657,29 @@ msgstr[1] "" msgid "%s: %s - %s" msgstr "" +#: lockfile.c:152 +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" + +#: lockfile.c:160 +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "" + #: merge.c:41 msgid "failed to read the cache" msgstr "" -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376 -#: builtin/checkout.c:587 builtin/clone.c:730 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375 +#: builtin/checkout.c:586 builtin/clone.c:732 msgid "unable to write new index file" msgstr "" @@ -700,7 +726,7 @@ msgstr "" msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:790 builtin/clone.c:374 +#: merge-recursive.c:790 builtin/clone.c:376 #, c-format msgid "failed to open '%s'" msgstr "" @@ -827,7 +853,7 @@ msgstr "" msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1650 git-submodule.sh:1048 +#: merge-recursive.c:1650 git-submodule.sh:941 msgid "submodule" msgstr "" @@ -854,50 +880,50 @@ msgstr "" msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1783 +#: merge-recursive.c:1781 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1800 +#: merge-recursive.c:1798 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1819 +#: merge-recursive.c:1817 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1828 +#: merge-recursive.c:1826 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1858 +#: merge-recursive.c:1856 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1906 +#: merge-recursive.c:1904 msgid "Merging:" msgstr "" -#: merge-recursive.c:1919 +#: merge-recursive.c:1917 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1956 +#: merge-recursive.c:1954 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2013 +#: merge-recursive.c:2011 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2024 builtin/merge.c:646 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831 msgid "Unable to write index." msgstr "" @@ -927,28 +953,28 @@ msgstr "" msgid "unable to parse object: %s" msgstr "" -#: parse-options.c:570 +#: parse-options.c:572 msgid "..." msgstr "" -#: parse-options.c:588 +#: parse-options.c:590 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:592 +#: parse-options.c:594 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:595 +#: parse-options.c:597 #, c-format msgid " %s" msgstr "" -#: parse-options.c:629 +#: parse-options.c:631 msgid "-NUM" msgstr "" @@ -957,7 +983,7 @@ msgstr "" msgid "malformed object name '%s'" msgstr "" -#: path.c:752 +#: path.c:796 #, c-format msgid "Could not make %s writable by group" msgstr "" @@ -1022,7 +1048,7 @@ msgid "" "Perhaps you forgot to add either ':/' or '.' ?" msgstr "" -#: pretty.c:969 +#: pretty.c:971 msgid "unable to parse --pretty format" msgstr "" @@ -1044,23 +1070,23 @@ msgid "" "Using version %i" msgstr "" -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974 -#: builtin/merge.c:984 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: refs/files-backend.c:2374 +#: refs/files-backend.c:2243 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:2377 +#: refs/files-backend.c:2246 #, c-format msgid "could not delete references: %s" msgstr "" -#: refs/files-backend.c:2386 +#: refs/files-backend.c:2255 #, c-format msgid "could not remove reference %s" msgstr "" @@ -1199,93 +1225,93 @@ msgstr "" msgid "malformed object name %s" msgstr "" -#: remote.c:745 +#: remote.c:746 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:749 +#: remote.c:750 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:753 +#: remote.c:754 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:761 +#: remote.c:762 msgid "Internal error" msgstr "" -#: remote.c:1677 remote.c:1720 +#: remote.c:1678 remote.c:1721 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1686 +#: remote.c:1687 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1689 +#: remote.c:1690 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1695 +#: remote.c:1696 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1710 +#: remote.c:1711 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1725 +#: remote.c:1726 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1736 +#: remote.c:1737 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1749 +#: remote.c:1750 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1771 +#: remote.c:1772 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:2073 +#: remote.c:2074 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2077 +#: remote.c:2078 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2080 +#: remote.c:2081 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "" -#: remote.c:2084 +#: remote.c:2085 #, 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:2090 +#: remote.c:2091 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2093 +#: remote.c:2094 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -1293,11 +1319,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2101 +#: remote.c:2102 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2104 +#: remote.c:2105 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -1308,20 +1334,20 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2114 +#: remote.c:2115 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: revision.c:2131 +#: revision.c:2142 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2134 +#: revision.c:2145 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2328 +#: revision.c:2339 msgid "--first-parent is incompatible with --bisect" msgstr "" @@ -1365,7 +1391,7 @@ msgid "" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:190 sequencer.c:833 sequencer.c:913 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912 #, c-format msgid "Could not write to %s" msgstr "" @@ -1523,12 +1549,12 @@ msgstr "" msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:835 sequencer.c:917 +#: sequencer.c:835 sequencer.c:916 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:854 sequencer.c:987 +#: sequencer.c:854 sequencer.c:986 msgid "no cherry-pick or revert in progress" msgstr "" @@ -1540,63 +1566,72 @@ msgstr "" msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:878 builtin/apply.c:4287 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851 #, c-format -msgid "cannot open %s: %s" +msgid "cannot open %s" msgstr "" -#: sequencer.c:881 +#: sequencer.c:880 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:882 +#: sequencer.c:881 msgid "unexpected end of file" msgstr "" -#: sequencer.c:888 +#: sequencer.c:887 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:910 +#: sequencer.c:909 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1055 +#: sequencer.c:1054 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:1058 +#: sequencer.c:1057 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:1092 +#: sequencer.c:1091 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1093 +#: sequencer.c:1092 msgid "Can't cherry-pick into empty head" msgstr "" -#: setup.c:246 +#: setup.c:248 #, c-format msgid "failed to read %s" msgstr "" +#: setup.c:468 +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "" + +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "" + #: sha1_file.c:1080 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: sha1_file.c:2459 +#: sha1_file.c:2458 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: sha1_file.c:2463 +#: sha1_file.c:2462 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -1614,29 +1649,38 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: submodule.c:62 submodule.c:96 +#: submodule.c:64 submodule.c:98 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: submodule.c:66 submodule.c:100 +#: submodule.c:68 submodule.c:102 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule.c:74 +#: submodule.c:76 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#: submodule.c:107 +#: submodule.c:109 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:118 +#: submodule.c:120 msgid "staging updated .gitmodules failed" msgstr "" +#: submodule.c:177 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "" + +#: submodule-config.c:355 +#, c-format +msgid "invalid value for %s" +msgstr "" + #: trailer.c:237 #, c-format msgid "running trailer command '%s' failed" @@ -1696,7 +1740,175 @@ msgstr "" msgid "Could not read ref %s" msgstr "" -#: unpack-trees.c:203 +#: unpack-trees.c:64 +#, 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 can switch branches." +msgstr "" + +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:69 +#, 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 can merge." +msgstr "" + +#: unpack-trees.c:71 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:74 +#, 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 can %s." +msgstr "" + +#: unpack-trees.c:76 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:81 +#, c-format +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" + +#: unpack-trees.c:85 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" + +#: unpack-trees.c:87 +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:90 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" + +#: unpack-trees.c:92 +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:95 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" + +#: unpack-trees.c:97 +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:102 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you can switch branches." +msgstr "" + +#: unpack-trees.c:104 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:107 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you can merge." +msgstr "" + +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you can %s." +msgstr "" + +#: unpack-trees.c:114 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "" + +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" + +#: unpack-trees.c:126 +#, c-format +msgid "" +"The following Working tree files would be overwritten by sparse checkout " +"update:\n" +"%s" +msgstr "" + +#: unpack-trees.c:128 +#, c-format +msgid "" +"The following Working tree files would be removed by sparse checkout " +"update:\n" +"%s" +msgstr "" + +#: unpack-trees.c:205 +#, c-format +msgid "Aborting\n" +msgstr "" + +#: unpack-trees.c:237 msgid "Checking out files" msgstr "" @@ -1734,230 +1946,226 @@ msgstr "" msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:224 wrapper.c:383 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "" -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691 -#: builtin/merge.c:1075 builtin/pull.c:387 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086 +#: builtin/pull.c:407 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: wrapper.c:611 -#, c-format -msgid "unable to access '%s': %s" -msgstr "" - -#: wrapper.c:632 +#: wrapper.c:594 wrapper.c:615 #, c-format msgid "unable to access '%s'" msgstr "" -#: wrapper.c:640 +#: wrapper.c:623 msgid "unable to get current working directory" msgstr "" -#: wrapper.c:667 +#: wrapper.c:650 #, c-format msgid "could not open %s for writing" msgstr "" -#: wrapper.c:678 builtin/am.c:410 +#: wrapper.c:661 builtin/am.c:410 #, c-format msgid "could not write to %s" msgstr "" -#: wrapper.c:684 +#: wrapper.c:667 #, c-format msgid "could not close %s" msgstr "" -#: wt-status.c:149 +#: wt-status.c:150 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:176 wt-status.c:203 +#: wt-status.c:177 wt-status.c:204 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:179 wt-status.c:206 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" -#: wt-status.c:182 +#: wt-status.c:183 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:184 wt-status.c:188 +#: wt-status.c:185 wt-status.c:189 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:186 +#: wt-status.c:187 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" -#: wt-status.c:197 wt-status.c:880 +#: wt-status.c:198 wt-status.c:881 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:215 wt-status.c:889 +#: wt-status.c:216 wt-status.c:890 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:219 +#: wt-status.c:220 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:221 +#: wt-status.c:222 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" -#: wt-status.c:222 +#: wt-status.c:223 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:224 +#: wt-status.c:225 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:236 +#: wt-status.c:237 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" -#: wt-status.c:251 +#: wt-status.c:252 msgid "both deleted:" msgstr "" -#: wt-status.c:253 +#: wt-status.c:254 msgid "added by us:" msgstr "" -#: wt-status.c:255 +#: wt-status.c:256 msgid "deleted by them:" msgstr "" -#: wt-status.c:257 +#: wt-status.c:258 msgid "added by them:" msgstr "" -#: wt-status.c:259 +#: wt-status.c:260 msgid "deleted by us:" msgstr "" -#: wt-status.c:261 +#: wt-status.c:262 msgid "both added:" msgstr "" -#: wt-status.c:263 +#: wt-status.c:264 msgid "both modified:" msgstr "" -#: wt-status.c:265 +#: wt-status.c:266 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "" -#: wt-status.c:273 +#: wt-status.c:274 msgid "new file:" msgstr "" -#: wt-status.c:275 +#: wt-status.c:276 msgid "copied:" msgstr "" -#: wt-status.c:277 +#: wt-status.c:278 msgid "deleted:" msgstr "" -#: wt-status.c:279 +#: wt-status.c:280 msgid "modified:" msgstr "" -#: wt-status.c:281 +#: wt-status.c:282 msgid "renamed:" msgstr "" -#: wt-status.c:283 +#: wt-status.c:284 msgid "typechange:" msgstr "" -#: wt-status.c:285 +#: wt-status.c:286 msgid "unknown:" msgstr "" -#: wt-status.c:287 +#: wt-status.c:288 msgid "unmerged:" msgstr "" -#: wt-status.c:369 +#: wt-status.c:370 msgid "new commits, " msgstr "" -#: wt-status.c:371 +#: wt-status.c:372 msgid "modified content, " msgstr "" -#: wt-status.c:373 +#: wt-status.c:374 msgid "untracked content, " msgstr "" -#: wt-status.c:390 +#: wt-status.c:391 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:754 +#: wt-status.c:755 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:756 +#: wt-status.c:757 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:837 +#: wt-status.c:838 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" -#: wt-status.c:948 +#: wt-status.c:949 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:951 +#: wt-status.c:952 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:954 +#: wt-status.c:956 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:957 +#: wt-status.c:959 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:967 +#: wt-status.c:969 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:970 +#: wt-status.c:972 msgid "The current patch is empty." msgstr "" -#: wt-status.c:974 +#: wt-status.c:976 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:976 +#: wt-status.c:978 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:978 +#: wt-status.c:980 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" @@ -2096,43 +2304,43 @@ msgstr "" msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1438 +#: wt-status.c:1460 msgid "On branch " msgstr "" -#: wt-status.c:1444 +#: wt-status.c:1466 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1446 +#: wt-status.c:1468 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1451 +#: wt-status.c:1473 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1453 +#: wt-status.c:1475 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1456 +#: wt-status.c:1478 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1474 +#: wt-status.c:1496 msgid "Initial commit" msgstr "" -#: wt-status.c:1488 +#: wt-status.c:1510 msgid "Untracked files" msgstr "" -#: wt-status.c:1490 +#: wt-status.c:1512 msgid "Ignored files" msgstr "" -#: wt-status.c:1494 +#: wt-status.c:1516 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -2140,82 +2348,82 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1500 +#: wt-status.c:1522 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1502 +#: wt-status.c:1524 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1508 +#: wt-status.c:1530 msgid "No changes" msgstr "" -#: wt-status.c:1513 +#: wt-status.c:1535 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1516 +#: wt-status.c:1538 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1519 +#: wt-status.c:1541 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1522 +#: wt-status.c:1544 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1525 +#: wt-status.c:1547 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1528 wt-status.c:1533 +#: wt-status.c:1550 wt-status.c:1555 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1531 +#: wt-status.c:1553 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1535 +#: wt-status.c:1557 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1642 +#: wt-status.c:1664 msgid "Initial commit on " msgstr "" -#: wt-status.c:1646 +#: wt-status.c:1668 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1675 +#: wt-status.c:1697 msgid "gone" msgstr "" -#: wt-status.c:1677 wt-status.c:1685 +#: wt-status.c:1699 wt-status.c:1707 msgid "behind " msgstr "" -#: wt-status.c:1680 wt-status.c:1683 +#: wt-status.c:1702 wt-status.c:1705 msgid "ahead " msgstr "" -#: compat/precompose_utf8.c:57 builtin/clone.c:413 +#: compat/precompose_utf8.c:57 builtin/clone.c:415 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -2229,7 +2437,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:70 builtin/commit.c:278 +#: builtin/add.c:70 builtin/commit.c:280 msgid "updating files failed" msgstr "" @@ -2242,7 +2450,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:194 builtin/rev-parse.c:797 +#: builtin/add.c:194 builtin/rev-parse.c:811 msgid "Could not read the index" msgstr "" @@ -2278,14 +2486,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "" -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114 msgid "be verbose" msgstr "" @@ -2293,7 +2501,7 @@ msgstr "" msgid "interactive picking" msgstr "" -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286 msgid "select hunks interactively" msgstr "" @@ -2361,16 +2569,16 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:35 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:240 msgid "index file corrupt" msgstr "" -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "" -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089 #, c-format msgid "could not read '%s'" msgstr "" @@ -2398,16 +2606,6 @@ msgstr "" msgid "fseek failed" msgstr "" -#: builtin/am.c:772 builtin/am.c:860 -#, c-format -msgid "could not open '%s' for reading: %s" -msgstr "" - -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "" - #: builtin/am.c:788 #, c-format msgid "could not parse patch '%s'" @@ -2417,109 +2615,109 @@ msgstr "" msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:901 +#: builtin/am.c:900 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:904 builtin/am.c:912 +#: builtin/am.c:903 builtin/am.c:911 msgid "invalid Date line" msgstr "" -#: builtin/am.c:909 +#: builtin/am.c:908 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:996 +#: builtin/am.c:995 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:1001 builtin/clone.c:378 +#: builtin/am.c:1000 builtin/clone.c:380 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:1005 +#: builtin/am.c:1004 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1137 builtin/commit.c:363 +#: builtin/am.c:1136 builtin/commit.c:365 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1188 +#: builtin/am.c:1187 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1189 +#: builtin/am.c:1188 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1190 +#: builtin/am.c:1189 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1328 +#: builtin/am.c:1327 msgid "Patch is empty. Was it split wrong?" msgstr "" -#: builtin/am.c:1402 builtin/log.c:1350 +#: builtin/am.c:1401 builtin/log.c:1516 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/am.c:1429 +#: builtin/am.c:1428 #, c-format msgid "unable to parse commit %s" msgstr "" -#: builtin/am.c:1631 +#: builtin/am.c:1630 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1633 +#: builtin/am.c:1632 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1652 +#: builtin/am.c:1651 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1658 +#: builtin/am.c:1657 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1673 +#: builtin/am.c:1672 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1697 builtin/merge.c:633 +#: builtin/am.c:1696 builtin/merge.c:636 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/am.c:1704 +#: builtin/am.c:1703 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830 -#: builtin/merge.c:855 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841 +#: builtin/merge.c:866 msgid "failed to write commit object" msgstr "" -#: builtin/am.c:1749 builtin/am.c:1753 +#: builtin/am.c:1748 builtin/am.c:1752 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1769 +#: builtin/am.c:1768 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: builtin/am.c:1774 +#: builtin/am.c:1773 msgid "Commit Body is:" msgstr "" @@ -2527,231 +2725,233 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1784 +#: builtin/am.c:1783 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1834 +#: builtin/am.c:1833 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1869 builtin/am.c:1941 +#: builtin/am.c:1868 builtin/am.c:1940 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1885 +#: builtin/am.c:1884 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1893 +#: builtin/am.c:1892 #, c-format msgid "Patch failed at %s %.*s" msgstr "" -#: builtin/am.c:1899 +#: builtin/am.c:1898 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "" -#: builtin/am.c:1944 +#: builtin/am.c:1943 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:1951 +#: builtin/am.c:1950 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" msgstr "" -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/am.c:2111 +#: builtin/am.c:2110 msgid "failed to clean index" msgstr "" -#: builtin/am.c:2145 +#: builtin/am.c:2144 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "" -#: builtin/am.c:2206 +#: builtin/am.c:2205 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "" -#: builtin/am.c:2239 +#: builtin/am.c:2238 msgid "git am [<options>] [(<mbox>|<Maildir>)...]" msgstr "" -#: builtin/am.c:2240 +#: builtin/am.c:2239 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "" -#: builtin/am.c:2246 +#: builtin/am.c:2245 msgid "run interactively" msgstr "" -#: builtin/am.c:2248 +#: builtin/am.c:2247 msgid "historical option -- no-op" msgstr "" -#: builtin/am.c:2250 +#: builtin/am.c:2249 msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "" -#: builtin/am.c:2253 +#: builtin/am.c:2252 msgid "add a Signed-off-by line to the commit message" msgstr "" -#: builtin/am.c:2256 +#: builtin/am.c:2255 msgid "recode into utf8 (default)" msgstr "" -#: builtin/am.c:2258 +#: builtin/am.c:2257 msgid "pass -k flag to git-mailinfo" msgstr "" -#: builtin/am.c:2260 +#: builtin/am.c:2259 msgid "pass -b flag to git-mailinfo" msgstr "" -#: builtin/am.c:2262 +#: builtin/am.c:2261 msgid "pass -m flag to git-mailinfo" msgstr "" -#: builtin/am.c:2264 +#: builtin/am.c:2263 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "" -#: builtin/am.c:2267 +#: builtin/am.c:2266 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -#: builtin/am.c:2270 +#: builtin/am.c:2269 msgid "strip everything before a scissors line" msgstr "" -#: builtin/am.c:2271 builtin/apply.c:4544 +#: builtin/am.c:2270 builtin/apply.c:4546 msgid "action" msgstr "" -#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281 -#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293 -#: builtin/am.c:2299 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 +#: builtin/am.c:2298 msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2280 builtin/apply.c:4568 +#: builtin/am.c:2279 builtin/apply.c:4570 msgid "root" msgstr "" -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95 -#: builtin/pull.c:171 builtin/submodule--helper.c:72 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163 +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95 +#: builtin/pull.c:179 builtin/submodule--helper.c:277 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767 +#: builtin/submodule--helper.c:770 msgid "path" msgstr "" -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182 +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134 +#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340 #: parse-options.h:132 parse-options.h:134 parse-options.h:244 msgid "n" msgstr "" -#: builtin/am.c:2292 builtin/apply.c:4512 +#: builtin/am.c:2291 builtin/apply.c:4514 msgid "num" msgstr "" -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438 #: builtin/tag.c:372 msgid "format" msgstr "" -#: builtin/am.c:2296 +#: builtin/am.c:2295 msgid "format the patch(es) are in" msgstr "" -#: builtin/am.c:2302 +#: builtin/am.c:2301 msgid "override error message when patch failure occurs" msgstr "" -#: builtin/am.c:2304 +#: builtin/am.c:2303 msgid "continue applying patches after resolving a conflict" msgstr "" -#: builtin/am.c:2307 +#: builtin/am.c:2306 msgid "synonyms for --continue" msgstr "" -#: builtin/am.c:2310 +#: builtin/am.c:2309 msgid "skip the current patch" msgstr "" -#: builtin/am.c:2313 +#: builtin/am.c:2312 msgid "restore the original branch and abort the patching operation." msgstr "" -#: builtin/am.c:2317 +#: builtin/am.c:2316 msgid "lie about committer date" msgstr "" -#: builtin/am.c:2319 +#: builtin/am.c:2318 msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 msgid "key-id" msgstr "" -#: builtin/am.c:2322 +#: builtin/am.c:2321 msgid "GPG-sign commits" msgstr "" -#: builtin/am.c:2325 +#: builtin/am.c:2324 msgid "(internal use for git-rebase)" msgstr "" -#: builtin/am.c:2340 +#: builtin/am.c:2339 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:2347 +#: builtin/am.c:2346 msgid "failed to read the index" msgstr "" -#: builtin/am.c:2362 +#: builtin/am.c:2361 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -#: builtin/am.c:2386 +#: builtin/am.c:2385 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" -#: builtin/am.c:2392 +#: builtin/am.c:2391 msgid "Resolve operation not in progress, we are not resuming." msgstr "" @@ -2784,37 +2984,37 @@ msgstr "" msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:940 +#: builtin/apply.c:937 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:944 +#: builtin/apply.c:942 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: builtin/apply.c:945 +#: builtin/apply.c:943 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:952 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1415 +#: builtin/apply.c:1406 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1472 +#: builtin/apply.c:1463 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1489 +#: builtin/apply.c:1480 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -2825,396 +3025,406 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1655 +#: builtin/apply.c:1646 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1657 +#: builtin/apply.c:1648 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1683 +#: builtin/apply.c:1674 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1719 +#: builtin/apply.c:1710 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1721 +#: builtin/apply.c:1712 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1724 +#: builtin/apply.c:1715 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1870 +#: builtin/apply.c:1861 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: builtin/apply.c:1899 +#: builtin/apply.c:1895 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:2050 +#: builtin/apply.c:2048 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2140 +#: builtin/apply.c:2138 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2144 +#: builtin/apply.c:2142 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2777 +#: builtin/apply.c:2775 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2896 +#: builtin/apply.c:2894 #, 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] "" -#: builtin/apply.c:2908 +#: builtin/apply.c:2906 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2914 +#: builtin/apply.c:2912 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2934 +#: builtin/apply.c:2932 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:3035 +#: builtin/apply.c:3033 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:3041 +#: builtin/apply.c:3039 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:3062 +#: builtin/apply.c:3060 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3186 +#: builtin/apply.c:3184 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3239 +#: builtin/apply.c:3237 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: builtin/apply.c:3267 builtin/apply.c:3489 +#: builtin/apply.c:3265 builtin/apply.c:3487 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3348 builtin/apply.c:3503 +#: builtin/apply.c:3346 builtin/apply.c:3501 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3357 builtin/apply.c:3511 +#: builtin/apply.c:3355 builtin/apply.c:3509 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3459 +#: builtin/apply.c:3457 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3528 +#: builtin/apply.c:3526 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3530 +#: builtin/apply.c:3528 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3689 builtin/apply.c:3691 +#: builtin/apply.c:3687 builtin/apply.c:3689 #, c-format msgid "invalid path '%s'" msgstr "" -#: builtin/apply.c:3746 +#: builtin/apply.c:3744 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3749 +#: builtin/apply.c:3747 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3769 +#: builtin/apply.c:3767 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3774 +#: builtin/apply.c:3772 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3794 +#: builtin/apply.c:3792 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: builtin/apply.c:3798 +#: builtin/apply.c:3796 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3812 +#: builtin/apply.c:3810 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:4048 +#: builtin/apply.c:4046 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:4077 +#: builtin/apply.c:4075 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: builtin/apply.c:4081 +#: builtin/apply.c:4079 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:4086 +#: builtin/apply.c:4084 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:4089 builtin/apply.c:4197 +#: builtin/apply.c:4087 builtin/apply.c:4195 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:4122 +#: builtin/apply.c:4120 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:4171 +#: builtin/apply.c:4169 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:4258 +#: builtin/apply.c:4256 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:4266 +#: builtin/apply.c:4264 msgid "internal error" msgstr "" -#: builtin/apply.c:4269 +#: builtin/apply.c:4267 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4279 +#: builtin/apply.c:4277 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4300 +#: builtin/apply.c:4285 +#, c-format +msgid "cannot open %s: %s" +msgstr "" + +#: builtin/apply.c:4298 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4303 +#: builtin/apply.c:4301 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4393 +#: builtin/apply.c:4387 +#, c-format +msgid "Skipped patch '%s'." +msgstr "" + +#: builtin/apply.c:4395 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4404 +#: builtin/apply.c:4406 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4507 +#: builtin/apply.c:4509 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4510 +#: builtin/apply.c:4512 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4513 +#: builtin/apply.c:4515 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4516 +#: builtin/apply.c:4518 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4518 +#: builtin/apply.c:4520 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4522 +#: builtin/apply.c:4524 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4524 +#: builtin/apply.c:4526 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4526 +#: builtin/apply.c:4528 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4528 +#: builtin/apply.c:4530 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4530 +#: builtin/apply.c:4532 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4532 +#: builtin/apply.c:4534 msgid "accept a patch that touches outside the working area" msgstr "" -#: builtin/apply.c:4534 +#: builtin/apply.c:4536 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4536 +#: builtin/apply.c:4538 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4538 +#: builtin/apply.c:4540 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4543 +#: builtin/apply.c:4545 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4545 +#: builtin/apply.c:4547 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4548 builtin/apply.c:4551 +#: builtin/apply.c:4550 builtin/apply.c:4553 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4554 +#: builtin/apply.c:4556 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4556 +#: builtin/apply.c:4558 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4558 +#: builtin/apply.c:4560 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4560 +#: builtin/apply.c:4562 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4563 +#: builtin/apply.c:4565 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4566 +#: builtin/apply.c:4568 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4569 +#: builtin/apply.c:4571 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4591 +#: builtin/apply.c:4593 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4599 +#: builtin/apply.c:4601 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4602 +#: builtin/apply.c:4604 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4621 +#: builtin/apply.c:4623 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4635 +#: builtin/apply.c:4637 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4641 builtin/apply.c:4651 +#: builtin/apply.c:4643 builtin/apply.c:4653 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -3280,99 +3490,99 @@ msgstr "" msgid "Blaming lines" msgstr "" -#: builtin/blame.c:2530 +#: builtin/blame.c:2531 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2531 +#: builtin/blame.c:2532 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2532 +#: builtin/blame.c:2533 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2533 +#: builtin/blame.c:2534 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2534 +#: builtin/blame.c:2535 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:2535 +#: builtin/blame.c:2536 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2536 +#: builtin/blame.c:2537 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2537 +#: builtin/blame.c:2538 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2538 +#: builtin/blame.c:2539 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2539 +#: builtin/blame.c:2540 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2540 +#: builtin/blame.c:2541 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2541 +#: builtin/blame.c:2542 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2542 +#: builtin/blame.c:2543 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2543 +#: builtin/blame.c:2544 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2544 +#: builtin/blame.c:2545 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2545 +#: builtin/blame.c:2546 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2546 +#: builtin/blame.c:2547 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2547 +#: builtin/blame.c:2548 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2548 +#: builtin/blame.c:2549 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2549 builtin/blame.c:2550 +#: builtin/blame.c:2550 builtin/blame.c:2551 msgid "score" msgstr "" -#: builtin/blame.c:2549 +#: builtin/blame.c:2550 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2550 +#: builtin/blame.c:2551 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "n,m" msgstr "" -#: builtin/blame.c:2551 +#: builtin/blame.c:2552 msgid "Process only line range n,m, counting from 1" msgstr "" @@ -3382,392 +3592,413 @@ msgstr "" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2640 +#: builtin/blame.c:2641 msgid "4 years, 11 months ago" msgstr "" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "" -#: builtin/branch.c:142 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:146 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -#: builtin/branch.c:160 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:164 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -#: builtin/branch.c:177 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:205 +#: builtin/branch.c:206 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:211 +#: builtin/branch.c:212 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:219 +#: builtin/branch.c:226 #, c-format -msgid "Cannot delete the branch '%s' which you are currently on." +msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "" -#: builtin/branch.c:235 +#: builtin/branch.c:241 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "" -#: builtin/branch.c:236 +#: builtin/branch.c:242 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:251 +#: builtin/branch.c:257 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "" -#: builtin/branch.c:252 +#: builtin/branch.c:258 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:259 +#: builtin/branch.c:265 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:260 +#: builtin/branch.c:266 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:303 +#: builtin/branch.c:309 #, c-format msgid "[%s: gone]" msgstr "" -#: builtin/branch.c:308 +#: builtin/branch.c:314 #, c-format msgid "[%s]" msgstr "" -#: builtin/branch.c:313 +#: builtin/branch.c:319 #, c-format msgid "[%s: behind %d]" msgstr "" -#: builtin/branch.c:315 +#: builtin/branch.c:321 #, c-format msgid "[behind %d]" msgstr "" -#: builtin/branch.c:319 +#: builtin/branch.c:325 #, c-format msgid "[%s: ahead %d]" msgstr "" -#: builtin/branch.c:321 +#: builtin/branch.c:327 #, c-format msgid "[ahead %d]" msgstr "" -#: builtin/branch.c:324 +#: builtin/branch.c:330 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:327 +#: builtin/branch.c:333 #, c-format msgid "[ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:340 +#: builtin/branch.c:346 msgid " **** invalid ref ****" msgstr "" -#: builtin/branch.c:366 +#: builtin/branch.c:372 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: builtin/branch.c:369 +#: builtin/branch.c:375 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" -#: builtin/branch.c:375 +#. TRANSLATORS: make sure this matches +#. "HEAD detached at " in wt-status.c +#: builtin/branch.c:381 #, c-format msgid "(HEAD detached at %s)" msgstr "" -#: builtin/branch.c:378 +#. TRANSLATORS: make sure this matches +#. "HEAD detached from " in wt-status.c +#: builtin/branch.c:386 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: builtin/branch.c:382 +#: builtin/branch.c:390 msgid "(no branch)" msgstr "" -#: builtin/branch.c:524 +#: builtin/branch.c:541 +#, c-format +msgid "Branch %s is being rebased at %s" +msgstr "" + +#: builtin/branch.c:545 +#, c-format +msgid "Branch %s is being bisected at %s" +msgstr "" + +#: builtin/branch.c:560 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:534 +#: builtin/branch.c:570 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:549 +#: builtin/branch.c:587 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:553 +#: builtin/branch.c:591 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:557 +#: builtin/branch.c:594 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:564 +#: builtin/branch.c:601 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:586 -#, c-format -msgid "could not write branch description template: %s" +#: builtin/branch.c:623 +msgid "could not write branch description template" msgstr "" -#: builtin/branch.c:615 +#: builtin/branch.c:651 msgid "Generic options" msgstr "" -#: builtin/branch.c:617 +#: builtin/branch.c:653 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:618 +#: builtin/branch.c:654 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:619 +#: builtin/branch.c:655 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:621 +#: builtin/branch.c:657 msgid "change upstream info" msgstr "" -#: builtin/branch.c:625 +#: builtin/branch.c:659 +msgid "upstream" +msgstr "" + +#: builtin/branch.c:659 +msgid "change the upstream info" +msgstr "" + +#: builtin/branch.c:661 msgid "use colored output" msgstr "" -#: builtin/branch.c:626 +#: builtin/branch.c:662 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:628 builtin/branch.c:629 +#: builtin/branch.c:664 builtin/branch.c:665 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:632 +#: builtin/branch.c:668 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:633 +#: builtin/branch.c:669 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:635 +#: builtin/branch.c:671 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:636 +#: builtin/branch.c:672 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:637 +#: builtin/branch.c:673 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:638 +#: builtin/branch.c:674 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:639 +#: builtin/branch.c:675 msgid "list branch names" msgstr "" -#: builtin/branch.c:640 +#: builtin/branch.c:676 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:642 +#: builtin/branch.c:678 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:643 +#: builtin/branch.c:679 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:644 +#: builtin/branch.c:680 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:645 +#: builtin/branch.c:681 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:646 +#: builtin/branch.c:682 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 msgid "key" msgstr "" -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 msgid "field name to sort on" msgstr "" -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567 #: builtin/tag.c:369 msgid "object" msgstr "" -#: builtin/branch.c:651 +#: builtin/branch.c:687 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:669 +#: builtin/branch.c:705 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:673 builtin/clone.c:705 +#: builtin/branch.c:709 builtin/clone.c:707 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:693 +#: builtin/branch.c:729 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:704 builtin/branch.c:746 +#: builtin/branch.c:740 builtin/branch.c:782 msgid "branch name required" msgstr "" -#: builtin/branch.c:722 +#: builtin/branch.c:758 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:727 +#: builtin/branch.c:763 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:734 +#: builtin/branch.c:770 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:737 +#: builtin/branch.c:773 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:752 +#: builtin/branch.c:788 msgid "too many branches for a rename operation" msgstr "" -#: builtin/branch.c:757 +#: builtin/branch.c:793 msgid "too many branches to set new upstream" msgstr "" -#: builtin/branch.c:761 +#: builtin/branch.c:797 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:768 +#: builtin/branch.c:804 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:780 +#: builtin/branch.c:816 msgid "too many branches to unset upstream" msgstr "" -#: builtin/branch.c:784 +#: builtin/branch.c:820 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:790 +#: builtin/branch.c:826 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:804 +#: builtin/branch.c:840 msgid "it does not make sense to create 'HEAD' manually" msgstr "" -#: builtin/branch.c:810 +#: builtin/branch.c:846 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:813 +#: builtin/branch.c:849 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" -#: builtin/branch.c:830 +#: builtin/branch.c:866 #, c-format msgid "" "\n" @@ -3775,16 +4006,6 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:831 -#, c-format -msgid " git branch -d %s\n" -msgstr "" - -#: builtin/branch.c:832 -#, c-format -msgid " git branch --set-upstream-to %s\n" -msgstr "" - #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" @@ -3880,7 +4101,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "" @@ -3970,8 +4191,9 @@ msgid "write the content to temporary files" msgstr "" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500 +#: builtin/submodule--helper.c:774 msgid "string" msgstr "" @@ -4021,79 +4243,79 @@ msgstr "" msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257 -#: builtin/checkout.c:260 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 +#: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:263 builtin/checkout.c:266 +#: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:269 +#: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:280 builtin/checkout.c:474 +#: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:496 +#: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:623 +#: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:661 +#: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:665 builtin/clone.c:659 +#: builtin/checkout.c:664 builtin/clone.c:661 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:669 +#: builtin/checkout.c:668 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:676 +#: builtin/checkout.c:675 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:678 builtin/checkout.c:1068 +#: builtin/checkout.c:677 builtin/checkout.c:1067 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:680 +#: builtin/checkout.c:679 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:732 +#: builtin/checkout.c:731 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:738 +#: builtin/checkout.c:737 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4108,7 +4330,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:757 +#: builtin/checkout.c:756 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -4125,162 +4347,162 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:793 +#: builtin/checkout.c:792 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:797 +#: builtin/checkout.c:796 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:824 builtin/checkout.c:1063 +#: builtin/checkout.c:823 builtin/checkout.c:1062 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:969 +#: builtin/checkout.c:968 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:1009 builtin/worktree.c:211 +#: builtin/checkout.c:1008 builtin/worktree.c:212 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1076 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1080 builtin/checkout.c:1084 +#: builtin/checkout.c:1079 builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096 -#: builtin/checkout.c:1099 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095 +#: builtin/checkout.c:1098 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1103 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318 -#: builtin/worktree.c:320 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323 +#: builtin/worktree.c:325 msgid "branch" msgstr "" -#: builtin/checkout.c:1138 +#: builtin/checkout.c:1137 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1140 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1145 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1150 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1152 builtin/merge.c:227 +#: builtin/checkout.c:1151 builtin/merge.c:230 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250 msgid "style" msgstr "" -#: builtin/checkout.c:1154 +#: builtin/checkout.c:1153 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1156 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1192 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1210 +#: builtin/checkout.c:1209 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1215 +#: builtin/checkout.c:1214 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1250 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1258 +#: builtin/checkout.c:1257 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:1263 +#: builtin/checkout.c:1262 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1267 +#: builtin/checkout.c:1266 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -4410,8 +4632,8 @@ msgstr "" msgid "remove whole directories" msgstr "" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182 msgid "pattern" msgstr "" @@ -4447,286 +4669,290 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:60 +#: builtin/clone.c:62 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:65 +#: builtin/clone.c:67 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:67 +#: builtin/clone.c:69 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:69 +#: builtin/clone.c:71 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:71 +#: builtin/clone.c:73 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:73 builtin/clone.c:75 +#: builtin/clone.c:75 builtin/clone.c:77 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:76 builtin/init-db.c:466 +#: builtin/clone.c:79 +msgid "number of submodules cloned in parallel" +msgstr "" + +#: builtin/clone.c:80 builtin/init-db.c:470 msgid "template-directory" msgstr "" -#: builtin/clone.c:77 builtin/init-db.c:467 +#: builtin/clone.c:81 builtin/init-db.c:471 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:79 builtin/submodule--helper.c:173 +#: builtin/clone.c:83 builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:777 msgid "reference repository" msgstr "" -#: builtin/clone.c:81 +#: builtin/clone.c:85 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "" -#: builtin/clone.c:83 +#: builtin/clone.c:87 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:85 +#: builtin/clone.c:89 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:87 +#: builtin/clone.c:91 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665 -#: builtin/pull.c:193 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667 +#: builtin/pull.c:201 msgid "depth" msgstr "" -#: builtin/clone.c:89 +#: builtin/clone.c:93 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:91 +#: builtin/clone.c:95 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:92 builtin/init-db.c:475 +#: builtin/clone.c:97 +msgid "any cloned submodules will be shallow" +msgstr "" + +#: builtin/clone.c:98 builtin/init-db.c:479 msgid "gitdir" msgstr "" -#: builtin/clone.c:93 builtin/init-db.c:476 +#: builtin/clone.c:99 builtin/init-db.c:480 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:94 +#: builtin/clone.c:100 msgid "key=value" msgstr "" -#: builtin/clone.c:95 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:239 +#: builtin/clone.c:241 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:305 +#: builtin/clone.c:307 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: builtin/clone.c:307 +#: builtin/clone.c:309 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: builtin/clone.c:312 +#: builtin/clone.c:314 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: builtin/clone.c:315 +#: builtin/clone.c:317 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: builtin/clone.c:380 builtin/diff.c:84 -#, c-format -msgid "failed to stat '%s'" -msgstr "" - -#: builtin/clone.c:382 +#: builtin/clone.c:384 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:396 +#: builtin/clone.c:398 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:418 +#: builtin/clone.c:420 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:422 +#: builtin/clone.c:424 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:447 builtin/clone.c:631 +#: builtin/clone.c:449 builtin/clone.c:633 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:459 +#: builtin/clone.c:461 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:536 +#: builtin/clone.c:538 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:626 +#: builtin/clone.c:628 #, c-format msgid "Checking connectivity... " msgstr "" -#: builtin/clone.c:629 +#: builtin/clone.c:631 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:647 +#: builtin/clone.c:649 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:696 +#: builtin/clone.c:698 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:727 +#: builtin/clone.c:729 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:753 +#: builtin/clone.c:767 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:816 +#: builtin/clone.c:830 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:818 +#: builtin/clone.c:832 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:850 +#: builtin/clone.c:864 builtin/receive-pack.c:1731 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:854 +#: builtin/clone.c:868 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:865 +#: builtin/clone.c:879 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:868 +#: builtin/clone.c:882 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:881 +#: builtin/clone.c:895 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:887 builtin/fetch.c:1174 +#: builtin/clone.c:901 builtin/fetch.c:1174 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:897 +#: builtin/clone.c:911 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:907 +#: builtin/clone.c:921 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218 -#: builtin/worktree.c:219 builtin/worktree.c:246 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547 +#: builtin/worktree.c:220 builtin/worktree.c:247 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:925 +#: builtin/clone.c:939 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:943 +#: builtin/clone.c:957 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:945 +#: builtin/clone.c:959 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:984 +#: builtin/clone.c:998 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:987 +#: builtin/clone.c:1001 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:992 +#: builtin/clone.c:1006 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:996 +#: builtin/clone.c:1010 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:1045 builtin/clone.c:1053 +#: builtin/clone.c:1059 builtin/clone.c:1067 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1056 +#: builtin/clone.c:1070 msgid "You appear to have cloned an empty repository." msgstr "" @@ -4829,103 +5055,103 @@ msgid "" "the remaining commits.\n" msgstr "" -#: builtin/commit.c:305 +#: builtin/commit.c:307 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:346 +#: builtin/commit.c:348 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:352 +#: builtin/commit.c:354 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:365 +#: builtin/commit.c:367 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:367 +#: builtin/commit.c:369 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:445 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:447 +#: builtin/commit.c:449 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:456 +#: builtin/commit.c:458 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:475 +#: builtin/commit.c:477 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:580 +#: builtin/commit.c:582 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:582 +#: builtin/commit.c:584 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:601 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:609 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "" -#: builtin/commit.c:653 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:702 builtin/shortlog.c:285 +#: builtin/commit.c:704 builtin/shortlog.c:285 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:704 +#: builtin/commit.c:706 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:708 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:730 -msgid "could not read MERGE_MSG" +#: builtin/commit.c:737 builtin/commit.c:745 +msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:734 -msgid "could not read SQUASH_MSG" +#: builtin/commit.c:742 +msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:785 +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:803 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -4935,7 +5161,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:808 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -4945,14 +5171,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:821 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:828 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -4960,341 +5186,341 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:848 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:856 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:863 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:881 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:938 +#: builtin/commit.c:949 msgid "Error building trees" msgstr "" -#: builtin/commit.c:953 builtin/tag.c:266 +#: builtin/commit.c:964 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:1055 +#: builtin/commit.c:1066 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1070 builtin/commit.c:1310 +#: builtin/commit.c:1081 builtin/commit.c:1321 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1107 +#: builtin/commit.c:1118 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1137 +#: builtin/commit.c:1148 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1146 +#: builtin/commit.c:1157 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1149 +#: builtin/commit.c:1160 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1151 +#: builtin/commit.c:1162 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1154 +#: builtin/commit.c:1165 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1164 +#: builtin/commit.c:1175 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1166 +#: builtin/commit.c:1177 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1174 +#: builtin/commit.c:1185 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1191 +#: builtin/commit.c:1202 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1193 +#: builtin/commit.c:1204 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1195 +#: builtin/commit.c:1206 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1197 +#: builtin/commit.c:1208 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1209 builtin/tag.c:475 +#: builtin/commit.c:1220 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1214 +#: builtin/commit.c:1225 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1324 builtin/commit.c:1605 +#: builtin/commit.c:1335 builtin/commit.c:1621 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1326 builtin/commit.c:1607 +#: builtin/commit.c:1337 builtin/commit.c:1623 msgid "show branch information" msgstr "" -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512 -#: builtin/worktree.c:430 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512 +#: builtin/worktree.c:437 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1331 builtin/commit.c:1611 +#: builtin/commit.c:1342 builtin/commit.c:1627 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1334 builtin/commit.c:1614 +#: builtin/commit.c:1345 builtin/commit.c:1630 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "" -#: builtin/commit.c:1337 builtin/commit.c:1617 +#: builtin/commit.c:1348 builtin/commit.c:1633 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1340 +#: builtin/commit.c:1351 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1341 parse-options.h:155 +#: builtin/commit.c:1352 parse-options.h:155 msgid "when" msgstr "" -#: builtin/commit.c:1342 +#: builtin/commit.c:1353 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1344 +#: builtin/commit.c:1355 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1430 +#: builtin/commit.c:1441 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1432 +#: builtin/commit.c:1443 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1477 +#: builtin/commit.c:1488 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1480 +#: builtin/commit.c:1491 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1575 +#: builtin/commit.c:1591 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1576 +#: builtin/commit.c:1592 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1578 +#: builtin/commit.c:1594 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1579 builtin/tag.c:351 +#: builtin/commit.c:1595 builtin/tag.c:351 msgid "read message from file" msgstr "" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "author" msgstr "" -#: builtin/commit.c:1580 +#: builtin/commit.c:1596 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1581 builtin/gc.c:326 +#: builtin/commit.c:1597 builtin/gc.c:326 msgid "date" msgstr "" -#: builtin/commit.c:1581 +#: builtin/commit.c:1597 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395 #: builtin/notes.c:558 builtin/tag.c:349 msgid "message" msgstr "" -#: builtin/commit.c:1582 +#: builtin/commit.c:1598 msgid "commit message" msgstr "" -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79 msgid "commit" msgstr "" -#: builtin/commit.c:1583 +#: builtin/commit.c:1599 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1584 +#: builtin/commit.c:1600 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1585 +#: builtin/commit.c:1601 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1586 +#: builtin/commit.c:1602 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1587 +#: builtin/commit.c:1603 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1589 +#: builtin/commit.c:1605 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1606 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1591 +#: builtin/commit.c:1607 msgid "default" msgstr "" -#: builtin/commit.c:1591 builtin/tag.c:354 +#: builtin/commit.c:1607 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1592 +#: builtin/commit.c:1608 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1597 +#: builtin/commit.c:1613 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1598 +#: builtin/commit.c:1614 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1599 +#: builtin/commit.c:1615 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1600 +#: builtin/commit.c:1616 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1601 +#: builtin/commit.c:1617 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1602 +#: builtin/commit.c:1618 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1603 +#: builtin/commit.c:1619 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1604 +#: builtin/commit.c:1620 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1615 +#: builtin/commit.c:1631 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1616 +#: builtin/commit.c:1632 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1621 +#: builtin/commit.c:1637 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1623 +#: builtin/commit.c:1639 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1652 +#: builtin/commit.c:1668 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1698 +#: builtin/commit.c:1718 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1705 +#: builtin/commit.c:1725 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1724 +#: builtin/commit.c:1744 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1735 +#: builtin/commit.c:1755 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1740 +#: builtin/commit.c:1760 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1788 +#: builtin/commit.c:1808 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -5437,7 +5663,7 @@ msgstr "" msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:469 +#: builtin/config.c:472 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -5447,7 +5673,7 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:611 +#: builtin/config.c:614 #, c-format msgid "cannot create configuration file %s" msgstr "" @@ -5483,7 +5709,7 @@ msgstr "" msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:250 builtin/log.c:459 +#: builtin/describe.c:250 builtin/log.c:465 #, c-format msgid "Not a valid object name %s" msgstr "" @@ -5570,7 +5796,7 @@ msgstr "" msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:410 builtin/name-rev.c:314 +#: builtin/describe.c:410 builtin/name-rev.c:321 msgid "show abbreviated commit object as fallback" msgstr "" @@ -5604,21 +5830,21 @@ msgstr "" msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:358 +#: builtin/diff.c:360 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:401 +#: builtin/diff.c:403 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:410 +#: builtin/diff.c:412 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:417 +#: builtin/diff.c:419 #, c-format msgid "unhandled object '%s' given." msgstr "" @@ -5691,19 +5917,19 @@ msgstr "" msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:92 builtin/pull.c:166 +#: builtin/fetch.c:92 builtin/pull.c:174 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:94 builtin/pull.c:169 +#: builtin/fetch.c:94 builtin/pull.c:177 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:96 builtin/pull.c:172 +#: builtin/fetch.c:96 builtin/pull.c:180 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:97 builtin/pull.c:174 +#: builtin/fetch.c:97 builtin/pull.c:182 msgid "force overwrite of local branch" msgstr "" @@ -5711,7 +5937,7 @@ msgstr "" msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:101 builtin/pull.c:176 +#: builtin/fetch.c:101 builtin/pull.c:184 msgid "fetch all tags and associated objects" msgstr "" @@ -5723,19 +5949,19 @@ msgstr "" msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:107 builtin/pull.c:179 +#: builtin/fetch.c:107 builtin/pull.c:187 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:108 builtin/pull.c:182 +#: builtin/fetch.c:108 builtin/pull.c:190 msgid "on-demand" msgstr "" -#: builtin/fetch.c:109 builtin/pull.c:183 +#: builtin/fetch.c:109 builtin/pull.c:191 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:113 builtin/pull.c:191 +#: builtin/fetch.c:113 builtin/pull.c:199 msgid "keep downloaded pack" msgstr "" @@ -5743,15 +5969,15 @@ msgstr "" msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:118 builtin/pull.c:194 +#: builtin/fetch.c:118 builtin/pull.c:202 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:120 builtin/pull.c:197 +#: builtin/fetch.c:120 builtin/pull.c:205 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:122 builtin/log.c:1236 +#: builtin/fetch.c:122 builtin/log.c:1399 msgid "dir" msgstr "" @@ -5763,15 +5989,15 @@ msgstr "" msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:128 builtin/pull.c:200 +#: builtin/fetch.c:128 builtin/pull.c:208 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:129 builtin/pull.c:202 +#: builtin/fetch.c:129 builtin/pull.c:210 msgid "refmap" msgstr "" -#: builtin/fetch.c:130 builtin/pull.c:203 +#: builtin/fetch.c:130 builtin/pull.c:211 msgid "specify fetch refmap" msgstr "" @@ -5829,11 +6055,6 @@ msgstr "" msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:610 builtin/fetch.c:851 -#, c-format -msgid "cannot open %s: %s\n" -msgstr "" - #: builtin/fetch.c:619 #, c-format msgid "%s did not send all necessary objects\n" @@ -6028,55 +6249,55 @@ msgstr "" msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:553 +#: builtin/fsck.c:552 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:559 +#: builtin/fsck.c:558 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:560 +#: builtin/fsck.c:559 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:561 +#: builtin/fsck.c:560 msgid "report tags" msgstr "" -#: builtin/fsck.c:562 +#: builtin/fsck.c:561 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:563 +#: builtin/fsck.c:562 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:564 +#: builtin/fsck.c:563 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:565 +#: builtin/fsck.c:564 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:566 +#: builtin/fsck.c:565 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:567 +#: builtin/fsck.c:566 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:569 +#: builtin/fsck.c:568 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:570 builtin/prune.c:107 +#: builtin/fsck.c:569 builtin/prune.c:107 msgid "show progress" msgstr "" -#: builtin/fsck.c:631 +#: builtin/fsck.c:630 msgid "Checking objects" msgstr "" @@ -6170,214 +6391,214 @@ msgstr "" msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:558 +#: builtin/grep.c:560 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:575 +#: builtin/grep.c:577 #, c-format msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:644 +#: builtin/grep.c:646 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:646 +#: builtin/grep.c:648 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:648 +#: builtin/grep.c:650 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:650 +#: builtin/grep.c:652 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:653 +#: builtin/grep.c:655 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:655 +#: builtin/grep.c:657 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:657 +#: builtin/grep.c:659 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:659 +#: builtin/grep.c:661 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:661 +#: builtin/grep.c:663 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:664 +#: builtin/grep.c:666 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:666 +#: builtin/grep.c:668 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:670 +#: builtin/grep.c:672 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:673 +#: builtin/grep.c:675 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:676 +#: builtin/grep.c:678 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:679 +#: builtin/grep.c:681 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:682 +#: builtin/grep.c:684 msgid "show line numbers" msgstr "" -#: builtin/grep.c:683 +#: builtin/grep.c:685 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:684 +#: builtin/grep.c:686 msgid "show filenames" msgstr "" -#: builtin/grep.c:686 +#: builtin/grep.c:688 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:688 +#: builtin/grep.c:690 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:690 +#: builtin/grep.c:692 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:693 +#: builtin/grep.c:695 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:695 +#: builtin/grep.c:697 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:697 +#: builtin/grep.c:699 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:698 +#: builtin/grep.c:700 msgid "highlight matches" msgstr "" -#: builtin/grep.c:700 +#: builtin/grep.c:702 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:702 +#: builtin/grep.c:704 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:705 +#: builtin/grep.c:707 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:708 +#: builtin/grep.c:710 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:710 +#: builtin/grep.c:712 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:712 +#: builtin/grep.c:714 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:713 +#: builtin/grep.c:715 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:716 +#: builtin/grep.c:718 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:718 +#: builtin/grep.c:720 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:721 +#: builtin/grep.c:723 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:723 +#: builtin/grep.c:725 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:725 +#: builtin/grep.c:727 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:737 +#: builtin/grep.c:739 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:739 +#: builtin/grep.c:741 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:741 +#: builtin/grep.c:743 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "pager" msgstr "" -#: builtin/grep.c:745 +#: builtin/grep.c:747 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:748 +#: builtin/grep.c:750 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:811 +#: builtin/grep.c:813 msgid "no pattern given." msgstr "" -#: builtin/grep.c:843 builtin/index-pack.c:1475 +#: builtin/grep.c:845 builtin/index-pack.c:1477 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:873 +#: builtin/grep.c:875 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:899 +#: builtin/grep.c:901 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:904 +#: builtin/grep.c:906 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:907 +#: builtin/grep.c:909 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:915 +#: builtin/grep.c:917 msgid "both --cached and trees are given." msgstr "" @@ -6464,7 +6685,7 @@ msgstr "" #: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 #, c-format -msgid "failed to exec '%s': %s" +msgid "failed to exec '%s'" msgstr "" #: builtin/help.c:205 @@ -6719,107 +6940,109 @@ msgstr "" #: builtin/index-pack.c:1253 #, c-format -msgid "completed with %d local objects" -msgstr "" +msgid "completed with %d local object" +msgid_plural "completed with %d local objects" +msgstr[0] "" +msgstr[1] "" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1265 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1269 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1293 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1367 +#: builtin/index-pack.c:1369 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1393 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1404 +#: builtin/index-pack.c:1406 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1412 +#: builtin/index-pack.c:1414 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1425 +#: builtin/index-pack.c:1427 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1436 +#: builtin/index-pack.c:1438 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c:1471 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1479 builtin/index-pack.c:1664 +#: builtin/index-pack.c:1481 builtin/index-pack.c:1678 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1538 +#: builtin/index-pack.c:1540 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1540 +#: builtin/index-pack.c:1542 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1587 +#: builtin/index-pack.c:1589 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1596 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1624 +#: builtin/index-pack.c:1609 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "" + +#: builtin/index-pack.c:1638 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1676 builtin/index-pack.c:1679 -#: builtin/index-pack.c:1691 builtin/index-pack.c:1695 +#: builtin/index-pack.c:1690 builtin/index-pack.c:1693 +#: builtin/index-pack.c:1705 builtin/index-pack.c:1709 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1709 +#: builtin/index-pack.c:1723 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1713 builtin/index-pack.c:1722 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "" - -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1731 msgid "--verify with no packfile name given" msgstr "" @@ -6858,27 +7081,27 @@ msgstr "" msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:118 +#: builtin/init-db.c:120 #, c-format msgid "templates not found %s" msgstr "" -#: builtin/init-db.c:131 +#: builtin/init-db.c:135 #, c-format -msgid "not copying templates of a wrong format version %d from '%s'" +msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:309 builtin/init-db.c:312 +#: builtin/init-db.c:312 builtin/init-db.c:315 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:340 +#: builtin/init-db.c:344 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:343 +#: builtin/init-db.c:347 #, c-format msgid "unable to move %s to %s" msgstr "" @@ -6886,55 +7109,55 @@ msgstr "" #. TRANSLATORS: The first '%s' is either "Reinitialized #. existing" or "Initialized empty", the second " shared" or #. "", and the last '%s%s' is the verbatim directory name. -#: builtin/init-db.c:399 +#: builtin/init-db.c:403 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Reinitialized existing" msgstr "" -#: builtin/init-db.c:400 +#: builtin/init-db.c:404 msgid "Initialized empty" msgstr "" -#: builtin/init-db.c:401 +#: builtin/init-db.c:405 msgid " shared" msgstr "" -#: builtin/init-db.c:448 +#: builtin/init-db.c:452 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -#: builtin/init-db.c:471 +#: builtin/init-db.c:475 msgid "permissions" msgstr "" -#: builtin/init-db.c:472 +#: builtin/init-db.c:476 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:506 builtin/init-db.c:511 +#: builtin/init-db.c:510 builtin/init-db.c:515 #, c-format msgid "cannot mkdir %s" msgstr "" -#: builtin/init-db.c:515 +#: builtin/init-db.c:519 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:536 +#: builtin/init-db.c:540 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:564 +#: builtin/init-db.c:568 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -6978,273 +7201,316 @@ msgstr "" msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:131 +#: builtin/log.c:137 msgid "suppress diff output" msgstr "" -#: builtin/log.c:132 +#: builtin/log.c:138 msgid "show source" msgstr "" -#: builtin/log.c:133 +#: builtin/log.c:139 msgid "Use mail map file" msgstr "" -#: builtin/log.c:134 +#: builtin/log.c:140 msgid "decorate options" msgstr "" -#: builtin/log.c:137 +#: builtin/log.c:143 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:233 +#: builtin/log.c:239 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:465 +#: builtin/log.c:471 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:479 builtin/log.c:572 +#: builtin/log.c:485 builtin/log.c:578 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:596 +#: builtin/log.c:602 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:715 +#: builtin/log.c:722 msgid "format.headers without value" msgstr "" -#: builtin/log.c:801 +#: builtin/log.c:812 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:816 +#: builtin/log.c:827 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:830 +#: builtin/log.c:841 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:840 +#: builtin/log.c:851 msgid "Not a range." msgstr "" -#: builtin/log.c:946 +#: builtin/log.c:957 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:1025 +#: builtin/log.c:1036 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1053 +#: builtin/log.c:1064 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1098 +#: builtin/log.c:1109 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1214 +#: builtin/log.c:1216 builtin/log.c:1857 builtin/log.c:1859 builtin/log.c:1871 +#, c-format +msgid "Unknown commit %s" +msgstr "" + +#: builtin/log.c:1226 builtin/notes.c:253 builtin/notes.c:304 +#: builtin/notes.c:306 builtin/notes.c:369 builtin/notes.c:424 +#: builtin/notes.c:510 builtin/notes.c:515 builtin/notes.c:593 +#: builtin/notes.c:656 builtin/notes.c:881 builtin/tag.c:455 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/log.c:1231 +msgid "Could not find exact merge base." +msgstr "" + +#: builtin/log.c:1235 +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:1255 +msgid "Failed to find exact merge base" +msgstr "" + +#: builtin/log.c:1266 +msgid "base commit should be the ancestor of revision list" +msgstr "" + +#: builtin/log.c:1270 +msgid "base commit shouldn't be in revision list" +msgstr "" + +#: builtin/log.c:1319 +msgid "cannot get patch id" +msgstr "" + +#: builtin/log.c:1377 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1217 +#: builtin/log.c:1380 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1221 +#: builtin/log.c:1384 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1223 +#: builtin/log.c:1386 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1225 +#: builtin/log.c:1388 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1226 +#: builtin/log.c:1389 msgid "sfx" msgstr "" -#: builtin/log.c:1227 +#: builtin/log.c:1390 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1229 +#: builtin/log.c:1392 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1231 +#: builtin/log.c:1394 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1233 +#: builtin/log.c:1396 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1236 +#: builtin/log.c:1399 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1239 +#: builtin/log.c:1402 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1242 +#: builtin/log.c:1405 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1244 +#: builtin/log.c:1407 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1246 +#: builtin/log.c:1409 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1248 +#: builtin/log.c:1411 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1250 +#: builtin/log.c:1413 msgid "Messaging" msgstr "" -#: builtin/log.c:1251 +#: builtin/log.c:1414 msgid "header" msgstr "" -#: builtin/log.c:1252 +#: builtin/log.c:1415 msgid "add email header" msgstr "" -#: builtin/log.c:1253 builtin/log.c:1255 +#: builtin/log.c:1416 builtin/log.c:1418 msgid "email" msgstr "" -#: builtin/log.c:1253 +#: builtin/log.c:1416 msgid "add To: header" msgstr "" -#: builtin/log.c:1255 +#: builtin/log.c:1418 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1257 +#: builtin/log.c:1420 msgid "ident" msgstr "" -#: builtin/log.c:1258 +#: builtin/log.c:1421 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1260 +#: builtin/log.c:1423 msgid "message-id" msgstr "" -#: builtin/log.c:1261 +#: builtin/log.c:1424 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1262 builtin/log.c:1265 +#: builtin/log.c:1425 builtin/log.c:1428 msgid "boundary" msgstr "" -#: builtin/log.c:1263 +#: builtin/log.c:1426 msgid "attach the patch" msgstr "" -#: builtin/log.c:1266 +#: builtin/log.c:1429 msgid "inline the patch" msgstr "" -#: builtin/log.c:1270 +#: builtin/log.c:1433 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1272 +#: builtin/log.c:1435 msgid "signature" msgstr "" -#: builtin/log.c:1273 +#: builtin/log.c:1436 msgid "add a signature" msgstr "" -#: builtin/log.c:1275 +#: builtin/log.c:1437 +msgid "base-commit" +msgstr "" + +#: builtin/log.c:1438 +msgid "add prerequisite tree info to the patch series" +msgstr "" + +#: builtin/log.c:1440 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1276 +#: builtin/log.c:1441 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1365 +#: builtin/log.c:1531 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1367 +#: builtin/log.c:1533 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1375 +#: builtin/log.c:1541 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1377 +#: builtin/log.c:1543 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1379 +#: builtin/log.c:1545 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1407 +#: builtin/log.c:1573 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1409 +#: builtin/log.c:1575 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1506 +#: builtin/log.c:1672 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1569 +#: builtin/log.c:1743 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1617 +#: builtin/log.c:1792 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1671 +#: builtin/log.c:1846 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1682 builtin/log.c:1684 builtin/log.c:1696 -#, c-format -msgid "Unknown commit %s" -msgstr "" - #: builtin/ls-files.c:378 msgid "git ls-files [<options>] [<file>...]" msgstr "" @@ -7432,170 +7698,174 @@ msgstr "" msgid "git merge --abort" msgstr "" -#: builtin/merge.c:100 +#: builtin/merge.c:101 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:137 +#: builtin/merge.c:138 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:138 +#: builtin/merge.c:139 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:143 +#: builtin/merge.c:144 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:193 builtin/pull.c:123 +#: builtin/merge.c:194 builtin/pull.c:126 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:196 builtin/pull.c:126 +#: builtin/merge.c:197 builtin/pull.c:129 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:197 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:132 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:199 builtin/pull.c:132 +#: builtin/merge.c:200 builtin/pull.c:135 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:202 builtin/pull.c:135 +#: builtin/merge.c:203 builtin/pull.c:138 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:205 builtin/pull.c:141 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:207 builtin/pull.c:144 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:207 +#: builtin/merge.c:208 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:209 builtin/pull.c:147 +#: builtin/merge.c:210 builtin/pull.c:150 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:213 +#: builtin/merge.c:214 msgid "Verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:214 builtin/notes.c:770 builtin/pull.c:152 +#: builtin/merge.c:215 builtin/notes.c:771 builtin/pull.c:157 #: builtin/revert.c:89 msgid "strategy" msgstr "" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:216 builtin/pull.c:158 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:216 builtin/pull.c:156 +#: builtin/merge.c:217 builtin/pull.c:161 msgid "option=value" msgstr "" -#: builtin/merge.c:217 builtin/pull.c:157 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:219 +#: builtin/merge.c:220 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:223 +#: builtin/merge.c:224 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:251 +#: builtin/merge.c:226 builtin/pull.c:169 +msgid "allow merging unrelated histories" +msgstr "" + +#: builtin/merge.c:254 msgid "could not run stash." msgstr "" -#: builtin/merge.c:256 +#: builtin/merge.c:259 msgid "stash failed" msgstr "" -#: builtin/merge.c:261 +#: builtin/merge.c:264 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:280 builtin/merge.c:297 +#: builtin/merge.c:283 builtin/merge.c:300 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:327 +#: builtin/merge.c:330 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:340 +#: builtin/merge.c:343 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:344 builtin/merge.c:764 builtin/merge.c:976 -#: builtin/merge.c:989 +#: builtin/merge.c:347 builtin/merge.c:767 builtin/merge.c:987 +#: builtin/merge.c:1000 #, c-format msgid "Could not write to '%s'" msgstr "" -#: builtin/merge.c:372 +#: builtin/merge.c:375 msgid "Writing SQUASH_MSG" msgstr "" -#: builtin/merge.c:374 +#: builtin/merge.c:377 msgid "Finishing SQUASH_MSG" msgstr "" -#: builtin/merge.c:397 +#: builtin/merge.c:400 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:448 +#: builtin/merge.c:451 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:538 +#: builtin/merge.c:541 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:657 +#: builtin/merge.c:660 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:671 +#: builtin/merge.c:674 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:684 +#: builtin/merge.c:687 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:773 +#: builtin/merge.c:776 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:782 +#: builtin/merge.c:785 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:788 +#: builtin/merge.c:791 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -7605,157 +7875,161 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:812 +#: builtin/merge.c:815 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:824 +#: builtin/merge.c:835 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:879 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:895 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:936 +#: builtin/merge.c:947 msgid "No current branch." msgstr "" -#: builtin/merge.c:938 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:940 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:945 +#: builtin/merge.c:956 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1080 +#: builtin/merge.c:1091 #, c-format msgid "could not close '%s'" msgstr "" -#: builtin/merge.c:1207 +#: builtin/merge.c:1219 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1223 +#: builtin/merge.c:1235 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1230 +#: builtin/merge.c:1242 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1233 +#: builtin/merge.c:1245 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1242 +#: builtin/merge.c:1254 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1250 +#: builtin/merge.c:1262 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1267 +#: builtin/merge.c:1279 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1269 +#: builtin/merge.c:1281 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1275 +#: builtin/merge.c:1286 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1277 +#: builtin/merge.c:1288 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1332 +#: builtin/merge.c:1344 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1335 +#: builtin/merge.c:1347 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1338 +#: builtin/merge.c:1350 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1341 +#: builtin/merge.c:1353 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1424 +#: builtin/merge.c:1415 +msgid "refusing to merge unrelated histories" +msgstr "" + +#: builtin/merge.c:1439 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1461 +#: builtin/merge.c:1476 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1468 +#: builtin/merge.c:1483 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1500 +#: builtin/merge.c:1515 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1538 builtin/merge.c:1617 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1527 +#: builtin/merge.c:1542 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1593 +#: builtin/merge.c:1608 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1595 +#: builtin/merge.c:1610 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1604 +#: builtin/merge.c:1619 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1616 +#: builtin/merge.c:1631 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -7863,7 +8137,7 @@ msgstr "" msgid "Directory %s is in index and no submodule?" msgstr "" -#: builtin/mv.c:72 +#: builtin/mv.c:72 builtin/rm.c:317 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" @@ -7941,48 +8215,48 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:257 builtin/remote.c:714 builtin/repack.c:365 +#: builtin/mv.c:260 builtin/remote.c:714 builtin/repack.c:365 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:251 +#: builtin/name-rev.c:258 msgid "git name-rev [<options>] <commit>..." msgstr "" -#: builtin/name-rev.c:252 +#: builtin/name-rev.c:259 msgid "git name-rev [<options>] --all" msgstr "" -#: builtin/name-rev.c:253 +#: builtin/name-rev.c:260 msgid "git name-rev [<options>] --stdin" msgstr "" -#: builtin/name-rev.c:305 +#: builtin/name-rev.c:312 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:306 +#: builtin/name-rev.c:313 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:308 +#: builtin/name-rev.c:315 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:310 +#: builtin/name-rev.c:317 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:311 +#: builtin/name-rev.c:318 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:319 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:325 msgid "dereference tags in the input (internal use)" msgstr "" @@ -8123,24 +8397,16 @@ msgstr "" msgid "The note contents have been left in %s" msgstr "" -#: builtin/notes.c:232 builtin/tag.c:440 +#: builtin/notes.c:232 builtin/tag.c:439 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:234 builtin/tag.c:443 +#: builtin/notes.c:234 builtin/tag.c:442 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:510 -#: builtin/notes.c:515 builtin/notes.c:593 builtin/notes.c:656 -#: builtin/notes.c:880 builtin/tag.c:456 -#, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "" - #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." @@ -8153,7 +8419,7 @@ msgstr "" #: builtin/notes.c:362 builtin/notes.c:417 builtin/notes.c:493 #: builtin/notes.c:505 builtin/notes.c:581 builtin/notes.c:649 -#: builtin/notes.c:945 +#: builtin/notes.c:946 msgid "too many parameters" msgstr "" @@ -8198,7 +8464,7 @@ msgstr "" msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:885 +#: builtin/notes.c:460 builtin/notes.c:621 builtin/notes.c:886 #, c-format msgid "Removing note for object %s\n" msgstr "" @@ -8234,63 +8500,63 @@ msgid "" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -#: builtin/notes.c:767 +#: builtin/notes.c:768 msgid "General options" msgstr "" -#: builtin/notes.c:769 +#: builtin/notes.c:770 msgid "Merge options" msgstr "" -#: builtin/notes.c:771 +#: builtin/notes.c:772 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:773 +#: builtin/notes.c:774 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:775 +#: builtin/notes.c:776 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:777 +#: builtin/notes.c:778 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:779 +#: builtin/notes.c:780 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:856 +#: builtin/notes.c:857 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "" -#: builtin/notes.c:883 +#: builtin/notes.c:884 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:895 +#: builtin/notes.c:896 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:898 +#: builtin/notes.c:899 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:979 +#: builtin/notes.c:980 msgid "notes-ref" msgstr "" -#: builtin/notes.c:980 +#: builtin/notes.c:981 msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1015 builtin/remote.c:1626 +#: builtin/notes.c:1016 builtin/remote.c:1628 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -8310,165 +8576,169 @@ msgstr "" msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:772 +#: builtin/pack-objects.c:763 +msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" +msgstr "" + +#: builtin/pack-objects.c:776 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1012 +#: builtin/pack-objects.c:1017 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2172 +#: builtin/pack-objects.c:2177 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2558 +#: builtin/pack-objects.c:2563 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2562 +#: builtin/pack-objects.c:2567 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2592 +#: builtin/pack-objects.c:2597 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2594 +#: builtin/pack-objects.c:2599 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2596 +#: builtin/pack-objects.c:2601 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2604 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2600 +#: builtin/pack-objects.c:2605 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2601 +#: builtin/pack-objects.c:2606 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2604 +#: builtin/pack-objects.c:2609 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2606 +#: builtin/pack-objects.c:2611 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2608 +#: builtin/pack-objects.c:2613 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2610 +#: builtin/pack-objects.c:2615 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2612 +#: builtin/pack-objects.c:2617 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2614 +#: builtin/pack-objects.c:2619 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2616 +#: builtin/pack-objects.c:2621 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2618 +#: builtin/pack-objects.c:2623 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2620 +#: builtin/pack-objects.c:2625 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2622 +#: builtin/pack-objects.c:2627 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2629 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2626 +#: builtin/pack-objects.c:2631 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2628 +#: builtin/pack-objects.c:2633 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:2631 +#: builtin/pack-objects.c:2636 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:2634 +#: builtin/pack-objects.c:2639 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:2637 +#: builtin/pack-objects.c:2642 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:2640 +#: builtin/pack-objects.c:2645 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:2642 +#: builtin/pack-objects.c:2647 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:2644 +#: builtin/pack-objects.c:2649 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:2645 parse-options.h:142 +#: builtin/pack-objects.c:2650 parse-options.h:142 msgid "time" msgstr "" -#: builtin/pack-objects.c:2646 +#: builtin/pack-objects.c:2651 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2654 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:2651 +#: builtin/pack-objects.c:2656 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:2653 +#: builtin/pack-objects.c:2658 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:2655 +#: builtin/pack-objects.c:2660 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2662 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2664 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2666 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:2752 +#: builtin/pack-objects.c:2757 msgid "Counting objects" msgstr "" @@ -8496,15 +8766,15 @@ msgstr "" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "" -#: builtin/prune.c:105 builtin/worktree.c:124 +#: builtin/prune.c:105 builtin/worktree.c:125 msgid "do not remove, show only" msgstr "" -#: builtin/prune.c:106 builtin/worktree.c:125 +#: builtin/prune.c:106 builtin/worktree.c:126 msgid "report pruned objects" msgstr "" -#: builtin/prune.c:109 builtin/worktree.c:127 +#: builtin/prune.c:109 builtin/worktree.c:128 msgid "expire objects older than <time>" msgstr "" @@ -8516,65 +8786,69 @@ msgstr "" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/pull.c:117 +#: builtin/pull.c:120 msgid "Options related to merging" msgstr "" -#: builtin/pull.c:120 +#: builtin/pull.c:123 msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:144 builtin/revert.c:105 +#: builtin/pull.c:147 builtin/revert.c:105 msgid "allow fast-forward" msgstr "" -#: builtin/pull.c:150 +#: builtin/pull.c:153 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/pull.c:164 +#: builtin/pull.c:156 +msgid "automatically stash/stash pop before and after rebase" +msgstr "" + +#: builtin/pull.c:172 msgid "Options related to fetching" msgstr "" -#: builtin/pull.c:186 +#: builtin/pull.c:194 msgid "number of submodules pulled in parallel" msgstr "" -#: builtin/pull.c:275 +#: builtin/pull.c:283 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "" -#: builtin/pull.c:359 +#: builtin/pull.c:379 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" -#: builtin/pull.c:365 +#: builtin/pull.c:385 msgid "Additionally, your index contains uncommitted changes." msgstr "" -#: builtin/pull.c:367 +#: builtin/pull.c:387 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" -#: builtin/pull.c:443 +#: builtin/pull.c:463 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -#: builtin/pull.c:445 +#: builtin/pull.c:465 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -#: builtin/pull.c:446 +#: builtin/pull.c:466 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -#: builtin/pull.c:449 +#: builtin/pull.c:469 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -8582,46 +8856,57 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "" -#: builtin/pull.c:454 +#: builtin/pull.c:474 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "" -#: builtin/pull.c:456 builtin/pull.c:471 +#: builtin/pull.c:476 builtin/pull.c:491 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "" -#: builtin/pull.c:458 builtin/pull.c:473 +#: builtin/pull.c:478 builtin/pull.c:493 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "" -#: builtin/pull.c:459 builtin/pull.c:474 +#: builtin/pull.c:479 builtin/pull.c:494 msgid "See git-pull(1) for details." msgstr "" -#: builtin/pull.c:469 +#: builtin/pull.c:481 builtin/pull.c:487 builtin/pull.c:496 +#: git-parse-remote.sh:64 +msgid "<remote>" +msgstr "" + +#: builtin/pull.c:481 builtin/pull.c:496 builtin/pull.c:501 +#: git-parse-remote.sh:65 +msgid "<branch>" +msgstr "" + +#: builtin/pull.c:489 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "" -#: builtin/pull.c:478 -#, c-format +#: builtin/pull.c:498 git-parse-remote.sh:95 msgid "" -"If you wish to set tracking information for this branch you can do so with:\n" -"\n" -" git branch --set-upstream-to=%s/<branch> %s\n" +"If you wish to set tracking information for this branch you can do so with:" msgstr "" -#: builtin/pull.c:483 +#: builtin/pull.c:503 #, 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:841 +#: builtin/pull.c:864 +msgid "--[no-]autostash option is only valid with --rebase." +msgstr "" + +#: builtin/pull.c:872 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:870 +#: builtin/pull.c:900 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -8629,7 +8914,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:875 +#: builtin/pull.c:905 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -8640,11 +8925,11 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:890 +#: builtin/pull.c:920 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:894 +#: builtin/pull.c:924 msgid "Cannot rebase onto multiple branches." msgstr "" @@ -8950,6 +9235,18 @@ msgstr "" msgid "debug unpack-trees" msgstr "" +#: builtin/receive-pack.c:25 +msgid "git receive-pack <git-dir>" +msgstr "" + +#: builtin/receive-pack.c:1719 +msgid "quiet" +msgstr "" + +#: builtin/receive-pack.c:1733 +msgid "You must specify a directory." +msgstr "" + #: builtin/reflog.c:423 #, c-format msgid "'%s' for '%s' is not a valid timestamp" @@ -9261,176 +9558,178 @@ msgstr "" msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1148 builtin/remote.c:1299 +#: builtin/remote.c:1148 builtin/remote.c:1301 msgid "(no URL)" msgstr "" -#: builtin/remote.c:1157 builtin/remote.c:1159 +#. TRANSLATORS: the colon ':' should align with +#. the one in " Fetch URL: %s" translation +#: builtin/remote.c:1159 builtin/remote.c:1161 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1161 builtin/remote.c:1163 builtin/remote.c:1165 +#: builtin/remote.c:1163 builtin/remote.c:1165 builtin/remote.c:1167 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1167 +#: builtin/remote.c:1169 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1179 +#: builtin/remote.c:1181 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1182 builtin/remote.c:1209 +#: builtin/remote.c:1184 builtin/remote.c:1211 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1191 +#: builtin/remote.c:1193 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1199 +#: builtin/remote.c:1201 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1206 +#: builtin/remote.c:1208 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1227 +#: builtin/remote.c:1229 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1229 +#: builtin/remote.c:1231 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1244 +#: builtin/remote.c:1246 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1246 +#: builtin/remote.c:1248 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1264 +#: builtin/remote.c:1266 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1266 +#: builtin/remote.c:1268 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1284 +#: builtin/remote.c:1286 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1285 +#: builtin/remote.c:1287 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1295 +#: builtin/remote.c:1297 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1312 +#: builtin/remote.c:1314 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1315 +#: builtin/remote.c:1317 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1360 +#: builtin/remote.c:1362 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1423 builtin/remote.c:1477 builtin/remote.c:1545 +#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1439 +#: builtin/remote.c:1441 msgid "add branch" msgstr "" -#: builtin/remote.c:1446 +#: builtin/remote.c:1448 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1463 +#: builtin/remote.c:1465 msgid "query push URLs rather than fetch URLs" msgstr "" -#: builtin/remote.c:1465 +#: builtin/remote.c:1467 msgid "return all URLs" msgstr "" -#: builtin/remote.c:1493 +#: builtin/remote.c:1495 #, c-format msgid "no URLs configured for remote '%s'" msgstr "" -#: builtin/remote.c:1519 +#: builtin/remote.c:1521 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1521 +#: builtin/remote.c:1523 msgid "add URL" msgstr "" -#: builtin/remote.c:1523 +#: builtin/remote.c:1525 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1530 +#: builtin/remote.c:1532 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1571 +#: builtin/remote.c:1573 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1579 +#: builtin/remote.c:1581 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/remote.c:1595 +#: builtin/remote.c:1597 msgid "be verbose; must be placed before a subcommand" msgstr "" @@ -9916,10 +10215,6 @@ msgstr "" msgid "exit with a zero status even if nothing matched" msgstr "" -#: builtin/rm.c:317 -msgid "Please, stage your changes to .gitmodules or stash them to proceed" -msgstr "" - #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" @@ -10112,78 +10407,177 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:73 builtin/submodule--helper.c:161 +#: builtin/submodule--helper.c:24 +#, c-format +msgid "No such ref: %s" +msgstr "" + +#: builtin/submodule--helper.c:31 +#, c-format +msgid "Expecting a full ref name, got %s" +msgstr "" + +#: builtin/submodule--helper.c:71 +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "" + +#: builtin/submodule--helper.c:278 builtin/submodule--helper.c:405 +#: builtin/submodule--helper.c:486 msgid "alternative anchor for relative paths" msgstr "" -#: builtin/submodule--helper.c:78 +#: builtin/submodule--helper.c:283 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:108 +#: builtin/submodule--helper.c:326 builtin/submodule--helper.c:340 +#, c-format +msgid "No url found for submodule path '%s' in .gitmodules" +msgstr "" + +#: builtin/submodule--helper.c:366 +#, c-format +msgid "Failed to register url for submodule path '%s'" +msgstr "" + +#: builtin/submodule--helper.c:370 +#, c-format +msgid "Submodule '%s' (%s) registered for path '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:380 +#, c-format +msgid "warning: command update mode suggested for submodule '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:387 +#, c-format +msgid "Failed to register update mode for submodule path '%s'" +msgstr "" + +#: builtin/submodule--helper.c:406 +msgid "Suppress output for initializing a submodule" +msgstr "" + +#: builtin/submodule--helper.c:411 +msgid "git submodule--helper init [<path>]" +msgstr "" + +#: builtin/submodule--helper.c:432 msgid "git submodule--helper name <path>" msgstr "" -#: builtin/submodule--helper.c:114 +#: builtin/submodule--helper.c:438 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" -#: builtin/submodule--helper.c:164 +#: builtin/submodule--helper.c:489 msgid "where the new submodule will be cloned to" msgstr "" -#: builtin/submodule--helper.c:167 +#: builtin/submodule--helper.c:492 msgid "name of the new submodule" msgstr "" -#: builtin/submodule--helper.c:170 +#: builtin/submodule--helper.c:495 msgid "url where to clone the submodule from" msgstr "" -#: builtin/submodule--helper.c:176 +#: builtin/submodule--helper.c:501 msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:182 +#: builtin/submodule--helper.c:507 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--url <url>][--depth <depth>] [--] [<path>...]" +"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" -#: builtin/submodule--helper.c:196 builtin/submodule--helper.c:202 -#: builtin/submodule--helper.c:210 +#: builtin/submodule--helper.c:532 builtin/submodule--helper.c:538 #, c-format msgid "could not create directory '%s'" msgstr "" -#: builtin/submodule--helper.c:198 +#: builtin/submodule--helper.c:534 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" -#: builtin/submodule--helper.c:221 +#: builtin/submodule--helper.c:550 #, c-format msgid "cannot open file '%s'" msgstr "" -#: builtin/submodule--helper.c:226 +#: builtin/submodule--helper.c:555 #, c-format msgid "could not close file %s" msgstr "" -#: builtin/submodule--helper.c:241 +#: builtin/submodule--helper.c:562 #, c-format msgid "could not get submodule directory for '%s'" msgstr "" -#: builtin/submodule--helper.c:267 -msgid "fatal: submodule--helper subcommand must be called with a subcommand" +#: builtin/submodule--helper.c:609 +#, c-format +msgid "Submodule path '%s' not initialized" +msgstr "" + +#: builtin/submodule--helper.c:613 +msgid "Maybe you want to use 'update --init'?" +msgstr "" + +#: builtin/submodule--helper.c:639 +#, c-format +msgid "Skipping unmerged submodule %s" +msgstr "" + +#: builtin/submodule--helper.c:660 +#, c-format +msgid "Skipping submodule '%s'" +msgstr "" + +#: builtin/submodule--helper.c:768 +msgid "path into the working tree" +msgstr "" + +#: builtin/submodule--helper.c:771 +msgid "path into the working tree, across nested submodule boundaries" +msgstr "" + +#: builtin/submodule--helper.c:775 +msgid "rebase, merge, checkout or none" +msgstr "" + +#: builtin/submodule--helper.c:779 +msgid "Create a shallow clone truncated to the specified number of revisions" +msgstr "" + +#: builtin/submodule--helper.c:782 +msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:274 +#: builtin/submodule--helper.c:783 +msgid "don't print cloning progress" +msgstr "" + +#: builtin/submodule--helper.c:788 +msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +msgstr "" + +#: builtin/submodule--helper.c:798 +msgid "bad value for update parameter" +msgstr "" + +#: builtin/submodule--helper.c:855 +msgid "submodule--helper subcommand must be called with a subcommand" +msgstr "" + +#: builtin/submodule--helper.c:862 #, c-format -msgid "fatal: '%s' is not a valid submodule--helper subcommand" +msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" #: builtin/symbolic-ref.c:7 @@ -10234,27 +10628,22 @@ msgstr "" msgid "git tag -v <tagname>..." msgstr "" -#: builtin/tag.c:80 +#: builtin/tag.c:81 #, c-format msgid "tag name too long: %.*s..." msgstr "" -#: builtin/tag.c:85 +#: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "" -#: builtin/tag.c:100 +#: builtin/tag.c:101 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:112 -#, c-format -msgid "could not verify the tag '%s'" -msgstr "" - -#: builtin/tag.c:122 +#: builtin/tag.c:117 #, c-format msgid "" "\n" @@ -10263,7 +10652,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:126 +#: builtin/tag.c:121 #, c-format msgid "" "\n" @@ -10390,21 +10779,21 @@ msgstr "" msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:453 +#: builtin/tag.c:452 msgid "too many params" msgstr "" -#: builtin/tag.c:459 +#: builtin/tag.c:458 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:464 +#: builtin/tag.c:463 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:489 +#: builtin/tag.c:491 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" @@ -10652,7 +11041,7 @@ msgstr "" msgid "print commit contents" msgstr "" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:84 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 msgid "print raw gpg status output" msgstr "" @@ -10672,7 +11061,7 @@ msgstr "" msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "" -#: builtin/verify-tag.c:83 +#: builtin/verify-tag.c:34 msgid "print tag contents" msgstr "" @@ -10688,68 +11077,72 @@ msgstr "" msgid "git worktree list [<options>]" msgstr "" -#: builtin/worktree.c:39 +#: builtin/worktree.c:40 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "" -#: builtin/worktree.c:45 +#: builtin/worktree.c:46 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "" -#: builtin/worktree.c:50 +#: builtin/worktree.c:51 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "" -#: builtin/worktree.c:61 +#: builtin/worktree.c:62 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "" -#: builtin/worktree.c:77 +#: builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" -#: builtin/worktree.c:112 +#: builtin/worktree.c:113 #, c-format -msgid "failed to remove: %s" +msgid "failed to remove '%s'" msgstr "" -#: builtin/worktree.c:201 +#: builtin/worktree.c:202 #, c-format msgid "'%s' already exists" msgstr "" -#: builtin/worktree.c:233 +#: builtin/worktree.c:234 #, c-format msgid "could not create directory of '%s'" msgstr "" -#: builtin/worktree.c:269 +#: builtin/worktree.c:270 #, c-format msgid "Preparing %s (identifier %s)" msgstr "" -#: builtin/worktree.c:317 +#: builtin/worktree.c:322 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:319 +#: builtin/worktree.c:324 msgid "create a new branch" msgstr "" -#: builtin/worktree.c:321 +#: builtin/worktree.c:326 msgid "create or reset a branch" msgstr "" -#: builtin/worktree.c:322 +#: builtin/worktree.c:327 msgid "detach HEAD at named commit" msgstr "" -#: builtin/worktree.c:329 +#: builtin/worktree.c:328 +msgid "populate the new working tree" +msgstr "" + +#: builtin/worktree.c:336 msgid "-b, -B, and --detach are mutually exclusive" msgstr "" @@ -10769,7 +11162,7 @@ msgstr "" msgid "only useful for debugging" msgstr "" -#: credential-cache--daemon.c:262 +#: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "" @@ -10780,7 +11173,7 @@ msgid "" "to read about a specific subcommand or concept." msgstr "" -#: http.c:321 +#: http.c:322 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" @@ -10908,7 +11301,7 @@ msgstr "" msgid "use <n> digits to display SHA-1s" msgstr "" -#: rerere.h:38 +#: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "" @@ -11101,58 +11494,54 @@ msgid "" "\"." msgstr "" -#: git-rebase.sh:165 +#: git-rebase.sh:168 msgid "Applied autostash." msgstr "" -#: git-rebase.sh:168 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "" -#: git-rebase.sh:169 +#: git-rebase.sh:172 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: git-rebase.sh:208 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:213 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:354 -msgid "The --exec option must be used with the --interactive option" -msgstr "" - -#: git-rebase.sh:359 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:370 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:377 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:380 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: git-rebase.sh:398 +#: git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "" -#: git-rebase.sh:417 +#: git-rebase.sh:415 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -11165,64 +11554,64 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:468 +#: git-rebase.sh:466 #, sh-format msgid "invalid upstream $upstream_name" msgstr "" -#: git-rebase.sh:492 +#: git-rebase.sh:490 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:495 git-rebase.sh:499 +#: git-rebase.sh:493 git-rebase.sh:497 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:504 +#: git-rebase.sh:502 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:527 +#: git-rebase.sh:525 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "" -#: git-rebase.sh:560 +#: git-rebase.sh:558 msgid "Cannot autostash" msgstr "" -#: git-rebase.sh:565 +#: git-rebase.sh:563 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "" -#: git-rebase.sh:569 +#: git-rebase.sh:567 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:589 +#: git-rebase.sh:587 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:593 +#: git-rebase.sh:591 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:604 +#: git-rebase.sh:602 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" -#: git-rebase.sh:613 +#: git-rebase.sh:611 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:623 +#: git-rebase.sh:621 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -11364,26 +11753,21 @@ msgstr "" msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:104 -#, sh-format -msgid "cannot strip one component off url '$remoteurl'" -msgstr "" - -#: git-submodule.sh:281 +#: git-submodule.sh:219 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:291 +#: git-submodule.sh:229 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:308 +#: git-submodule.sh:246 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:312 +#: git-submodule.sh:250 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -11391,235 +11775,217 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:330 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:332 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:340 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:342 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "" -#: git-submodule.sh:344 +#: git-submodule.sh:282 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" -#: git-submodule.sh:345 +#: git-submodule.sh:283 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -#: git-submodule.sh:347 +#: git-submodule.sh:285 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:359 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:364 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:373 +#: git-submodule.sh:311 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:417 -#, sh-format -msgid "Entering '$prefix$displaypath'" -msgstr "" - -#: git-submodule.sh:437 +#: git-submodule.sh:355 #, sh-format -msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." +msgid "Entering '$displaypath'" msgstr "" -#: git-submodule.sh:483 +#: git-submodule.sh:375 #, sh-format -msgid "No url found for submodule path '$displaypath' in .gitmodules" +msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" -#: git-submodule.sh:492 +#: git-submodule.sh:448 #, sh-format -msgid "Failed to register url for submodule path '$displaypath'" +msgid "pathspec and --all are incompatible" msgstr "" -#: git-submodule.sh:494 +#: git-submodule.sh:453 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$displaypath'" +msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" -#: git-submodule.sh:511 -#, sh-format -msgid "Failed to register update mode for submodule path '$displaypath'" -msgstr "" - -#: git-submodule.sh:549 -#, sh-format -msgid "Use '.' if you really want to deinitialize all submodules" -msgstr "" - -#: git-submodule.sh:566 +#: git-submodule.sh:470 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "" -#: git-submodule.sh:567 +#: git-submodule.sh:471 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -#: git-submodule.sh:573 +#: git-submodule.sh:477 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "" -#: git-submodule.sh:576 +#: git-submodule.sh:480 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "" -#: git-submodule.sh:577 +#: git-submodule.sh:481 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "" -#: git-submodule.sh:580 +#: git-submodule.sh:484 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "" -#: git-submodule.sh:589 +#: git-submodule.sh:493 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" -#: git-submodule.sh:723 -#, sh-format -msgid "" -"Submodule path '$displaypath' not initialized\n" -"Maybe you want to use 'update --init'?" -msgstr "" - -#: git-submodule.sh:736 +#: git-submodule.sh:635 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:745 +#: git-submodule.sh:644 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:768 +#: git-submodule.sh:667 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:788 +#: git-submodule.sh:680 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:789 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:793 +#: git-submodule.sh:685 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:794 +#: git-submodule.sh:686 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:799 +#: git-submodule.sh:691 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:800 +#: git-submodule.sh:692 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:805 +#: git-submodule.sh:697 #, sh-format -msgid "" -"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" +msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:806 +#: git-submodule.sh:698 #, sh-format -msgid "Submodule path '$prefix$sm_path': '$command $sha1'" +msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:836 +#: git-submodule.sh:729 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:944 +#: git-submodule.sh:837 msgid "The --cached option cannot be used with the --files option" msgstr "" -#: git-submodule.sh:996 +#: git-submodule.sh:889 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:1016 +#: git-submodule.sh:909 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:1019 +#: git-submodule.sh:912 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:1022 +#: git-submodule.sh:915 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:1047 +#: git-submodule.sh:940 msgid "blob" msgstr "" -#: git-submodule.sh:1165 +#: git-submodule.sh:1059 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:1229 +#: git-submodule.sh:1123 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "" + +#: git-parse-remote.sh:89 +#, sh-format +msgid "See git-${cmd}(1) for details." +msgstr "" |