diff options
Diffstat (limited to 'po/git.pot')
| -rw-r--r-- | po/git.pot | 2361 |
1 files changed, 1360 insertions, 1001 deletions
diff --git a/po/git.pot b/po/git.pot index a826dcbf9f..4a9d4efed9 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: 2013-03-05 12:36+0800\n" +"POT-Creation-Date: 2013-04-30 08:25+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c:49 +#: advice.c:53 #, c-format msgid "hint: %.*s\n" msgstr "" @@ -27,7 +27,7 @@ msgstr "" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:79 +#: advice.c:83 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -60,7 +60,7 @@ msgstr "" msgid "archive format" msgstr "" -#: archive.c:324 builtin/log.c:1115 +#: archive.c:324 builtin/log.c:1126 msgid "prefix" msgstr "" @@ -68,15 +68,15 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366 -#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653 -#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77 -#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536 +#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371 +#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665 +#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77 +#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536 #: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 msgid "file" msgstr "" -#: archive.c:327 builtin/archive.c:92 +#: archive.c:327 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" @@ -104,19 +104,19 @@ msgstr "" msgid "list supported archive formats" msgstr "" -#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85 +#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86 msgid "repo" msgstr "" -#: archive.c:346 builtin/archive.c:94 +#: archive.c:346 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615 +#: archive.c:347 builtin/archive.c:92 builtin/notes.c:615 msgid "command" msgstr "" -#: archive.c:348 builtin/archive.c:96 +#: archive.c:348 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" @@ -126,6 +126,120 @@ msgid "" "Use '\\!' for literal leading exclamation." msgstr "" +#: branch.c:60 +#, c-format +msgid "Not setting branch %s as its own upstream." +msgstr "" + +#: branch.c:82 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s by rebasing." +msgstr "" + +#: branch.c:83 +#, c-format +msgid "Branch %s set up to track remote branch %s from %s." +msgstr "" + +#: branch.c:87 +#, c-format +msgid "Branch %s set up to track local branch %s by rebasing." +msgstr "" + +#: branch.c:88 +#, c-format +msgid "Branch %s set up to track local branch %s." +msgstr "" + +#: branch.c:92 +#, c-format +msgid "Branch %s set up to track remote ref %s by rebasing." +msgstr "" + +#: branch.c:93 +#, c-format +msgid "Branch %s set up to track remote ref %s." +msgstr "" + +#: branch.c:97 +#, c-format +msgid "Branch %s set up to track local ref %s by rebasing." +msgstr "" + +#: branch.c:98 +#, c-format +msgid "Branch %s set up to track local ref %s." +msgstr "" + +#: branch.c:118 +#, c-format +msgid "Tracking not set up: name too long: %s" +msgstr "" + +#: branch.c:137 +#, c-format +msgid "Not tracking: ambiguous information for ref %s" +msgstr "" + +#: branch.c:182 +#, c-format +msgid "'%s' is not a valid branch name." +msgstr "" + +#: branch.c:187 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "" + +#: branch.c:195 +msgid "Cannot force update the current branch." +msgstr "" + +#: branch.c:201 +#, c-format +msgid "Cannot setup tracking information; starting point '%s' is not a branch." +msgstr "" + +#: branch.c:203 +#, c-format +msgid "the requested upstream branch '%s' does not exist" +msgstr "" + +#: branch.c:205 +msgid "" +"\n" +"If you are planning on basing your work on an upstream\n" +"branch that already exists at the remote, you may need to\n" +"run \"git fetch\" to retrieve it.\n" +"\n" +"If you are planning to push out a new local branch that\n" +"will track its remote counterpart, you may want to use\n" +"\"git push -u\" to set the upstream config as you push." +msgstr "" + +#: branch.c:250 +#, c-format +msgid "Not a valid object name: '%s'." +msgstr "" + +#: branch.c:270 +#, c-format +msgid "Ambiguous object name: '%s'." +msgstr "" + +#: branch.c:275 +#, c-format +msgid "Not a valid branch point: '%s'." +msgstr "" + +#: branch.c:281 +msgid "Failed to lock ref for update" +msgstr "" + +#: branch.c:299 +msgid "Failed to write ref" +msgstr "" + #: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" @@ -136,7 +250,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:89 builtin/commit.c:674 +#: bundle.c:89 builtin/commit.c:676 #, c-format msgid "could not open '%s'" msgstr "" @@ -145,27 +259,27 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299 -#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347 -#: builtin/shortlog.c:157 +#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300 +#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349 +#: builtin/shortlog.c:155 msgid "revision walk setup failed" msgstr "" #: bundle.c:186 #, c-format -msgid "The bundle contains %d ref" -msgid_plural "The bundle contains %d refs" +msgid "The bundle contains this ref:" +msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:192 +#: bundle.c:193 msgid "The bundle records a complete history." msgstr "" #: bundle.c:195 #, c-format -msgid "The bundle requires this ref" -msgid_plural "The bundle requires these %d refs" +msgid "The bundle requires this ref:" +msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" @@ -173,7 +287,7 @@ msgstr[1] "" msgid "rev-list died" msgstr "" -#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260 +#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -321,19 +435,19 @@ msgid "" "%s" msgstr "" -#: diff.c:3468 +#: diff.c:3481 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3482 +#: diff.c:3495 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: gpg-interface.c:59 gpg-interface.c:127 +#: gpg-interface.c:59 gpg-interface.c:131 msgid "could not run gpg." msgstr "" @@ -345,27 +459,27 @@ msgstr "" msgid "gpg failed to sign the data" msgstr "" -#: gpg-interface.c:112 +#: gpg-interface.c:115 #, c-format msgid "could not create temporary file '%s': %s" msgstr "" -#: gpg-interface.c:115 +#: gpg-interface.c:118 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "" -#: grep.c:1622 +#: grep.c:1623 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1639 +#: grep.c:1640 #, c-format msgid "'%s': %s" msgstr "" -#: grep.c:1650 +#: grep.c:1651 #, c-format msgid "'%s': short read %s" msgstr "" @@ -425,8 +539,8 @@ msgstr[1] "" msgid "failed to read the cache" msgstr "" -#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534 -#: builtin/clone.c:586 +#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566 +#: builtin/clone.c:645 msgid "unable to write new index file" msgstr "" @@ -475,7 +589,7 @@ msgstr "" msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:773 builtin/clone.c:302 +#: merge-recursive.c:773 builtin/clone.c:313 #, c-format msgid "failed to open '%s'" msgstr "" @@ -602,7 +716,7 @@ msgstr "" msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1633 git-submodule.sh:942 +#: merge-recursive.c:1633 git-submodule.sh:1029 msgid "submodule" msgstr "" @@ -672,10 +786,15 @@ msgstr "" msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2009 builtin/merge.c:643 +#: merge-recursive.c:2009 builtin/merge.c:658 msgid "Unable to write index." msgstr "" +#: object.c:195 +#, c-format +msgid "unable to parse object: %s" +msgstr "" + #: parse-options.c:489 msgid "..." msgstr "" @@ -711,18 +830,18 @@ msgstr "" msgid "'%s' is beyond a symbolic link" msgstr "" -#: remote.c:1653 +#: remote.c:1781 #, 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:1659 +#: remote.c:1787 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:1662 +#: remote.c:1790 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -730,11 +849,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1670 +#: remote.c:1798 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:1673 +#: remote.c:1801 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -745,257 +864,267 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1683 +#: remote.c:1811 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984 -#: builtin/merge.c:994 +#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999 +#: builtin/merge.c:1009 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986 -#: builtin/merge.c:999 +#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779 +#: builtin/merge.c:1001 builtin/merge.c:1014 #, c-format msgid "Could not write to '%s'" msgstr "" -#: sequencer.c:146 +#: sequencer.c:229 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:149 +#: sequencer.c:232 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:162 sequencer.c:774 sequencer.c:857 +#: sequencer.c:245 sequencer.c:859 sequencer.c:942 #, c-format msgid "Could not write to %s" msgstr "" -#: sequencer.c:165 +#: sequencer.c:248 #, c-format msgid "Error wrapping up %s" msgstr "" -#: sequencer.c:180 +#: sequencer.c:263 msgid "Your local changes would be overwritten by cherry-pick." msgstr "" -#: sequencer.c:182 +#: sequencer.c:265 msgid "Your local changes would be overwritten by revert." msgstr "" -#: sequencer.c:185 +#: sequencer.c:268 msgid "Commit your changes or stash them to proceed." msgstr "" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:236 +#: sequencer.c:319 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:267 +#: sequencer.c:350 msgid "Could not resolve HEAD commit\n" msgstr "" -#: sequencer.c:288 +#: sequencer.c:371 msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:333 +#: sequencer.c:416 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:338 +#: sequencer.c:421 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:404 +#: sequencer.c:487 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:423 +#: sequencer.c:506 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:431 +#: sequencer.c:514 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:435 +#: sequencer.c:518 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:448 +#: sequencer.c:531 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:452 +#: sequencer.c:535 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:536 +#: sequencer.c:621 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:537 +#: sequencer.c:622 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:569 +#: sequencer.c:654 msgid "empty commit set passed" msgstr "" -#: sequencer.c:577 +#: sequencer.c:662 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:582 +#: sequencer.c:667 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:640 +#: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:662 +#: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:667 +#: sequencer.c:752 msgid "No commits parsed." msgstr "" -#: sequencer.c:680 +#: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:684 +#: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:691 +#: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:719 +#: sequencer.c:804 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:722 +#: sequencer.c:807 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:734 +#: sequencer.c:819 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:755 +#: sequencer.c:840 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:756 +#: sequencer.c:841 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:760 +#: sequencer.c:845 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:776 sequencer.c:861 +#: sequencer.c:861 sequencer.c:946 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:795 sequencer.c:929 +#: sequencer.c:880 sequencer.c:1014 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:797 +#: sequencer.c:882 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:799 +#: sequencer.c:884 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:821 builtin/apply.c:4056 +#: sequencer.c:906 builtin/apply.c:4060 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:824 +#: sequencer.c:909 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:825 +#: sequencer.c:910 msgid "unexpected end of file" msgstr "" -#: sequencer.c:831 +#: sequencer.c:916 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:854 +#: sequencer.c:939 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1016 +#: sequencer.c:1083 +#, c-format +msgid "%s: can't cherry-pick a %s" +msgstr "" + +#: sequencer.c:1085 +#, c-format +msgid "%s: bad revision" +msgstr "" + +#: sequencer.c:1119 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1017 +#: sequencer.c:1120 msgid "Can't cherry-pick into empty head" msgstr "" -#: sha1_name.c:1044 +#: sha1_name.c:1036 msgid "HEAD does not point to a branch" msgstr "" -#: sha1_name.c:1047 +#: sha1_name.c:1039 #, c-format msgid "No such branch: '%s'" msgstr "" -#: sha1_name.c:1049 +#: sha1_name.c:1041 #, c-format msgid "No upstream configured for branch '%s'" msgstr "" -#: sha1_name.c:1052 +#: sha1_name.c:1044 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" @@ -1118,261 +1247,294 @@ msgstr "" msgid "untracked content, " msgstr "" -#: wt-status.c:303 +#: wt-status.c:306 #, c-format msgid "new file: %s" msgstr "" -#: wt-status.c:306 +#: wt-status.c:309 #, c-format msgid "copied: %s -> %s" msgstr "" -#: wt-status.c:309 +#: wt-status.c:312 #, c-format msgid "deleted: %s" msgstr "" -#: wt-status.c:312 +#: wt-status.c:315 #, c-format msgid "modified: %s" msgstr "" -#: wt-status.c:315 +#: wt-status.c:318 #, c-format msgid "renamed: %s -> %s" msgstr "" -#: wt-status.c:318 +#: wt-status.c:321 #, c-format msgid "typechange: %s" msgstr "" -#: wt-status.c:321 +#: wt-status.c:324 #, c-format msgid "unknown: %s" msgstr "" -#: wt-status.c:324 +#: wt-status.c:327 #, c-format msgid "unmerged: %s" msgstr "" -#: wt-status.c:327 +#: wt-status.c:330 #, c-format msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:789 +#: wt-status.c:803 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:792 wt-status.c:944 +#: wt-status.c:806 wt-status.c:958 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:795 +#: wt-status.c:809 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:798 +#: wt-status.c:812 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:808 +#: wt-status.c:822 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:811 +#: wt-status.c:825 msgid "The current patch is empty." msgstr "" -#: wt-status.c:815 +#: wt-status.c:829 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr "" -#: wt-status.c:817 +#: wt-status.c:831 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:819 +#: wt-status.c:833 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:879 wt-status.c:896 +#: wt-status.c:893 wt-status.c:910 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:884 wt-status.c:901 +#: wt-status.c:898 wt-status.c:915 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:887 +#: wt-status.c:901 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:889 +#: wt-status.c:903 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:891 +#: wt-status.c:905 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:904 +#: wt-status.c:918 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:908 +#: wt-status.c:922 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:913 +#: wt-status.c:927 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:916 +#: wt-status.c:930 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:920 +#: wt-status.c:934 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:925 +#: wt-status.c:939 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:928 +#: wt-status.c:942 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:930 +#: wt-status.c:944 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:940 +#: wt-status.c:954 msgid "You are currently cherry-picking." msgstr "" -#: wt-status.c:947 +#: wt-status.c:961 msgid " (all conflicts fixed: run \"git commit\")" msgstr "" -#: wt-status.c:958 +#: wt-status.c:970 +#, c-format +msgid "You are currently reverting commit %s." +msgstr "" + +#: wt-status.c:975 +msgid " (fix conflicts and run \"git revert --continue\")" +msgstr "" + +#: wt-status.c:978 +msgid " (all conflicts fixed: run \"git revert --continue\")" +msgstr "" + +#: wt-status.c:980 +msgid " (use \"git revert --abort\" to cancel the revert operation)" +msgstr "" + +#: wt-status.c:991 #, c-format -msgid "You are currently bisecting branch '%s'." +msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:962 +#: wt-status.c:995 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:965 +#: wt-status.c:998 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1064 +#: wt-status.c:1173 msgid "On branch " msgstr "" -#: wt-status.c:1071 +#: wt-status.c:1184 +msgid "HEAD detached at " +msgstr "" + +#: wt-status.c:1186 +msgid "HEAD detached from " +msgstr "" + +#: wt-status.c:1189 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1083 +#: wt-status.c:1206 msgid "Initial commit" msgstr "" -#: wt-status.c:1097 +#: wt-status.c:1220 msgid "Untracked files" msgstr "" -#: wt-status.c:1099 +#: wt-status.c:1222 msgid "Ignored files" msgstr "" -#: wt-status.c:1101 +#: wt-status.c:1226 +#, c-format +msgid "" +"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" +"may speed it up, but you have to be careful not to forget to add\n" +"new files yourself (see 'git help status')." +msgstr "" + +#: wt-status.c:1232 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1103 +#: wt-status.c:1234 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1109 +#: wt-status.c:1240 msgid "No changes" msgstr "" -#: wt-status.c:1114 +#: wt-status.c:1245 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1117 +#: wt-status.c:1248 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1120 +#: wt-status.c:1251 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1123 +#: wt-status.c:1254 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1126 +#: wt-status.c:1257 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1129 wt-status.c:1134 +#: wt-status.c:1260 wt-status.c:1265 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1132 +#: wt-status.c:1263 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1136 +#: wt-status.c:1267 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1244 +#: wt-status.c:1375 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1250 +#: wt-status.c:1381 msgid "Initial commit on " msgstr "" -#: wt-status.c:1265 +#: wt-status.c:1396 msgid "behind " msgstr "" -#: wt-status.c:1268 wt-status.c:1271 +#: wt-status.c:1399 wt-status.c:1402 msgid "ahead " msgstr "" -#: wt-status.c:1273 +#: wt-status.c:1404 msgid ", behind " msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:341 +#: compat/precompose_utf8.c:58 builtin/clone.c:352 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -1381,179 +1543,200 @@ msgstr "" msgid "git add [options] [--] <pathspec>..." msgstr "" -#: builtin/add.c:63 +#. +#. * To be consistent with "git add -p" and most Git +#. * commands, we should default to being tree-wide, but +#. * this is not the original behavior and can't be +#. * changed until users trained themselves not to type +#. * "git add -u" or "git add -A". For now, we warn and +#. * keep the old behavior. Later, the behavior can be changed +#. * to tree-wide, keeping the warning for a while, and +#. * eventually we can drop the warning. +#. +#: builtin/add.c:58 +#, c-format +msgid "" +"The behavior of 'git add %s (or %s)' with no path argument from a\n" +"subdirectory of the tree will change in Git 2.0 and should not be used " +"anymore.\n" +"To add content for the whole tree, run:\n" +"\n" +" git add %s :/\n" +" (or git add %s :/)\n" +"\n" +"To restrict the command to the current directory, run:\n" +"\n" +" git add %s .\n" +" (or git add %s .)\n" +"\n" +"With the current Git version, the command is restricted to the current " +"directory.\n" +msgstr "" + +#: builtin/add.c:100 +#, c-format +msgid "" +"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" +"whose behaviour will change in Git 2.0 with respect to paths you removed.\n" +"Paths like '%s' that are\n" +"removed from your working tree are ignored with this version of Git.\n" +"\n" +"* 'git add --ignore-removal <pathspec>', which is the current default,\n" +" ignores paths you removed from your working tree.\n" +"\n" +"* 'git add --all <pathspec>' will let you also record the removals.\n" +"\n" +"Run 'git status' to check the paths you removed from your working tree.\n" +msgstr "" + +#: builtin/add.c:144 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:68 builtin/commit.c:231 +#: builtin/add.c:149 builtin/commit.c:233 msgid "updating files failed" msgstr "" -#: builtin/add.c:78 +#: builtin/add.c:163 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:148 +#: builtin/add.c:253 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275 +#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: builtin/add.c:234 +#: builtin/add.c:339 msgid "Could not read the index" msgstr "" -#: builtin/add.c:244 +#: builtin/add.c:349 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:248 +#: builtin/add.c:353 msgid "Could not write patch" msgstr "" -#: builtin/add.c:253 +#: builtin/add.c:358 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:255 +#: builtin/add.c:360 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:261 +#: builtin/add.c:366 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:271 +#: builtin/add.c:376 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 #: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 #: builtin/rm.c:206 msgid "dry run" msgstr "" -#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19 -#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613 -#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112 +#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19 +#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613 +#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112 msgid "be verbose" msgstr "" -#: builtin/add.c:280 +#: builtin/add.c:396 msgid "interactive picking" msgstr "" -#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258 +#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:282 +#: builtin/add.c:398 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:283 +#: builtin/add.c:399 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:284 +#: builtin/add.c:400 msgid "update tracked files" msgstr "" -#: builtin/add.c:285 +#: builtin/add.c:401 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:286 +#: builtin/add.c:402 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:287 +#. takes no arguments +#: builtin/add.c:405 +msgid "ignore paths removed in the working tree (same as --no-all)" +msgstr "" + +#: builtin/add.c:407 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:288 +#: builtin/add.c:408 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:289 +#: builtin/add.c:409 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:311 +#: builtin/add.c:431 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:312 +#: builtin/add.c:432 msgid "no files added" msgstr "" -#: builtin/add.c:318 +#: builtin/add.c:438 msgid "adding files failed" msgstr "" -#. -#. * To be consistent with "git add -p" and most Git -#. * commands, we should default to being tree-wide, but -#. * this is not the original behavior and can't be -#. * changed until users trained themselves not to type -#. * "git add -u" or "git add -A". For now, we warn and -#. * keep the old behavior. Later, this warning can be -#. * turned into a die(...), and eventually we may -#. * reallow the command with a new behavior. -#. -#: builtin/add.c:335 -#, c-format -msgid "" -"The behavior of 'git add %s (or %s)' with no path argument from a\n" -"subdirectory of the tree will change in Git 2.0 and should not be used " -"anymore.\n" -"To add content for the whole tree, run:\n" -"\n" -" git add %s :/\n" -" (or git add %s :/)\n" -"\n" -"To restrict the command to the current directory, run:\n" -"\n" -" git add %s .\n" -" (or git add %s .)\n" -"\n" -"With the current Git version, the command is restricted to the current " -"directory." -msgstr "" - -#: builtin/add.c:381 +#: builtin/add.c:477 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:383 +#: builtin/add.c:495 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:414 +#: builtin/add.c:525 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:415 +#: builtin/add.c:526 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204 -#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235 +#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204 +#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235 msgid "index file corrupt" msgstr "" -#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370 +#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370 msgid "Unable to write new index file" msgstr "" @@ -1681,342 +1864,342 @@ msgstr "" msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2684 +#: builtin/apply.c:2688 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2802 +#: builtin/apply.c:2806 #, 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:2814 +#: builtin/apply.c:2818 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2820 +#: builtin/apply.c:2824 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2839 +#: builtin/apply.c:2843 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:2942 +#: builtin/apply.c:2946 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:2948 +#: builtin/apply.c:2952 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:2969 +#: builtin/apply.c:2973 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3091 +#: builtin/apply.c:3095 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189 +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3169 builtin/apply.c:3391 +#: builtin/apply.c:3173 builtin/apply.c:3395 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3250 builtin/apply.c:3405 +#: builtin/apply.c:3254 builtin/apply.c:3409 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419 +#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3259 builtin/apply.c:3413 +#: builtin/apply.c:3263 builtin/apply.c:3417 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3361 +#: builtin/apply.c:3365 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3430 +#: builtin/apply.c:3434 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3432 +#: builtin/apply.c:3436 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3533 +#: builtin/apply.c:3537 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3536 +#: builtin/apply.c:3540 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3556 +#: builtin/apply.c:3560 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3561 +#: builtin/apply.c:3565 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3569 +#: builtin/apply.c:3573 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3582 +#: builtin/apply.c:3586 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124 +#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3818 +#: builtin/apply.c:3822 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3846 +#: builtin/apply.c:3850 #, c-format msgid "corrupt patch for subproject %s" msgstr "" -#: builtin/apply.c:3850 +#: builtin/apply.c:3854 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3855 +#: builtin/apply.c:3859 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3858 builtin/apply.c:3966 +#: builtin/apply.c:3862 builtin/apply.c:3970 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3891 +#: builtin/apply.c:3895 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3940 +#: builtin/apply.c:3944 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:4027 +#: builtin/apply.c:4031 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:4035 +#: builtin/apply.c:4039 msgid "internal error" msgstr "" #. Say this even without --verbose -#: builtin/apply.c:4038 +#: builtin/apply.c:4042 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4048 +#: builtin/apply.c:4052 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4069 +#: builtin/apply.c:4073 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4072 +#: builtin/apply.c:4076 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4222 +#: builtin/apply.c:4226 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4233 +#: builtin/apply.c:4237 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91 +#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92 #: builtin/fetch.c:63 msgid "path" msgstr "" -#: builtin/apply.c:4353 +#: builtin/apply.c:4357 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4356 +#: builtin/apply.c:4360 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4358 +#: builtin/apply.c:4362 msgid "num" msgstr "" -#: builtin/apply.c:4359 +#: builtin/apply.c:4363 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4362 +#: builtin/apply.c:4366 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4364 +#: builtin/apply.c:4368 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4368 +#: builtin/apply.c:4372 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4370 +#: builtin/apply.c:4374 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4372 +#: builtin/apply.c:4376 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4374 +#: builtin/apply.c:4378 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4376 +#: builtin/apply.c:4380 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4378 +#: builtin/apply.c:4382 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4380 +#: builtin/apply.c:4384 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4382 +#: builtin/apply.c:4386 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463 +#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4387 +#: builtin/apply.c:4391 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4388 +#: builtin/apply.c:4392 msgid "action" msgstr "" -#: builtin/apply.c:4389 +#: builtin/apply.c:4393 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4392 builtin/apply.c:4395 +#: builtin/apply.c:4396 builtin/apply.c:4399 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4398 +#: builtin/apply.c:4402 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4400 +#: builtin/apply.c:4404 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4402 +#: builtin/apply.c:4406 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4404 +#: builtin/apply.c:4408 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4407 +#: builtin/apply.c:4411 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4410 +#: builtin/apply.c:4414 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4412 +#: builtin/apply.c:4416 msgid "root" msgstr "" -#: builtin/apply.c:4413 +#: builtin/apply.c:4417 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4435 +#: builtin/apply.c:4439 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4443 +#: builtin/apply.c:4447 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4446 +#: builtin/apply.c:4450 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4462 +#: builtin/apply.c:4466 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4476 +#: builtin/apply.c:4480 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4482 builtin/apply.c:4492 +#: builtin/apply.c:4486 builtin/apply.c:4496 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2040,21 +2223,21 @@ msgstr "" msgid "git archive: expected ACK/NAK, got EOF" msgstr "" -#: builtin/archive.c:63 +#: builtin/archive.c:61 #, c-format msgid "git archive: NACK %s" msgstr "" -#: builtin/archive.c:65 +#: builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "" -#: builtin/archive.c:66 +#: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "" -#: builtin/archive.c:71 +#: builtin/archive.c:68 msgid "git archive: expected a flush" msgstr "" @@ -2074,430 +2257,472 @@ msgstr "" msgid "git blame [options] [rev-opts] [rev] [--] file" msgstr "" -#: builtin/blame.c:30 builtin/shortlog.c:15 +#: builtin/blame.c:30 msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:2350 +#: builtin/blame.c:2355 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2351 +#: builtin/blame.c:2356 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2352 +#: builtin/blame.c:2357 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2353 +#: builtin/blame.c:2358 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2354 +#: builtin/blame.c:2359 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2355 +#: builtin/blame.c:2360 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2356 +#: builtin/blame.c:2361 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2357 +#: builtin/blame.c:2362 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2358 +#: builtin/blame.c:2363 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2359 +#: builtin/blame.c:2364 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2360 +#: builtin/blame.c:2365 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2361 +#: builtin/blame.c:2366 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2362 +#: builtin/blame.c:2367 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2363 +#: builtin/blame.c:2368 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2364 +#: builtin/blame.c:2369 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2365 +#: builtin/blame.c:2370 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2366 +#: builtin/blame.c:2371 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2367 +#: builtin/blame.c:2372 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2368 builtin/blame.c:2369 +#: builtin/blame.c:2373 builtin/blame.c:2374 msgid "score" msgstr "" -#: builtin/blame.c:2368 +#: builtin/blame.c:2373 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2369 +#: builtin/blame.c:2374 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2370 +#: builtin/blame.c:2375 msgid "n,m" msgstr "" -#: builtin/blame.c:2370 +#: builtin/blame.c:2375 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/branch.c:23 +#: builtin/branch.c:24 msgid "git branch [options] [-r | -a] [--merged | --no-merged]" msgstr "" -#: builtin/branch.c:24 +#: builtin/branch.c:25 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" msgstr "" -#: builtin/branch.c:25 +#: builtin/branch.c:26 msgid "git branch [options] [-r] (-d | -D) <branchname>..." msgstr "" -#: builtin/branch.c:26 +#: builtin/branch.c:27 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" msgstr "" -#: builtin/branch.c:145 +#: builtin/branch.c:150 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:149 +#: builtin/branch.c:154 #, 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:163 +#: builtin/branch.c:168 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:167 +#: builtin/branch.c:172 #, 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:180 +#: builtin/branch.c:185 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:208 +#: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:214 +#: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:222 +#: builtin/branch.c:227 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" -#: builtin/branch.c:235 +#: builtin/branch.c:240 #, c-format msgid "remote branch '%s' not found." msgstr "" -#: builtin/branch.c:236 +#: builtin/branch.c:241 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:250 +#: builtin/branch.c:255 #, c-format msgid "Error deleting remote branch '%s'" msgstr "" -#: builtin/branch.c:251 +#: builtin/branch.c:256 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:258 +#: builtin/branch.c:263 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:259 +#: builtin/branch.c:264 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:361 +#: builtin/branch.c:366 #, c-format msgid "branch '%s' does not point at a commit" msgstr "" -#: builtin/branch.c:433 +#: builtin/branch.c:453 #, c-format msgid "[%s: behind %d]" msgstr "" -#: builtin/branch.c:435 +#: builtin/branch.c:455 #, c-format msgid "[behind %d]" msgstr "" -#: builtin/branch.c:439 +#: builtin/branch.c:459 #, c-format msgid "[%s: ahead %d]" msgstr "" -#: builtin/branch.c:441 +#: builtin/branch.c:461 #, c-format msgid "[ahead %d]" msgstr "" -#: builtin/branch.c:444 +#: builtin/branch.c:464 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:447 +#: builtin/branch.c:467 #, c-format msgid "[ahead %d, behind %d]" msgstr "" -#: builtin/branch.c:469 +#: builtin/branch.c:490 msgid " **** invalid ref ****" msgstr "" -#: builtin/branch.c:560 +#: builtin/branch.c:582 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "" + +#: builtin/branch.c:585 +#, c-format +msgid "(no branch, bisect started on %s)" +msgstr "" + +#: builtin/branch.c:588 +#, c-format +msgid "(detached from %s)" +msgstr "" + +#: builtin/branch.c:591 msgid "(no branch)" msgstr "" -#: builtin/branch.c:593 +#: builtin/branch.c:637 #, c-format msgid "object '%s' does not point to a commit" msgstr "" -#: builtin/branch.c:625 +#: builtin/branch.c:669 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:638 +#: builtin/branch.c:682 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:648 +#: builtin/branch.c:692 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:663 +#: builtin/branch.c:707 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:667 +#: builtin/branch.c:711 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:671 +#: builtin/branch.c:715 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:678 +#: builtin/branch.c:722 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:693 +#: builtin/branch.c:737 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:717 +#: builtin/branch.c:761 #, c-format msgid "could not write branch description template: %s" msgstr "" -#: builtin/branch.c:747 +#: builtin/branch.c:791 msgid "Generic options" msgstr "" -#: builtin/branch.c:749 +#: builtin/branch.c:793 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:750 +#: builtin/branch.c:794 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:751 +#: builtin/branch.c:795 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:753 +#: builtin/branch.c:797 msgid "change upstream info" msgstr "" -#: builtin/branch.c:757 +#: builtin/branch.c:801 msgid "use colored output" msgstr "" -#: builtin/branch.c:758 +#: builtin/branch.c:802 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788 -#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367 -#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468 +#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832 +#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369 +#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468 msgid "commit" msgstr "" -#: builtin/branch.c:762 builtin/branch.c:768 +#: builtin/branch.c:806 builtin/branch.c:812 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:774 +#: builtin/branch.c:818 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:775 +#: builtin/branch.c:819 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:777 +#: builtin/branch.c:821 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:778 +#: builtin/branch.c:822 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:779 +#: builtin/branch.c:823 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:780 +#: builtin/branch.c:824 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:781 +#: builtin/branch.c:825 msgid "list branch names" msgstr "" -#: builtin/branch.c:782 +#: builtin/branch.c:826 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:784 +#: builtin/branch.c:828 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:785 +#: builtin/branch.c:829 msgid "force creation (when already exists)" msgstr "" -#: builtin/branch.c:788 +#: builtin/branch.c:832 msgid "print only not merged branches" msgstr "" -#: builtin/branch.c:794 +#: builtin/branch.c:838 msgid "print only merged branches" msgstr "" -#: builtin/branch.c:798 +#: builtin/branch.c:842 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:811 +#: builtin/branch.c:855 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:816 builtin/clone.c:561 +#: builtin/branch.c:860 builtin/clone.c:619 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:839 +#: builtin/branch.c:883 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:845 +#: builtin/branch.c:889 builtin/branch.c:928 msgid "branch name required" msgstr "" -#: builtin/branch.c:860 +#: builtin/branch.c:904 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:865 +#: builtin/branch.c:909 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:872 +#: builtin/branch.c:916 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:875 +#: builtin/branch.c:919 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:888 +#: builtin/branch.c:934 msgid "too many branches for a rename operation" msgstr "" -#: builtin/branch.c:893 +#: builtin/branch.c:939 +msgid "too many branches to set new upstream" +msgstr "" + +#: builtin/branch.c:943 +#, c-format +msgid "" +"could not set upstream of HEAD to %s when it does not point to any branch." +msgstr "" + +#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990 +#, c-format +msgid "no such branch '%s'" +msgstr "" + +#: builtin/branch.c:950 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:905 +#: builtin/branch.c:962 +msgid "too many branches to unset upstream" +msgstr "" + +#: builtin/branch.c:966 +msgid "could not unset upstream of HEAD when it does not point to any branch." +msgstr "" + +#: builtin/branch.c:972 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:920 +#: builtin/branch.c:987 +msgid "it does not make sense to create 'HEAD' manually" +msgstr "" + +#: builtin/branch.c:993 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:923 +#: builtin/branch.c:996 #, 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:940 +#: builtin/branch.c:1013 #, c-format msgid "" "\n" @@ -2505,12 +2730,12 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:941 +#: builtin/branch.c:1014 #, c-format msgid " git branch -d %s\n" msgstr "" -#: builtin/branch.c:942 +#: builtin/branch.c:1015 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr "" @@ -2528,43 +2753,43 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:247 +#: builtin/cat-file.c:176 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "" -#: builtin/cat-file.c:248 +#: builtin/cat-file.c:177 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "" -#: builtin/cat-file.c:266 +#: builtin/cat-file.c:195 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:267 +#: builtin/cat-file.c:196 msgid "show object type" msgstr "" -#: builtin/cat-file.c:268 +#: builtin/cat-file.c:197 msgid "show object size" msgstr "" -#: builtin/cat-file.c:270 +#: builtin/cat-file.c:199 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:271 +#: builtin/cat-file.c:200 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:273 +#: builtin/cat-file.c:202 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:275 +#: builtin/cat-file.c:204 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:278 +#: builtin/cat-file.c:207 msgid "show info about objects fed from the standard input" msgstr "" @@ -2592,27 +2817,27 @@ msgstr "" msgid "input paths are terminated by a null character" msgstr "" -#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177 +#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177 msgid "suppress progress reporting" msgstr "" -#: builtin/check-ignore.c:151 +#: builtin/check-ignore.c:146 msgid "cannot specify pathnames with --stdin" msgstr "" -#: builtin/check-ignore.c:154 +#: builtin/check-ignore.c:149 msgid "-z only makes sense with --stdin" msgstr "" -#: builtin/check-ignore.c:156 +#: builtin/check-ignore.c:151 msgid "no path specified" msgstr "" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:155 msgid "--quiet is only valid with a single pathname" msgstr "" -#: builtin/check-ignore.c:162 +#: builtin/check-ignore.c:157 msgid "cannot have both --quiet and --verbose" msgstr "" @@ -2668,106 +2893,106 @@ msgstr "" msgid "git checkout [options] [<branch>] -- <file>..." msgstr "" -#: builtin/checkout.c:116 builtin/checkout.c:149 +#: builtin/checkout.c:117 builtin/checkout.c:150 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:118 builtin/checkout.c:151 +#: builtin/checkout.c:119 builtin/checkout.c:152 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:134 +#: builtin/checkout.c:135 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:178 +#: builtin/checkout.c:179 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:195 +#: builtin/checkout.c:196 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:212 +#: builtin/checkout.c:213 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242 -#: builtin/checkout.c:245 +#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243 +#: builtin/checkout.c:246 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:248 builtin/checkout.c:251 +#: builtin/checkout.c:249 builtin/checkout.c:252 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:254 +#: builtin/checkout.c:255 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:265 builtin/checkout.c:426 +#: builtin/checkout.c:266 builtin/checkout.c:458 msgid "corrupt index file" msgstr "" -#: builtin/checkout.c:295 builtin/checkout.c:302 +#: builtin/checkout.c:329 builtin/checkout.c:336 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:448 +#: builtin/checkout.c:480 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:569 +#: builtin/checkout.c:601 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/checkout.c:602 +#: builtin/checkout.c:634 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:609 +#: builtin/checkout.c:641 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:612 +#: builtin/checkout.c:644 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:616 +#: builtin/checkout.c:648 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:618 builtin/checkout.c:955 +#: builtin/checkout.c:650 builtin/checkout.c:987 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:620 +#: builtin/checkout.c:652 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:676 +#: builtin/checkout.c:708 #, c-format msgid " ... and %d more.\n" msgstr "" #. The singular version -#: builtin/checkout.c:682 +#: builtin/checkout.c:714 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2782,7 +3007,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:700 +#: builtin/checkout.c:732 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2792,144 +3017,148 @@ msgid "" "\n" msgstr "" -#: builtin/checkout.c:730 +#: builtin/checkout.c:762 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:734 +#: builtin/checkout.c:766 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:761 builtin/checkout.c:950 +#: builtin/checkout.c:793 builtin/checkout.c:982 msgid "You are on a branch yet to be born" msgstr "" #. case (1) -#: builtin/checkout.c:886 +#: builtin/checkout.c:918 #, c-format msgid "invalid reference: %s" msgstr "" #. case (1): want a tree -#: builtin/checkout.c:925 +#: builtin/checkout.c:957 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:964 +#: builtin/checkout.c:996 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:967 builtin/checkout.c:971 +#: builtin/checkout.c:999 builtin/checkout.c:1003 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983 -#: builtin/checkout.c:986 +#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015 +#: builtin/checkout.c:1018 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:991 +#: builtin/checkout.c:1023 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 +#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90 #: builtin/remote.c:169 builtin/remote.c:171 msgid "branch" msgstr "" -#: builtin/checkout.c:1014 +#: builtin/checkout.c:1046 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1016 +#: builtin/checkout.c:1048 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1017 +#: builtin/checkout.c:1049 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1018 +#: builtin/checkout.c:1050 msgid "detach the HEAD at named commit" msgstr "" -#: builtin/checkout.c:1019 +#: builtin/checkout.c:1051 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1053 msgid "new branch" msgstr "" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1053 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1022 +#: builtin/checkout.c:1054 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1024 +#: builtin/checkout.c:1056 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1026 +#: builtin/checkout.c:1058 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1027 +#: builtin/checkout.c:1059 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1028 builtin/merge.c:215 +#: builtin/checkout.c:1060 builtin/merge.c:217 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245 +#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245 msgid "style" msgstr "" -#: builtin/checkout.c:1030 +#: builtin/checkout.c:1062 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1033 +#: builtin/checkout.c:1065 +msgid "do not limit pathspecs to sparse entries only" +msgstr "" + +#: builtin/checkout.c:1067 msgid "second guess 'git checkout no-such-branch'" msgstr "" -#: builtin/checkout.c:1057 +#: builtin/checkout.c:1091 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1074 +#: builtin/checkout.c:1108 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1081 +#: builtin/checkout.c:1115 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1150 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1123 +#: builtin/checkout.c:1157 #, 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:1128 +#: builtin/checkout.c:1162 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1132 +#: builtin/checkout.c:1166 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -2976,8 +3205,8 @@ msgstr "" msgid "remove whole directories" msgstr "" -#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717 -#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182 +#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717 +#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182 msgid "pattern" msgstr "" @@ -3008,215 +3237,230 @@ msgid "" "clean" msgstr "" -#: builtin/clone.c:36 +#: builtin/clone.c:37 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 +#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214 #: builtin/push.c:436 msgid "force progress reporting" msgstr "" -#: builtin/clone.c:66 +#: builtin/clone.c:67 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:72 +#: builtin/clone.c:73 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:74 +#: builtin/clone.c:75 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:76 +#: builtin/clone.c:77 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:78 +#: builtin/clone.c:79 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:80 builtin/clone.c:82 +#: builtin/clone.c:81 builtin/clone.c:83 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:83 builtin/init-db.c:485 +#: builtin/clone.c:84 builtin/init-db.c:485 msgid "template-directory" msgstr "" -#: builtin/clone.c:84 builtin/init-db.c:486 +#: builtin/clone.c:85 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:86 +#: builtin/clone.c:87 msgid "reference repository" msgstr "" -#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "" -#: builtin/clone.c:88 +#: builtin/clone.c:89 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:90 +#: builtin/clone.c:91 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:92 +#: builtin/clone.c:93 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662 +#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662 msgid "depth" msgstr "" -#: builtin/clone.c:94 +#: builtin/clone.c:95 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:96 +#: builtin/clone.c:97 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:97 builtin/init-db.c:494 +#: builtin/clone.c:98 builtin/init-db.c:494 msgid "gitdir" msgstr "" -#: builtin/clone.c:98 builtin/init-db.c:495 +#: builtin/clone.c:99 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "key=value" msgstr "" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:243 +#: builtin/clone.c:254 #, c-format -msgid "reference repository '%s' is not a local directory." +msgid "reference repository '%s' is not a local repository." msgstr "" -#: builtin/clone.c:306 +#: builtin/clone.c:317 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/clone.c:308 builtin/diff.c:77 +#: builtin/clone.c:319 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "" -#: builtin/clone.c:310 +#: builtin/clone.c:321 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:324 +#: builtin/clone.c:335 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:346 +#: builtin/clone.c:357 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:350 +#: builtin/clone.c:361 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:373 +#: builtin/clone.c:384 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:443 +#: builtin/clone.c:397 +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:476 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:552 +#: builtin/clone.c:550 +msgid "remote did not send all necessary objects" +msgstr "" + +#: builtin/clone.c:610 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:690 +#: builtin/clone.c:641 +msgid "unable to checkout working tree" +msgstr "" + +#: builtin/clone.c:749 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:694 +#: builtin/clone.c:753 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:705 +#: builtin/clone.c:764 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:708 +#: builtin/clone.c:767 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:721 +#: builtin/clone.c:780 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:726 +#: builtin/clone.c:785 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:736 +#: builtin/clone.c:795 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:746 +#: builtin/clone.c:805 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:759 builtin/clone.c:771 +#: builtin/clone.c:818 builtin/clone.c:830 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:762 +#: builtin/clone.c:821 #, c-format msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/clone.c:781 +#: builtin/clone.c:840 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:783 +#: builtin/clone.c:842 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:818 +#: builtin/clone.c:877 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:867 +#: builtin/clone.c:926 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:874 +#: builtin/clone.c:933 msgid "You appear to have cloned an empty repository." msgstr "" @@ -3291,93 +3535,93 @@ msgid "" "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:258 +#: builtin/commit.c:260 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:300 +#: builtin/commit.c:302 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:306 +#: builtin/commit.c:308 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410 +#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:391 +#: builtin/commit.c:393 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:393 +#: builtin/commit.c:395 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:403 +#: builtin/commit.c:405 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:423 +#: builtin/commit.c:425 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:511 builtin/commit.c:517 +#: builtin/commit.c:513 builtin/commit.c:519 #, c-format msgid "invalid commit: %s" msgstr "" -#: builtin/commit.c:540 +#: builtin/commit.c:542 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:560 +#: builtin/commit.c:562 #, c-format msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954 +#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:610 builtin/shortlog.c:272 +#: builtin/commit.c:612 builtin/shortlog.c:270 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:612 +#: builtin/commit.c:614 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:616 +#: builtin/commit.c:618 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:622 +#: builtin/commit.c:624 msgid "commit has empty message" msgstr "" -#: builtin/commit.c:638 +#: builtin/commit.c:640 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:642 +#: builtin/commit.c:644 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:646 +#: builtin/commit.c:648 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:707 +#: builtin/commit.c:709 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:718 +#: builtin/commit.c:720 #, c-format msgid "" "\n" @@ -3387,7 +3631,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:723 +#: builtin/commit.c:725 #, c-format msgid "" "\n" @@ -3397,14 +3641,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:735 +#: builtin/commit.c:737 #, 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:740 +#: builtin/commit.c:742 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -3412,351 +3656,351 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:753 +#: builtin/commit.c:755 #, c-format msgid "%sAuthor: %s" msgstr "" -#: builtin/commit.c:760 +#: builtin/commit.c:762 #, c-format msgid "%sCommitter: %s" msgstr "" -#: builtin/commit.c:780 +#: builtin/commit.c:782 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:817 +#: builtin/commit.c:819 msgid "Error building trees" msgstr "" -#: builtin/commit.c:832 builtin/tag.c:359 +#: builtin/commit.c:834 builtin/tag.c:359 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:929 +#: builtin/commit.c:931 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:944 builtin/commit.c:1138 +#: builtin/commit.c:946 builtin/commit.c:1140 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:974 +#: builtin/commit.c:976 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:985 +#: builtin/commit.c:987 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:988 +#: builtin/commit.c:990 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:990 +#: builtin/commit.c:992 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:993 +#: builtin/commit.c:995 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1003 +#: builtin/commit.c:1005 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1005 +#: builtin/commit.c:1007 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1013 +#: builtin/commit.c:1015 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1030 +#: builtin/commit.c:1032 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1032 +#: builtin/commit.c:1034 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1034 +#: builtin/commit.c:1036 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1036 +#: builtin/commit.c:1038 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1046 builtin/tag.c:575 +#: builtin/commit.c:1048 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1051 +#: builtin/commit.c:1053 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1057 builtin/commit.c:1192 +#: builtin/commit.c:1059 builtin/commit.c:1194 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1152 builtin/commit.c:1388 +#: builtin/commit.c:1154 builtin/commit.c:1390 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1154 builtin/commit.c:1390 +#: builtin/commit.c:1156 builtin/commit.c:1392 msgid "show branch information" msgstr "" -#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426 +#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1159 builtin/commit.c:1394 +#: builtin/commit.c:1161 builtin/commit.c:1396 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1162 builtin/commit.c:1397 +#: builtin/commit.c:1164 builtin/commit.c:1399 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647 -#: builtin/fast-export.c:650 builtin/tag.c:459 +#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659 +#: builtin/fast-export.c:662 builtin/tag.c:459 msgid "mode" msgstr "" -#: builtin/commit.c:1165 builtin/commit.c:1400 +#: builtin/commit.c:1167 builtin/commit.c:1402 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1168 +#: builtin/commit.c:1170 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1169 parse-options.h:151 +#: builtin/commit.c:1171 parse-options.h:151 msgid "when" msgstr "" -#: builtin/commit.c:1170 +#: builtin/commit.c:1172 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1172 +#: builtin/commit.c:1174 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1246 +#: builtin/commit.c:1248 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1248 +#: builtin/commit.c:1250 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1289 +#: builtin/commit.c:1291 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1291 +#: builtin/commit.c:1293 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1358 +#: builtin/commit.c:1360 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1359 +#: builtin/commit.c:1361 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1361 +#: builtin/commit.c:1363 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1362 builtin/tag.c:457 +#: builtin/commit.c:1364 builtin/tag.c:457 msgid "read message from file" msgstr "" -#: builtin/commit.c:1363 +#: builtin/commit.c:1365 msgid "author" msgstr "" -#: builtin/commit.c:1363 +#: builtin/commit.c:1365 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1364 builtin/gc.c:178 +#: builtin/commit.c:1366 builtin/gc.c:178 msgid "date" msgstr "" -#: builtin/commit.c:1364 +#: builtin/commit.c:1366 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533 +#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533 #: builtin/notes.c:690 builtin/tag.c:455 msgid "message" msgstr "" -#: builtin/commit.c:1365 +#: builtin/commit.c:1367 msgid "commit message" msgstr "" -#: builtin/commit.c:1366 +#: builtin/commit.c:1368 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1367 +#: builtin/commit.c:1369 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1368 +#: builtin/commit.c:1370 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1369 +#: builtin/commit.c:1371 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1370 +#: builtin/commit.c:1372 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109 +#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1372 +#: builtin/commit.c:1374 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1373 +#: builtin/commit.c:1375 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1374 +#: builtin/commit.c:1376 msgid "default" msgstr "" -#: builtin/commit.c:1374 builtin/tag.c:460 +#: builtin/commit.c:1376 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1375 +#: builtin/commit.c:1377 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461 +#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461 msgid "key id" msgstr "" -#: builtin/commit.c:1377 builtin/merge.c:214 +#: builtin/commit.c:1379 builtin/merge.c:216 msgid "GPG sign commit" msgstr "" #. end commit message options -#: builtin/commit.c:1380 +#: builtin/commit.c:1382 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1381 +#: builtin/commit.c:1383 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1382 +#: builtin/commit.c:1384 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1383 +#: builtin/commit.c:1385 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1384 +#: builtin/commit.c:1386 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1385 +#: builtin/commit.c:1387 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1386 +#: builtin/commit.c:1388 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1387 +#: builtin/commit.c:1389 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1398 +#: builtin/commit.c:1400 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1399 +#: builtin/commit.c:1401 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1404 +#: builtin/commit.c:1406 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1407 +#: builtin/commit.c:1409 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1439 +#: builtin/commit.c:1441 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1477 builtin/merge.c:508 +#: builtin/commit.c:1479 builtin/merge.c:510 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1484 +#: builtin/commit.c:1486 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1491 +#: builtin/commit.c:1493 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1510 +#: builtin/commit.c:1512 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1524 +#: builtin/commit.c:1526 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1529 +#: builtin/commit.c:1531 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857 +#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1565 +#: builtin/commit.c:1567 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1569 +#: builtin/commit.c:1571 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1580 +#: builtin/commit.c:1582 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -3879,8 +4123,12 @@ msgstr "" msgid "respect include directives on lookup" msgstr "" -#: builtin/count-objects.c:69 -msgid "git count-objects [-v]" +#: builtin/count-objects.c:82 +msgid "git count-objects [-v] [-H | --human-readable]" +msgstr "" + +#: builtin/count-objects.c:97 +msgid "print sizes in human readable format" msgstr "" #: builtin/describe.c:15 @@ -3891,125 +4139,125 @@ msgstr "" msgid "git describe [options] --dirty" msgstr "" -#: builtin/describe.c:234 +#: builtin/describe.c:233 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:238 +#: builtin/describe.c:237 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:240 +#: builtin/describe.c:239 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:267 +#: builtin/describe.c:266 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:270 +#: builtin/describe.c:269 #, c-format msgid "%s is not a valid '%s' object" msgstr "" -#: builtin/describe.c:287 +#: builtin/describe.c:286 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:289 +#: builtin/describe.c:288 #, c-format msgid "searching to describe %s\n" msgstr "" -#: builtin/describe.c:329 +#: builtin/describe.c:328 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:353 +#: builtin/describe.c:352 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:357 +#: builtin/describe.c:356 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:378 +#: builtin/describe.c:377 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:381 +#: builtin/describe.c:380 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:403 +#: builtin/describe.c:402 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:404 +#: builtin/describe.c:403 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:405 -msgid "use any ref in .git/refs" +#: builtin/describe.c:404 +msgid "use any ref" msgstr "" -#: builtin/describe.c:406 -msgid "use any tag in .git/refs/tags" +#: builtin/describe.c:405 +msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:407 +#: builtin/describe.c:406 msgid "always use long format" msgstr "" -#: builtin/describe.c:410 +#: builtin/describe.c:409 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:412 +#: builtin/describe.c:411 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:414 +#: builtin/describe.c:413 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:416 builtin/name-rev.c:238 +#: builtin/describe.c:415 builtin/name-rev.c:238 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:417 +#: builtin/describe.c:416 msgid "mark" msgstr "" -#: builtin/describe.c:418 +#: builtin/describe.c:417 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:436 +#: builtin/describe.c:435 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:462 +#: builtin/describe.c:461 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:482 +#: builtin/describe.c:481 msgid "--dirty is incompatible with committishes" msgstr "" @@ -4051,39 +4299,39 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:646 +#: builtin/fast-export.c:658 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:648 +#: builtin/fast-export.c:660 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:651 +#: builtin/fast-export.c:663 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:654 +#: builtin/fast-export.c:666 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:656 +#: builtin/fast-export.c:668 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:658 +#: builtin/fast-export.c:670 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:660 +#: builtin/fast-export.c:672 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:662 +#: builtin/fast-export.c:674 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:663 +#: builtin/fast-export.c:675 msgid "Skip output of blob data" msgstr "" @@ -4159,7 +4407,7 @@ msgstr "" msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:88 builtin/log.c:1119 +#: builtin/fetch.c:88 builtin/log.c:1130 msgid "dir" msgstr "" @@ -4334,29 +4582,29 @@ msgstr "" msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701 -#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701 +#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175 #: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 msgid "n" msgstr "" -#: builtin/fmt-merge-msg.c:660 +#: builtin/fmt-merge-msg.c:664 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:663 +#: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:670 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:671 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:668 +#: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "" @@ -4688,28 +4936,23 @@ msgstr "" msgid "no pattern given." msgstr "" -#: builtin/grep.c:825 -#, c-format -msgid "bad object %s" -msgstr "" - -#: builtin/grep.c:868 +#: builtin/grep.c:866 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:891 +#: builtin/grep.c:889 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:896 +#: builtin/grep.c:894 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:899 +#: builtin/grep.c:897 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:907 +#: builtin/grep.c:905 msgid "both --cached and trees are given." msgstr "" @@ -4747,360 +4990,396 @@ msgstr "" msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:42 +#: builtin/help.c:43 msgid "print all available commands" msgstr "" -#: builtin/help.c:43 +#: builtin/help.c:44 +msgid "print list of useful guides" +msgstr "" + +#: builtin/help.c:45 msgid "show man page" msgstr "" -#: builtin/help.c:44 +#: builtin/help.c:46 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:46 +#: builtin/help.c:48 msgid "show info page" msgstr "" -#: builtin/help.c:52 -msgid "git help [--all] [--man|--web|--info] [command]" +#: builtin/help.c:54 +msgid "git help [--all] [--guides] [--man|--web|--info] [command]" msgstr "" -#: builtin/help.c:64 +#: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:92 +#: builtin/help.c:94 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:105 +#: builtin/help.c:107 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:113 +#: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 +#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178 #, c-format msgid "failed to exec '%s': %s" msgstr "" -#: builtin/help.c:216 +#: builtin/help.c:218 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -#: builtin/help.c:228 +#: builtin/help.c:230 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:349 +#: builtin/help.c:351 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:366 +#: builtin/help.c:368 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:374 +#: builtin/help.c:376 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:429 builtin/help.c:436 +#: builtin/help.c:422 +msgid "Defining attributes per path" +msgstr "" + +#: builtin/help.c:423 +msgid "A Git glossary" +msgstr "" + +#: builtin/help.c:424 +msgid "Specifies intentionally untracked files to ignore" +msgstr "" + +#: builtin/help.c:425 +msgid "Defining submodule properties" +msgstr "" + +#: builtin/help.c:426 +msgid "Specifying revisions and ranges for Git" +msgstr "" + +#: builtin/help.c:427 +msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" +msgstr "" + +#: builtin/help.c:428 +msgid "An overview of recommended workflows with Git" +msgstr "" + +#: builtin/help.c:440 +msgid "The common Git guides are:\n" +msgstr "" + +#: builtin/help.c:462 builtin/help.c:478 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:452 +#: builtin/help.c:494 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "" -#: builtin/index-pack.c:170 +#: builtin/index-pack.c:182 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:190 +#: builtin/index-pack.c:202 msgid "object of unexpected type" msgstr "" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:239 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:237 +#: builtin/index-pack.c:249 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:238 +#: builtin/index-pack.c:250 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:250 +#: builtin/index-pack.c:262 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:257 +#: builtin/index-pack.c:269 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:273 +#: builtin/index-pack.c:285 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:278 +#: builtin/index-pack.c:290 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:292 +#: builtin/index-pack.c:304 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c:306 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:324 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "" -#: builtin/index-pack.c:434 +#: builtin/index-pack.c:446 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:483 +#: builtin/index-pack.c:495 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:491 +#: builtin/index-pack.c:503 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:499 +#: builtin/index-pack.c:511 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:542 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:532 +#: builtin/index-pack.c:544 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:558 +#: builtin/index-pack.c:570 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678 -#: builtin/index-pack.c:712 builtin/index-pack.c:721 +#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690 +#: builtin/index-pack.c:724 builtin/index-pack.c:733 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:652 builtin/pack-objects.c:170 +#: builtin/index-pack.c:664 builtin/pack-objects.c:170 #: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:718 +#: builtin/index-pack.c:730 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:732 +#: builtin/index-pack.c:744 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:747 +#: builtin/index-pack.c:759 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:749 +#: builtin/index-pack.c:761 msgid "Error in object" msgstr "" -#: builtin/index-pack.c:751 +#: builtin/index-pack.c:763 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:821 builtin/index-pack.c:847 +#: builtin/index-pack.c:833 builtin/index-pack.c:863 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:986 +#: builtin/index-pack.c:1004 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:986 +#: builtin/index-pack.c:1004 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1012 +#: builtin/index-pack.c:1030 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1017 +#: builtin/index-pack.c:1035 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1020 +#: builtin/index-pack.c:1038 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1031 +#: builtin/index-pack.c:1049 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1054 +#: builtin/index-pack.c:1072 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1064 +#: builtin/index-pack.c:1082 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1106 +#: builtin/index-pack.c:1124 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1112 +#: builtin/index-pack.c:1132 #, c-format msgid "completed with %d local objects" msgstr "" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1142 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1125 +#: builtin/index-pack.c:1146 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1150 +#: builtin/index-pack.c:1171 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1229 +#: builtin/index-pack.c:1250 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1253 +#: builtin/index-pack.c:1274 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1266 +#: builtin/index-pack.c:1287 #, c-format msgid "cannot write keep file '%s'" msgstr "" -#: builtin/index-pack.c:1274 +#: builtin/index-pack.c:1295 #, c-format msgid "cannot close written keep file '%s'" msgstr "" -#: builtin/index-pack.c:1287 +#: builtin/index-pack.c:1308 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1298 +#: builtin/index-pack.c:1319 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1331 +#: builtin/index-pack.c:1352 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1337 +#: builtin/index-pack.c:1358 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/index-pack.c:1341 builtin/index-pack.c:1514 +#: builtin/index-pack.c:1362 builtin/index-pack.c:1535 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/index-pack.c:1399 +#: builtin/index-pack.c:1420 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1401 +#: builtin/index-pack.c:1422 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1448 +#: builtin/index-pack.c:1469 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1455 +#: builtin/index-pack.c:1476 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1482 +#: builtin/index-pack.c:1503 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1526 builtin/index-pack.c:1529 -#: builtin/index-pack.c:1541 builtin/index-pack.c:1545 +#: builtin/index-pack.c:1547 builtin/index-pack.c:1550 +#: builtin/index-pack.c:1562 builtin/index-pack.c:1566 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1559 +#: builtin/index-pack.c:1580 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1563 builtin/index-pack.c:1573 +#: builtin/index-pack.c:1584 builtin/index-pack.c:1594 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1582 +#: builtin/index-pack.c:1603 msgid "--verify with no packfile name given" msgstr "" @@ -5264,345 +5543,340 @@ msgstr "" msgid "Cannot access work tree '%s'" msgstr "" -#: builtin/log.c:39 -msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" +#: builtin/log.c:40 +msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" msgstr "" -#: builtin/log.c:40 +#: builtin/log.c:41 msgid " or: git show [options] <object>..." msgstr "" -#: builtin/log.c:102 +#: builtin/log.c:103 msgid "suppress diff output" msgstr "" -#: builtin/log.c:103 +#: builtin/log.c:104 msgid "show source" msgstr "" -#: builtin/log.c:104 +#: builtin/log.c:105 msgid "Use mail map file" msgstr "" -#: builtin/log.c:105 +#: builtin/log.c:106 msgid "decorate options" msgstr "" -#: builtin/log.c:198 +#: builtin/log.c:199 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:419 builtin/log.c:511 +#: builtin/log.c:422 builtin/log.c:514 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:535 +#: builtin/log.c:538 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:627 +#: builtin/log.c:638 msgid "format.headers without value" msgstr "" -#: builtin/log.c:701 +#: builtin/log.c:720 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:717 +#: builtin/log.c:736 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:731 +#: builtin/log.c:750 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:739 +#: builtin/log.c:758 msgid "Not a range." msgstr "" -#: builtin/log.c:812 +#: builtin/log.c:860 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:885 +#: builtin/log.c:936 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:913 +#: builtin/log.c:964 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "" -#: builtin/log.c:958 +#: builtin/log.c:1009 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1097 +#: builtin/log.c:1108 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1100 +#: builtin/log.c:1111 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1104 +#: builtin/log.c:1115 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1106 +#: builtin/log.c:1117 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1108 +#: builtin/log.c:1119 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1109 +#: builtin/log.c:1120 msgid "sfx" msgstr "" -#: builtin/log.c:1110 +#: builtin/log.c:1121 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1112 +#: builtin/log.c:1123 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1114 +#: builtin/log.c:1125 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1116 +#: builtin/log.c:1127 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1119 +#: builtin/log.c:1130 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1122 +#: builtin/log.c:1133 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1125 +#: builtin/log.c:1136 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1127 +#: builtin/log.c:1138 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1129 +#: builtin/log.c:1140 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1131 +#: builtin/log.c:1142 msgid "Messaging" msgstr "" -#: builtin/log.c:1132 +#: builtin/log.c:1143 msgid "header" msgstr "" -#: builtin/log.c:1133 +#: builtin/log.c:1144 msgid "add email header" msgstr "" -#: builtin/log.c:1134 builtin/log.c:1136 +#: builtin/log.c:1145 builtin/log.c:1147 msgid "email" msgstr "" -#: builtin/log.c:1134 +#: builtin/log.c:1145 msgid "add To: header" msgstr "" -#: builtin/log.c:1136 +#: builtin/log.c:1147 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1138 +#: builtin/log.c:1149 msgid "message-id" msgstr "" -#: builtin/log.c:1139 +#: builtin/log.c:1150 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1140 builtin/log.c:1143 +#: builtin/log.c:1151 builtin/log.c:1154 msgid "boundary" msgstr "" -#: builtin/log.c:1141 +#: builtin/log.c:1152 msgid "attach the patch" msgstr "" -#: builtin/log.c:1144 +#: builtin/log.c:1155 msgid "inline the patch" msgstr "" -#: builtin/log.c:1148 +#: builtin/log.c:1159 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1150 +#: builtin/log.c:1161 msgid "signature" msgstr "" -#: builtin/log.c:1151 +#: builtin/log.c:1162 msgid "add a signature" msgstr "" -#: builtin/log.c:1153 +#: builtin/log.c:1164 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1202 -#, c-format -msgid "bogus committer info %s" -msgstr "" - -#: builtin/log.c:1247 +#: builtin/log.c:1248 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1249 +#: builtin/log.c:1250 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1257 +#: builtin/log.c:1258 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1259 +#: builtin/log.c:1260 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1261 +#: builtin/log.c:1262 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1284 +#: builtin/log.c:1285 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1286 +#: builtin/log.c:1287 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1439 +#: builtin/log.c:1435 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1488 +#: builtin/log.c:1484 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1543 +#: builtin/log.c:1539 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570 +#: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/ls-files.c:409 +#: builtin/ls-files.c:402 msgid "git ls-files [options] [<file>...]" msgstr "" -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:459 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:461 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:463 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:472 +#: builtin/ls-files.c:465 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:474 +#: builtin/ls-files.c:467 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:476 +#: builtin/ls-files.c:469 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:478 +#: builtin/ls-files.c:471 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:481 +#: builtin/ls-files.c:474 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:483 +#: builtin/ls-files.c:476 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:478 msgid "show 'other' directories' name only" msgstr "" -#: builtin/ls-files.c:488 +#: builtin/ls-files.c:481 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:491 +#: builtin/ls-files.c:484 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:493 +#: builtin/ls-files.c:486 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:488 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:491 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:501 +#: builtin/ls-files.c:494 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:496 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:506 +#: builtin/ls-files.c:499 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:509 +#: builtin/ls-files.c:502 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:510 +#: builtin/ls-files.c:503 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:511 +#: builtin/ls-files.c:504 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:513 +#: builtin/ls-files.c:506 msgid "show debugging data" msgstr "" @@ -5709,108 +5983,112 @@ msgstr "" msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112 +#: builtin/merge.c:203 +msgid "Verify that the named commit has a valid GPG signature" +msgstr "" + +#: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112 msgid "strategy" msgstr "" -#: builtin/merge.c:203 +#: builtin/merge.c:205 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:204 +#: builtin/merge.c:206 msgid "option=value" msgstr "" -#: builtin/merge.c:205 +#: builtin/merge.c:207 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:207 +#: builtin/merge.c:209 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:211 +#: builtin/merge.c:213 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:240 +#: builtin/merge.c:242 msgid "could not run stash." msgstr "" -#: builtin/merge.c:245 +#: builtin/merge.c:247 msgid "stash failed" msgstr "" -#: builtin/merge.c:250 +#: builtin/merge.c:252 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:269 builtin/merge.c:286 +#: builtin/merge.c:271 builtin/merge.c:288 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:316 +#: builtin/merge.c:318 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:329 +#: builtin/merge.c:331 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:361 +#: builtin/merge.c:363 msgid "Writing SQUASH_MSG" msgstr "" -#: builtin/merge.c:363 +#: builtin/merge.c:365 msgid "Finishing SQUASH_MSG" msgstr "" -#: builtin/merge.c:386 +#: builtin/merge.c:388 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:436 +#: builtin/merge.c:438 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:535 +#: builtin/merge.c:550 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:628 +#: builtin/merge.c:643 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/merge.c:656 +#: builtin/merge.c:671 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:670 +#: builtin/merge.c:685 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:684 +#: builtin/merge.c:699 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:773 +#: builtin/merge.c:788 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:782 +#: builtin/merge.c:797 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:788 +#: builtin/merge.c:803 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -5820,140 +6098,161 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:812 +#: builtin/merge.c:827 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:824 +#: builtin/merge.c:839 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:889 +#: builtin/merge.c:904 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:905 +#: builtin/merge.c:920 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:946 +#: builtin/merge.c:961 msgid "No current branch." msgstr "" -#: builtin/merge.c:948 +#: builtin/merge.c:963 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:950 +#: builtin/merge.c:965 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:955 +#: builtin/merge.c:970 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1042 builtin/merge.c:1199 +#: builtin/merge.c:1057 builtin/merge.c:1214 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1110 +#: builtin/merge.c:1125 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1126 git-pull.sh:31 +#: builtin/merge.c:1141 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1129 git-pull.sh:34 +#: builtin/merge.c:1144 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:1133 +#: builtin/merge.c:1148 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1136 +#: builtin/merge.c:1151 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1145 +#: builtin/merge.c:1160 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1150 +#: builtin/merge.c:1165 msgid "You cannot combine --no-ff with --ff-only." msgstr "" -#: builtin/merge.c:1157 +#: builtin/merge.c:1172 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1189 +#: builtin/merge.c:1204 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1192 +#: builtin/merge.c:1207 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1194 +#: builtin/merge.c:1209 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1310 +#: builtin/merge.c:1265 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "" + +#: builtin/merge.c:1268 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "" + +#. 'N' +#: builtin/merge.c:1271 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "" + +#: builtin/merge.c:1274 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "" + +#: builtin/merge.c:1358 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1349 +#: builtin/merge.c:1397 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1356 +#: builtin/merge.c:1404 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1388 +#: builtin/merge.c:1436 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1411 builtin/merge.c:1490 +#: builtin/merge.c:1459 builtin/merge.c:1538 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1415 +#: builtin/merge.c:1463 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1481 +#: builtin/merge.c:1529 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1483 +#: builtin/merge.c:1531 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1492 +#: builtin/merge.c:1540 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1504 +#: builtin/merge.c:1552 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -6902,11 +7201,15 @@ msgstr "" msgid "bypass pre-push hook" msgstr "" -#: builtin/push.c:448 -msgid "--delete is incompatible with --all, --mirror and --tags" +#: builtin/push.c:440 +msgid "push missing but relevant tags" msgstr "" #: builtin/push.c:450 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "" + +#: builtin/push.c:452 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -7639,7 +7942,7 @@ msgid "" msgstr "" #: builtin/revert.c:22 -msgid "git revert [options] <commit-ish>" +msgid "git revert [options] <commit-ish>..." msgstr "" #: builtin/revert.c:23 @@ -7647,7 +7950,7 @@ msgid "git revert <subcommand>" msgstr "" #: builtin/revert.c:28 -msgid "git cherry-pick [options] <commit-ish>" +msgid "git cherry-pick [options] <commit-ish>..." msgstr "" #: builtin/revert.c:29 @@ -7790,31 +8093,31 @@ msgid "git rm: unable to remove %s" msgstr "" #: builtin/shortlog.c:13 -msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" +msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" msgstr "" -#: builtin/shortlog.c:133 +#: builtin/shortlog.c:131 #, c-format msgid "Missing author: %s" msgstr "" -#: builtin/shortlog.c:229 +#: builtin/shortlog.c:227 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:231 +#: builtin/shortlog.c:229 msgid "Suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:233 +#: builtin/shortlog.c:231 msgid "Show the email address of each author" msgstr "" -#: builtin/shortlog.c:234 +#: builtin/shortlog.c:232 msgid "w[,i1[,i2]]" msgstr "" -#: builtin/shortlog.c:235 +#: builtin/shortlog.c:233 msgid "Linewrap output" msgstr "" @@ -7830,67 +8133,67 @@ msgstr "" msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c:650 msgid "show remote-tracking and local branches" msgstr "" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c:652 msgid "show remote-tracking branches" msgstr "" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "color '*!+-' corresponding to the branch" msgstr "" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "show <n> more commits after the common ancestor" msgstr "" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "synonym to more=-1" msgstr "" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c:659 msgid "suppress naming strings" msgstr "" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c:661 msgid "include the current branch" msgstr "" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c:663 msgid "name commits with their object names" msgstr "" -#: builtin/show-branch.c:666 +#: builtin/show-branch.c:665 msgid "show possible merge bases" msgstr "" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:667 msgid "show refs unreachable from any other ref" msgstr "" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:669 msgid "show commits in topological order" msgstr "" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "show only commits not on the first branch" msgstr "" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c:673 msgid "show merges reachable from only one tip" msgstr "" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:675 msgid "show commits where no parent comes before its children" msgstr "" -#: builtin/show-branch.c:678 +#: builtin/show-branch.c:677 msgid "<n>[,<base>]" msgstr "" -#: builtin/show-branch.c:679 +#: builtin/show-branch.c:678 msgid "show <n> most recent ref-log entries starting at base" msgstr "" @@ -8337,7 +8640,10 @@ msgid "only useful for debugging" msgstr "" #: git.c:16 -msgid "See 'git help <command>' for more information on a specific command." +msgid "" +"'git help -a' and 'git help -g' lists available subcommands and some\n" +"concept guides. See 'git help <command>' or 'git help <concept>'\n" +"to read about a specific subcommand or concept." msgstr "" #: parse-options.h:156 @@ -8674,59 +8980,59 @@ msgid "" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" -#: git-bisect.sh:347 git-bisect.sh:474 +#: git-bisect.sh:363 git-bisect.sh:490 msgid "We are not bisecting." msgstr "" -#: git-bisect.sh:354 +#: git-bisect.sh:370 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "" -#: git-bisect.sh:363 +#: git-bisect.sh:379 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" "Try 'git bisect reset <commit>'." msgstr "" -#: git-bisect.sh:390 +#: git-bisect.sh:406 msgid "No logfile given" msgstr "" -#: git-bisect.sh:391 +#: git-bisect.sh:407 #, sh-format msgid "cannot read $file for replaying" msgstr "" -#: git-bisect.sh:408 +#: git-bisect.sh:424 msgid "?? what are you talking about?" msgstr "" -#: git-bisect.sh:420 +#: git-bisect.sh:436 #, sh-format msgid "running $command" msgstr "" -#: git-bisect.sh:427 +#: git-bisect.sh:443 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -#: git-bisect.sh:453 +#: git-bisect.sh:469 msgid "bisect run cannot continue any more" msgstr "" -#: git-bisect.sh:459 +#: git-bisect.sh:475 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" -#: git-bisect.sh:466 +#: git-bisect.sh:482 msgid "bisect run success" msgstr "" @@ -8741,7 +9047,7 @@ msgstr "" msgid "Pull is not possible because you have unmerged files." msgstr "" -#: git-pull.sh:197 +#: git-pull.sh:203 msgid "updating an unborn branch with changes added to the index" msgstr "" @@ -8749,7 +9055,7 @@ msgstr "" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:229 +#: git-pull.sh:235 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -8757,11 +9063,11 @@ msgid "" "Warning: commit $orig_head." msgstr "" -#: git-pull.sh:254 +#: git-pull.sh:260 msgid "Cannot merge multiple branches into empty head" msgstr "" -#: git-pull.sh:258 +#: git-pull.sh:264 msgid "Cannot rebase onto multiple branches" msgstr "" @@ -9002,37 +9308,37 @@ msgstr "" msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:90 +#: git-submodule.sh:91 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "" -#: git-submodule.sh:195 +#: git-submodule.sh:196 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "" -#: git-submodule.sh:238 +#: git-submodule.sh:239 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "" -#: git-submodule.sh:250 +#: git-submodule.sh:251 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "" -#: git-submodule.sh:343 +#: git-submodule.sh:349 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:360 +#: git-submodule.sh:366 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:364 +#: git-submodule.sh:370 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -9040,180 +9346,233 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:382 +#: git-submodule.sh:388 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:384 +#: git-submodule.sh:390 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:392 +#: git-submodule.sh:398 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:394 +#: git-submodule.sh:400 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "" -#: git-submodule.sh:396 +#: git-submodule.sh:402 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" -#: git-submodule.sh:397 +#: git-submodule.sh:403 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -#: git-submodule.sh:399 +#: git-submodule.sh:405 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:411 +#: git-submodule.sh:417 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:416 +#: git-submodule.sh:422 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:425 +#: git-submodule.sh:431 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:468 +#: git-submodule.sh:474 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:482 +#: git-submodule.sh:488 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "" -#: git-submodule.sh:526 +#: git-submodule.sh:532 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "" -#: git-submodule.sh:535 +#: git-submodule.sh:541 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:537 +#: git-submodule.sh:543 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "" -#: git-submodule.sh:545 +#: git-submodule.sh:551 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:649 +#: git-submodule.sh:588 +#, sh-format +msgid "Use '.' if you really want to deinitialize all submodules" +msgstr "" + +#: git-submodule.sh:603 +#, sh-format +msgid "Submodule work tree '$sm_path' contains a .git directory" +msgstr "" + +#: git-submodule.sh:604 +#, sh-format +msgid "" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "" + +#: git-submodule.sh:610 +#, sh-format +msgid "" +"Submodule work tree '$sm_path' contains local modifications; use '-f' to " +"discard them" +msgstr "" + +#: git-submodule.sh:613 +#, sh-format +msgid "Cleared directory '$sm_path'" +msgstr "" + +#: git-submodule.sh:614 +#, sh-format +msgid "Could not remove submodule work tree '$sm_path'" +msgstr "" + +#: git-submodule.sh:617 +#, sh-format +msgid "Could not create empty submodule directory '$sm_path'" +msgstr "" + +#: git-submodule.sh:626 +#, sh-format +msgid "Submodule '$name' ($url) unregistered for path '$sm_path'" +msgstr "" + +#: git-submodule.sh:731 #, sh-format msgid "" -"Submodule path '$sm_path' not initialized\n" +"Submodule path '$prefix$sm_path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -#: git-submodule.sh:662 +#: git-submodule.sh:744 #, sh-format -msgid "Unable to find current revision in submodule path '$sm_path'" +msgid "Unable to find current revision in submodule path '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:671 git-submodule.sh:695 +#: git-submodule.sh:753 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:709 +#: git-submodule.sh:777 #, sh-format -msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" +msgid "Unable to fetch in submodule path '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:710 +#: git-submodule.sh:791 #, sh-format -msgid "Submodule path '$sm_path': rebased into '$sha1'" +msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:715 +#: git-submodule.sh:792 #, sh-format -msgid "Unable to merge '$sha1' in submodule path '$sm_path'" +msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:716 +#: git-submodule.sh:797 #, sh-format -msgid "Submodule path '$sm_path': merged in '$sha1'" +msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:721 +#: git-submodule.sh:798 #, sh-format -msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" +msgid "Submodule path '$prefix$sm_path': merged in '$sha1'" msgstr "" -#: git-submodule.sh:722 +#: git-submodule.sh:803 #, sh-format -msgid "Submodule path '$sm_path': checked out '$sha1'" +msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:744 git-submodule.sh:1066 +#: git-submodule.sh:804 #, sh-format -msgid "Failed to recurse into submodule path '$sm_path'" +msgid "Submodule path '$prefix$sm_path': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:831 +#, sh-format +msgid "Failed to recurse into submodule path '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:852 +#: git-submodule.sh:939 msgid "The --cached option cannot be used with the --files option" msgstr "" #. unexpected type -#: git-submodule.sh:892 +#: git-submodule.sh:979 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:910 +#: git-submodule.sh:997 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:913 +#: git-submodule.sh:1000 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:916 +#: git-submodule.sh:1003 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:941 +#: git-submodule.sh:1028 msgid "blob" msgstr "" -#: git-submodule.sh:979 +#: git-submodule.sh:1066 msgid "Submodules changed but not updated:" msgstr "" -#: git-submodule.sh:981 +#: git-submodule.sh:1068 msgid "Submodule changes to be committed:" msgstr "" -#: git-submodule.sh:1129 +#: git-submodule.sh:1153 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:1216 #, sh-format msgid "Synchronizing submodule url for '$prefix$sm_path'" msgstr "" |